From b47a5855217009b3399269a20486e86b1bee33ce Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Thu, 22 Aug 2024 23:19:00 +0200
Subject: [PATCH 1/2] improve EditContactController

add placeholder and hints, cleanup layout.
---
 .../Controller/EditContactController.swift    | 67 +++++++++++++------
 1 file changed, 47 insertions(+), 20 deletions(-)

diff --git a/deltachat-ios/Controller/EditContactController.swift b/deltachat-ios/Controller/EditContactController.swift
index ffd59ab88..09203346e 100644
--- a/deltachat-ios/Controller/EditContactController.swift
+++ b/deltachat-ios/Controller/EditContactController.swift
@@ -1,37 +1,64 @@
 import UIKit
 import DcCore
 
-class EditContactController: NewContactController {
+class EditContactController: UITableViewController {
+    let dcContext: DcContext
+    let dcContact: DcContact
+    let authNameOrAddr: String
+    let nameCell = TextFieldCell.makeNameCell()
+    let cells: [UITableViewCell]
 
     init(dcContext: DcContext, contactIdForUpdate: Int) {
-        super.init(dcContext: dcContext)
-        title = String.localized("edit_contact")
+        self.dcContext = dcContext
+        dcContact = dcContext.getContact(id: contactIdForUpdate)
+        authNameOrAddr = dcContact.authName.isEmpty ? dcContact.email : dcContact.authName
+        cells = [nameCell]
+        super.init(style: .grouped)
 
-        let contact = dcContext.getContact(id: contactIdForUpdate)
+        nameCell.textFieldDelegate = self
+        nameCell.textField.text = dcContact.editedName
+        nameCell.textField.enablesReturnKeyAutomatically = false
+        nameCell.textField.returnKeyType = .done
+        nameCell.placeholder = String.localizedStringWithFormat(String.localized("edit_name_placeholder"), authNameOrAddr)
 
-        nameCell.textField.text = contact.editedName
-        if !contact.authName.isEmpty { // else show string "Name" as set by super.init()
-            nameCell.placeholder = contact.authName
-        }
-        emailCell.textField.text = contact.email
-        emailCell.textField.isEnabled = false // only contact name can be edited
-        emailCell.contentView.alpha = 0.3
-
-        model.name = contact.editedName
-        model.email = contact.email
-
-        doneButton = UIBarButtonItem(barButtonSystemItem: .save, target: self, action: #selector(saveContactButtonPressed))
-        doneButton?.isEnabled = contactIsValid()
-        navigationItem.rightBarButtonItem = doneButton
+        title = String.localized("menu_edit_name")
+        navigationItem.rightBarButtonItem = UIBarButtonItem(barButtonSystemItem: .save, target: self, action: #selector(saveButtonPressed))
+        navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .cancel, target: self, action: #selector(cancelButtonPressed))
     }
 
     required init?(coder _: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
 
-    @objc override func saveContactButtonPressed() {
-        _ = dcContext.createContact(name: model.name, email: model.email)
+    override func viewDidAppear(_: Bool) {
+        nameCell.textField.becomeFirstResponder()
+    }
+
+    @objc func saveButtonPressed() {
+        _ = dcContext.createContact(name: nameCell.textField.text ?? "", email: dcContact.email)
         navigationController?.popViewController(animated: true)
     }
 
+    @objc func cancelButtonPressed() {
+        navigationController?.popViewController(animated: true)
+    }
+
+    override func tableView(_: UITableView, numberOfRowsInSection _: Int) -> Int {
+        return cells.count
+    }
+
+    override func tableView(_: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        return cells[indexPath.row]
+    }
+
+    override func tableView(_ tableView: UITableView, titleForFooterInSection section: Int) -> String? {
+        return String.localizedStringWithFormat(String.localized("edit_name_explain"), authNameOrAddr)
+    }
+}
+
+extension EditContactController: UITextFieldDelegate {
+    func textFieldShouldReturn(_ textField: UITextField) -> Bool {
+        saveButtonPressed()
+        return true
+    }
 }

From 06a6b26749bb6409cc21fb14b4f2bb0506cc6508 Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Fri, 23 Aug 2024 00:23:44 +0200
Subject: [PATCH 2/2] show edit field in full width

---
 deltachat-ios/Controller/EditContactController.swift | 1 +
 deltachat-ios/View/TextFieldCell.swift               | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/deltachat-ios/Controller/EditContactController.swift b/deltachat-ios/Controller/EditContactController.swift
index 09203346e..c516e4cda 100644
--- a/deltachat-ios/Controller/EditContactController.swift
+++ b/deltachat-ios/Controller/EditContactController.swift
@@ -19,6 +19,7 @@ class EditContactController: UITableViewController {
         nameCell.textField.text = dcContact.editedName
         nameCell.textField.enablesReturnKeyAutomatically = false
         nameCell.textField.returnKeyType = .done
+        nameCell.useFullWidth()
         nameCell.placeholder = String.localizedStringWithFormat(String.localized("edit_name_placeholder"), authNameOrAddr)
 
         title = String.localized("menu_edit_name")
diff --git a/deltachat-ios/View/TextFieldCell.swift b/deltachat-ios/View/TextFieldCell.swift
index e302b629f..d48cd8028 100644
--- a/deltachat-ios/View/TextFieldCell.swift
+++ b/deltachat-ios/View/TextFieldCell.swift
@@ -137,6 +137,11 @@ class TextFieldCell: UITableViewCell {
         textField.text = text
     }
 
+    func useFullWidth() {
+        title.isHidden = true
+        textField.textAlignment = .left
+    }
+
     override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
         if previousTraitCollection?.preferredContentSizeCategory !=
             traitCollection.preferredContentSizeCategory {