improve submitting with editingformviewcontroller

urmxrainbow · Oct 18, 2024 · 40aa0d1 · 40aa0d1
1 parent 809aeca
commit 40aa0d1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/HabitRPG/Extensions/EditingFormViewController-Extensions.swift b/HabitRPG/Extensions/EditingFormViewController-Extensions.swift
@@ -16,7 +16,7 @@ extension EditingFormViewController {
         controller.autoDismiss = false
         controller.formTitle = title
         controller.saveButtonTitle = saveButtonTitle
-        controller.fields.append(EditingTextField(key: "username", title: subtitle, type: .name, placeholder: L10n.username))
+        controller.fields.append(EditingTextField(key: "username", title: subtitle, type: .name, submitOnEnter: true, placeholder: L10n.username))
         controller.onSave = {values in
             controller.isLoading(true)
             if let username = values["username"] {

diff --git a/HabitRPG/UI/Settings/EditingFormViewController.swift b/HabitRPG/UI/Settings/EditingFormViewController.swift
@@ -121,10 +121,12 @@ class EditingTextField: UIStackView, UITextFieldDelegate {
 
     let key: String
     private let type: EditingTextFieldType
+    let submitOnEnter: Bool
 
     init(key: String, title: String, type: EditingTextFieldType, submitOnEnter: Bool = false, placeholder: String? = nil, value: String? = nil) {
         self.key = key
         self.type = type
+        self.submitOnEnter = submitOnEnter
         super.init(frame: CGRect.zero)
         textField.delegate = self
         textField.text = value
@@ -242,6 +244,13 @@ class EditingFormViewController: UIViewController, Themeable {
             stackView.addArrangedSubview(field)
         }
         stackView.addArrangedSubview(loadingIndicator)
+
+        if let field = fields.last, field.submitOnEnter {
+            field.textField.returnKeyType = .done
+            if !field.textField.allTargets.contains(self) {
+                field.textField.addTarget(self, action: #selector(saveForm), for: .editingDidEndOnExit)
+            }
+        }
     }
 
     override func viewDidAppear(_ animated: Bool) {