SwiftUI Version of Room Notification Settings V2

DesignKit/Source/AvatarSize.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
+import UIKit
+
+// Figma Avatar Sizes: https://www.figma.com/file/X4XTH9iS2KGJ2wFKDqkyed/Compound?node-id=1258%3A19678
+public enum AvatarSize: Int {
+    case xxSmall = 16
+    case xSmall = 32
+    case small = 36
+    case medium = 42
+    case large = 44
+    case xLarge = 52
+    case xxLarge = 80
+}
+
+extension AvatarSize {
+    public var size: CGSize {
+        return CGSize(width: self.rawValue, height: self.rawValue)
+    }
+}

Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme

@@ -4,7 +4,8 @@
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
+      buildImplicitDependencies = "YES"
+      runPostActionsOnFailure = "NO">
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"

Riot/Categories/Combine/Publisher.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
+import Combine
+
+/**
+ Sams as `assign(to:on:)` but maintains a weak reference to object(Useful in cases where you want to pass self and not cause a retain cycle.)
+ - SeeAlso:
+ [assign(to:on:)](https://developer.apple.com/documentation/combine/just/assign(to:on:))
+ */
+@available(iOS 14.0, *)
+extension Publisher where Failure == Never {
+    func weakAssign<T: AnyObject>(
+        to keyPath: ReferenceWritableKeyPath<T, Output>,
+        on object: T
+    ) -> AnyCancellable {
+        sink { [weak object] value in
+            object?[keyPath: keyPath] = value
+        }
+    }
+}

Riot/Generated/Strings.swift

@@ -4014,7 +4014,7 @@ internal enum VectorL10n {
   internal static var settingsAdd3pidPasswordMessage: String { 
     return VectorL10n.tr("Vector", "settings_add_3pid_password_message") 
   }
-  /// Add email adress
+  /// Add email address
   internal static var settingsAdd3pidPasswordTitleEmail: String { 
     return VectorL10n.tr("Vector", "settings_add_3pid_password_title_email") 
   }

Riot/Managers/Theme/SwiftUI/ThemeKey.swift

@@ -0,0 +1,55 @@
+// 
+// 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 ThemeKey: EnvironmentKey {
+    static let defaultValue = ThemeService.shared().theme
+}
+
+@available(iOS 14.0, *)
+extension EnvironmentValues {
+  var theme: Theme {
+    get { self[ThemeKey.self] }
+    set { self[ThemeKey.self] = newValue }
+  }
+}
+
+/**
+ A theme modifier for setting the theme for this view and all its descendants in the hierarchy.
+ - Parameters:
+  - theme: a Theme to be set as the environment value.
+ */
+@available(iOS 14.0, *)
+extension View {
+  func theme(_ theme: Theme) -> some View {
+    environment(\.theme, theme)
+  }
+}
+
+/**
+ A theme modifier for setting the theme by id for this view and all its descendants in the hierarchy.
+ - Parameters:
+  - themeId: ThemeIdentifier of a theme to be set as the environment value.
+ */
+@available(iOS 14.0, *)
+extension View {
+  func theme(_ themeId: ThemeIdentifier) -> some View {
+    let theme = ThemeService.shared().theme(withThemeId: themeId.rawValue)
+    return environment(\.theme, theme)
+  }
+}

Riot/Managers/Theme/SwiftUI/ThemeObserver.swift

@@ -0,0 +1,31 @@
+// 
+// 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 Combine
+
+@available(iOS 14.0, *)
+class ThemeObserver: ObservableObject {
+
+    static let shared = ThemeObserver()
+
+    init() {
+        NotificationCenter.default.publisher(for: NSNotification.Name.themeServiceDidChangeTheme).map { _ in
+            ThemeService.shared().theme
+        }.assign(to: &$theme)
+    }
+    @Published var theme: Theme = ThemeService.shared().theme
+}

Riot/Modules/Common/ActivityIndicator/SwiftUI/ActivityIndicator.swift

@@ -0,0 +1,49 @@
+// 
+// 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 SwiftUI
+
+/**
+ A visual cue to user that something is in progress.
+ */
+@available(iOS 14.0, *)
+struct ActivityIndicator: View {
+
+    private enum Constants {
+        static let backgroundColor = Color(UIColor(white: 0.8, alpha: 0.9))
+    }
+
+    var body: some View {
+        ProgressView()
+            .progressViewStyle(CircularProgressViewStyle(tint: Color.white))
+            .padding()
+            .background(Constants.backgroundColor)
+            .cornerRadius(5)
+
+    }
+}
+
+@available(iOS 14.0, *)
+struct ActivityIndicator_Previews: PreviewProvider {
+    static var previews: some View {
+        Group {
+            Text("Hello World!")
+                .activityIndicator(show: true)
+            Text("Hello World!")
+                .activityIndicator(show: false)
+        }
+    }
+}

Riot/Modules/Common/ActivityIndicator/SwiftUI/ActivityIndicatorModifier.swift

@@ -0,0 +1,44 @@
+// 
+// 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
+
+/**
+ A modifier for showing the activity indcator centered over a view.
+ */
+@available(iOS 14.0, *)
+struct ActivityIndicatorModifier: ViewModifier {
+    var show: Bool
+
+    @ViewBuilder
+    func body(content: Content) -> some View {
+        if show {
+            content
+                .overlay(ActivityIndicator(), alignment: .center)
+        } else {
+            content
+        }
+    }
+}
+
+@available(iOS 14.0, *)
+extension View {
+    @available(iOS 14.0, *)
+    func activityIndicator(show: Bool) -> some View {
+        self.modifier(ActivityIndicatorModifier(show: show))
+    }
+}

Riot/Modules/Common/Avatar/AvatarInputType.swift

@@ -0,0 +1,34 @@
+// 
+// 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 AvatarInputType {
+    var mxContentUri: String? { get }
+    var matrixItemId: String { get }
+    var displayName: String? { get }
+}
+
+struct AvatarInput: AvatarInputType {
+    let mxContentUri: String?
+    var matrixItemId: String
+    let displayName: String?
+}
+
+enum AvatarInputOption {
+    case swiftUI(AvatarInputType)
+    case uiKit(AvatarViewDataProtocol)
+}

Riot/Modules/Common/Avatar/Mock/MockAvatarInput.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
+
+class MockAvatarInput {
+    static let example = AvatarInput(mxContentUri: "faveUri", matrixItemId: "id123", displayName: "Alice")
+}

Riot/Modules/Common/Avatar/Mock/MockAvatarService.swift

@@ -0,0 +1,29 @@
+// 
+// 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 Combine
+import DesignKit
+
+@available(iOS 14.0, *)
+class MockAvatarService: AvatarServiceType {
+    static let example: AvatarServiceType = MockAvatarService()
+    func avatarImage(mxContentUri: String, avatarSize: AvatarSize) -> Future<UIImage, Error> {
+        Future { promise in
+            promise(.success(Asset.Images.appSymbol.image))
+        }
+    }
+}