Move complete room notification settings module to RiotSwiftUI and fix naming/directory structure.

RiotSwiftUI/Modules/Settings/Notifications/Coordinator/NotificationSettingsBridgePresenter.swift

@@ -0,0 +1,101 @@
+//
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+import Foundation
+
+@available(iOS 14.0, *)
+@objc protocol NotificationSettingsCoordinatorBridgePresenterDelegate {
+    func notificationSettingsCoordinatorBridgePresenterDelegateDidComplete(_ coordinatorBridgePresenter: NotificationSettingsCoordinatorBridgePresenter)
+}
+
+/// NotificationSettingsCoordinatorBridgePresenter enables to start NotificationSettingsCoordinator from a view controller.
+/// This bridge is used while waiting for global usage of coordinator pattern.
+/// It breaks the Coordinator abstraction and it has been introduced for Objective-C compatibility (mainly for integration in legacy view controllers).
+/// Each bridge should be removed once the underlying Coordinator has been integrated by another Coordinator.
+@available(iOS 14.0, *)
+@objcMembers
+final class NotificationSettingsCoordinatorBridgePresenter: NSObject {
+    
+    // MARK: - Properties
+    
+    // MARK: Private
+    
+    private let session: MXSession
+    private var coordinator: NotificationSettingsCoordinator?
+    private var router: NavigationRouter?
+    
+    // MARK: Public
+    
+    weak var delegate: NotificationSettingsCoordinatorBridgePresenterDelegate?
+    
+    // MARK: - Setup
+    
+    init(session: MXSession) {
+        self.session = session
+        super.init()
+    }
+    
+    // MARK: - Public
+    
+    func push(from navigationController: UINavigationController, animated: Bool, screen: NotificationSettingsScreen, popCompletion: (() -> Void)?) {
+        
+        let router = NavigationRouter(navigationController: navigationController)
+        
+        let notificationSettingsCoordinator = NotificationSettingsCoordinator(session: session, screen: screen)
+        
+        router.push(notificationSettingsCoordinator, animated: animated) { [weak self] in
+            self?.coordinator = nil
+            self?.router = nil
+            popCompletion?()
+        }
+        
+        notificationSettingsCoordinator.start()
+        
+        self.coordinator = notificationSettingsCoordinator
+        self.router = router
+    }
+    
+    func dismiss(animated: Bool, completion: (() -> Void)?) {
+        guard let coordinator = self.coordinator else {
+            return
+        }
+        coordinator.toPresentable().dismiss(animated: animated) {
+            self.coordinator = nil
+
+            if let completion = completion {
+                completion()
+            }
+        }
+    }
+}
+
+// MARK: - NotificationSettingsCoordinatorDelegate
+@available(iOS 14.0, *)
+extension NotificationSettingsCoordinatorBridgePresenter: NotificationSettingsCoordinatorDelegate {
+    func notificationSettingsCoordinatorDidComplete(_ coordinator: NotificationSettingsCoordinatorType) {
+        self.delegate?.notificationSettingsCoordinatorBridgePresenterDelegateDidComplete(self)
+    }
+}
+
+// MARK: - UIAdaptivePresentationControllerDelegate
+
+@available(iOS 14.0, *)
+extension NotificationSettingsCoordinatorBridgePresenter: UIAdaptivePresentationControllerDelegate {
+    
+    func notificationSettingsCoordinatorDidComplete(_ presentationController: UIPresentationController) {
+        self.delegate?.notificationSettingsCoordinatorBridgePresenterDelegateDidComplete(self)
+    }
+    
+}

RiotSwiftUI/Modules/Settings/Notifications/Coordinator/NotificationSettingsCoordinator.swift

@@ -0,0 +1,76 @@
+// File created from ScreenTemplate
+// $ createScreen.sh Settings/Notifications NotificationSettings
+/*
+ Copyright 2021 New Vector Ltd
+ 
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ 
+ http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+import Foundation
+import SwiftUI
+
+@available(iOS 14.0, *)
+final class NotificationSettingsCoordinator: NotificationSettingsCoordinatorType {
+    
+    // MARK: - Properties
+    
+    // MARK: Private
+    
+    private let session: MXSession
+    private var notificationSettingsViewModel: NotificationSettingsViewModelType
+    private let notificationSettingsViewController: UIViewController
+    
+    // MARK: Public
+
+    // Must be used only internally
+    var childCoordinators: [Coordinator] = []
+    
+    weak var delegate: NotificationSettingsCoordinatorDelegate?
+    
+    // MARK: - Setup
+    
+    init(session: MXSession, screen: NotificationSettingsScreen) {
+        self.session = session
+        let notificationSettingsService = MXNotificationSettingsService(session: session)
+        let viewModel = NotificationSettingsViewModel(notificationSettingsService: notificationSettingsService, ruleIds: screen.pushRules)
+        let viewController: UIViewController
+        switch screen {
+        case .defaultNotifications:
+            viewController = VectorHostingController(rootView: DefaultNotificationSettings(viewModel: viewModel))
+        case .mentionsAndKeywords:
+            viewController = VectorHostingController(rootView: MentionsAndKeywordNotificationSettings(viewModel: viewModel))
+        case .other:
+            viewController = VectorHostingController(rootView: OtherNotificationSettings(viewModel: viewModel))
+        }
+        self.notificationSettingsViewModel = viewModel
+        self.notificationSettingsViewController = viewController
+    }
+    
+    // MARK: - Public methods
+    
+    func start() {            
+        self.notificationSettingsViewModel.coordinatorDelegate = self
+    }
+    
+    func toPresentable() -> UIViewController {
+        return self.notificationSettingsViewController
+    }
+}
+
+// MARK: - NotificationSettingsViewModelCoordinatorDelegate
+@available(iOS 14.0, *)
+extension NotificationSettingsCoordinator: NotificationSettingsViewModelCoordinatorDelegate {
+    func notificationSettingsViewModelDidComplete(_ viewModel: NotificationSettingsViewModelType) {
+        self.delegate?.notificationSettingsCoordinatorDidComplete(self)
+    }
+}

RiotSwiftUI/Modules/Settings/Notifications/Coordinator/NotificationSettingsCoordinatorType.swift

@@ -0,0 +1,28 @@
+// File created from ScreenTemplate
+// $ createScreen.sh Settings/Notifications NotificationSettings
+/*
+ Copyright 2021 New Vector Ltd
+ 
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ 
+ http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+import Foundation
+
+protocol NotificationSettingsCoordinatorDelegate: AnyObject {
+    func notificationSettingsCoordinatorDidComplete(_ coordinator: NotificationSettingsCoordinatorType)
+}
+
+/// `NotificationSettingsCoordinatorType` is a protocol describing a Coordinator that handle key backup setup passphrase navigation flow.
+protocol NotificationSettingsCoordinatorType: Coordinator, Presentable {
+    var delegate: NotificationSettingsCoordinatorDelegate? { get }
+}