Merge pull request #1752 from planetary-social/fix-keyboard

fix the keyboard in onboarding screens
planetary-social · Feb 1, 2025 · f1441e6 · f1441e6
2 parents 5d0ca91 + 880f83d
commit f1441e6
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -22,6 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed a crash when processing a malformed delete (kind 5) event. [#170](https://github.com/verse-pbc/issues/issues/170)
 - Fixed: tapping a user on a list causes a crash. [#172](https://github.com/verse-pbc/issues/issues/172)
 - Removed link to Listr.lol when list is empty. [#176](https://github.com/verse-pbc/issues/issues/176)
+- Fixed: text fields sometimes don't work on onboarding screens. [#178](https://github.com/verse-pbc/issues/issues/178)
 
 ### Internal Changes
 - Added function for creating a new list and a test verifying list editing. [#112](https://github.com/verse-pbc/issues/issues/112)

diff --git a/Nos/Views/Onboarding/DisplayNameView.swift b/Nos/Views/Onboarding/DisplayNameView.swift
@@ -6,6 +6,7 @@ struct DisplayNameView: View {
     @Environment(OnboardingState.self) private var state
     @Environment(CurrentUser.self) private var currentUser
     @Environment(\.managedObjectContext) private var viewContext
+    @FocusState private var isTextFieldFocused: Bool
 
     @Dependency(\.crashReporting) private var crashReporting
 
@@ -16,7 +17,7 @@ struct DisplayNameView: View {
         ZStack {
             Color.appBg
                 .ignoresSafeArea()
-            ViewThatFits(in: .vertical) {
+            ViewThatFits {
                 displayNameStack
 
                 ScrollView {
@@ -25,6 +26,11 @@ struct DisplayNameView: View {
             }
         }
         .navigationBarHidden(true)
+        .onAppear {
+            isTextFieldFocused = true
+        }
+        .ignoresSafeArea(.keyboard)
+        .interactiveDismissDisabled()
         .alert("", isPresented: $showError) {
             Button {
                 nextStep()
@@ -55,6 +61,7 @@ struct DisplayNameView: View {
                 .foregroundStyle(Color.primaryTxt)
                 .fontWeight(.bold)
                 .autocorrectionDisabled()
+                .focused($isTextFieldFocused)
                 .padding()
                 .withStyledBorder()
             Spacer()
@@ -65,6 +72,7 @@ struct DisplayNameView: View {
         }
         .padding(40)
         .readabilityPadding()
+        .frame(maxWidth: .infinity, maxHeight: .infinity)
     }
 
     func nextStep() {

diff --git a/Nos/Views/Onboarding/UsernameView.swift b/Nos/Views/Onboarding/UsernameView.swift
@@ -16,6 +16,7 @@ struct UsernameView: View {
     @Environment(OnboardingState.self) private var state
     @Environment(CurrentUser.self) private var currentUser
     @Environment(\.managedObjectContext) private var viewContext
+    @FocusState private var isTextFieldFocused: Bool
 
     @Dependency(\.crashReporting) private var crashReporting
     @Dependency(\.namesAPI) private var namesAPI
@@ -47,15 +48,20 @@ struct UsernameView: View {
         ZStack {
             Color.appBg
                 .ignoresSafeArea()
-            ViewThatFits(in: .vertical) {
-                displayNameStack
-
+            ViewThatFits {
+                usernameStack
+                
                 ScrollView {
-                    displayNameStack
+                    usernameStack
                 }
             }
         }
         .navigationBarHidden(true)
+        .onAppear {
+            isTextFieldFocused = true
+        }
+        .ignoresSafeArea(.keyboard)
+        .interactiveDismissDisabled()
         .alert("", isPresented: showAlert) {
             Button {
                 nextStep()
@@ -67,7 +73,7 @@ struct UsernameView: View {
         }
     }
 
-    var displayNameStack: some View {
+    var usernameStack: some View {
         VStack(alignment: .leading, spacing: 20) {
             LargeNumberView(4)
             HStack(alignment: .firstTextBaseline) {
@@ -92,6 +98,7 @@ struct UsernameView: View {
                 .foregroundStyle(Color.primaryTxt)
                 .fontWeight(.bold)
                 .autocorrectionDisabled()
+                .focused($isTextFieldFocused)
                 .padding()
                 .withStyledBorder()
 
@@ -110,6 +117,7 @@ struct UsernameView: View {
         }
         .padding(40)
         .readabilityPadding()
+        .frame(maxWidth: .infinity, maxHeight: .infinity)
     }
 
     var usernameAlreadyClaimedText: some View {