Merge pull request #296 from deltachat/move-contact-requests

move contact-requests out of focus

deltachat-ios/Controller/SettingsController.swift

@@ -110,6 +110,9 @@ internal final class SettingsViewController: QuickTableViewController {
             Section(
                 title: String.localized("pref_communication"),
                 rows: [
+                    NavigationRow(text: String.localized("menu_deaddrop"),
+                              detailText: .none,
+                              action: { [weak self] in self?.showDeaddrop($0) }),
                     NavigationRow(text: String.localized("pref_show_emails"),
                                   detailText: .value1(SettingsClassicViewController.getValString(val: DcConfig.showEmails)),
                               action: { [weak self] in self?.showClassicMail($0) }),
@@ -206,6 +209,14 @@ internal final class SettingsViewController: QuickTableViewController {
         present(alert, animated: true, completion: nil)
     }
 
+    private func showDeaddrop(_: Row) {
+        let deaddropViewController = MailboxViewController(dcContext: dcContext, chatId: Int(DC_CHAT_ID_DEADDROP))
+        let deaddropNavigationController = DcNavigationController(rootViewController: deaddropViewController)
+        let deaddropCoordinator = MailboxCoordinator(dcContext: dcContext, navigationController: deaddropNavigationController)
+        deaddropViewController.coordinator = deaddropCoordinator
+        self.coordinator?.navigationController.pushViewController(deaddropViewController, animated: true)
+    }
+
     private func showClassicMail(_: Row) {
         coordinator?.showClassicMail()
     }

deltachat-ios/Coordinator/AppCoordinator.swift

@@ -6,10 +6,9 @@ import MobileCoreServices
 class AppCoordinator: NSObject, Coordinator {
     private let window: UIWindow
     private let dcContext: DcContext
-    private let mailboxTab = 0
-    private let qrTab = 1
-    private let chatsTab = 2
-    private let settingsTab = 3
+    private let qrTab = 0
+    private let chatsTab = 1
+    private let settingsTab = 2
 
     var rootViewController: UIViewController {
         return tabBarController
@@ -19,26 +18,13 @@ class AppCoordinator: NSObject, Coordinator {
 
     private lazy var tabBarController: UITabBarController = {
         let tabBarController = UITabBarController()
-        tabBarController.viewControllers = [mailboxController, qrController, chatListController, settingsController]
-        // put viewControllers here
+        tabBarController.viewControllers = [qrController, chatListController, settingsController]
         tabBarController.tabBar.tintColor = DcColors.primary
-        tabBarController.tabBar.backgroundColor = .white
         return tabBarController
     }()
 
     // MARK: viewControllers
 
-    private lazy var mailboxController: UIViewController = {
-        let controller = MailboxViewController(dcContext: dcContext, chatId: Int(DC_CHAT_ID_DEADDROP))
-        let nav = DcNavigationController(rootViewController: controller)
-        let settingsImage = UIImage(named: "message")
-        nav.tabBarItem = UITabBarItem(title: String.localized("menu_deaddrop"), image: settingsImage, tag: mailboxTab)
-        let coordinator = MailboxCoordinator(dcContext: dcContext, navigationController: nav)
-        self.childCoordinators.append(coordinator)
-        controller.coordinator = coordinator
-        return nav
-    }()
-
     private lazy var qrController: UIViewController = {
         let controller = QrViewController(dcContext: dcContext)
         let nav = DcNavigationController(rootViewController: controller)