浏览代码

renamed NavigationController to DCNavigationController

Bastian van de Wetering 6 年之前
父节点
当前提交
ec0319446d

+ 4 - 4
deltachat-ios.xcodeproj/project.pbxproj

@@ -19,7 +19,7 @@
 		789E879D21D6DF86003ED1C5 /* ProgressHud.swift in Sources */ = {isa = PBXBuildFile; fileRef = 789E879C21D6DF86003ED1C5 /* ProgressHud.swift */; };
 		78E45E3A21D3CFBC00D4B15E /* SettingsController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78E45E3921D3CFBC00D4B15E /* SettingsController.swift */; };
 		78E45E3C21D3D03700D4B15E /* TextFieldTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78E45E3B21D3D03700D4B15E /* TextFieldTableViewCell.swift */; };
-		78E45E3E21D3D28C00D4B15E /* NavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78E45E3D21D3D28C00D4B15E /* NavigationController.swift */; };
+		78E45E3E21D3D28C00D4B15E /* DCNavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78E45E3D21D3D28C00D4B15E /* DCNavigationController.swift */; };
 		78E45E4021D3D70700D4B15E /* ContactListController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78E45E3F21D3D70700D4B15E /* ContactListController.swift */; };
 		78E45E4221D3DB4000D4B15E /* UIViewController+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78E45E4121D3DB4000D4B15E /* UIViewController+Extension.swift */; };
 		78E45E4421D3F14A00D4B15E /* UIImage+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78E45E4321D3F14A00D4B15E /* UIImage+Extension.swift */; };
@@ -94,7 +94,7 @@
 		78E45E2121D1768900D4B15E /* src */ = {isa = PBXFileReference; lastKnownFileType = folder; name = src; path = "deltachat-ios/libraries/deltachat-core/src"; sourceTree = "<group>"; };
 		78E45E3921D3CFBC00D4B15E /* SettingsController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsController.swift; sourceTree = "<group>"; };
 		78E45E3B21D3D03700D4B15E /* TextFieldTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextFieldTableViewCell.swift; sourceTree = "<group>"; };
-		78E45E3D21D3D28C00D4B15E /* NavigationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigationController.swift; sourceTree = "<group>"; };
+		78E45E3D21D3D28C00D4B15E /* DCNavigationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DCNavigationController.swift; sourceTree = "<group>"; };
 		78E45E3F21D3D70700D4B15E /* ContactListController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContactListController.swift; sourceTree = "<group>"; };
 		78E45E4121D3DB4000D4B15E /* UIViewController+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIViewController+Extension.swift"; sourceTree = "<group>"; };
 		78E45E4321D3F14A00D4B15E /* UIImage+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIImage+Extension.swift"; sourceTree = "<group>"; };
@@ -277,7 +277,7 @@
 			isa = PBXGroup;
 			children = (
 				AE18F28B228C17630007B1BE /* AccountSetup */,
-				78E45E3D21D3D28C00D4B15E /* NavigationController.swift */,
+				78E45E3D21D3D28C00D4B15E /* DCNavigationController.swift */,
 				785BE16721E247F1003BE98C /* MessageInfoViewController.swift */,
 				7A0052C71FBE6CB40048C3BF /* NewContactController.swift */,
 				AEE56D752253431E007DC082 /* AccountSetupController.swift */,
@@ -623,7 +623,7 @@
 				78E45E4421D3F14A00D4B15E /* UIImage+Extension.swift in Sources */,
 				AE52EA20229EB9F000C586C9 /* EditGroupViewController.swift in Sources */,
 				70B08FCD21073B910097D3EA /* NewGroupMemberChoiceController.swift in Sources */,
-				78E45E3E21D3D28C00D4B15E /* NavigationController.swift in Sources */,
+				78E45E3E21D3D28C00D4B15E /* DCNavigationController.swift in Sources */,
 				78E45E4021D3D70700D4B15E /* ContactListController.swift in Sources */,
 				AE18F294228C602A0007B1BE /* SecuritySettingsController.swift in Sources */,
 				78ED838D21D577D000243125 /* events.swift in Sources */,

+ 1 - 1
deltachat-ios/Controller/NavigationController.swift → deltachat-ios/Controller/DCNavigationController.swift

