UI: iOS: use DiffableDataSource for SSID editor

Signed-off-by: Andrej Mihajlov <[email protected]>

Author: Andrej Mihajlov

Sources/WireGuardApp/Base.lproj/Localizable.strings

@@ -109,6 +109,7 @@
 "tunnelOnDemandSectionTitleAddSSIDs" = "Add SSIDs";
 "tunnelOnDemandAddMessageAddConnectedSSID (%@)" = "Add connected: %@";
 "tunnelOnDemandAddMessageAddNewSSID" = "Add new";
+"tunnelOnDemandSSIDTextFieldPlaceholder" = "SSID";
 
 "tunnelOnDemandKey" = "On demand";
 "tunnelOnDemandOptionOff" = "Off";

Sources/WireGuardApp/UI/iOS/View/EditableTextCell.swift

@@ -5,8 +5,21 @@ import UIKit
 
 class EditableTextCell: UITableViewCell {
     var message: String {
-        get { return valueTextField.text ?? "" }
-        set(value) { valueTextField.text = value }
+        get {
+            return valueTextField.text ?? ""
+        }
+        set {
+            valueTextField.text = newValue
+        }
+    }
+
+    var placeholder: String? {
+        get {
+            return valueTextField.placeholder
+        }
+        set {
+            valueTextField.placeholder = newValue
+        }
     }
 
     let valueTextField: UITextField = {
@@ -21,22 +34,26 @@ class EditableTextCell: UITableViewCell {
         return valueTextField
     }()
 
-    var onValueBeingEdited: ((String) -> Void)?
+    var onValueBeingEdited: ((EditableTextCell, String) -> Void)?
 
     override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
         super.init(style: style, reuseIdentifier: reuseIdentifier)
 
-        valueTextField.delegate = self
         contentView.addSubview(valueTextField)
         valueTextField.translatesAutoresizingMaskIntoConstraints = false
-        let bottomAnchorConstraint = contentView.layoutMarginsGuide.bottomAnchor.constraint(equalToSystemSpacingBelow: valueTextField.bottomAnchor, multiplier: 1)
+
+        // Reduce the bottom margin by 0.5pt to maintain the default cell height (44pt)
+        let bottomAnchorConstraint = contentView.layoutMarginsGuide.bottomAnchor.constraint(equalTo: valueTextField.bottomAnchor, constant: -0.5)
         bottomAnchorConstraint.priority = .defaultLow
+
         NSLayoutConstraint.activate([
-            valueTextField.leadingAnchor.constraint(equalToSystemSpacingAfter: contentView.layoutMarginsGuide.leadingAnchor, multiplier: 1),
-            contentView.layoutMarginsGuide.trailingAnchor.constraint(equalToSystemSpacingAfter: valueTextField.trailingAnchor, multiplier: 1),
-            valueTextField.topAnchor.constraint(equalToSystemSpacingBelow: contentView.layoutMarginsGuide.topAnchor, multiplier: 1),
+            valueTextField.leadingAnchor.constraint(equalTo: contentView.layoutMarginsGuide.leadingAnchor),
+            contentView.layoutMarginsGuide.trailingAnchor.constraint(equalTo: valueTextField.trailingAnchor),
+            contentView.layoutMarginsGuide.topAnchor.constraint(equalTo: valueTextField.topAnchor),
             bottomAnchorConstraint
         ])
+
+        NotificationCenter.default.addObserver(self, selector: #selector(textFieldDidChangeText(_:)), name: UITextField.textDidChangeNotification, object: valueTextField)
     }
 
     required init?(coder aDecoder: NSCoder) {
@@ -50,15 +67,10 @@ class EditableTextCell: UITableViewCell {
     override func prepareForReuse() {
         super.prepareForReuse()
         message = ""
+        placeholder = nil
     }
-}
 
-extension EditableTextCell: UITextFieldDelegate {
-    func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool {
-        if let onValueBeingEdited = onValueBeingEdited {
-            let modifiedText = ((textField.text ?? "") as NSString).replacingCharacters(in: range, with: string)
-            onValueBeingEdited(modifiedText)
-        }
-        return true
+    @objc private func textFieldDidChangeText(_ notification: Notification) {
+        onValueBeingEdited?(self, valueTextField.text ?? "")
     }
 }