Merge pull request #78 from TaskarCenterAtUW/feature-add-subtTitle-sidewalk

Feature add subTitle sidewalkWidth

Author: iAKM

GoInfoGame/GoInfoGame/UI/CustomComponents/QuestionHeader.swift

@@ -34,6 +34,9 @@ struct QuestionHeader: View {
                 .font(.subheadline)
                 .foregroundColor(.gray)
                 .padding(.top,2)
+                .multilineTextAlignment(.leading)
+                .lineLimit(nil)
+                .fixedSize(horizontal: false, vertical: true)
         }
     }
 }

GoInfoGame/GoInfoGame/UI/Map/CustomMap.swift

@@ -144,6 +144,8 @@ struct CustomMap: UIViewRepresentable {
         let newCoordinates = Set(newAnnotations.map { $0.coordinate })
         /// Checking if the coordinates of existing annotations are different from the coordinates of new annotations
         if existingCoordinates != newCoordinates {
+            /// to reset isRegionSet value whenever region changes.
+                context.coordinator.isRegionSet = false
             /// Removing annotations that are not present in the new set
             let annotationsToRemove = mapView.annotations.filter {
                 guard let displayUnitAnnotation = $0 as? DisplayUnitAnnotation else { return false }
@@ -164,15 +166,16 @@ struct CustomMap: UIViewRepresentable {
 
     // calculate distance between user current location and selected annotation
         func calculateDistance(selectedAnnotation: CLLocationCoordinate2D) -> CLLocationDistance {
-            let userCurrentLocation = locationManagerDelegate.locationManager.location!.coordinate
+            guard let userCurrentLocation = locationManagerDelegate.locationManager.location?.coordinate else { return CLLocationDistance(0) }
+        
             let fromLocation = CLLocation(latitude: userCurrentLocation.latitude, longitude: userCurrentLocation.longitude)
             let toLocation = CLLocation(latitude: selectedAnnotation.latitude, longitude: selectedAnnotation.longitude)
             return CLLocationDistance(Int(fromLocation.distance(from: toLocation)))
         }
 
     // infer direction
     func inferDirection(selectedAnnotation: CLLocationCoordinate2D) -> String {
-        let userCurrentLocation = locationManagerDelegate.locationManager.location!.coordinate
+        guard let userCurrentLocation = locationManagerDelegate.locationManager.location?.coordinate else { return "undetermined" }
         let userLocationPoint = MKMapPoint(userCurrentLocation)
         let destinationPoint = MKMapPoint(selectedAnnotation)
         let angleRadians = atan2(destinationPoint.y - userLocationPoint.y, destinationPoint.x - userLocationPoint.x)

GoInfoGame/GoInfoGame/UI/Map/MapView.swift

@@ -25,6 +25,7 @@ struct MapView: View {
                           selectedQuest: $viewModel.selectedQuest,
                       isPresented: $isPresented, contextualInfo: { contextualInfo in
                 print(contextualInfo)
+                self.setSubTitleForSideWalk(subTitle: contextualInfo)
             })
                 .edgesIgnoringSafeArea(.all)
 
@@ -46,6 +47,13 @@ struct MapView: View {
             isPresented = false
         }
     }
+    
+    private func setSubTitleForSideWalk(subTitle: String) {
+        if let sidewalk =  self.viewModel.selectedQuest?.parent as? SideWalkWidth {
+            sidewalk.subTitle = subTitle
+        }
+    }
+
 }
 
 #Preview {

GoInfoGame/GoInfoGame/quests/BusStopLit/BusStopLitForm.swift

@@ -31,6 +31,7 @@ struct BusStopLitForm: View, QuestForm {
                     RoundedRectangle(cornerRadius: 10)
                         .fill(Color.white)
                         .shadow(color: .gray, radius: 2, x: 0, y: 2))
+                .padding(.bottom,20)
             }.padding()
             if isShowingAreYouSure {
                 CustomSureAlert(alertTitle: LocalizedStrings.questSourceDialogTitle.localized, content: LocalizedStrings.questSourceDialogNote.localized,leftBtnLabel: LocalizedStrings.undoConfirmNegative.localized, rightBtnLabel:LocalizedStrings.questGenericConfirmationYes.localized, isDontShowCheckVisible: true,onCancel: {

GoInfoGame/GoInfoGame/quests/SidewalkWidth/SideWalkWidth.swift

@@ -40,6 +40,13 @@ class SideWalkWidth : QuestBase, Quest {
             return AnyView(self.internalForm as! SideWalkWidthForm)
         }
     }
+     var subTitle: String = "" {
+        didSet {
+            if let sidwalk = self.internalForm as? SideWalkWidthForm {
+                sidwalk.viewModel.subTitle = self.subTitle
+            }
+        }
+    }
 
     override init() {
         super.init()

GoInfoGame/GoInfoGame/quests/SidewalkWidth/SideWalkWidthForm.swift

@@ -9,6 +9,9 @@ import SwiftUI
 import UIKit
 import Combine
 
+class SideWalkWidthFormModel : ObservableObject {
+   @Published var subTitle: String = "Residential Road"
+}
 
 struct SideWalkWidthForm: View, QuestForm {
     typealias AnswerClass = WidthAnswer
@@ -17,13 +20,14 @@ struct SideWalkWidthForm: View, QuestForm {
     @State private var inches: Int = 0
     @State private var isConfirmAlert: Bool = false
     @State private var isKeyboardVisible: Bool = false // Track keyboard visibility
+    @ObservedObject var viewModel = SideWalkWidthFormModel()
     var action: ((WidthAnswer) -> Void)?
 
     var body: some View {
         VStack{
             QuestionHeader(icon: Image("sidewalk-width-img"),
                            title: LocalizedStrings.questDetermineSidewalkWidth.localized,
-                           subtitle: "Residential Road")
+                           subtitle: viewModel.subTitle)
             Text(LocalizedStrings.questRoadWithExplanation.localized).font(.caption)
                 .frame(maxWidth: .infinity, alignment: .leading)
                 .fixedSize(horizontal: false, vertical: true)

GoInfoGame/GoInfoGame/quests/WayLit/WayLitForm.swift

@@ -30,6 +30,7 @@ struct WayLitForm: View, QuestForm {
                 .background(RoundedRectangle(cornerRadius: 10)
                     .fill(Color.white)
                     .shadow(color: .gray, radius: 2, x: 0, y: 2))
+                .padding(.bottom,20)
             }.padding()
             if isShowingAreYouSure {
                 CustomSureAlert(alertTitle: LocalizedStrings.questSourceDialogTitle.localized, content: LocalizedStrings.questSourceDialogNote.localized,leftBtnLabel: LocalizedStrings.undoConfirmNegative.localized, rightBtnLabel:LocalizedStrings.questGenericConfirmationYes.localized, isDontShowCheckVisible: true,onCancel: {