Merge pull request #90 from TaskarCenterAtUW/feature-ui-bug-fixes

Feature UI bug fixes

Author: shweta2101

GoInfoGame/GoInfoGame/UI/CustomComponents/ImageGridItemView.swift

@@ -89,8 +89,8 @@ struct ImageGridItemView: View {
         } else {
             return (minWidth: isLabelBelow ? 70 : 0,
                     maxWidth: isLabelBelow ? 70 : .infinity,
-                    minHeight: isLabelBelow ? 70 : 150,
-                    maxHeight: isLabelBelow ? 70 : 150)
+                    minHeight: isLabelBelow ? 70 : 130,
+                    maxHeight: isLabelBelow ? 70 : 130)
         }
     }
 

GoInfoGame/GoInfoGame/UI/Map/CustomMap.swift

@@ -94,7 +94,7 @@ struct CustomMap: UIViewRepresentable {
                             contextualString = "The \(selectedQuest.title!) is on \(streetName == "" ? "the street" : streetName) at \(distance) meters"
                         }
                         self.contextualInfo?(contextualString)
-                    } 
+                    }
                 }
             }
             // Deselect the annotation to prevent re-adding on selection

GoInfoGame/GoInfoGame/UI/Profile/ProfileView.swift

@@ -193,7 +193,7 @@ struct LoginView: View {
             .sheet(isPresented: $isSafariViewControllerPresented) {
                 OAuthViewController()
             }
-            .navigationBarHidden(true)
+            .navigationBarHidden(false)
             .padding()
         }
 

GoInfoGame/GoInfoGame/UI/QuestsList/QuestsListUIView.swift

