Implement home screen activity indicators

2026-05-01 21:56:58 +02:00 · 2022-02-15 15:47:46 +00:00
parent 89da843d37
commit d8e790f8ea
19 changed files with 168 additions and 366 deletions
@@ -0,0 +1,47 @@
+// 
+// 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 UIKit
+import MatrixSDK
+import CommonKit
+
+/// Presenter which displays activity / loading indicators using app-wide `AppNavigator`, thus displaying them in a unified way,
+/// and `ActivityCenter`/`Activity`, which ensures that only one activity is shown at a given time.
+///
+/// Note: clients can skip using `AppActivityIndicatorPresenter` and instead coordiinate with `AppNavigatorProtocol` directly.
+/// The presenter exists mostly as a transition for view controllers already using `ActivityIndicatorPresenterType` and / or view controllers
+/// written in objective-c.
+@objc final class AppActivityIndicatorPresenter: NSObject, ActivityIndicatorPresenterType {
+    private let appNavigator: AppNavigatorProtocol
+    private var activity: Activity?
+    
+    init(appNavigator: AppNavigatorProtocol) {
+        self.appNavigator = appNavigator
+    }
+
+    @objc func presentActivityIndicator() {
+        activity = appNavigator.addLoadingActivity()
+    }
+    
+    @objc func removeCurrentActivityIndicator(animated: Bool, completion: (() -> Void)?) {
+        activity = nil
+    }
+    
+    func presentActivityIndicator(on view: UIView, animated: Bool, completion: (() -> Void)?) {
+        MXLog.error("[AppActivityIndicatorPresenter] Shared activity indicator does not support presenting from custom views")
+    }
+}
@@ -1,69 +0,0 @@
-// 
-// 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 UIKit
-import MatrixSDK
-
-/// Activity indicator presenter which uses a shared `ActivityCenter` to coordinate different activity indicators,
-/// and which uses the root navigation view controller to display the activities.
-@objc final class GlobalActivityCenterPresenter: NSObject, ActivityIndicatorPresenterType {
-    private var loadingActivity: Activity?
-    
-    private var rootNavigationController: UINavigationController? {
-        guard
-            let delegate = UIApplication.shared.delegate as? AppDelegate,
-            let rootVC = delegate.window?.rootViewController
-        else {
-            MXLog.error("[ActivityIndicatorPresenter] Missing root view controller")
-            return nil
-        }
-        
-        if let vc = (rootVC as? UISplitViewController)?.viewControllers.first as? UINavigationController {
-            return vc
-        } else if let vc = rootVC as? UINavigationController {
-            return vc
-        } else if let vc = rootVC.navigationController {
-            return vc
-        }
-        return nil
-    }
-
-    @objc func presentActivityIndicator(animated: Bool) {
-        guard let vc = rootNavigationController else {
-            MXLog.error("[ActivityIndicatorPresenter] Missing available navigation controller")
-            return
-        }
-        
-        let presenter = ActivityIndicatorToastPresenter(
-            text: VectorL10n.roomParticipantsSecurityLoading,
-            navigationController: vc
-        )
-        let request = ActivityRequest(
-            presenter: presenter,
-            dismissal: .manual
-        )
-        loadingActivity = ActivityCenter.shared.add(request)
-    }
-    
-    func presentActivityIndicator(on view: UIView, animated: Bool, completion: (() -> Void)?) {
-        MXLog.error("[ActivityIndicatorPresenter] Shared activity indicator needs to be presented on a view controller")
-    }
-    
-    @objc func removeCurrentActivityIndicator(animated: Bool, completion: (() -> Void)?) {
-        loadingActivity = nil
-    }
-}