Added focused in texteditor

canopas · Nov 26, 2024 · 172e282 · 172e282
1 parent ca6e739
commit 172e282
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/Splito/UI/Home/Expense/AddExpenseView.swift b/Splito/UI/Home/Expense/AddExpenseView.swift
@@ -286,16 +286,17 @@ struct ExpenseNotesView: View {
             .frame(width: 24, height: 24)
             .padding(.horizontal, 8)
             .padding(.vertical, 4)
-            .onTouchGesture(handleNotesTap)
+            .onTapGestureForced(perform: handleNotesTap)
     }
 }
 
-struct ExpenseAddNotesView: View {
+private struct ExpenseAddNotesView: View {
     @Environment(\.dismiss) var dismiss
 
     @Binding var expenseNotes: String
 
     @State private var tempNotes: String
+    @FocusState private var isFocused: Bool
 
     init(expenseNotes: Binding<String>) {
         self._expenseNotes = expenseNotes
@@ -313,8 +314,11 @@ struct ExpenseAddNotesView: View {
                 .foregroundColor(primaryText)
                 .lineSpacing(5)
                 .multilineTextAlignment(.leading)
+                .scrollContentBackground(.hidden)
+                .focused($isFocused)
         }
         .padding(.horizontal, 16)
+        .background(surfaceColor)
         .navigationTitle("Add notes")
         .navigationBarTitleDisplayMode(.inline)
         .toolbar {
@@ -331,5 +335,8 @@ struct ExpenseAddNotesView: View {
                 }
             }
         }
+        .onAppear {
+            isFocused = true
+        }
     }
 }
diff --git a/Splito/UI/Home/Expense/AddExpenseViewModel.swift b/Splito/UI/Home/Expense/AddExpenseViewModel.swift
@@ -215,6 +215,11 @@ extension AddExpenseViewModel {
         showImagePickerOptions = true
     }
 
+    func handleNotesAction() {
+        UIApplication.shared.endEditing()
+        showAddNotesEditor = true
+    }
+
     func handleActionSelection(_ action: ActionsOfSheet) {
         switch action {
         case .camera:
@@ -301,10 +306,6 @@ extension AddExpenseViewModel {
         showSplitTypeSelection = true
     }
 
-    func handleNotesAction() {
-        showAddNotesEditor = true
-    }
-
     func handleSplitTypeSelectionAction(members: [String], splitData: [String: Double], splitType: SplitType) {
         Task {
             await handleSplitTypeSelection(members: members, splitData: splitData, splitType: splitType)

diff --git a/Splito/UI/Home/Expense/Expense Detail/ExpenseDetailsView.swift b/Splito/UI/Home/Expense/Expense Detail/ExpenseDetailsView.swift
@@ -36,9 +36,9 @@ struct ExpenseDetailsView: View {
                         if let notes = viewModel.expense?.notes {
                             Text(notes)
                                 .padding(16)
+                                .frame(maxWidth: .infinity, alignment: .leading)
                                 .background(container2Color)
                                 .cornerRadius(8)
-                                .frame(maxWidth: .infinity, alignment: .leading)
                         }
 
                         VSpacer(24)