merge, finish swiftui and add theming

Riot/Modules/Room/NotificationSettings/SwiftUI/FormPickerItem.swift

@@ -0,0 +1,59 @@
+// 
+// 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
+
+@available(iOS 13.0, *)
+struct FormPickerItem: View {
+    
+    typealias ClickCallback = () -> Void
+    
+    @Environment(\.theme) var theme: Theme
+    
+    var title: String
+    var selected: Bool
+    var onClick: ClickCallback?
+    
+    var body: some View {
+        HStack {
+            Text(title)
+                .font(Font(theme.fonts.body))
+                .foregroundColor(Color(theme.textPrimaryColor))
+            Spacer()
+            if selected {
+                Image("checkmark")
+                    .foregroundColor(Color(theme.tintColor))
+            }
+        }
+        .listRowBackground(Color(theme.backgroundColor))
+        .contentShape(Rectangle())
+        .onTapGesture {
+            onClick?()
+        }
+    }
+}
+
+@available(iOS 13.0, *)
+struct FormPickerCell_Previews: PreviewProvider {
+    static var previews: some View {
+        List {
+            FormPickerItem(title: "Item 1", selected: true, onClick: nil)
+            FormPickerItem(title: "Item 2", selected: false, onClick: nil)
+            FormPickerItem(title: "Item 3", selected: false, onClick: nil)
+        }.listStyle(GroupedListStyle())
+        
+    }
+}

Riot/Modules/Room/NotificationSettings/SwiftUI/FormSectionFooter.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 SwiftUI
+
+@available(iOS 13.0, *)
+struct FormSectionFooter: View {
+    
+    @Environment(\.theme) var theme: Theme
+    var text: String
+    
+    var body: some View {
+        Text(text)
+            .foregroundColor(Color(theme.textSecondaryColor))
+            .padding(.top)
+            .font(Font(theme.fonts.callout))
+    }
+}
+
+@available(iOS 13.0, *)
+struct FormSectionFooter_Previews: PreviewProvider {
+    static var previews: some View {
+        List {
+            SwiftUI.Section(footer: FormSectionFooter(text: "Footer Text")) {
+                Text("Item 1")
+                Text("Item 2")
+                Text("Item 3")
+            }
+        }.listStyle(GroupedListStyle())
+    }
+}

Riot/Modules/Room/NotificationSettings/SwiftUI/FormSectionHeader.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 SwiftUI
+
+@available(iOS 13.0, *)
+struct FormSectionHeader: View {
+    
+    @Environment(\.theme) var theme: Theme
+    var text: String
+    
+    var body: some View {
+        Text(text)
+            .foregroundColor(Color(theme.textSecondaryColor))
+            .padding(.top)
+            .font(Font(theme.fonts.footnote))
+    }
+}
+
+@available(iOS 13.0, *)
+struct FormSectionHeader_Previews: PreviewProvider {
+    static var previews: some View {
+        List {
+            SwiftUI.Section(header: FormSectionHeader(text: "Section Header")) {
+                Text("Item 1")
+                Text("Item 2")
+                Text("Item 3")
+            }
+        }.listStyle(GroupedListStyle())
+    }
+}

Riot/Modules/Room/NotificationSettings/SwiftUI/RoomNotificationSettingsView.swift

@@ -0,0 +1,103 @@
+// 
+// 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
+
+@available(iOS 13.0.0, *)
+struct RoomNotificationSettingsView: View {
+    
+    @Environment(\.theme) var theme: Theme
+    @ObservedObject var viewModel: RoomNotificationSettingsViewModel
+    let presentedModally: Bool
+    
+    @State var notificationState: RoomNotificationState = RoomNotificationState.all
+    
+    
+    var body: some View {
+        let leftButton = presentedModally ?
+            SwiftUI.Button(VectorL10n.cancel) {
+                viewModel.process(viewAction: .cancel)
+            }
+            : nil
+        let rightButton = SwiftUI.Button(VectorL10n.save) {
+            viewModel.process(viewAction: .save)
+        }
+        VectorForm {
+            SwiftUI.Section(
+                header: FormSectionHeader(text: VectorL10n.roomNotifsSettingsNotifyMeFor),
+                footer: FormSectionFooter(text: viewModel.viewState.roomEncryptedString)
+            ) {
+                ForEach(viewModel.viewState.notificationOptions) { option in
+                    FormPickerItem(title: option.title, selected: viewModel.viewState.notificationState == option) {
+                        viewModel.process(viewAction: .selectNotificationState(option))
+                    }
+                }
+            }
+        }
+        .navigationBarTitle(VectorL10n.roomDetailsNotifs)
+        .navigationBarItems(
+            leading: leftButton,
+            trailing: rightButton
+        ).onAppear {
+            viewModel.process(viewAction: .load)
+        }
+    }
+}
+    
+
+
+fileprivate extension RoomNotificationState {
+    var title: String {
+        switch self {
+        case .all:
+            return VectorL10n.roomNotifsSettingsAllMessages
+        case .mentionsAndKeywordsOnly:
+            return VectorL10n.roomNotifsSettingsMentionsAndKeywords
+        case .mute:
+            return VectorL10n.roomNotifsSettingsNone
+        }
+    }
+}
+
+fileprivate extension RoomNotificationSettingsViewState {
+    var roomEncryptedString: String {
+        roomEncrypted ? VectorL10n.roomNotifsSettingsEncryptedRoomNotice : ""
+    }
+}
+
+extension RoomNotificationState: Identifiable {
+    var id: String { UUID().uuidString }
+}
+
+
+@available(iOS 14.0, *)
+struct RoomNotificationSettingsView_Previews: PreviewProvider {
+    
+    static let mockViewModel = RoomNotificationSettingsViewModel(
+        roomNotificationService: MockRoomNotificationSettingsService.example,
+        roomEncrypted: true,
+        avatarViewData: nil
+    )
+    
+    static var previews: some View {
+        Group {
+            NavigationView {
+                RoomNotificationSettingsView(viewModel: mockViewModel, presentedModally: true)
+                    .navigationBarTitleDisplayMode(.inline)
+            }
+        }
+    }
+}

Riot/Modules/Room/NotificationSettings/SwiftUI/VectorForm.swift

@@ -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 SwiftUI
+
+@available(iOS 13.0, *)
+struct VectorForm<Content: View>: View {
+    
+    @Environment(\.theme) var theme: Theme
+    var content: () -> Content
+    
+    var body: some View {
+        List(content: content)
+        .listRowBackground(Color(theme.backgroundColor))
+        .listStyle(GroupedListStyle())
+        .onAppear {
+            UITableView.appearance().backgroundColor = theme.baseColor
+            UINavigationBar.appearance().barTintColor = theme.baseColor
+            UINavigationBar.appearance().titleTextAttributes = [.foregroundColor: theme.textPrimaryColor]
+            UINavigationBar.appearance().isTranslucent = false
+            UINavigationBar.appearance().setBackgroundImage(UIImage(), for: UIBarMetrics.default)
+            UINavigationBar.appearance().shadowImage = UIImage()
+        }
+    }
+}
+
+@available(iOS 13.0, *)
+struct VectorForm_Previews: PreviewProvider {
+    static var previews: some View {
+        VectorForm {
+            Text("Item 1")
+        }
+    }
+}