@@ -8,7 +8,7 @@
 
 import UIKit
 
-final class NavigationController: UINavigationController {
+final class DCNavigationController: UINavigationController {
   var stateChangedObserver: Any?
 
   override func viewDidLoad() {

+ 7 - 7
deltachat-ios/Coordinator/AppCoordinator.swift

@@ -33,7 +33,7 @@ class AppCoordinator: NSObject, Coordinator, UITabBarControllerDelegate {
 
 	private lazy var contactListController: UIViewController = {
 		let controller = ContactListController()
-		let nav = NavigationController(rootViewController: controller)
+		let nav = DCNavigationController(rootViewController: controller)
 		let settingsImage = UIImage(named: "contacts")
 		nav.tabBarItem = UITabBarItem(title: "Contacts", image: settingsImage, tag: 4)
 		let coordinator = ContactListCoordinator(navigationController: nav)
@@ -45,7 +45,7 @@ class AppCoordinator: NSObject, Coordinator, UITabBarControllerDelegate {
 	private lazy var mailboxController: UIViewController = {
 		let controller = MailboxViewController(chatId: Int(DC_CHAT_ID_DEADDROP), title: "Mailbox")
 		controller.disableWriting = true
-		let nav = NavigationController(rootViewController: controller)
+		let nav = DCNavigationController(rootViewController: controller)
 		let settingsImage = UIImage(named: "message")
 		nav.tabBarItem = UITabBarItem(title: "Mailbox", image: settingsImage, tag: 4)
 		let coordinator = MailboxCoordinator(navigationController: nav)
@@ -56,7 +56,7 @@ class AppCoordinator: NSObject, Coordinator, UITabBarControllerDelegate {
 
 	private lazy var profileController: UIViewController = {
 		let controller = ProfileViewController()
-		let nav = NavigationController(rootViewController: controller)
+		let nav = DCNavigationController(rootViewController: controller)
 		let settingsImage = UIImage(named: "report_card")
 		nav.tabBarItem = UITabBarItem(title: "My Profile", image: settingsImage, tag: 4)
 		let coordinator = ProfileCoordinator(rootViewController: nav)
@@ -67,7 +67,7 @@ class AppCoordinator: NSObject, Coordinator, UITabBarControllerDelegate {
 
 	private lazy var chatListController: UIViewController = {
 		let controller = ChatListController()
-		let nav = NavigationController(rootViewController: controller)
+		let nav = DCNavigationController(rootViewController: controller)
 		let settingsImage = UIImage(named: "chat")
 		nav.tabBarItem = UITabBarItem(title: "Chats", image: settingsImage, tag: 4)
 		let coordinator = ChatListCoordinator(navigationController: nav)
@@ -78,7 +78,7 @@ class AppCoordinator: NSObject, Coordinator, UITabBarControllerDelegate {
 
 	private lazy var settingsController: UIViewController = {
 		let controller = SettingsViewController()
-		let nav = NavigationController(rootViewController: controller)
+		let nav = DCNavigationController(rootViewController: controller)
 		let settingsImage = UIImage(named: "settings")
 		nav.tabBarItem = UITabBarItem(title: "Settings", image: settingsImage, tag: 4)
 		let coordinator = SettingsCoordinator(navigationController: nav)
@@ -104,7 +104,7 @@ class AppCoordinator: NSObject, Coordinator, UITabBarControllerDelegate {
 
 	func presentLoginController() {
 		let accountSetupController = AccountSetupController()
-		let accountSetupNavigationController = NavigationController(rootViewController: accountSetupController)
+		let accountSetupNavigationController = DCNavigationController(rootViewController: accountSetupController)
 		rootViewController.present(accountSetupNavigationController, animated: false, completion: nil)
 	}
 }
@@ -225,7 +225,7 @@ class SettingsCoordinator: Coordinator {
 		let coordinator = AccountSetupCoordinator(navigationController: navigationController)
 		childCoordinators.append(coordinator)
 		accountSetupVC.coordinator = coordinator
-		let accountSetupNavigationController = NavigationController(rootViewController: accountSetupVC)
+		let accountSetupNavigationController = DCNavigationController(rootViewController: accountSetupVC)
 		navigationController.present(accountSetupNavigationController, animated: true, completion: nil)
 	}
 }