Эх сурвалжийг харах

use disclosureIndicator vs. ActionCell more carefully, hidesBottomBarWhenPushed

B. Petersen 2 жил өмнө
parent
commit
8cbc4bc06f

+ 11 - 11
deltachat-ios/Controller/Settings/AdvancedViewController.swift

@@ -52,19 +52,17 @@ internal final class AdvancedViewController: UITableViewController, ProgressAler
         return cell
     }()
 
-    private lazy var manageKeysCell: UITableViewCell = {
-        let cell = UITableViewCell(style: .value1, reuseIdentifier: nil)
+    private lazy var manageKeysCell: ActionCell = {
+        let cell = ActionCell()
         cell.tag = CellTags.manageKeys.rawValue
-        cell.textLabel?.text = String.localized("pref_manage_keys")
-        cell.accessoryType = .disclosureIndicator
+        cell.actionTitle = String.localized("pref_manage_keys")
         return cell
     }()
 
-    private lazy var experimentalFeaturesCell: UITableViewCell = {
-        let cell = UITableViewCell(style: .value1, reuseIdentifier: nil)
+    private lazy var experimentalFeaturesCell: ActionCell = {
+        let cell = ActionCell()
         cell.tag = CellTags.experimentalFeatures.rawValue
-        cell.textLabel?.text = String.localized("pref_experimental_features")
-        cell.accessoryType = .disclosureIndicator
+        cell.actionTitle = String.localized("pref_experimental_features")
         return cell
     }()
 
@@ -76,10 +74,11 @@ internal final class AdvancedViewController: UITableViewController, ProgressAler
         return cell
     }()
 
-    private lazy var viewLogCell: ActionCell = {
-        let cell = ActionCell()
+    private lazy var viewLogCell: UITableViewCell = {
+        let cell = UITableViewCell(style: .value1, reuseIdentifier: nil)
         cell.tag = CellTags.viewLog.rawValue
-        cell.actionTitle = String.localized("pref_view_log")
+        cell.textLabel?.text = String.localized("pref_view_log")
+        cell.accessoryType = .disclosureIndicator
         return cell
     }()
 
@@ -104,6 +103,7 @@ internal final class AdvancedViewController: UITableViewController, ProgressAler
         self.dcContext = dcAccounts.getSelected()
         self.dcAccounts = dcAccounts
         super.init(style: .grouped)
+        hidesBottomBarWhenPushed = true
     }
 
     required init?(coder _: NSCoder) {

+ 5 - 6
deltachat-ios/Controller/Settings/SettingsViewController.swift

@@ -131,11 +131,10 @@ internal final class SettingsViewController: UITableViewController, ProgressAler
         return cell
     }()
 
-    private lazy var exportBackupCell: UITableViewCell = {
-        let cell = UITableViewCell(style: .value1, reuseIdentifier: nil)
+    private lazy var exportBackupCell: ActionCell = {
+        let cell = ActionCell()
         cell.tag = CellTags.exportBackup.rawValue
-        cell.textLabel?.text = String.localized("export_backup_desktop")
-        cell.accessoryType = .disclosureIndicator
+        cell.actionTitle = String.localized("export_backup_desktop")
         return cell
     }()
 
@@ -182,9 +181,9 @@ internal final class SettingsViewController: UITableViewController, ProgressAler
         )
         let preferencesSection = SectionConfigs(
             headerTitle: String.localized("pref_chats_and_media"),
-            footerTitle: String.localized("pref_read_receipts_explain"),
+            footerTitle: nil,
             cells: [showEmailsCell, blockedContactsCell, mediaQualityCell, downloadOnDemandCell,
-                    autodelCell, exportBackupCell, notificationCell, receiptConfirmationCell]
+                    autodelCell, notificationCell, receiptConfirmationCell, exportBackupCell]
         )
         let appearanceSection = SectionConfigs(
             headerTitle: String.localized("pref_appearance"),