Bladeren bron

remove AddGroupMembersCoordinator

B. Petersen 5 jaren geleden
bovenliggende
commit
97585fa01f

+ 12 - 3
deltachat-ios/Controller/GroupMembersViewController.swift

@@ -61,7 +61,6 @@ class NewGroupAddMembersViewController: GroupMembersViewController {
 }
 
 class AddGroupMembersViewController: GroupMembersViewController {
-    weak var coordinator: AddGroupMembersCoordinator?
     private var chatId: Int?
     private let sectionNewContact = 0
     private let sectionMemberList = 1
@@ -80,7 +79,7 @@ class AddGroupMembersViewController: GroupMembersViewController {
 
     private lazy var chat: DcChat? = {
         if let chatId = chatId {
-            return coordinator?.dcContext.getChat(chatId: chatId)
+            return dcContext.getChat(chatId: chatId)
         }
         return nil
     }()
@@ -182,7 +181,7 @@ class AddGroupMembersViewController: GroupMembersViewController {
         switch indexPath.section {
         case sectionNewContact:
             tableView.deselectRow(at: indexPath, animated: true)
-            coordinator?.showNewContactController()
+            showNewContactController()
         case sectionMemberList:
             didSelectContactCell(at: indexPath)
         default:
@@ -224,6 +223,16 @@ class AddGroupMembersViewController: GroupMembersViewController {
 
         return cell
     }
+
+    // MARK: - coordinator
+
+    func showNewContactController() {
+        if let navigationController = self.parent as? UINavigationController {
+            let newContactController = NewContactController(dcContext: dcContext)
+            newContactController.openChatOnSave = false
+            navigationController.pushViewController(newContactController, animated: true)
+        }
+    }
 }
 
 class BlockedContactsViewController: GroupMembersViewController, GroupMemberSelectionDelegate {

+ 0 - 22
deltachat-ios/Coordinator/AppCoordinator.swift

@@ -467,9 +467,6 @@ class GroupChatDetailCoordinator: Coordinator {
 
     func showAddGroupMember(chatId: Int) {
         let groupMemberViewController = AddGroupMembersViewController(chatId: chatId)
-        let coordinator = AddGroupMembersCoordinator(dcContext: dcContext, navigationController: navigationController)
-        childCoordinators.append(coordinator)
-        groupMemberViewController.coordinator = coordinator
         navigationController.pushViewController(groupMemberViewController, animated: true)
     }
 
@@ -635,25 +632,6 @@ class NewGroupAddMembersCoordinator: Coordinator {
     }
 }
 
-// MARK: - AddGroupMembersCoordinator
-class AddGroupMembersCoordinator: Coordinator {
-    var dcContext: DcContext
-    let navigationController: UINavigationController
-
-    private var childCoordinators: [Coordinator] = []
-
-    init(dcContext: DcContext, navigationController: UINavigationController) {
-        self.dcContext = dcContext
-        self.navigationController = navigationController
-    }
-
-    func showNewContactController() {
-        let newContactController = NewContactController(dcContext: dcContext)
-        newContactController.openChatOnSave = false
-        navigationController.pushViewController(newContactController, animated: true)
-    }
-}
-
 /*
  boilerplate - I tend to remove that interface (cyberta)
  */