mirror of
https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git
synced 2026-04-18 23:48:29 +02:00
Finish extraction
- Moves SwiftUI code out of Riot and into RiotSwiftUI which has no dependency on Matrix SDK. - Git wasn't smart enough to see the file moves. Most feature function has remain unchanged. 1 change I did make was remove NotificationSettingsViewModel's dependence on MxPushRule, so that the view model could be moved into RiotSwiftUI. - Add LocaleProvider to abstract VectorL10n's use of Matrix SDK language so it can be used in RiotSwiftUI. - Split Theme into UKit/SwiftUI version to remove RiotSwiftUI's dependence on ThemeService and ThemeV1. - Migrated from ThemeObserver to ThemePublisher. We push updates to ThemePublisher so that we can remove ThemeService as dependency. - Add .DS_Store to .gitignore
This commit is contained in:
@@ -0,0 +1,98 @@
|
||||
//
|
||||
// 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 14.0.0, *)
|
||||
struct RoomNotificationSettings: View {
|
||||
|
||||
@ObservedObject var viewModel: RoomNotificationSettingsSwiftUIViewModel
|
||||
|
||||
let presentedModally: Bool
|
||||
|
||||
@ViewBuilder
|
||||
private var leftButton: some View {
|
||||
if presentedModally {
|
||||
Button(VectorL10n.cancel) {
|
||||
viewModel.process(viewAction: .cancel)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ViewBuilder
|
||||
private var rightButton: some View {
|
||||
Button(VectorL10n.save) {
|
||||
viewModel.process(viewAction: .save)
|
||||
}
|
||||
}
|
||||
|
||||
var body: some View {
|
||||
VectorForm {
|
||||
if let avatarData = viewModel.viewState.avatarData as? AvatarInputType {
|
||||
RoomNotificationSettingsHeader(
|
||||
avatarData: avatarData,
|
||||
displayName: viewModel.viewState.displayName
|
||||
)
|
||||
}
|
||||
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))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.activityIndicator(show: viewModel.viewState.saving)
|
||||
.navigationBarTitle(VectorL10n.roomDetailsNotifs)
|
||||
.navigationBarItems(
|
||||
leading: leftButton,
|
||||
trailing: rightButton
|
||||
)
|
||||
.onAppear {
|
||||
viewModel.process(viewAction: .load)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@available(iOS 14.0, *)
|
||||
struct RoomNotificationSettings_Previews: PreviewProvider {
|
||||
|
||||
static let mockViewModel = RoomNotificationSettingsSwiftUIViewModel(
|
||||
roomNotificationService: MockRoomNotificationSettingsService.example,
|
||||
avatarData: MockAvatarInput.example,
|
||||
displayName: MockAvatarInput.example.displayName,
|
||||
roomEncrypted: true
|
||||
)
|
||||
|
||||
static var previews: some View {
|
||||
Group {
|
||||
NavigationView {
|
||||
RoomNotificationSettings(viewModel: mockViewModel, presentedModally: true)
|
||||
.navigationBarTitleDisplayMode(.inline)
|
||||
.addDependency(MockAvatarService.example)
|
||||
}
|
||||
NavigationView {
|
||||
RoomNotificationSettings(viewModel: mockViewModel, presentedModally: true)
|
||||
.navigationBarTitleDisplayMode(.inline)
|
||||
.theme(ThemeIdentifier.dark)
|
||||
.addDependency(MockAvatarService.example)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user