Merge pull request #30 from techstartucalgary/welcome-page

Answer state managent
techstartucalgary · Dec 24, 2023 · ff99d70 · ff99d70
2 parents a7ec583 + 6fce131
commit ff99d70
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 40 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1 @@
+{}
diff --git a/Rethread/Rethread.xcodeproj/project.pbxproj b/Rethread/Rethread.xcodeproj/project.pbxproj
@@ -464,6 +464,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "\"Rethread/Preview Content\"";
+				DEVELOPMENT_TEAM = "";
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
@@ -494,6 +495,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "\"Rethread/Preview Content\"";
+				DEVELOPMENT_TEAM = "";
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;

diff --git a/...oj/project.xcworkspace/xcuserdata/parsakargari.xcuserdatad/UserInterfaceState.xcuserstate b/...oj/project.xcworkspace/xcuserdata/parsakargari.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Rethread/Rethread/OnboardingView.swift b/Rethread/Rethread/OnboardingView.swift
@@ -4,6 +4,7 @@ struct OnboardingView: View {
     // # Of pages
     var numberOfPages = 4
     @State private var currentScreenIndex = 0
+    @State private var answers: [[String]] = Array(repeating: [], count: 3)
 
     var body: some View {
         VStack {
@@ -15,23 +16,26 @@ struct OnboardingView: View {
                     options: ["Kahlil Gibran", "Rumi", "Hafez", "Shakespeare"],
                     isLastPage: false, 
                     action: goToNextScreen, 
-                    previousAction: goToPreviousScreen
+                    previousAction: goToPreviousScreen,
+                    selectedAnswers: $answers[currentScreenIndex - 1] 
                 )
             } else if currentScreenIndex == 2 {
                 QuestionView(
                     question: "Identify the author of this quote: 'The only impossible journey is the one you never begin.'",
                     options: ["Tony Robbins", "Neil Armstrong", "Mark Twain", "J.R.R. Tolkien"],
                     isLastPage: false, 
                     action: goToNextScreen, 
-                    previousAction: goToPreviousScreen
+                    previousAction: goToPreviousScreen,
+                    selectedAnswers: $answers[currentScreenIndex - 1]
                 )
             } else {
                 QuestionView(
                     question: "Determine who said: 'Out beyond ideas of wrongdoing and rightdoing, there is a field. I'll meet you there.'",
                     options: ["Rumi", "Oscar Wilde", "Emily Dickinson", "Pablo Neruda"],
                     isLastPage: true, 
-                    action: goToNextScreen, 
-                    previousAction: goToPreviousScreen
+                    action: goToNextScreen,
+                    previousAction: goToPreviousScreen,
+                    selectedAnswers: $answers[currentScreenIndex - 1]
                 )
             }
         }
@@ -51,18 +55,19 @@ struct OnboardingView: View {
             if currentScreenIndex < numberOfPages - 1 {
                 currentScreenIndex += 1
             } else {
-                // finishOnboarding()
+                finishOnboarding()
             }
         }
     }
 
     func finishOnboarding() {
-        // Code to finish onboarding and update @AppStorage value
+        sendAnswersToBackend(answers)
+        answers.removeAll()
     }
-}
-
-struct OnboardingView_Previews: PreviewProvider {
-    static var previews: some View {
-        OnboardingView()
+
+    func sendAnswersToBackend(_ answers: [[String]]) {
+        // Implement the network request logic here
+        print("Sending answers to backend:", answers)
     }
+
 }
diff --git a/Rethread/Rethread/QuestionView.swift b/Rethread/Rethread/QuestionView.swift
@@ -7,15 +7,15 @@ struct QuestionView: View {
     var action: () -> Void
     var previousAction: () -> Void
 
-    @State private var selectedOptions: Set<String> = []
+    @Binding var selectedAnswers: [String] // Directly using the binding to manage state
 
     private func currentButtonStyle() -> AnyButtonStyle {
-            if isLastPage {
-                return AnyButtonStyle(LetStartButtonStyle(isEnabled: !selectedOptions.isEmpty))
-            } else {
-                return AnyButtonStyle(NextButtonStyle(isEnabled: !selectedOptions.isEmpty))
-            }
+        if isLastPage {
+            return AnyButtonStyle(LetStartButtonStyle(isEnabled: !selectedAnswers.isEmpty))
+        } else {
+            return AnyButtonStyle(NextButtonStyle(isEnabled: !selectedAnswers.isEmpty))
         }
+    }
 
     var body: some View {
         VStack {
@@ -28,27 +28,13 @@ struct QuestionView: View {
                 .padding(.horizontal, 20.0)
 
             ForEach(options, id: \.self) { option in
-                HStack {
-                    // Custom checkbox
-                    Image(systemName: selectedOptions.contains(option) ? "checkmark.square.fill" : "square")
-                        .resizable()
-                        .frame(width: 22, height: 22)
-                        .foregroundColor(Color(red: 102/255, green: 112/255, blue: 128/255))
-                        .onTapGesture {
-                            if selectedOptions.contains(option) {
-                                selectedOptions.remove(option)
-                            } else {
-                                selectedOptions.insert(option)
-                            }
-                        }
-
-                    Text(option)
-                        .foregroundColor(.black)
-                        .padding(.leading)
-
-                    Spacer()
+                OptionRow(option: option, isSelected: selectedAnswers.contains(option)) {
+                    if let index = selectedAnswers.firstIndex(of: option) {
+                        selectedAnswers.remove(at: index) // Deselect the option
+                    } else {
+                        selectedAnswers.append(option) // Select the option
+                    }
                 }
-                .padding(.vertical, 15)
             }
             .padding([.leading, .trailing], 35)
 
@@ -75,7 +61,7 @@ struct QuestionView: View {
                     }
                 }
                 .buttonStyle(currentButtonStyle())
-                .disabled(selectedOptions.isEmpty)
+                .disabled(selectedAnswers.isEmpty)
             }
             .padding(.bottom, 70)
 
@@ -85,6 +71,30 @@ struct QuestionView: View {
     }
 }
 
+struct OptionRow: View {
+    var option: String
+    var isSelected: Bool
+    var toggleSelection: () -> Void
+
+    var body: some View {
+        HStack {
+            Image(systemName: isSelected ? "checkmark.square.fill" : "square")
+                .resizable()
+                .frame(width: 22, height: 22)
+                .foregroundColor(Color(red: 102/255, green: 112/255, blue: 128/255))
+                .onTapGesture(perform: toggleSelection)
+
+            Text(option)
+                .foregroundColor(.black)
+                .padding(.leading)
+                .onTapGesture(perform: toggleSelection)
+
+            Spacer()
+        }
+        .padding(.vertical, 15)
+    }
+}
+
 struct AnyButtonStyle: ButtonStyle {
     private let _makeBody: (Configuration) -> AnyView
 
@@ -96,5 +106,3 @@ struct AnyButtonStyle: ButtonStyle {
         self._makeBody(configuration)
     }
 }
-
-