Focused expense name instead amount

canopas · Dec 17, 2024 · 9906a8e · 9906a8e
1 parent 9b25974
commit 9906a8e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/Splito/UI/Home/Expense/AddExpenseView.swift b/Splito/UI/Home/Expense/AddExpenseView.swift
@@ -47,6 +47,9 @@ struct AddExpenseView: View {
         .navigationBarTitleDisplayMode(.inline)
         .toastView(toast: $viewModel.toast)
         .alertView.alert(isPresented: $viewModel.showAlert, alertStruct: viewModel.alert)
+        .onAppear {
+            focusedField = .expenseName
+        }
         .sheet(isPresented: $viewModel.showGroupSelection) {
             NavigationStack {
                 SelectGroupView(viewModel: SelectGroupViewModel(selectedGroup: viewModel.selectedGroup,
@@ -119,6 +122,8 @@ private struct ExpenseInfoView: View {
 
     var focusedField: FocusState<AddExpenseViewModel.AddExpenseField?>.Binding
 
+    @FocusState var isAmountFocused: Bool
+
     var body: some View {
         VStack(spacing: 16) {
             ExpenseDetailRow(name: $viewModel.expenseName, focusedField: focusedField, subtitle: "With you and:",
@@ -128,10 +133,7 @@ private struct ExpenseInfoView: View {
             ExpenseDetailRow(name: $viewModel.expenseName, focusedField: focusedField,
                              subtitle: "Description", field: .expenseName)
 
-            AmountRowView(amount: $viewModel.expenseAmount, subtitle: "Amount")
-                .onTapGesture {
-                    focusedField.wrappedValue = .amount
-                }
+            AmountRowView(amount: $viewModel.expenseAmount, isAmountFocused: $isAmountFocused, subtitle: "Amount")
                 .focused(focusedField, equals: .amount)
 
             HStack(alignment: .top, spacing: 16) {
@@ -171,9 +173,6 @@ private struct ExpenseDetailRow: View {
                         .font(.subTitle2())
                         .foregroundStyle(primaryText)
                         .keyboardType(.default)
-                        .onTapGesture {
-                            focusedField.wrappedValue = .expenseName
-                        }
                         .tint(primaryColor)
                         .focused(focusedField, equals: field)
                         .textInputAutocapitalization(.sentences)

diff --git a/Splito/UI/Home/Groups/Group/Group Options/Settle up/Payment/GroupPaymentView.swift b/Splito/UI/Home/Groups/Group/Group Options/Settle up/Payment/GroupPaymentView.swift
@@ -14,6 +14,8 @@ struct GroupPaymentView: View {
 
     @StateObject var viewModel: GroupPaymentViewModel
 
+    @FocusState var isAmountFocused: Bool
+
     var body: some View {
         GeometryReader { geometry in
             VStack(alignment: .center, spacing: 0) {
@@ -59,7 +61,7 @@ struct GroupPaymentView: View {
 
                             VSpacer(16)
 
-                            AmountRowView(amount: $viewModel.amount, subtitle: "Enter amount")
+                            AmountRowView(amount: $viewModel.amount, isAmountFocused: $isAmountFocused, subtitle: "Enter amount")
 
                             Spacer(minLength: 40)
                         }
@@ -84,8 +86,11 @@ struct GroupPaymentView: View {
         .background(surfaceColor)
         .toastView(toast: $viewModel.toast)
         .alertView.alert(isPresented: $viewModel.showAlert, alertStruct: viewModel.alert)
+        .onAppear {
+            isAmountFocused = true
+        }
         .onTapGesture {
-            UIApplication.shared.endEditing()
+            isAmountFocused = false
         }
         .toolbarRole(.editor)
         .toolbar {
@@ -123,10 +128,10 @@ struct GroupPaymentView: View {
 struct AmountRowView: View {
 
     @Binding var amount: Double
+    var isAmountFocused: FocusState<Bool>.Binding
 
     let subtitle: String
 
-    @FocusState var isAmountFocused: Bool
     @State private var amountString: String = ""
 
     var body: some View {
@@ -141,15 +146,14 @@ struct AmountRowView: View {
                 .font(.Header1())
                 .tint(primaryColor)
                 .foregroundStyle(amountString.isEmpty ? outlineColor : primaryText)
-                .focused($isAmountFocused)
+                .focused(isAmountFocused)
                 .multilineTextAlignment(.center)
                 .autocorrectionDisabled()
                 .onChange(of: amountString) { newValue in
                     formatAmount(newValue: newValue)
                 }
                 .onAppear {
                     amountString = amount == 0 ? "" : String(format: "₹ %.2f", amount)
-                    isAmountFocused = true
                 }
         }
         .padding(16)