Merge pull request #269 from TaskarCenterAtUW/bug-2033-Misaligned-first-answer-choice-box

Fixed Misaligned first answer choice box

Author: srikanth-vg

GoInfoGame/GoInfoGame/DataBase/DatabaseConnector.swift

@@ -14,7 +14,7 @@ import osmparser
 class DatabaseConnector {
     static let shared = DatabaseConnector()
 
-    private let realm: Realm
+    let realm: Realm
 
     private init() {
         // Initialize Realm instance

GoInfoGame/GoInfoGame/quests/LongQuests/Components/QuestOptions.swift

@@ -38,9 +38,9 @@ struct QuestOptions: View {
         switch questType {
         case .exclusiveChoice:
             let columns = [
-                GridItem(.flexible(), spacing: 30),
-                GridItem(.flexible(), spacing: 30),
-                GridItem(.flexible(), spacing: 30),
+                GridItem(.flexible(minimum: 10.0, maximum: 100.0), spacing: 30),
+                GridItem(.flexible(minimum: 10.0, maximum: 100.0), spacing: 30),
+                GridItem(.flexible(minimum: 10.0, maximum: 100.0), spacing: 30),
             ]
             ZStack {
                 ScrollView {
@@ -142,12 +142,16 @@ struct QuestOptions: View {
                                                             .font(.system(size: 15, weight: .bold))
                                                             .foregroundColor(.black)
                                                             .offset(x: offset.0, y: offset.1)
+                                                            .frame(width: 100, height: 100)
+                                                            .minimumScaleFactor(0.67) // min font size is 10
                                                     }
 
                                                     Text(option.choiceText)
                                                         .font(.system(size: 15, weight: .bold))
                                                         .foregroundColor(.white)
                                                         .shadow(color: Color.black.opacity(0.7), radius: 4, x: 0, y: 2)
+                                                        .frame(width: 100, height: 100)
+                                                        .minimumScaleFactor(0.67) // min font size is 10
                                                 }
                                             }
                                         }
@@ -217,6 +221,11 @@ struct QuestOptions: View {
        }
 }
 
-//#Preview {
-//    QuestOptions(options: ["Ashpalt", "Concrete", "Brick", "Others"], selectedOption: "")
-//}
+#Preview {
+    QuestOptions(options: [QuestAnswerChoice(value: "yes", choiceText: "Yes, this roadway can be crossed safely.", imageURL: nil, choiceFollowUp: nil),
+                           QuestAnswerChoice(value: "no", choiceText: "No, this roadway is too wide to cross safely.", imageURL: nil, choiceFollowUp: nil)], selectedAnswerId: .constant(UUID()), onChoiceSelected: { qa in
+        
+    }, questType: GoInfoGame.QuestType.exclusiveChoice, currentAnswer: .constant("Binding<String?>")) { s in
+        
+    }
+}

GoInfoGame/GoInfoGame/quests/LongQuests/View/LongForm.swift

@@ -325,5 +325,14 @@ struct LongForm: View, QuestForm {
 }
 
 #Preview {
-    LongForm()
+    let quest = LongFormElement(elementType: "Sidewalks", questQuery: "ways with (highway=footway and footway=sidewalk)", elementTypeIcon: "icon", quests: [LongQuest(questID: 14,
+                                                                                                                           questTitle: "Does the length of this crossing allow for safe navigation?",
+                                                                                                                           questDescription: "Determine whether this crossing is short enough to cross safely.",
+                                                                                                                           questType: .exclusiveChoice,
+                                                                                                                           questTag: "ext:crossing_adequate_length",
+                                                                                                                           questAnswerChoices: [QuestAnswerChoice(value: "yes", choiceText: "Yes, this roadway can be crossed safely. this is to test the line limit functionlity. want to see the max capability of this feature. the max lines should be 10. this is for our obervations only. till now it is able to render 10 lines with out any issue.", imageURL: nil, choiceFollowUp: nil),
+                                                                                                                                                QuestAnswerChoice(value: "no", choiceText: "No, this roadway is too wide to cross safely.", imageURL: nil, choiceFollowUp: nil)], questImageURL: nil, questAnswerValidation: nil, questAnswerDependency: nil, questUserAnswer: nil)])
+    QuestsRepository.shared.longQuestModels.append(quest)
+    return LongForm(elementName: quest.elementType, questID: "questId",query: quest.questQuery, action: { tags in
+                })
 }

GoInfoGame/GoInfoGame/quests/LongQuests/View/LongQuestView.swift

@@ -58,3 +58,21 @@ struct LongQuestView: View {
     }
 
 }
+
+#Preview {
+    let longQeust = LongQuest(questID: 14,
+                              questTitle: "Does the length of this crossing allow for safe navigation?",
+                              questDescription: "Determine whether this crossing is short enough to cross safely.",
+                              questType: .exclusiveChoice,
+                              questTag: "ext:crossing_adequate_length",
+                              questAnswerChoices: [QuestAnswerChoice(value: "yes", choiceText: "Yes, this roadway can be crossed safely.", imageURL: nil, choiceFollowUp: nil),
+                                                   QuestAnswerChoice(value: "no", choiceText: "No, this roadway is too wide to cross safely.", imageURL: nil, choiceFollowUp: nil)], questImageURL: nil, questAnswerValidation: nil, questAnswerDependency: nil, questUserAnswer: nil)
+    
+    
+    
+    LongQuestView(selectedAnswers: .constant([UUID(): UUID()]), quest: longQeust, onChoiceSelected: { qa in
+        
+    }, uploadPhoto: { s in
+        
+    }, currentAnswer: .constant(nil))
+}

GoInfoGame/GoInfoGame/quests/QuestUndoManager.swift

@@ -15,7 +15,7 @@ class MapUndoManager {
     private let realm: Realm
 
     private init() {
-        realm = try! Realm()
+        realm = DatabaseConnector.shared.realm
     }
 
     var updateTagsHandler: ((_ changeset: StoredChangeset?) -> Void)?