Merge pull request #944 from HedvigInsurance/feature/app-redesign/inp…

…ut-field-contact-screen Feature/app redesign/input field contact screen
HedvigInsurance · Aug 29, 2023 · f357214 · f357214
2 parents 44b4fdb + 93cdfbc
commit f357214
Show file tree

Hide file tree

Showing 8 changed files with 51 additions and 18 deletions.
diff --git a/...aims/Sources/Views/SubmitClaim/IncidentInfo/SubmitClaimOccurrencePlusLocationScreen.swift b/...aims/Sources/Views/SubmitClaim/IncidentInfo/SubmitClaimOccurrencePlusLocationScreen.swift
@@ -58,10 +58,12 @@ struct SubmitClaimOccurrencePlusLocationScreen: View {
 
             if let dateOfOccurrenceStep = dateOfOccurenceStep {
                 hSection {
-                    hDatePickerField(config: .init(
-                        maxDate: dateOfOccurenceStep?.getMaxDate(),
-                        placeholder: L10n.Claims.Item.Screen.Date.Of.Incident.button,
-                        title: L10n.Claims.Incident.Screen.Date.Of.incident),
+                    hDatePickerField(
+                        config: .init(
+                            maxDate: dateOfOccurenceStep?.getMaxDate(),
+                            placeholder: L10n.Claims.Item.Screen.Date.Of.Incident.button,
+                            title: L10n.Claims.Incident.Screen.Date.Of.incident
+                        ),
                         selectedDate: dateOfOccurrenceStep.dateOfOccurence?.localDateToDate,
                         placehodlerText: L10n.Claims.Item.Screen.Date.Of.Incident.button
                     ) { date in

diff --git a/Projects/Claims/Sources/Views/SubmitClaim/SubmitClaimContactScreen.swift b/Projects/Claims/Sources/Views/SubmitClaim/SubmitClaimContactScreen.swift
@@ -1,11 +1,13 @@
+import Combine
 import SwiftUI
 import hCore
 import hCoreUI
 
-public struct SubmitClaimContactScreen: View {
+public struct SubmitClaimContactScreen: View, KeyboardReadable {
     @PresentableStore var store: SubmitClaimStore
     @State var phoneNumber: String
     @State var type: ClaimsFlowContactType?
+    @State var keyboardEnabled: Bool = false
 
     public init(
         model: FlowClaimPhoneNumberStepModel
@@ -26,17 +28,25 @@ public struct SubmitClaimContactScreen: View {
                             placeholder: L10n.phoneNumberRowTitle
                         )
                     }
+                    .onReceive(keyboardPublisher) { newIsKeyboardEnabled in
+                        keyboardEnabled = newIsKeyboardEnabled
+                    }
                     .sectionContainerStyle(.transparent)
                     .disableOn(SubmitClaimStore.self, [.postPhoneNumber])
                     LoadingButtonWithContent(SubmitClaimStore.self, ClaimsLoadingType.postPhoneNumber) {
-                        store.send(.phoneNumberRequest(phoneNumber: phoneNumber))
-                        UIApplication.dismissKeyboard()
+                        if keyboardEnabled {
+                            UIApplication.dismissKeyboard()
+                        } else {
+                            store.send(.phoneNumberRequest(phoneNumber: phoneNumber))
+                            UIApplication.dismissKeyboard()
+                        }
                     } content: {
-                        hText(L10n.saveAndContinueButtonLabel, style: .body)
+                        hText(keyboardEnabled ? L10n.generalSaveButton : L10n.generalContinueButton)
                     }
                     .frame(maxWidth: .infinity, alignment: .bottom)
                     .padding(.horizontal, 16)
                 }
+                .padding(.bottom, 16)
             }
     }
 }
@@ -55,3 +65,22 @@ enum ClaimsFlowContactType: hTextFieldFocusStateCompliant {
 
     case phoneNumber
 }
+
+protocol KeyboardReadable {
+    var keyboardPublisher: AnyPublisher<Bool, Never> { get }
+}
+
+extension KeyboardReadable {
+    var keyboardPublisher: AnyPublisher<Bool, Never> {
+        Publishers.Merge(
+            NotificationCenter.default
+                .publisher(for: UIResponder.keyboardWillShowNotification)
+                .map { _ in true },
+
+            NotificationCenter.default
+                .publisher(for: UIResponder.keyboardWillHideNotification)
+                .map { _ in false }
+        )
+        .eraseToAnyPublisher()
+    }
+}
diff --git a/Projects/Home/Sources/Components/HomeSection.swift b/Projects/Home/Sources/Components/HomeSection.swift
@@ -0,0 +1 @@
+
diff --git a/Projects/hCoreUI/Sources/InsurableLimits/InsurableLimits.swift b/Projects/hCoreUI/Sources/InsurableLimits/InsurableLimits.swift
@@ -6,15 +6,15 @@ import hGraphQL
 public struct InsurableLimitsSectionView: View {
     var limits: [InsurableLimits]
     var didTap: (_ limit: InsurableLimits) -> Void
-    
+
     public init(
         limits: [InsurableLimits],
         didTap: @escaping (InsurableLimits) -> Void
     ) {
         self.limits = limits
         self.didTap = didTap
     }
-    
+
     public var body: some View {
         hSection(limits, id: \.label) { limit in
             hRow {

diff --git a/Projects/hCoreUI/Sources/ToggleStyles/CheckboxToggleStyle.swift b/Projects/hCoreUI/Sources/ToggleStyles/CheckboxToggleStyle.swift
@@ -2,9 +2,9 @@ import Foundation
 import SwiftUI
 
 public struct ChecboxToggleStyle: ToggleStyle {
-    
-    public init(){}
-    
+
+    public init() {}
+
     public func makeBody(configuration: Configuration) -> some View {
         if #available(iOS 15.0, *) {
             HStack {

diff --git a/Projects/hCoreUI/Sources/Views/MarqueeText.swift b/Projects/hCoreUI/Sources/Views/MarqueeText.swift
@@ -33,7 +33,7 @@ public struct MarqueeText: View {
                         Text(self.text)
                             .lineLimit(1)
                             .font(.init(font))
-                            .offset(x:0)
+                            .offset(x: 0)
                             .offset(x: self.animate ? -(stringWidth - geo.size.width) - 6 : 0)  //
                             .animation(
                                 self.animate

diff --git a/Projects/hCoreUI/Sources/hForm/hFloatingTextField.swift b/Projects/hCoreUI/Sources/hForm/hFloatingTextField.swift
@@ -118,6 +118,7 @@ public struct hFloatingTextField<Value: hTextFieldFocusStateCompliant>: View {
         }
         .onTapGesture {
             self.equals = self.focusValue
+            self.vm.textField?.becomeFirstResponder()
         }
         .onChange(of: error) { error in
             self.animate = true

diff --git a/Projects/hCoreUI/Sources/hForm/hRadioField.swift b/Projects/hCoreUI/Sources/hForm/hRadioField.swift
@@ -9,7 +9,7 @@ public struct hRadioField<Content: View>: View {
     @Binding var selected: String?
     @Binding private var error: String?
     @State private var animate = false
-    
+
     public init(
         id: String,
         content: @escaping () -> Content,
@@ -23,7 +23,7 @@ public struct hRadioField<Content: View>: View {
         self._error = error ?? Binding.constant(nil)
         self.useAnimation = useAnimation
     }
-    
+
     public var body: some View {
         HStack {
             content
@@ -53,7 +53,7 @@ public struct hRadioField<Content: View>: View {
             }
         }
     }
-    
+
     @hColorBuilder
     func retColor(isSelected: Bool) -> some hColor {
         if isSelected {
@@ -62,7 +62,7 @@ public struct hRadioField<Content: View>: View {
             hFillColorNew.opaqueOne
         }
     }
-    
+
     @hColorBuilder
     func getBorderColor(isSelected: Bool) -> some hColor {
         if isSelected {