Merge pull request #325 from deltachat/tweak-settings

tweak settings

deltachat-ios/Controller/AccountSetupController.swift

@@ -237,9 +237,11 @@ class AccountSetupController: UITableViewController {
     ]
     private lazy var dangerCells: [UITableViewCell] = [deleteAccountCell]
 
+    private let editView: Bool
     private var advancedSectionShowing: Bool = false
 
     init(dcContext: DcContext, editView: Bool) {
+        self.editView = editView
         self.dcContext = dcContext
 
         self.sections.append(basicSection)
@@ -260,7 +262,11 @@ class AccountSetupController: UITableViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        title = String.localized("login_header")
+        if editView {
+            title = String.localized("pref_password_and_account_settings")
+        } else {
+            title = String.localized("login_header")
+        }
         navigationItem.rightBarButtonItem = loginButton
     }
 
@@ -315,17 +321,15 @@ class AccountSetupController: UITableViewController {
     }
 
     override func tableView(_: UITableView, titleForHeaderInSection section: Int) -> String? {
-        if sections[section] == dangerSection {
+        if sections[section] == basicSection && editView {
+            return String.localized("login_header")
+        } else if sections[section] == dangerSection {
             return String.localized("danger")
         } else {
             return nil
         }
     }
 
-    override func tableView(_: UITableView, heightForHeaderInSection _: Int) -> CGFloat {
-        return 36.0
-    }
-
     override func tableView(_: UITableView, titleForFooterInSection section: Int) -> String? {
         if sections[section] == basicSection {
             return String.localized("login_no_servers_hint")

deltachat-ios/Controller/EditSettingsController.swift

@@ -17,6 +17,8 @@ class EditSettingsController: UITableViewController {
 
     private let sectionCount = 2
 
+    private var childCoordinators: Coordinator?
+
     private lazy var displayNameCell: TextFieldCell = {
         let cell = TextFieldCell(description: String.localized("pref_your_name"), placeholder: String.localized("pref_your_name"))
         cell.setText(text: DcConfig.displayname ?? nil)
@@ -40,6 +42,7 @@ class EditSettingsController: UITableViewController {
     init(dcContext: DcContext) {
         self.dcContext = dcContext
         super.init(style: .grouped)
+        hidesBottomBarWhenPushed = true
     }
 
     required init?(coder aDecoder: NSCoder) {
@@ -105,6 +108,7 @@ class EditSettingsController: UITableViewController {
             guard let nc = navigationController else { return }
             let accountSetupVC = AccountSetupController(dcContext: dcContext, editView: true)
             let coordinator = AccountSetupCoordinator(dcContext: dcContext, navigationController: nc)
+            self.childCoordinators = coordinator
             accountSetupVC.coordinator = coordinator
             nc.pushViewController(accountSetupVC, animated: true)
         }

deltachat-ios/Controller/MailboxViewController.swift

@@ -5,7 +5,7 @@ class MailboxViewController: ChatViewController {
 
     override init(dcContext: DcContext, chatId: Int) {
         super.init(dcContext: dcContext, chatId: chatId)
-        hidesBottomBarWhenPushed = false
+        hidesBottomBarWhenPushed = true
         disableWriting = true
         showCustomNavBar = false
     }

deltachat-ios/Controller/SettingsClassicViewController.swift

@@ -20,6 +20,7 @@ class SettingsClassicViewController: UITableViewController {
         self.options = [Int(DC_SHOW_EMAILS_OFF), Int(DC_SHOW_EMAILS_ACCEPTED_CONTACTS), Int(DC_SHOW_EMAILS_ALL)]
         super.init(style: .grouped)
         self.title = String.localized("pref_show_emails")
+        hidesBottomBarWhenPushed = true
     }
 
     required init?(coder aDecoder: NSCoder) {