ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-02 12:07:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added a disclaimer in Notification Settings for "Mentions Only" (#2081)

Browse Source
This commit is contained in:
Mauro
2023-11-15 15:57:17 +01:00
committed by GitHub
parent eb6f7e0409
commit 342feb4113
27 changed files with 244 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Screens/RoomNotificationSettingsScreen/View/RoomNotificationSettingsCustomSectionView.swift
+20 -2
View File
@@ -23,7 +23,8 @@ struct RoomNotificationSettingsCustomSectionView: View {
var body: some View {
Section {
ForEach(context.viewState.availableCustomRoomNotificationModes, id: \.self) { mode in
ListRow(label: .plain(title: context.viewState.strings.string(for: mode)),
ListRow(label: .plain(title: context.viewState.strings.string(for: mode),
description: context.viewState.description(mode: mode)),
details: (context.viewState.pendingCustomMode == mode) ? .isWaiting(true) : nil,
kind: .selection(isSelected: context.viewState.isSelected(mode: mode)) {
context.send(viewAction: .setCustomMode(mode))
@@ -40,7 +41,7 @@ struct RoomNotificationSettingsCustomSectionView: View {
struct RoomNotificationSettingsCustomSectionView_Previews: PreviewProvider, TestablePreview {
static let viewModel = {
let notificationSettingsProxy = NotificationSettingsProxyMock(with: .init(defaultRoomMode: .allMessages, roomMode: .mentionsAndKeywordsOnly))
let roomProxy = RoomProxyMock(with: .init(displayName: "Room", isEncrypted: true, joinedMembersCount: 4))
return RoomNotificationSettingsScreenViewModel(notificationSettingsProxy: notificationSettingsProxy,
@@ -48,10 +49,27 @@ struct RoomNotificationSettingsCustomSectionView_Previews: PreviewProvider, Test
displayAsUserDefinedRoomSettings: false)
}()
static let viewModelUnencrypted = {
let notificationSettingsProxy = NotificationSettingsProxyMock(with: .init(defaultRoomMode: .allMessages, roomMode: .mentionsAndKeywordsOnly))
let roomProxy = RoomProxyMock(with: .init(displayName: "Room", isEncrypted: false, joinedMembersCount: 4))
return RoomNotificationSettingsScreenViewModel(notificationSettingsProxy: notificationSettingsProxy,
roomProxy: roomProxy,
displayAsUserDefinedRoomSettings: false)
}()
static var previews: some View {
Form {
RoomNotificationSettingsCustomSectionView(context: viewModel.context)
}
.compoundForm()
.previewDisplayName("Encrypted")
Form {
RoomNotificationSettingsCustomSectionView(context: viewModelUnencrypted.context)
}
.compoundForm()
.previewDisplayName("Unencrypted")
}
}
ElementX/Sources/Screens/RoomNotificationSettingsScreen/View/RoomNotificationSettingsUserDefinedScreen.swift
+13
View File
@@ -58,8 +58,21 @@ struct RoomNotificationSettingsUserDefinedScreen_Previews: PreviewProvider, Test
roomProxy: roomProxy,
displayAsUserDefinedRoomSettings: true)
}()
static let viewModelUnencrypted = {
let notificationSettingsProxy = NotificationSettingsProxyMock(with: .init(defaultRoomMode: .mentionsAndKeywordsOnly, roomMode: .mentionsAndKeywordsOnly))
let roomProxy = RoomProxyMock(with: .init(displayName: "Room", isEncrypted: false, joinedMembersCount: 4))
return RoomNotificationSettingsScreenViewModel(notificationSettingsProxy: notificationSettingsProxy,
roomProxy: roomProxy,
displayAsUserDefinedRoomSettings: true)
}()
static var previews: some View {
RoomNotificationSettingsUserDefinedScreen(context: viewModel.context)
.previewDisplayName("Encrypted")
RoomNotificationSettingsUserDefinedScreen(context: viewModelUnencrypted.context)
.previewDisplayName("Unencrypted")
}
}