Merge pull request #71 from TaskarCenterAtUW/feature-ui-fixes

Fixed UI issues in Yes/No and width views

Author: iAKM

GoInfoGame/GoInfoGame/UI/CustomComponents/WidthView.swift

@@ -13,29 +13,46 @@ enum LengthUnit {
 }
 
 struct WidthView: View {
-    @Binding var feet: Double
-    @Binding var inches: Double
+    @Binding var feet: Int
+    @Binding var inches: Int
     @State private var isInputValid: Bool = false
     @Binding var isConfirmAlert: Bool
-    var unit : LengthUnit = .feetInch
+    var unit: LengthUnit = .feetInch
 
     var body: some View {
-        if(unit  == .feetInch ) {
+        if unit == .feetInch {
             VStack {
                 HStack {
-                    TextField("Feet", value: $feet, formatter: NumberFormatter(), onEditingChanged: { _ in
-                        validateInput()
-                    })
+                    TextField("Feet", text: Binding(
+                        get: { "\(self.feet)" },
+                        set: {
+                            if let value = NumberFormatter().number(from: $0) {
+                                self.feet = value.intValue
+                            } else {
+                                self.feet = 0
+                            }
+                            validateInput()
+                        }
+                    ))
                     .frame(width: 20)
                     .padding(.horizontal)
                     .overlay(Rectangle().frame(height: 1).padding(.top, 25).foregroundColor(.orange), alignment: .bottom)
                     .textFieldStyle(PlainTextFieldStyle())
                     .keyboardType(UIKeyboardType.numberPad)
+
                     Text("'").font(.title)
-                    
-                    TextField("Inches", value: $inches, formatter: NumberFormatter(), onEditingChanged: { _ in
-                        validateInput()
-                    })
+
+                    TextField("Inches", text: Binding(
+                        get: { "\(self.inches)" },
+                        set: {
+                            if let value = NumberFormatter().number(from: $0) {
+                                self.inches = value.intValue
+                            } else {
+                                self.inches = 0
+                            }
+                            validateInput()
+                        }
+                    ))
                     .frame(width: 20)
                     .padding(.horizontal)
                     .overlay(Rectangle().frame(height: 1).padding(.top, 25).foregroundColor(.orange), alignment: .bottom)
@@ -45,39 +62,44 @@ struct WidthView: View {
                     if isInputValid {
                         Button() {
                             isConfirmAlert = true
-                        }label: {
+                        } label: {
                             Image(systemName: "checkmark.circle.fill")
                                 .font(Font.system(size: 40))
                                 .foregroundColor(.orange)
                         }
                     }
                 }
             }
-            
-            
-        }
-        else if (unit == .meters) {
-            HStack(content: {
-                TextField("Inches", value: $inches, formatter: NumberFormatter(), onEditingChanged: { _ in
-                    validateInput()
-                })
+        } else if unit == .meters {
+            HStack {
+                TextField("Inches", text: Binding(
+                    get: { "\(self.inches)" },
+                    set: {
+                        if let value = NumberFormatter().number(from: $0) {
+                            self.inches = value.intValue
+                        } else {
+                            self.inches = 0
+                        }
+                        validateInput()
+                    }
+                ))
                 .frame(width: 20)
                 .padding(.horizontal)
                 .overlay(Rectangle().frame(height: 1).padding(.top, 25).foregroundColor(.orange), alignment: .bottom)
                 .textFieldStyle(PlainTextFieldStyle())
                 .keyboardType(UIKeyboardType.numberPad)
-                
+
                 Text("m").font(.title)
-            })
+            }
         }
-            
     }
+
     private func validateInput() {
         isInputValid = feet > 0 && inches >= 0
     }
 }
 
 #Preview {
-    WidthView(feet: .constant(0.0), inches: .constant(0.0), isConfirmAlert: .constant(false))
+    WidthView(feet: .constant(0), inches: .constant(0), isConfirmAlert: .constant(false))
 
 }

GoInfoGame/GoInfoGame/UI/CustomComponents/YesNoView.swift

@@ -27,29 +27,40 @@ struct YesNoView: View {
     var body: some View {
         HStack(spacing: 0) {
             Spacer()
-            Button {
+            Button(action: {
                 action?(.other)
-            } label: {
+            }) {
                 Text(actionBtnLabel)
-                    .foregroundColor(.orange).font(.body)
+                    .foregroundColor(.orange)
+                    .font(.caption)
+                    .fontWeight(.bold)
                     .frame(maxWidth: .infinity)
             }
             .frame(minHeight: 50)
-            Spacer()
+            Spacer().frame(width: 0)
             Divider().background(Color.gray).frame(height: 30)
-            Button(LocalizedStrings.questGenericHasFeatureYes.localized) {
+            Button(action: {
                 action?(.yes)
+            }) {
+                Text(LocalizedStrings.questGenericHasFeatureYes.localized)
+                    .foregroundColor(.orange)
+                    .font(.caption)
+                    .fontWeight(.bold)
+                    .frame(maxWidth: 80)
             }
-            .foregroundColor(.orange)
-            .frame(minWidth: 20, maxWidth: 80, minHeight: 50)
+            .frame(minHeight: 50)
+            Spacer().frame(width: 4)
             Divider().background(Color.gray).frame(height: 30)
-            Button {
+            Button(action: {
                 action?(.no)
-            } label: {
+            }) {
                 Text(LocalizedStrings.questGenericHasFeatureNo.localized)
-                    .foregroundColor(.orange).font(.body)
+                    .foregroundColor(.orange)
+                    .font(.caption)
+                    .fontWeight(.bold)
                     .frame(maxWidth: .infinity)
             }
+            .frame(minHeight: 50)
         }
     }
 }

GoInfoGame/GoInfoGame/quests/CrossingIsland/CrossingIslandForm.swift

@@ -35,6 +35,7 @@ struct CrossingIslandForm: 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/SideWalkWidthForm.swift

@@ -6,13 +6,17 @@
 //
 
 import SwiftUI
+import UIKit
+import Combine
+
 
 struct SideWalkWidthForm: View, QuestForm {
     typealias AnswerClass = WidthAnswer
     @State private var showAlert = false
-    @State private var feet: Double = 0.0
-    @State private var inches: Double = 0.0
+    @State private var feet: Int = 0
+    @State private var inches: Int = 0
     @State private var isConfirmAlert: Bool = false
+    @State private var isKeyboardVisible: Bool = false // Track keyboard visibility
     var action: ((WidthAnswer) -> Void)?
 
     var body: some View {
@@ -26,6 +30,12 @@ struct SideWalkWidthForm: View, QuestForm {
                 .foregroundColor(.gray)
                 .padding(.top,10)
             WidthView(feet: $feet, inches: $inches, isConfirmAlert: $isConfirmAlert)
+                .onReceive(Just(isConfirmAlert)) { isAlert in
+                            if isAlert {
+                                // Dismiss the keyboard when confirmation is given
+                                UIApplication.shared.sendAction(#selector(UIResponder.resignFirstResponder), to: nil, from: nil, for: nil)
+                            }
+                        }
             Divider()
             Button {
                 showAlert = true
@@ -57,8 +67,8 @@ struct SideWalkWidthForm: View, QuestForm {
         action?(answer)
     }
 
-    func convertFeetToMeter(feet: Double, inches: Double)-> String {
-        let meters = (feet * 12 + inches) * 0.0254
+    func convertFeetToMeter(feet: Int, inches: Int)-> String {
+        let meters = Double((feet * 12 + inches)) * 0.0254
         return String(format: "%.2f", meters)
     }
 }