|
@@ -24,19 +24,19 @@ class AppCoordinator: NSObject, Coordinator {
|
|
|
|
|
|
private lazy var loginController: UIViewController = {
|
|
|
let accountSetupController = AccountSetupController(dcContext: dcContext, editView: false)
|
|
|
- let accountSetupNav = DcNavigationController(rootViewController: accountSetupController)
|
|
|
- let coordinator = AccountSetupCoordinator(dcContext: dcContext, navigationController: accountSetupNav)
|
|
|
+ let nav = UINavigationController(rootViewController: accountSetupController)
|
|
|
+ let coordinator = AccountSetupCoordinator(dcContext: dcContext, navigationController: nav)
|
|
|
coordinator.onLoginSuccess = presentTabBarController
|
|
|
childCoordinators.append(coordinator)
|
|
|
accountSetupController.coordinator = coordinator
|
|
|
- return accountSetupNav
|
|
|
+ return nav
|
|
|
}()
|
|
|
|
|
|
// MARK: viewControllers
|
|
|
|
|
|
private lazy var qrController: UIViewController = {
|
|
|
let controller = QrViewController(dcContext: dcContext)
|
|
|
- let nav = DcNavigationController(rootViewController: controller)
|
|
|
+ let nav = UINavigationController(rootViewController: controller)
|
|
|
let settingsImage = UIImage(named: "qr_code")
|
|
|
nav.tabBarItem = UITabBarItem(title: String.localized("qr_code"), image: settingsImage, tag: qrTab)
|
|
|
let coordinator = QrViewCoordinator(navigationController: nav)
|
|
@@ -47,7 +47,7 @@ class AppCoordinator: NSObject, Coordinator {
|
|
|
|
|
|
private lazy var chatListController: UIViewController = {
|
|
|
let controller = ChatListController(dcContext: dcContext, showArchive: false)
|
|
|
- let nav = DcNavigationController(rootViewController: controller)
|
|
|
+ let nav = UINavigationController(rootViewController: controller)
|
|
|
let settingsImage = UIImage(named: "ic_chat")
|
|
|
nav.tabBarItem = UITabBarItem(title: String.localized("pref_chats"), image: settingsImage, tag: chatsTab)
|
|
|
let coordinator = ChatListCoordinator(dcContext: dcContext, navigationController: nav)
|
|
@@ -58,7 +58,7 @@ class AppCoordinator: NSObject, Coordinator {
|
|
|
|
|
|
private lazy var settingsController: UIViewController = {
|
|
|
let controller = SettingsViewController(dcContext: dcContext)
|
|
|
- let nav = DcNavigationController(rootViewController: controller)
|
|
|
+ let nav = UINavigationController(rootViewController: controller)
|
|
|
let settingsImage = UIImage(named: "settings")
|
|
|
nav.tabBarItem = UITabBarItem(title: String.localized("menu_settings"), image: settingsImage, tag: settingsTab)
|
|
|
let coordinator = SettingsCoordinator(dcContext: dcContext, navigationController: nav)
|