Do avatar placeholder in SwiftUI, Add AvatarViewModel, Add dependency injection for MxMediaManager dependency.

Riot/Modules/Common/SwiftUI/DependencyContainer.swift

@@ -0,0 +1,35 @@
+// 
+// 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
+
+struct DependencyContainer {
+
+    private var dependencyList: [String: Any] = [:]
+    
+    func resolve<T>() -> T {
+        let key = String(describing: T.self)
+        guard let t = dependencyList[key] as? T else {
+            fatalError("No provider registered for type \(T.self)")
+        }
+        return t
+    }
+    
+    mutating func register<T>(dependency: T) {
+        let key = String(describing: T.self)
+        dependencyList[key] = dependency
+    }
+}

Riot/Modules/Common/SwiftUI/DependencyContainerKey.swift

@@ -0,0 +1,45 @@
+//
+// 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
+
+private struct DependencyContainerKey: EnvironmentKey {
+    static let defaultValue = DependencyContainer()
+}
+
+@available(iOS 14.0, *)
+extension EnvironmentValues {
+    var dependencies: DependencyContainer {
+        get { self[DependencyContainerKey.self] }
+        set { self[DependencyContainerKey.self] = newValue }
+    }
+}
+
+/**
+ */
+@available(iOS 14.0, *)
+extension View {
+    func setDependencies(_ container: DependencyContainer) -> some View {
+        environment(\.dependencies, container)
+    }
+    
+    func addDependency<T>(_ dependency: T) -> some View {
+        transformEnvironment(\.dependencies) { container in
+            container.register(dependency: dependency)
+        }
+    }
+}

Riot/Modules/Common/SwiftUI/DependencyInjector.swift

@@ -0,0 +1,40 @@
+// 
+// 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
+
+struct DependencyInjector {
+    private static var dependencyList: [String:Any] = [:]
+    
+    static func resolve<T>() -> T {
+        guard let t = dependencyList[String(describing: T.self)] as? T else {
+            fatalError("No provider registered for type \(T.self)")
+        }
+        return t
+    }
+    
+    static func register<T>(dependency: T) {
+        dependencyList[String(describing: T.self)] = dependency
+    }
+}
+
+@propertyWrapper struct Inject<T> {
+    var wrappedValue: T
+    
+    init() {
+        self.wrappedValue = DependencyInjector.resolve()
+    }
+}

Riot/Modules/Common/SwiftUI/Inject.swift

@@ -0,0 +1,42 @@
+// 
+// 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
+
+@propertyWrapper struct Inject<Value> {
+    
+    static subscript<T: Injectable>(
+        _enclosingInstance instance: T,
+        wrapped wrappedKeyPath: ReferenceWritableKeyPath<T, Value>,
+        storage storageKeyPath: ReferenceWritableKeyPath<T, Self>
+    ) -> Value {
+        get {
+            let v: Value = instance.dependencies.resolve()
+            return v
+        }
+        set {
+            fatalError()
+        }
+    }
+    
+    @available(*, unavailable,
+    message: "@Published can only be applied to classes"
+    )
+    var wrappedValue: Value {
+        get { fatalError() }
+        set { fatalError(" \(newValue)" ) }
+    }
+}

Riot/Modules/Common/SwiftUI/Injectable.swift

@@ -0,0 +1,21 @@
+// 
+// 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 Injectable {
+    var dependencies: DependencyContainer! { get }
+}

Riot/Modules/Common/SwiftUI/VectorHostingController.swift

@@ -22,10 +22,16 @@ import SwiftUI
  (E.g. vectorContent modifier and themeing to the NavigationController container.
  */
 @available(iOS 14.0, *)
-class VectorHostingViewController: UIHostingController<AnyView> {
+class VectorHostingController: UIHostingController<AnyView> {
+    
+    // MARK: Private
+    
+    private var theme: Theme
+    private var dependencyContainer = DependencyContainer()
     
     init<Content>(rootView: Content) where Content: View {
         self.theme = ThemeService.shared().theme
+        
         super.init(rootView: AnyView(rootView.vectorContent()))
     }
     
@@ -33,10 +39,6 @@ class VectorHostingViewController: UIHostingController<AnyView> {
         fatalError("VectorHostingViewController does not currently support init from nibs")
     }
     
-    // MARK: Private
-    
-    private var theme: Theme
-    
     // MARK: - Life cycle
     
     override func viewDidLoad() {
@@ -45,6 +47,10 @@ class VectorHostingViewController: UIHostingController<AnyView> {
         self.update(theme: self.theme)
     }
     
+    func add<T>(dependency: T) {
+        dependencyContainer.register(dependency: dependency)
+    }
+    
     private func registerThemeServiceDidChangeThemeNotification() {
         NotificationCenter.default.addObserver(self, selector: #selector(themeDidChange), name: .themeServiceDidChangeTheme, object: nil)
     }
@@ -61,4 +67,3 @@ class VectorHostingViewController: UIHostingController<AnyView> {
         }
     }
 }
-