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

Update room notification settings mismatch screen (#1733)

Browse Source
This commit is contained in:
Nicolas Mauri
2023-09-18 11:11:27 +02:00
committed by GitHub
parent 420b982b90
commit 03603d13e5
7 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Resources/Localizations/en.lproj/Localizable.strings
+1 -1
View File
@@ -301,7 +301,7 @@
"screen_notification_settings_additional_settings_section_title" = "Additional settings"; "screen_notification_settings_additional_settings_section_title" = "Additional settings";
"screen_notification_settings_calls_label" = "Audio and video calls"; "screen_notification_settings_calls_label" = "Audio and video calls";
"screen_notification_settings_configuration_mismatch" = "Configuration mismatch"; "screen_notification_settings_configuration_mismatch" = "Configuration mismatch";
"screen_notification_settings_configuration_mismatch_description" = "We’ve simplified Notifications Settings to make options easier to find.\n\nSome custom settings you’ve chosen in the past are not shown here, but they’re still active.\n\nIf you proceed, some of your settings may change."; "screen_notification_settings_configuration_mismatch_description" = "We’ve simplified Notifications Settings to make options easier to find. Some custom settings you’ve chosen in the past are not shown here, but they’re still active.\n\nIf you proceed, some of your settings may change.";
"screen_notification_settings_direct_chats" = "Direct chats"; "screen_notification_settings_direct_chats" = "Direct chats";
"screen_notification_settings_edit_custom_settings_section_title" = "Custom setting per chat"; "screen_notification_settings_edit_custom_settings_section_title" = "Custom setting per chat";
"screen_notification_settings_edit_failed_updating_default_mode" = "An error occurred while updating the notification setting."; "screen_notification_settings_edit_failed_updating_default_mode" = "An error occurred while updating the notification setting.";
ElementX/Sources/Generated/Strings.swift
+1 -3
View File
@@ -762,9 +762,7 @@ public enum L10n {
public static var screenNotificationSettingsCallsLabel: String { return L10n.tr("Localizable", "screen_notification_settings_calls_label") } public static var screenNotificationSettingsCallsLabel: String { return L10n.tr("Localizable", "screen_notification_settings_calls_label") }
/// Configuration mismatch /// Configuration mismatch
public static var screenNotificationSettingsConfigurationMismatch: String { return L10n.tr("Localizable", "screen_notification_settings_configuration_mismatch") } public static var screenNotificationSettingsConfigurationMismatch: String { return L10n.tr("Localizable", "screen_notification_settings_configuration_mismatch") }
/// We’ve simplified Notifications Settings to make options easier to find. /// We’ve simplified Notifications Settings to make options easier to find. Some custom settings you’ve chosen in the past are not shown here, but they’re still active.
///
/// Some custom settings you’ve chosen in the past are not shown here, but they’re still active.
/// ///
/// If you proceed, some of your settings may change. /// If you proceed, some of your settings may change.
public static var screenNotificationSettingsConfigurationMismatchDescription: String { return L10n.tr("Localizable", "screen_notification_settings_configuration_mismatch_description") } public static var screenNotificationSettingsConfigurationMismatchDescription: String { return L10n.tr("Localizable", "screen_notification_settings_configuration_mismatch_description") }
ElementX/Sources/Screens/Settings/NotificationSettingsScreen/View/NotificationSettingsScreen.swift
+5 -6
View File
@@ -156,13 +156,12 @@ struct NotificationSettingsScreen: View {
private var configurationMismatchSection: some View { private var configurationMismatchSection: some View {
Section { Section {
ListRow(kind: .custom { ListRow(kind: .custom {
VStack(alignment: .leading, spacing: 12) { VStack(alignment: .leading, spacing: 16) {
Image(systemName: "gearshape") VStack(alignment: .leading, spacing: 8) {
.font(.compound.headingSMSemibold)
VStack(alignment: .leading, spacing: 4) {
Text(L10n.screenNotificationSettingsConfigurationMismatch) Text(L10n.screenNotificationSettingsConfigurationMismatch)
.font(.compound.headingSMSemibold) .font(.compound.bodyLGSemibold)
Text(L10n.screenNotificationSettingsConfigurationMismatchDescription) Text(L10n.screenNotificationSettingsConfigurationMismatchDescription)
.font(.compound.bodyMD)
.foregroundColor(.compound.textSecondary) .foregroundColor(.compound.textSecondary)
} }
Button { Button {
@@ -175,7 +174,7 @@ struct NotificationSettingsScreen: View {
.accessibilityIdentifier(A11yIdentifiers.notificationSettingsScreen.fixMismatchConfiguration) .accessibilityIdentifier(A11yIdentifiers.notificationSettingsScreen.fixMismatchConfiguration)
} }
.padding(.horizontal, ListRowPadding.horizontal) .padding(.horizontal, ListRowPadding.horizontal)
.padding(.vertical, ListRowPadding.vertical) .padding(.vertical, 24)
}) })
} }
} }
UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.notificationSettingsScreenMismatchConfiguration.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:12aa24cb445649e4b6520e960667a92c8166bf84418e24306380d63aee6c03a7 oid sha256:99866d3b4a2bc5a4ddbf926c299b84bfd8c193383ec76ad532c39c5a3922fbf2
size 95563 size 92935
UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.notificationSettingsScreenMismatchConfiguration.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:9319b24a7b129121d5e6bf8a14fae1b9700df5b44ddea3e0be03872602480578 oid sha256:10fb63da202e1cc0dcad769ba42428522b89304166563b184689c08394262e7f
size 129165 size 116668
UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.notificationSettingsScreenMismatchConfiguration.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:a339016cc249bc0f2014b7f65d084213115a2ceac30c7b7df65379ab47ea1512 oid sha256:dbd9ec65129869d4dbd9f6fdd4436c2894f8aef74c94bff8fcc1160a239dd551
size 124169 size 119908
UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.notificationSettingsScreenMismatchConfiguration.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:69fc8921f9bd24b07eeb042da2b6b4dc85861dda6a62f94133fa136c5bfb498a oid sha256:0f907bcedc944a19451dde127e2579c38f94e1d732cbd8b3f227fecd8f0fb0d4
size 197579 size 169669