@@ -54,7 +54,9 @@ struct QuestsListUIView : View {
 func getSheetSize(sheetSize: SheetSize) -> Set<PresentationDetent> {
     if sheetSize == .SMALL {
         return [.height(250)]
-    } else if sheetSize == .LARGE {
+    } else if sheetSize == .MEDIUM {
+        return [.height(450)]
+    }else if sheetSize == .LARGE {
         return [.height(600)]
     } else if sheetSize == .XLARGE {
         return [.height(800)]

GoInfoGame/GoInfoGame/quests/CrossingKerbHeight/CrossingKerbHeightForm.swift

@@ -17,7 +17,7 @@ struct CrossingKerbHeightForm: View, QuestForm {
     @Environment(\.presentationMode) var presentationMode
 
     @EnvironmentObject var contextualInfo: ContextualInfo
-
+    
     let imageData: [ImageData] = [
         ImageData(id:"kerb_height_raised",type: "raised", imageName: "kerb_height_raised", tag: "raised", optionName: LocalizedStrings.questKerbHeightRaised.localized),
         ImageData(id:"kerb_height_lowered",type: "lowered", imageName: "kerb_height_lowered", tag: "lowered", optionName: LocalizedStrings.questKerbHeightLowered.localized),
@@ -29,54 +29,65 @@ struct CrossingKerbHeightForm: View, QuestForm {
     var body: some View {
         ScrollView {
             VStack {
-                    DismissButtonView {
-                        withAnimation {
-                            presentationMode.wrappedValue.dismiss()
-                        }
+                DismissButtonView {
+                    withAnimation {
+                        presentationMode.wrappedValue.dismiss()
                     }
-                QuestionHeader(icon: Image("kerb_type"), title: LocalizedStrings.questCrossingKerbHeightTitle.localized, contextualInfo: contextualInfo.info).padding(.bottom,10)
-                    VStack(alignment: .leading){
-                        Text(LocalizedStrings.selectOne.localized).font(.caption).foregroundColor(.gray)
-                        ImageGridItemView(gridCount: 2, isLabelBelow: false, imageData: imageData, isImageRotated: false, isDisplayImageOnly: false, isScrollable: false, allowMultipleSelection: false, onTap: { (selectedImage) in
-                        }, selectedImages: $selectedImage)
-                        Divider()
-                        HStack() {
-                            Spacer()
-                            Button {
-                                showOtherAlert = true
-                            } label: {
-                                Text(LocalizedStrings.otherAnswers.localized).foregroundColor(.orange)
-                            }
+                }
+                QuestionHeader(icon: Image("kerb_type"), title: LocalizedStrings.questCrossingKerbHeightTitle.localized, contextualInfo: contextualInfo.info).padding(.top,10)
+                    .padding(.leading,10)
+                ZStack {
+                    VStack(alignment: .leading) {
+                        Text(LocalizedStrings.selectOne.localized)
+                            .font(.caption)
+                            .foregroundColor(.gray).padding(.bottom,10)
+                        
+                        ImageGridItemView(gridCount: 2,
+                                          isLabelBelow: false,
+                                          imageData: imageData,
+                                          isImageRotated: false,
+                                          isDisplayImageOnly: false,
+                                          isScrollable: false,
+                                          allowMultipleSelection: false,
+                                          onTap: { selectedImage in },
+                                          selectedImages: $selectedImage)
+                        
+                    }.padding()
+                    VStack {
+                        Spacer()
+                        HStack {
                             Spacer()
                             if !selectedImage.isEmpty {
-                                Button() {
+                                Button(action: {
                                     let answer = KerbHeightTypeAnswer.fromString(selectedImage.first ?? "")
                                     action?(answer ?? KerbHeightTypeAnswer.none)
-                                }label: {
+                                }) {
                                     Image(systemName: "checkmark.circle.fill")
                                         .font(Font.system(size: 40))
                                         .foregroundColor(.orange)
+                                        .padding()
                                 }
                             }
-                        }.padding(.top,10)
-                    } .padding()
-                        .background(
-                            RoundedRectangle(cornerRadius: 10)
-                                .fill(Color.white)
-                                .shadow(color: .gray, radius: 2, x: 0, y: 2))
-                    
+                        }
+                    }
                 }
-        }
-            
-            /// if user selects other answers option
-            if showOtherAlert {
-                /// display leave a note instead alert
-                CustomSureAlert(alertTitle: LocalizedStrings.questLeaveNewNoteTitle.localized, content: LocalizedStrings.questLeaveNewNoteDescription.localized,leftBtnLabel: LocalizedStrings.questLeaveNewNoteNo.localized, rightBtnLabel:LocalizedStrings.questLeaveNewNoteYes.localized, isDontShowCheckVisible: false, onCancel: {
-                    self.showOtherAlert = false
-                }, onConfirm: {
-                    self.showOtherAlert = false
-                })
+                .background(
+                    RoundedRectangle(cornerRadius: 10)
+                        .fill(Color.white)
+                        .shadow(color: .gray, radius: 2, x: 0, y: 2))
+                
             }
+        }
+        
+        /// if user selects other answers option
+        if showOtherAlert {
+            /// display leave a note instead alert
+            CustomSureAlert(alertTitle: LocalizedStrings.questLeaveNewNoteTitle.localized, content: LocalizedStrings.questLeaveNewNoteDescription.localized,leftBtnLabel: LocalizedStrings.questLeaveNewNoteNo.localized, rightBtnLabel:LocalizedStrings.questLeaveNewNoteYes.localized, isDontShowCheckVisible: false, onCancel: {
+                self.showOtherAlert = false
+            }, onConfirm: {
+                self.showOtherAlert = false
+            })
+        }
 
     }
 }

GoInfoGame/GoInfoGame/quests/CrossingMarking/CrossMarking.swift

@@ -20,7 +20,7 @@ class CrossMarking: QuestBase, Quest {
     var changesetComment: String = ""
     var relationData: Element? = nil
     var displayUnit: DisplayUnit {
-        DisplayUnit(title: self.title, description: "",parent: self,sheetSize:.LARGE )
+        DisplayUnit(title: self.title, description: "",parent: self,sheetSize:.MEDIUM )
     }
     var filterExpression: ElementFilterExpression? {
         if(_internalExpression != nil){
@@ -60,6 +60,7 @@ class CrossMarking: QuestBase, Quest {
 enum CrossingAnswer: String {
     case yes = "Yes"
     case no = "No"
+    case none = "none"
 }
 
 struct TextItem<T> {

GoInfoGame/GoInfoGame/quests/CrossingMarking/CrossMarkingForm.swift

@@ -11,7 +11,7 @@ import SwiftUI
 struct CrossMarkingForm : View,QuestForm{
     var action: ((CrossingAnswer) -> Void)?
     typealias AnswerClass = CrossingAnswer
-    @State private var selectedAnswer: CrossingAnswer?
+    @State private var selectedAnswer =  CrossingAnswer.none;
     @State private var showAlert = false
 
     @Environment(\.presentationMode) var presentationMode
@@ -38,22 +38,22 @@ struct CrossMarkingForm : View,QuestForm{
                     ForEach(items, id: \.titleId) { item in
                         RadioItem(textItem: item, isSelected: item.value == selectedAnswer) {
                             selectedAnswer = item.value
-                            action?(selectedAnswer ?? .no)
                         }
                         .frame(maxWidth: .infinity, alignment: .leading)
-                        .padding()
+                        .padding(.top,5)
+                        .padding(.bottom,5)
                     }}.padding(.top,10)
-                Divider()
-                Button {
-                    showAlert = true
-                } label: {
-                    Text(LocalizedStrings.cantSay.localized).foregroundColor(.orange)
+                if selectedAnswer != CrossingAnswer.none {
+                    Button() {
+                    /// applying final selected answer
+                        action?(selectedAnswer)
+                    }label: {
+                        Image(systemName: "checkmark.circle.fill")
+                            .font(Font.system(size: 40))
+                            .foregroundColor(.orange)
+                    }
                 }
-                .alert(isPresented: $showAlert) {
-                    Alert(title: Text("More Questions"))
-                }
-                .padding()
-            }
+            }.padding()
             .background(
                 RoundedRectangle(cornerRadius: 10)
                     .fill(Color.white)

GoInfoGame/GoInfoGame/quests/CrossingType/CrossingType.swift

@@ -24,7 +24,7 @@ class CrossingType: QuestBase, Quest {
     var relationData: Element? = nil
     var _internalExpression: ElementFilterExpression?
     var displayUnit: DisplayUnit {
-        DisplayUnit(title: self.title, description: "",parent: self,sheetSize:.LARGE )
+        DisplayUnit(title: self.title, description: "",parent: self,sheetSize:.MEDIUM )
     }
     var filterExpression: ElementFilterExpression? {
         if(_internalExpression != nil){

GoInfoGame/GoInfoGame/quests/CrossingType/CrossingTypeForm.swift

@@ -33,7 +33,7 @@ struct CrossingTypeForm: View, QuestForm {
                     withAnimation {
                         presentationMode.wrappedValue.dismiss()
                     }
-                }
+                }.padding(.top,5)
                 QuestionHeader(icon:Image("pedestrian_crossing"), title: LocalizedStrings.questCrossingTypeTitle.localized, contextualInfo: contextualInfo.info)
                 VStack(alignment:.center){
                     VStack (alignment: .leading){
@@ -43,15 +43,7 @@ struct CrossingTypeForm: View, QuestForm {
                             print("selected crossing type tag ->",selectedAnswer.rawValue)
                         }, selectedImages: $selectedImage)
                     }
-                    Divider()
-                    HStack() {
-                        Spacer()
-                        Button {
-                            self.showOtherAlert.toggle()
-                        } label: {
-                            Text(LocalizedStrings.cantSay.localized.uppercased()).foregroundColor(.orange)
-                        }.frame(alignment: .center)
-                        Spacer()
+                    VStack() {
                         if selectedAnswer != .none {
                             Button() {
 

GoInfoGame/GoInfoGame/quests/SidewalkSurface/SidewalkSurfaceForm.swift

@@ -51,21 +51,15 @@ struct SidewalkSurfaceForm: QuestForm ,View {
                                contextualInfo: contextualInfo.info)
                 .padding(.bottom,10)
                 // Quest Body
+                
                 VStack(alignment: .leading){
                     Text(LocalizedStrings.select.localized).font(.caption).foregroundColor(.gray)
                     /// Grid view for displaying selectable surfaces
                     ImageGridItemView(gridCount: 3, isLabelBelow: true, imageData: imagesFromSurfaces, isImageRotated: false, isDisplayImageOnly: false, isScrollable: true, allowMultipleSelection: false, onTap: { (selectedImage) in
                         selectedAnswer = SidewalkSurfaceAnswer(value: SurfaceAndNote(surface: Surface(rawValue: selectedImage.first ?? ""),note: ""))
                         print("selectedAnswer:", selectedAnswer)
-                        print("Clicked Tag: \(selectedImage)")}, selectedImages: $selectedImage)
-                    Divider()
-                    HStack() {
-                        Spacer()
-                        Button {
-                            showAlert = true
-                        } label: {
-                            Text(LocalizedStrings.otherAnswers.localized).foregroundColor(.orange)
-                        }.frame(alignment: .center)
+                        print("Clicked Tag: \(selectedImage)")}, selectedImages: $selectedImage).frame(height: 350)
+                    HStack(alignment: .center) {
                         Spacer()
                         if selectedAnswer.value.surface != Surface.none {
                             Button() {