added some changes to custom sure alert

Author: shweta2101

GoInfoGame/GoInfoGame/Helpers/LocalizedStrings.swift

@@ -87,6 +87,7 @@ enum LocalizedStrings: String {
     case questStepsRampSeparateWheelchairDecline = "quest_steps_ramp_separate_wheelchair_decline"
     case questPedestrianCrossingIsland = "quest_pedestrian_crossing_island"
     case dontShowAgain = "dont_show_again"
+    case questTactilePavingKerbTitle = "quest_tactile_paving_kerb_title"
 
     var localized: String {
         return NSLocalizedString(rawValue, comment: "")

GoInfoGame/GoInfoGame/UI/CustomComponents/CustomSureAlert.swift

@@ -8,24 +8,29 @@
 import SwiftUI
 
 struct CustomSureAlert: View {
+    let alertTitle: String
+    let content: String
+    let isDontShowCheckVisible: Bool
     let onCancel: () -> Void
     let onConfirm: () -> Void
 
     var body: some View {
-        CustomAlert(title: LocalizedStrings.questSourceDialogTitle.localized, content: {
+        CustomAlert(title: alertTitle, content: {
             VStack {
-                Text(LocalizedStrings.questSourceDialogNote.localized)
+                Text(content)
                 Spacer()
-                HStack {
-                    Image(systemName: "square")
-                        .foregroundColor(.gray)
-                    Text(LocalizedStrings.dontShowAgain.localized)
+                if isDontShowCheckVisible {
+                    HStack {
+                        Image(systemName: "square")
+                            .foregroundColor(.gray)
+                        Text(LocalizedStrings.dontShowAgain.localized)
+                    }
                 }
             }
         }, leftActionText: LocalizedStrings.undoConfirmNegative.localized, rightActionText: LocalizedStrings.questGenericConfirmationYes.localized, leftButtonAction: onCancel, rightButtonAction: onConfirm, height: 200, width: 270)
     }
 }
 
 #Preview {
-    CustomSureAlert(onCancel: {}, onConfirm: {})
+    CustomSureAlert(alertTitle: "", content: LocalizedStrings.questSourceDialogNote.localized,isDontShowCheckVisible: true, onCancel: {}, onConfirm: {})
 }

GoInfoGame/GoInfoGame/en.lproj/Localizable.strings

@@ -86,4 +86,5 @@
 "quest_steps_ramp_separate_wheelchair_decline" = "not separate";
 "quest_pedestrian_crossing_island" = "Does this pedestrian crossing have an island?";
 "dont_show_again" = "Don't show again for this session";
+"quest_tactile_paving_kerb_title" = "Is there tactile paving on this curb here?";
 

GoInfoGame/GoInfoGame/quests/BusStopLit/BusStopLitForm.swift

@@ -33,7 +33,7 @@ struct BusStopLitForm: View, QuestForm {
                         .shadow(color: .gray, radius: 2, x: 0, y: 2))
             }.padding()
             if isShowingAreYouSure {
-                CustomSureAlert(onCancel: {
+                CustomSureAlert(alertTitle: LocalizedStrings.questSourceDialogTitle.localized, content: LocalizedStrings.questSourceDialogNote.localized, isDontShowCheckVisible: true,onCancel: {
                     self.isShowingAreYouSure = false
                 }, onConfirm: {
                     self.isShowingAreYouSure = false

GoInfoGame/GoInfoGame/quests/CrossingIsland/CrossingIslandForm.swift

@@ -15,6 +15,7 @@ struct CrossingIslandForm: View, QuestForm {
     typealias AnswerClass = YesNoAnswer
     @State private var isShowingAreYouSure = false
     @State private var selectedAnswer: YesNoAnswer = .unknown
+    @State private var showOtherAlert = false
 
     var body: some View {
         ZStack {
@@ -26,6 +27,8 @@ struct CrossingIslandForm: View, QuestForm {
                     self.selectedAnswer = answer
                     if answer == .yes || answer == .no {
                         self.isShowingAreYouSure.toggle()
+                    } else if answer == .other {
+                        self.showOtherAlert.toggle()
                     }
                 })
                 .background(
@@ -34,14 +37,23 @@ struct CrossingIslandForm: View, QuestForm {
                         .shadow(color: .gray, radius: 2, x: 0, y: 2))
             }.padding()
             if isShowingAreYouSure {
-                CustomSureAlert(onCancel: {
+                CustomSureAlert(alertTitle: LocalizedStrings.questSourceDialogTitle.localized, content: LocalizedStrings.questSourceDialogNote.localized, isDontShowCheckVisible: true,onCancel: {
                     self.isShowingAreYouSure = false
                 }, onConfirm: {
                     self.isShowingAreYouSure = false
                     self.action?(selectedAnswer)
                 })
                 .zIndex(1)
             }
+            /// if user selects other answers option
+            if showOtherAlert {
+                /// display leave a note instead alert
+                CustomSureAlert(alertTitle: LocalizedStrings.questLeaveNewNoteTitle.localized, content: LocalizedStrings.questLeaveNewNoteDescription.localized, isDontShowCheckVisible: false, onCancel: {
+                    self.showOtherAlert = false
+                }, onConfirm: {
+                    self.showOtherAlert = false
+                })
+            }
         }
     }
 }

GoInfoGame/GoInfoGame/quests/Handrail/HandRailForm.swift

@@ -30,7 +30,7 @@ struct HandRailForm: View, QuestForm {
                     .shadow(color: .gray, radius: 2, x: 0, y: 2))
             }.padding()
             if isShowingAreYouSure {
-                CustomSureAlert(onCancel: {
+                CustomSureAlert(alertTitle: LocalizedStrings.questSourceDialogTitle.localized, content: LocalizedStrings.questSourceDialogNote.localized, isDontShowCheckVisible: true,onCancel: {
                     self.isShowingAreYouSure = false
                 }, onConfirm: {
                     self.isShowingAreYouSure = false

GoInfoGame/GoInfoGame/quests/TactilePavingKerb/TactilePavingKerbForm.swift

@@ -19,7 +19,7 @@ struct TactilePavingKerbForm: View, QuestForm {
     var body: some View {
         ZStack{
             VStack{
-                QuestionHeader(icon:Image("kerb_tactile_paving"), title: LocalizedStrings.questStepCountTitle.localized, subtitle: "Lowered Curb")
+                QuestionHeader(icon:Image("kerb_tactile_paving"), title: LocalizedStrings.questTactilePavingKerbTitle.localized, subtitle: "Lowered Curb")
                 VStack(alignment:.leading){
                     Text(LocalizedStrings.usuallyLooksLikeThis.localized).font(.caption).foregroundColor(.gray)
                     Image("tactile_paving_illustration")
@@ -42,7 +42,7 @@ struct TactilePavingKerbForm: View, QuestForm {
             /// if user selects yes/no option
             if showAlert {
                 /// display are you sure alert
-                CustomSureAlert(onCancel: {
+                CustomSureAlert(alertTitle: LocalizedStrings.questSourceDialogTitle.localized, content: LocalizedStrings.questSourceDialogNote.localized, isDontShowCheckVisible: true, onCancel: {
                     self.showAlert = false
                 }, onConfirm: {
                     self.showAlert = false
@@ -53,11 +53,11 @@ struct TactilePavingKerbForm: View, QuestForm {
             /// if user selects other answers option
             if showOtherAlert {
                 /// display leave a note instead alert
-                CustomNoteAlert {
+                CustomSureAlert(alertTitle: LocalizedStrings.questLeaveNewNoteTitle.localized, content: LocalizedStrings.questLeaveNewNoteDescription.localized, isDontShowCheckVisible: false, onCancel: {
                     self.showOtherAlert = false
-                } onConfirm: {
+                }, onConfirm: {
                     self.showOtherAlert = false
-                }
+                })
             }
         }.onTapGesture {
             showAlert = false

GoInfoGame/GoInfoGame/quests/TactilePavingSteps/TactilePavingStepsForm.swift

@@ -41,7 +41,7 @@ struct TactilePavingStepsForm: View, QuestForm {
                             .shadow(color: .gray, radius: 2, x: 0, y: 2))
             }.padding()
             if isShowingAreYouSure {
-                CustomSureAlert(onCancel: {
+                CustomSureAlert(alertTitle: LocalizedStrings.questSourceDialogTitle.localized, content: LocalizedStrings.questSourceDialogNote.localized, isDontShowCheckVisible: true,onCancel: {
                     self.isShowingAreYouSure = false
                 }, onConfirm: {
                     self.isShowingAreYouSure = false

GoInfoGame/GoInfoGame/quests/WayLit/WayLitForm.swift

@@ -32,7 +32,7 @@ struct WayLitForm: View, QuestForm {
                     .shadow(color: .gray, radius: 2, x: 0, y: 2))
             }.padding()
             if isShowingAreYouSure {
-                CustomSureAlert(onCancel: {
+                CustomSureAlert(alertTitle: LocalizedStrings.questSourceDialogTitle.localized, content: LocalizedStrings.questSourceDialogNote.localized, isDontShowCheckVisible: true,onCancel: {
                     self.isShowingAreYouSure = false
                 }, onConfirm: {
                     self.isShowingAreYouSure = false