Merge branch 'add-return-key-handler'

2 files changed, 48 insertions, 2 deletions

diff --git a/ios/MullvadVPN/AccountInputGroupView.swift b/ios/MullvadVPN/AccountInputGroupView.swift
index f3c2a05d8d..5f9c99190f 100644
--- a/ios/MullvadVPN/AccountInputGroupView.swift
+++ b/ios/MullvadVPN/AccountInputGroupView.swift
@@ -26,6 +26,8 @@ class AccountInputGroupView: UIView {
         textField.smartQuotesType = .no
         textField.spellCheckingType = .no
         textField.keyboardType = .numberPad
+        textField.returnKeyType = .done
+        textField.enablesReturnKeyAutomatically = false
 
         return textField
     }()
diff --git a/ios/MullvadVPN/AccountTextField.swift b/ios/MullvadVPN/AccountTextField.swift
index 0e51e3f6b2..a7ddbb7a84 100644
--- a/ios/MullvadVPN/AccountTextField.swift
+++ b/ios/MullvadVPN/AccountTextField.swift
@@ -8,10 +8,12 @@
 
 import UIKit
 
-@IBDesignable class AccountTextField: UITextField {
+class AccountTextField: UITextField, UITextFieldDelegate {
 
     private let input = AccountTokenInput()
 
+    var onReturnKey: ((AccountTextField) -> Bool)?
+
     override init(frame: CGRect) {
         super.init(frame: frame)
         setup()
@@ -25,8 +27,15 @@ import UIKit
     private func setup() {
         backgroundColor = UIColor.clear
 
-        delegate = input
+        delegate = self
         pasteDelegate = input
+
+        NotificationCenter.default.addObserver(
+            self,
+            selector: #selector(keyboardWillShow(_:)),
+            name: UIWindow.keyboardWillShowNotification,
+            object: nil
+        )
     }
 
     var autoformattingText: String {
@@ -43,6 +52,12 @@ import UIKit
         return input.parsedString
     }
 
+    var enableReturnKey: Bool = true {
+        didSet {
+            updateKeyboardReturnKey()
+        }
+    }
+
     override func textRect(forBounds bounds: CGRect) -> CGRect {
         return bounds.insetBy(dx: 14, dy: 12)
     }
@@ -51,4 +66,33 @@ import UIKit
         return textRect(forBounds: bounds)
     }
 
+    // MARK: - UITextFieldDelegate
+
+    func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool {
+        return input.textField(textField, shouldChangeCharactersIn: range, replacementString: string)
+    }
+
+    func textFieldShouldReturn(_ textField: UITextField) -> Bool {
+        return onReturnKey?(self) ?? true
+    }
+
+    // MARK: - Keyboard notifications
+
+    @objc private func keyboardWillShow(_ notification: Notification) {
+        if self.isFirstResponder {
+            updateKeyboardReturnKey()
+        }
+    }
+
+    private func updateKeyboardReturnKey() {
+        setEnableKeyboardReturnKey(enableReturnKey)
+    }
+
+    private func setEnableKeyboardReturnKey(_ enableReturnKey: Bool) {
+        let selector = NSSelectorFromString("setReturnKeyEnabled:")
+        if let inputDelegate = self.inputDelegate as? NSObject, inputDelegate.responds(to: selector) {
+            inputDelegate.setValue(enableReturnKey, forKey: "returnKeyEnabled")
+        }
+    }
+
 }