From 3aadb0c407d0dbfad6eaf74f1001fca948ba52d8 Mon Sep 17 00:00:00 2001 From: Stefan Ceriu Date: Mon, 18 Mar 2024 14:07:02 +0200 Subject: [PATCH] Update UI components - add bottom background to certain screens - change hero images to support green styles and fix default colors - switch new onboarding screns to the FullScreenDialog - disable interactive dismissal - update snapshots --- .../images/Alerts.imageset/Alerts.svg | 57 ++++++++++++++++++ .../images/Alerts.imageset/Contents.json | 15 +++++ .../Contents.json | 12 ++++ .../background-bottom-light.png | Bin 0 -> 42776 bytes .../en.lproj/Localizable.strings | 6 +- ElementX/Sources/Generated/Assets.swift | 2 + ElementX/Sources/Generated/Strings.swift | 10 ++- .../SwiftUI/Layout/FullscreenDialog.swift | 1 - .../Other/SwiftUI/Views/HeroImage.swift | 36 +++++++++-- .../View/AnalyticsPromptScreen.swift | 3 +- .../View/IdentityConfirmationScreen.swift | 24 ++++---- .../View/IdentityConfirmedScreen.swift | 26 ++++---- .../View/NotificationPermissionsScreen.swift | 11 ++-- ...est_analyticsPromptScreen-iPad-en-GB.1.png | 4 +- ...st_analyticsPromptScreen-iPad-pseudo.1.png | 4 +- ...nalyticsPromptScreen-iPhone-15-en-GB.1.png | 4 +- ...alyticsPromptScreen-iPhone-15-pseudo.1.png | 4 +- ...pLockSetupPINScreen-iPad-en-GB.Confirm.png | 4 +- ...ppLockSetupPINScreen-iPad-en-GB.Create.png | 4 +- ...etupPINScreen-iPad-en-GB.Unlock-Failed.png | 4 +- ...ppLockSetupPINScreen-iPad-en-GB.Unlock.png | 4 +- ...LockSetupPINScreen-iPad-pseudo.Confirm.png | 4 +- ...pLockSetupPINScreen-iPad-pseudo.Create.png | 4 +- ...tupPINScreen-iPad-pseudo.Unlock-Failed.png | 4 +- ...pLockSetupPINScreen-iPad-pseudo.Unlock.png | 4 +- ...SetupPINScreen-iPhone-15-en-GB.Confirm.png | 4 +- ...kSetupPINScreen-iPhone-15-en-GB.Create.png | 4 +- ...INScreen-iPhone-15-en-GB.Unlock-Failed.png | 4 +- ...kSetupPINScreen-iPhone-15-en-GB.Unlock.png | 4 +- ...etupPINScreen-iPhone-15-pseudo.Confirm.png | 4 +- ...SetupPINScreen-iPhone-15-pseudo.Create.png | 4 +- ...NScreen-iPhone-15-pseudo.Unlock-Failed.png | 4 +- ...SetupPINScreen-iPhone-15-pseudo.Unlock.png | 4 +- .../test_heroImage-iPad-en-GB.1.png | 4 +- .../test_heroImage-iPad-pseudo.1.png | 4 +- .../test_heroImage-iPhone-15-en-GB.1.png | 4 +- .../test_heroImage-iPhone-15-pseudo.1.png | 4 +- ...dentityConfirmationScreen-iPad-en-GB.1.png | 4 +- ...entityConfirmationScreen-iPad-pseudo.1.png | 4 +- ...tyConfirmationScreen-iPhone-15-en-GB.1.png | 4 +- ...yConfirmationScreen-iPhone-15-pseudo.1.png | 4 +- ...t_identityConfirmedScreen-iPad-en-GB.1.png | 4 +- ..._identityConfirmedScreen-iPad-pseudo.1.png | 4 +- ...ntityConfirmedScreen-iPhone-15-en-GB.1.png | 4 +- ...tityConfirmedScreen-iPhone-15-pseudo.1.png | 4 +- ...nScreen-iPad-en-GB.Credentials-Entered.png | 4 +- ...t_loginScreen-iPad-en-GB.OIDC-Fallback.png | 4 +- ...est_loginScreen-iPad-en-GB.Unsupported.png | 4 +- ...test_loginScreen-iPad-en-GB.matrix-org.png | 4 +- ...Screen-iPad-pseudo.Credentials-Entered.png | 4 +- ..._loginScreen-iPad-pseudo.OIDC-Fallback.png | 4 +- ...st_loginScreen-iPad-pseudo.Unsupported.png | 4 +- ...est_loginScreen-iPad-pseudo.matrix-org.png | 4 +- ...en-iPhone-15-en-GB.Credentials-Entered.png | 4 +- ...inScreen-iPhone-15-en-GB.OIDC-Fallback.png | 4 +- ...oginScreen-iPhone-15-en-GB.Unsupported.png | 4 +- ...loginScreen-iPhone-15-en-GB.matrix-org.png | 4 +- ...n-iPhone-15-pseudo.Credentials-Entered.png | 4 +- ...nScreen-iPhone-15-pseudo.OIDC-Fallback.png | 4 +- ...ginScreen-iPhone-15-pseudo.Unsupported.png | 4 +- ...oginScreen-iPhone-15-pseudo.matrix-org.png | 4 +- ...ficationPermissionsScreen-iPad-en-GB.1.png | 4 +- ...icationPermissionsScreen-iPad-pseudo.1.png | 4 +- ...ionPermissionsScreen-iPhone-15-en-GB.1.png | 4 +- ...onPermissionsScreen-iPhone-15-pseudo.1.png | 4 +- ...Screen-iPad-en-GB.Messages-and-Content.png | 4 +- ...creen-iPad-pseudo.Messages-and-Content.png | 4 +- ...n-iPhone-15-en-GB.Messages-and-Content.png | 4 +- ...-iPhone-15-pseudo.Messages-and-Content.png | 4 +- ...ackupKeyBackupScreen-iPad-en-GB.Set-up.png | 4 +- ...ckupKeyBackupScreen-iPad-pseudo.Set-up.png | 4 +- ...KeyBackupScreen-iPhone-15-en-GB.Set-up.png | 4 +- ...eyBackupScreen-iPhone-15-pseudo.Set-up.png | 4 +- ...pLogoutConfirmationScreen-iPad-en-GB.1.png | 4 +- ...LogoutConfirmationScreen-iPad-pseudo.1.png | 4 +- ...utConfirmationScreen-iPhone-15-en-GB.1.png | 4 +- ...tConfirmationScreen-iPhone-15-pseudo.1.png | 4 +- ...ecoveryKeyScreen-iPad-en-GB.Incomplete.png | 4 +- ...ecoveryKeyScreen-iPad-en-GB.Not-set-up.png | 4 +- ...kupRecoveryKeyScreen-iPad-en-GB.Set-up.png | 4 +- ...coveryKeyScreen-iPad-pseudo.Incomplete.png | 4 +- ...coveryKeyScreen-iPad-pseudo.Not-set-up.png | 4 +- ...upRecoveryKeyScreen-iPad-pseudo.Set-up.png | 4 +- ...ryKeyScreen-iPhone-15-en-GB.Incomplete.png | 4 +- ...ryKeyScreen-iPhone-15-en-GB.Not-set-up.png | 4 +- ...coveryKeyScreen-iPhone-15-en-GB.Set-up.png | 4 +- ...yKeyScreen-iPhone-15-pseudo.Incomplete.png | 4 +- ...yKeyScreen-iPhone-15-pseudo.Not-set-up.png | 4 +- ...overyKeyScreen-iPhone-15-pseudo.Set-up.png | 4 +- ...verConfirmationScreen-iPad-en-GB.Login.png | 4 +- ...ConfirmationScreen-iPad-en-GB.Register.png | 4 +- ...erConfirmationScreen-iPad-pseudo.Login.png | 4 +- ...onfirmationScreen-iPad-pseudo.Register.png | 4 +- ...nfirmationScreen-iPhone-15-en-GB.Login.png | 4 +- ...rmationScreen-iPhone-15-en-GB.Register.png | 4 +- ...firmationScreen-iPhone-15-pseudo.Login.png | 4 +- ...mationScreen-iPhone-15-pseudo.Register.png | 4 +- .../test_serverSelection-iPad-en-GB.1.png | 4 +- .../test_serverSelection-iPad-en-GB.2.png | 4 +- .../test_serverSelection-iPad-en-GB.3.png | 4 +- .../test_serverSelection-iPad-en-GB.4.png | 4 +- .../test_serverSelection-iPad-pseudo.1.png | 4 +- .../test_serverSelection-iPad-pseudo.2.png | 4 +- .../test_serverSelection-iPad-pseudo.3.png | 4 +- .../test_serverSelection-iPad-pseudo.4.png | 4 +- ...test_serverSelection-iPhone-15-en-GB.1.png | 4 +- ...test_serverSelection-iPhone-15-en-GB.2.png | 4 +- ...test_serverSelection-iPhone-15-en-GB.3.png | 4 +- ...test_serverSelection-iPhone-15-en-GB.4.png | 4 +- ...est_serverSelection-iPhone-15-pseudo.1.png | 4 +- ...est_serverSelection-iPhone-15-pseudo.2.png | 4 +- ...est_serverSelection-iPhone-15-pseudo.3.png | 4 +- ...est_serverSelection-iPhone-15-pseudo.4.png | 4 +- 113 files changed, 362 insertions(+), 241 deletions(-) create mode 100644 ElementX/Resources/Assets.xcassets/images/Alerts.imageset/Alerts.svg create mode 100644 ElementX/Resources/Assets.xcassets/images/Alerts.imageset/Contents.json create mode 100644 ElementX/Resources/Assets.xcassets/images/background-bottom-light.imageset/Contents.json create mode 100644 ElementX/Resources/Assets.xcassets/images/background-bottom-light.imageset/background-bottom-light.png diff --git a/ElementX/Resources/Assets.xcassets/images/Alerts.imageset/Alerts.svg b/ElementX/Resources/Assets.xcassets/images/Alerts.imageset/Alerts.svg new file mode 100644 index 0000000000..98673b3f44 --- /dev/null +++ b/ElementX/Resources/Assets.xcassets/images/Alerts.imageset/Alerts.svg @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ElementX/Resources/Assets.xcassets/images/Alerts.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/Alerts.imageset/Contents.json new file mode 100644 index 0000000000..643d2effbe --- /dev/null +++ b/ElementX/Resources/Assets.xcassets/images/Alerts.imageset/Contents.json @@ -0,0 +1,15 @@ +{ + "images" : [ + { + "filename" : "Alerts.svg", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true + } +} diff --git a/ElementX/Resources/Assets.xcassets/images/background-bottom-light.imageset/Contents.json b/ElementX/Resources/Assets.xcassets/images/background-bottom-light.imageset/Contents.json new file mode 100644 index 0000000000..92e209943a --- /dev/null +++ b/ElementX/Resources/Assets.xcassets/images/background-bottom-light.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "background-bottom-light.png", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ElementX/Resources/Assets.xcassets/images/background-bottom-light.imageset/background-bottom-light.png b/ElementX/Resources/Assets.xcassets/images/background-bottom-light.imageset/background-bottom-light.png new file mode 100644 index 0000000000000000000000000000000000000000..a5c1ba5464188d978d64d30289d7c995af336359 GIT binary patch literal 42776 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 XOn6Jiw-IpA00000NkvXXu0mjfJ3O$6 literal 0 HcmV?d00001 diff --git a/ElementX/Resources/Localizations/en.lproj/Localizable.strings b/ElementX/Resources/Localizations/en.lproj/Localizable.strings index a08118ab3e..b19aa1c283 100644 --- a/ElementX/Resources/Localizations/en.lproj/Localizable.strings +++ b/ElementX/Resources/Localizations/en.lproj/Localizable.strings @@ -398,6 +398,10 @@ "screen_edit_profile_error_title" = "Unable to update profile"; "screen_edit_profile_title" = "Edit profile"; "screen_edit_profile_updating_details" = "Updating profile…"; +"screen_identity_confirmation_subtitle" = "Verify this device to set up secure messaging."; +"screen_identity_confirmation_title" = "Confirm that it's you"; +"screen_identity_confirmed_subtitle" = "Now you can read or send messages securely, and anyone you chat with can also trust this device."; +"screen_identity_confirmed_title" = "Device verified"; "screen_invites_decline_chat_message" = "Are you sure you want to decline the invitation to join %1$@?"; "screen_invites_decline_chat_title" = "Decline invite"; "screen_invites_decline_direct_chat_message" = "Are you sure you want to decline this private chat with %1$@?"; @@ -499,7 +503,7 @@ "screen_room_attachment_text_formatting" = "Text Formatting"; "screen_room_change_permissions_administrators" = "Admins only"; "screen_room_change_permissions_ban_people" = "Ban people"; -"screen_room_change_permissions_delete_messages" = "Delete messages"; +"screen_room_change_permissions_delete_messages" = "Remove messages"; "screen_room_change_permissions_invite_people" = "Invite people"; "screen_room_change_permissions_moderators" = "Admins and moderators"; "screen_room_change_permissions_remove_people" = "Remove people"; diff --git a/ElementX/Sources/Generated/Assets.swift b/ElementX/Sources/Generated/Assets.swift index aebca381e7..ff7b6b5627 100644 --- a/ElementX/Sources/Generated/Assets.swift +++ b/ElementX/Sources/Generated/Assets.swift @@ -31,8 +31,10 @@ internal enum Asset { internal static let grabber = ColorAsset(name: "colors/grabber") } internal enum Images { + internal static let alerts = ImageAsset(name: "images/Alerts") internal static let appLogo = ImageAsset(name: "images/app-logo") internal static let serverSelectionIcon = ImageAsset(name: "images/server-selection-icon") + internal static let backgroundBottomLight = ImageAsset(name: "images/background-bottom-light") internal static let closeRte = ImageAsset(name: "images/close-rte") internal static let composerAttachment = ImageAsset(name: "images/composer-attachment") internal static let stopRecording = ImageAsset(name: "images/stop-recording") diff --git a/ElementX/Sources/Generated/Strings.swift b/ElementX/Sources/Generated/Strings.swift index 4638d9ffd4..0ba214ac1a 100644 --- a/ElementX/Sources/Generated/Strings.swift +++ b/ElementX/Sources/Generated/Strings.swift @@ -991,6 +991,14 @@ internal enum L10n { internal static var screenEditProfileTitle: String { return L10n.tr("Localizable", "screen_edit_profile_title") } /// Updating profile… internal static var screenEditProfileUpdatingDetails: String { return L10n.tr("Localizable", "screen_edit_profile_updating_details") } + /// Verify this device to set up secure messaging. + internal static var screenIdentityConfirmationSubtitle: String { return L10n.tr("Localizable", "screen_identity_confirmation_subtitle") } + /// Confirm that it's you + internal static var screenIdentityConfirmationTitle: String { return L10n.tr("Localizable", "screen_identity_confirmation_title") } + /// Now you can read or send messages securely, and anyone you chat with can also trust this device. + internal static var screenIdentityConfirmedSubtitle: String { return L10n.tr("Localizable", "screen_identity_confirmed_subtitle") } + /// Device verified + internal static var screenIdentityConfirmedTitle: String { return L10n.tr("Localizable", "screen_identity_confirmed_title") } /// Are you sure you want to decline the invitation to join %1$@? internal static func screenInvitesDeclineChatMessage(_ p1: Any) -> String { return L10n.tr("Localizable", "screen_invites_decline_chat_message", String(describing: p1)) @@ -1215,7 +1223,7 @@ internal enum L10n { internal static var screenRoomChangePermissionsAdministrators: String { return L10n.tr("Localizable", "screen_room_change_permissions_administrators") } /// Ban people internal static var screenRoomChangePermissionsBanPeople: String { return L10n.tr("Localizable", "screen_room_change_permissions_ban_people") } - /// Delete messages + /// Remove messages internal static var screenRoomChangePermissionsDeleteMessages: String { return L10n.tr("Localizable", "screen_room_change_permissions_delete_messages") } /// Everyone internal static var screenRoomChangePermissionsEveryone: String { return L10n.tr("Localizable", "screen_room_change_permissions_everyone") } diff --git a/ElementX/Sources/Other/SwiftUI/Layout/FullscreenDialog.swift b/ElementX/Sources/Other/SwiftUI/Layout/FullscreenDialog.swift index 86edb78ff3..d9d3491077 100644 --- a/ElementX/Sources/Other/SwiftUI/Layout/FullscreenDialog.swift +++ b/ElementX/Sources/Other/SwiftUI/Layout/FullscreenDialog.swift @@ -72,7 +72,6 @@ struct FullscreenDialog: View { Spacer() .frame(height: UIConstants.spacerHeight(in: geometry)) } - .background() } } } diff --git a/ElementX/Sources/Other/SwiftUI/Views/HeroImage.swift b/ElementX/Sources/Other/SwiftUI/Views/HeroImage.swift index 54154e453b..5208450ce3 100644 --- a/ElementX/Sources/Other/SwiftUI/Views/HeroImage.swift +++ b/ElementX/Sources/Other/SwiftUI/Views/HeroImage.swift @@ -21,35 +21,61 @@ import SwiftUI /// takes a compound icon. If you would like to apply it to an SFSymbol, you can call /// the `heroImage()` modifier directly on the Image. struct HeroImage: View { + enum Style { + case normal + case positive + + var foregroundColor: Color { + switch self { + case .normal: + return .compound.iconSecondaryAlpha + case .positive: + return .compound.iconSuccessPrimary + } + } + + var backgroundFillColor: Color { + switch self { + case .normal: + return .compound.bgSubtleSecondary + case .positive: + return .compound.bgSuccessSubtle + } + } + } + /// The icon that is shown. let icon: KeyPath + var style: Style = .normal var body: some View { CompoundIcon(icon, size: .custom(42), relativeTo: .title) - .modifier(HeroImageModifier()) + .modifier(HeroImageModifier(style: style)) } } extension Image { /// Styles the image for use as the main/top/hero screen icon. You should prefer /// the HeroImage component when possible, by using an icon from Compound. - func heroImage(insets: CGFloat = 16) -> some View { + func heroImage(insets: CGFloat = 16, style: HeroImage.Style = .normal) -> some View { resizable() .renderingMode(.template) .aspectRatio(contentMode: .fit) .scaledPadding(insets, relativeTo: .title) - .modifier(HeroImageModifier()) + .modifier(HeroImageModifier(style: style)) } } private struct HeroImageModifier: ViewModifier { + let style: HeroImage.Style + func body(content: Content) -> some View { content - .foregroundColor(.compound.iconPrimary) .scaledFrame(size: 70, relativeTo: .title) + .foregroundColor(style.foregroundColor) .background { RoundedRectangle(cornerRadius: 14) - .fill(Color.compound.bgSubtleSecondary) + .fill(style.backgroundFillColor) } .accessibilityHidden(true) } diff --git a/ElementX/Sources/Screens/Onboarding/AnalyticsPromptScreen/View/AnalyticsPromptScreen.swift b/ElementX/Sources/Screens/Onboarding/AnalyticsPromptScreen/View/AnalyticsPromptScreen.swift index 785a97e6ec..cf46198ba4 100644 --- a/ElementX/Sources/Screens/Onboarding/AnalyticsPromptScreen/View/AnalyticsPromptScreen.swift +++ b/ElementX/Sources/Screens/Onboarding/AnalyticsPromptScreen/View/AnalyticsPromptScreen.swift @@ -26,10 +26,11 @@ struct AnalyticsPromptScreen: View { } bottomContent: { buttons } - .background() + .background(Asset.Images.backgroundBottomLight.swiftUIImage.resizable().ignoresSafeArea()) .environment(\.backgroundStyle, AnyShapeStyle(Color.compound.bgCanvasDefault)) .navigationBarHidden(true) .navigationBarBackButtonHidden(true) + .interactiveDismissDisabled() } /// The main content of the screen that is shown inside the scroll view. diff --git a/ElementX/Sources/Screens/Onboarding/IdentityConfirmationScreen/View/IdentityConfirmationScreen.swift b/ElementX/Sources/Screens/Onboarding/IdentityConfirmationScreen/View/IdentityConfirmationScreen.swift index 4f73fd50af..f0c81ca1e0 100644 --- a/ElementX/Sources/Screens/Onboarding/IdentityConfirmationScreen/View/IdentityConfirmationScreen.swift +++ b/ElementX/Sources/Screens/Onboarding/IdentityConfirmationScreen/View/IdentityConfirmationScreen.swift @@ -21,16 +21,16 @@ struct IdentityConfirmationScreen: View { @ObservedObject var context: IdentityConfirmationScreenViewModel.Context var body: some View { - ScrollView { - VStack(spacing: 32) { - screenHeader - } - .padding(.horizontal, 16) - .padding(.top, 24) - .frame(maxWidth: .infinity) + FullscreenDialog(topPadding: UIConstants.startScreenBreakerScreenTopPadding) { + screenHeader + } bottomContent: { + actionButtons } - .safeAreaInset(edge: .bottom) { actionButtons.padding() } - .background(Color.compound.bgCanvasDefault.ignoresSafeArea()) + .background() + .environment(\.backgroundStyle, AnyShapeStyle(Color.compound.bgCanvasDefault)) + .navigationBarHidden(true) + .navigationBarBackButtonHidden(true) + .interactiveDismissDisabled() } // MARK: - Private @@ -41,15 +41,13 @@ struct IdentityConfirmationScreen: View { HeroImage(icon: \.lockSolid) .padding(.bottom, 16) - #warning("FIXME") - Text("Confirm that it's you") + Text(L10n.screenIdentityConfirmationTitle) .font(.title2.bold()) .multilineTextAlignment(.center) .foregroundColor(.compound.textPrimary) .padding(.bottom, 8) - #warning("FIXME") - Text("Verify this device to set up secure messaging.") + Text(L10n.screenIdentityConfirmationSubtitle) .font(.subheadline) .multilineTextAlignment(.center) .foregroundColor(.compound.textSecondary) diff --git a/ElementX/Sources/Screens/Onboarding/IdentityConfirmedScreen/View/IdentityConfirmedScreen.swift b/ElementX/Sources/Screens/Onboarding/IdentityConfirmedScreen/View/IdentityConfirmedScreen.swift index acd101bd14..eaf24907ad 100644 --- a/ElementX/Sources/Screens/Onboarding/IdentityConfirmedScreen/View/IdentityConfirmedScreen.swift +++ b/ElementX/Sources/Screens/Onboarding/IdentityConfirmedScreen/View/IdentityConfirmedScreen.swift @@ -21,16 +21,16 @@ struct IdentityConfirmedScreen: View { @ObservedObject var context: IdentityConfirmedScreenViewModel.Context var body: some View { - ScrollView { - VStack(spacing: 32) { - screenHeader - } - .padding(.horizontal, 16) - .padding(.top, 24) - .frame(maxWidth: .infinity) + FullscreenDialog(topPadding: UIConstants.startScreenBreakerScreenTopPadding) { + screenHeader + } bottomContent: { + actionButtons } - .safeAreaInset(edge: .bottom) { actionButtons.padding() } - .background(Color.compound.bgCanvasDefault.ignoresSafeArea()) + .background() + .environment(\.backgroundStyle, AnyShapeStyle(Color.compound.bgCanvasDefault)) + .navigationBarHidden(true) + .navigationBarBackButtonHidden(true) + .interactiveDismissDisabled() } // MARK: - Private @@ -38,18 +38,16 @@ struct IdentityConfirmedScreen: View { @ViewBuilder private var screenHeader: some View { VStack(spacing: 0) { - HeroImage(icon: \.checkCircle) + HeroImage(icon: \.checkCircle, style: .positive) .padding(.bottom, 16) - #warning("FIXME") - Text("Device verified") + Text(L10n.screenIdentityConfirmedTitle) .font(.title2.bold()) .multilineTextAlignment(.center) .foregroundColor(.compound.textPrimary) .padding(.bottom, 8) - #warning("FIXME") - Text("Now you can read or send messages securely, and anyone you chat with can also trust this device.") + Text(L10n.screenIdentityConfirmedSubtitle) .font(.subheadline) .multilineTextAlignment(.center) .foregroundColor(.compound.textSecondary) diff --git a/ElementX/Sources/Screens/Onboarding/NotificationPermissionsScreen/View/NotificationPermissionsScreen.swift b/ElementX/Sources/Screens/Onboarding/NotificationPermissionsScreen/View/NotificationPermissionsScreen.swift index 335e1924db..c6b6f85726 100644 --- a/ElementX/Sources/Screens/Onboarding/NotificationPermissionsScreen/View/NotificationPermissionsScreen.swift +++ b/ElementX/Sources/Screens/Onboarding/NotificationPermissionsScreen/View/NotificationPermissionsScreen.swift @@ -26,10 +26,11 @@ struct NotificationPermissionsScreen: View { } bottomContent: { buttons } - .background() + .background(Asset.Images.backgroundBottomLight.swiftUIImage.resizable().ignoresSafeArea()) .environment(\.backgroundStyle, AnyShapeStyle(Color.compound.bgCanvasDefault)) .navigationBarHidden(true) .navigationBarBackButtonHidden(true) + .interactiveDismissDisabled() } /// The main content of the screen that is shown inside the scroll view. @@ -38,17 +39,17 @@ struct NotificationPermissionsScreen: View { HeroImage(icon: \.notificationsSolid) .padding(.bottom, 8) - #warning("FIXME") - Text("Allow notifications and never miss a message") + Text(L10n.screenNotificationOptinTitle) .font(.compound.headingMDBold) .multilineTextAlignment(.center) .foregroundColor(.compound.textPrimary) - #warning("FIXME") - Text("You can change your settings later.") + Text(L10n.screenNotificationOptinSubtitle) .font(.compound.bodyMD) .multilineTextAlignment(.center) .foregroundColor(.compound.textSecondary) + + Asset.Images.alerts.swiftUIImage.resizable().aspectRatio(contentMode: .fit) } } diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_analyticsPromptScreen-iPad-en-GB.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_analyticsPromptScreen-iPad-en-GB.1.png index 0069e930e7..861e80beb7 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_analyticsPromptScreen-iPad-en-GB.1.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_analyticsPromptScreen-iPad-en-GB.1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:70fcd44d149c0c7633fe2bee0ba85f3ae81d1fedd801a66239f0d1307909a430 -size 173623 +oid sha256:b54da68b43812faf5832a6c72c4a84a89856f851df8334642b0269baa4ffe2f0 +size 501526 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_analyticsPromptScreen-iPad-pseudo.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_analyticsPromptScreen-iPad-pseudo.1.png index 5dcf51263a..2436480ad6 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_analyticsPromptScreen-iPad-pseudo.1.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_analyticsPromptScreen-iPad-pseudo.1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5eb23616fd2661ac5a2990e0dfef92c504da2726db2138222b88fba79fcd7500 -size 267411 +oid sha256:83df2d37566501eb0a9e9e95be7512362e0f618404632118beb3ade825d41a43 +size 595704 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_analyticsPromptScreen-iPhone-15-en-GB.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_analyticsPromptScreen-iPhone-15-en-GB.1.png index 2bfbab7558..399d42875a 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_analyticsPromptScreen-iPhone-15-en-GB.1.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_analyticsPromptScreen-iPhone-15-en-GB.1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9be44c03d825f3650984e0cfd0540915913f896951acd0d39991f9843371c111 -size 122394 +oid sha256:0d65348d6d512ba6b9466ffebb918a6d281b71ae5b2ea16fcd10773f69554617 +size 294015 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_analyticsPromptScreen-iPhone-15-pseudo.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_analyticsPromptScreen-iPhone-15-pseudo.1.png index ec952675ef..7f614308ec 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_analyticsPromptScreen-iPhone-15-pseudo.1.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_analyticsPromptScreen-iPhone-15-pseudo.1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:28cffcec20c859af14d5e018c63da99c3014375d56ffd30751c15846f823f031 -size 200260 +oid sha256:94d09585304bd4b83af876ed03d2b292487978f5659cb2d75a3a5591e5fd6e0f +size 333111 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPad-en-GB.Confirm.png b/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPad-en-GB.Confirm.png index 900dbb9dc2..85761f8b2f 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPad-en-GB.Confirm.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPad-en-GB.Confirm.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:39a6378f7df6c01583babab0b71bac767f97fa37905f2d867d0a8904d7e9acdd -size 122499 +oid sha256:162403cd32a6c79acd4786edfcc285a9d584170b44873d1437e5515b541847c3 +size 122476 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPad-en-GB.Create.png b/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPad-en-GB.Create.png index ee7ea18e9e..db7a62b76a 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPad-en-GB.Create.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPad-en-GB.Create.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:55e0c5e851d041da806f13a65b5d1b0c1161a3b71941db9cc6e9a8723bf4510f -size 124974 +oid sha256:9880a7b5f78c5988203f4a774a30eca89668994f4afcb87781e22996c783b5a8 +size 124949 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPad-en-GB.Unlock-Failed.png b/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPad-en-GB.Unlock-Failed.png index 6ac162f7f8..5ba02a2885 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPad-en-GB.Unlock-Failed.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPad-en-GB.Unlock-Failed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:640a83ceb101623de31fd268475af5b9059c7a2ca7a8f7aa8199fb7daef5a939 -size 100288 +oid sha256:3a64df9cc08178a8531180e66c954d27146e9ebb0f1e5aac16d1a45ebab51689 +size 100275 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPad-en-GB.Unlock.png b/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPad-en-GB.Unlock.png index d27769cfb9..3ac43ed00d 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPad-en-GB.Unlock.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPad-en-GB.Unlock.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a1bbe9c2e6a8fb461ea4aaa0624f5f73c4465072b598d5aafd053df719eb5610 -size 98946 +oid sha256:bd72f778b163ba1c82df97fd16070bd561e316c8c37d6405b28ded4d74868d10 +size 98926 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPad-pseudo.Confirm.png b/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPad-pseudo.Confirm.png index 5e1780ce4f..6b2d392471 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPad-pseudo.Confirm.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPad-pseudo.Confirm.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4ce96b100be97ab727d12dd40fa830e45c3273cde01109db36edb2948cb0f23b -size 169765 +oid sha256:8f95ccf77417c7ed780bd8407a7998f9ef666d2e3f8b943d488b5b8d625575f4 +size 169754 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPad-pseudo.Create.png b/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPad-pseudo.Create.png index 67b17b6fd0..33aeb14929 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPad-pseudo.Create.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPad-pseudo.Create.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8674d2c5605782b44e429817a872f828465efa8fd0efed8da84fa6e1502a4c3b -size 171910 +oid sha256:ff786d539d4331ea6121671665c2e2fb37e7c1e4961218995825047d1d152223 +size 171896 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPad-pseudo.Unlock-Failed.png b/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPad-pseudo.Unlock-Failed.png index 3dd6cd7eda..6fee0e92af 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPad-pseudo.Unlock-Failed.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPad-pseudo.Unlock-Failed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5de5005d6e79e1d8bbc85ec321df1978098c1caa08d951eb600e50348101f9b3 -size 114059 +oid sha256:1e8fba49e9b8215deedfaba38f6c49e4cecbee6b61209c4fbe213e0b42be6d8e +size 114052 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPad-pseudo.Unlock.png b/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPad-pseudo.Unlock.png index fcce47ff8f..b36a8f55a2 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPad-pseudo.Unlock.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPad-pseudo.Unlock.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:65ae23a0ac8ec3fe8ba1e8492c9347d0a0e57de0c2b1d1b84507ec9f0058a3e1 -size 113353 +oid sha256:685d2fede01ed8b63cfbc5ee589991f348bd42e861128989720f4990548f4686 +size 113343 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPhone-15-en-GB.Confirm.png b/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPhone-15-en-GB.Confirm.png index de95b56734..051de4c2a1 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPhone-15-en-GB.Confirm.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPhone-15-en-GB.Confirm.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:854578a7bf75adaad847dcf733ad364670d0b5c601f3c767c26a1f477f67e2a2 -size 80094 +oid sha256:43a4868593e39b3e3d15ba969b8253531fcc5f00a3ddf4ea4e6840ec68831e96 +size 80060 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPhone-15-en-GB.Create.png b/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPhone-15-en-GB.Create.png index 8adbce269d..5252a1bab8 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPhone-15-en-GB.Create.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPhone-15-en-GB.Create.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d09086b13a697b7ce3e112aebec1c8fcaa07143e7d24d6b6fcae8b12e4844899 -size 82078 +oid sha256:f45d39fb3d1fe05638841fd815df5878df5f4141519479565146f5b035958abd +size 82051 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPhone-15-en-GB.Unlock-Failed.png b/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPhone-15-en-GB.Unlock-Failed.png index dbb72ef855..13f7e29c8e 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPhone-15-en-GB.Unlock-Failed.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPhone-15-en-GB.Unlock-Failed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:77162b478466530aa5673acca394d3b34b36174a486abc2aa78802b63dcccc04 -size 57653 +oid sha256:7d4e28a94c979ac8de6329810d715004aef026231b9bc6ad0f2419d883f7cbfd +size 57637 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPhone-15-en-GB.Unlock.png b/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPhone-15-en-GB.Unlock.png index e40b4606e3..02eeb94925 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPhone-15-en-GB.Unlock.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPhone-15-en-GB.Unlock.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c5de6d19acc089cea0d13048ea24ad2bdfbf84474f99469c97ad46f7a2135b58 -size 56491 +oid sha256:f00c3448cbaefec953659ea95765b03e55dea21d334f9526c2d6120b46dee654 +size 56469 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPhone-15-pseudo.Confirm.png b/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPhone-15-pseudo.Confirm.png index a46ef38da0..d22afdae6c 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPhone-15-pseudo.Confirm.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPhone-15-pseudo.Confirm.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:51f1498af1600bd16c2ff63d26a241e0eed0279576bf7f7d063d2d8752bd1b90 -size 124281 +oid sha256:d3f6473c96bb50f081a793304c17d67ac630bd88bfc632e1884986535aa505b9 +size 124266 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPhone-15-pseudo.Create.png b/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPhone-15-pseudo.Create.png index b2066b81fd..9139e9122a 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPhone-15-pseudo.Create.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPhone-15-pseudo.Create.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:332349a7e1b08546476638d82703d6658193ff36931f4eb105cac8df4d20f274 -size 126046 +oid sha256:059e13c56d548709b8c2f2e9f981006fc14e9d5cd98becd0ff63f5b04080817c +size 126032 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPhone-15-pseudo.Unlock-Failed.png b/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPhone-15-pseudo.Unlock-Failed.png index c8008d66a6..ff09992c5c 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPhone-15-pseudo.Unlock-Failed.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPhone-15-pseudo.Unlock-Failed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e79c31390ca36a329d1bebaa344a2aaaa16325d128c8c38275bc90a1b1da5047 -size 70183 +oid sha256:c80a8cc9e30301026e805f6494ea6fd32fe144a14055b9e416c844aef99b543a +size 70165 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPhone-15-pseudo.Unlock.png b/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPhone-15-pseudo.Unlock.png index 3235106317..83c5f435d9 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPhone-15-pseudo.Unlock.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen-iPhone-15-pseudo.Unlock.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a338698467bdd325c3ac3e9ab714bcf3dd45f4f0cc1d4cb9cc7ace6a5c802237 -size 69005 +oid sha256:303658147470fad3bcedd5b8b9366aac6a6ccaabad38697a6dd135a163ed778a +size 68986 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_heroImage-iPad-en-GB.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_heroImage-iPad-en-GB.1.png index 571222771e..168dbcff2b 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_heroImage-iPad-en-GB.1.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_heroImage-iPad-en-GB.1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7a81814ebc67c3572e4807bce328f5b640fc4c808f87f20cef498136793bc74a -size 76339 +oid sha256:deef58bc59212605f4fb503758d00f879dea836560a982d7c118191b369f12ee +size 76561 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_heroImage-iPad-pseudo.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_heroImage-iPad-pseudo.1.png index 571222771e..168dbcff2b 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_heroImage-iPad-pseudo.1.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_heroImage-iPad-pseudo.1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7a81814ebc67c3572e4807bce328f5b640fc4c808f87f20cef498136793bc74a -size 76339 +oid sha256:deef58bc59212605f4fb503758d00f879dea836560a982d7c118191b369f12ee +size 76561 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_heroImage-iPhone-15-en-GB.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_heroImage-iPhone-15-en-GB.1.png index b7be39b810..82fa427e5b 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_heroImage-iPhone-15-en-GB.1.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_heroImage-iPhone-15-en-GB.1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:42eb624b57a2cfec4a9af214c183993e15ce79c96835f897ae276ed34183df32 -size 34985 +oid sha256:26a2b2acad930b6d01c5d9c0a648f753c880190e476e0c01621534477254908a +size 34939 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_heroImage-iPhone-15-pseudo.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_heroImage-iPhone-15-pseudo.1.png index b7be39b810..82fa427e5b 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_heroImage-iPhone-15-pseudo.1.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_heroImage-iPhone-15-pseudo.1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:42eb624b57a2cfec4a9af214c183993e15ce79c96835f897ae276ed34183df32 -size 34985 +oid sha256:26a2b2acad930b6d01c5d9c0a648f753c880190e476e0c01621534477254908a +size 34939 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_identityConfirmationScreen-iPad-en-GB.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_identityConfirmationScreen-iPad-en-GB.1.png index 2293090660..74fd9a52d7 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_identityConfirmationScreen-iPad-en-GB.1.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_identityConfirmationScreen-iPad-en-GB.1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:04bd818e25443943c7c17e7515f1e4152ae7db19fee3582a8cee286724296aab -size 115211 +oid sha256:2c3b9ae465ec1ced1ae377887bbc2874b883f68786c3c0902f45aa9646788e3a +size 119557 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_identityConfirmationScreen-iPad-pseudo.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_identityConfirmationScreen-iPad-pseudo.1.png index 6bd5037d65..ab963ce769 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_identityConfirmationScreen-iPad-pseudo.1.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_identityConfirmationScreen-iPad-pseudo.1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e9c6fe789e9dba12a3481b0d11f16370a5648b81c4d93d049b83f4f07c4b5a6a -size 147343 +oid sha256:47fc77302dc1146e908e639f38df09b084ba558b15b6de02fdbccc0137f6385a +size 153837 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_identityConfirmationScreen-iPhone-15-en-GB.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_identityConfirmationScreen-iPhone-15-en-GB.1.png index 77b7cb6e2d..989255233f 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_identityConfirmationScreen-iPhone-15-en-GB.1.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_identityConfirmationScreen-iPhone-15-en-GB.1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a792fdc919fd5551f7bf4852b49589734bde9560e135121314a3dfa6718a467d -size 71648 +oid sha256:b4c1c36942cebf6feb3a643db9d01f74d43d38417de056b73334f0ebe1694bad +size 71464 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_identityConfirmationScreen-iPhone-15-pseudo.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_identityConfirmationScreen-iPhone-15-pseudo.1.png index 601fdd7567..ffee60aeb8 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_identityConfirmationScreen-iPhone-15-pseudo.1.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_identityConfirmationScreen-iPhone-15-pseudo.1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6793bde70c09ae3a933dcef0dba6161b717cae0e46c10cbffb46219a07cbecba -size 106792 +oid sha256:bf8244de3ddb79ee2d0a3f10f816cac054e291f8f09e167b49a6df7877b3bbb7 +size 106741 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_identityConfirmedScreen-iPad-en-GB.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_identityConfirmedScreen-iPad-en-GB.1.png index 1e6e7cc1a5..897fed7e7e 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_identityConfirmedScreen-iPad-en-GB.1.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_identityConfirmedScreen-iPad-en-GB.1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5ed4734663ba3be0254294aafd7954927c21f9d1a79c243a087ff4dee121ed4a -size 115982 +oid sha256:8dfc9897f5cef15fa16a1e51ec869b6dfd3c05a1376300ffed7440ff4b490d0c +size 120872 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_identityConfirmedScreen-iPad-pseudo.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_identityConfirmedScreen-iPad-pseudo.1.png index 37393f7b98..34d63ed504 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_identityConfirmedScreen-iPad-pseudo.1.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_identityConfirmedScreen-iPad-pseudo.1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e2c6e21f87ff3d880c3725155cd86b0e9cae680c3ce99f0496247eb04833460c -size 157244 +oid sha256:0dd9ce4a46cff45390876e7dfdbaeecce78c69a40a403f8563544e05e3efc379 +size 162211 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_identityConfirmedScreen-iPhone-15-en-GB.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_identityConfirmedScreen-iPhone-15-en-GB.1.png index 28b9fdcb0d..8bb83fea55 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_identityConfirmedScreen-iPhone-15-en-GB.1.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_identityConfirmedScreen-iPhone-15-en-GB.1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7f4e1122af5b690c4acd98cbf313ea5818a0af6184da717471d654f6df5fbe2a -size 74275 +oid sha256:6a9cd6d7a9970fa0a77aff7201990172dfdfb9c25c48b4197ab5c229f01bffce +size 73653 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_identityConfirmedScreen-iPhone-15-pseudo.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_identityConfirmedScreen-iPhone-15-pseudo.1.png index 1e6e5b2e7b..09ff97a039 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_identityConfirmedScreen-iPhone-15-pseudo.1.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_identityConfirmedScreen-iPhone-15-pseudo.1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:221408232da9545d0b7a26e3a061c62aa0bd51f23d91f4983d33f1a3c94059a7 -size 115005 +oid sha256:be25dc7183d5821ffab59e57d022f69bc014aa7b51111ca57cba636f52934d18 +size 114490 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPad-en-GB.Credentials-Entered.png b/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPad-en-GB.Credentials-Entered.png index be9e026a34..85a47e70bc 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPad-en-GB.Credentials-Entered.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPad-en-GB.Credentials-Entered.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bf4526e6071e06c824a04dc12e93cac99e86bd546d8bfe297f976c1824e058d3 -size 113974 +oid sha256:610c447d2d7a198cea65d05a5ee804bcb9639dcc2d43ff4552013c5360675604 +size 113972 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPad-en-GB.OIDC-Fallback.png b/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPad-en-GB.OIDC-Fallback.png index a1f7851aaf..1f927a5e97 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPad-en-GB.OIDC-Fallback.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPad-en-GB.OIDC-Fallback.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d91c005148ea502989e7683d686ac3dc54ae9cbe461ae06ca5d6c3b67e8f641 -size 118811 +oid sha256:c79f3b0e2984b1e1d7001738052b1ac4375ba3901d59f74735964ec91b080925 +size 118810 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPad-en-GB.Unsupported.png b/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPad-en-GB.Unsupported.png index a1f7851aaf..1f927a5e97 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPad-en-GB.Unsupported.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPad-en-GB.Unsupported.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d91c005148ea502989e7683d686ac3dc54ae9cbe461ae06ca5d6c3b67e8f641 -size 118811 +oid sha256:c79f3b0e2984b1e1d7001738052b1ac4375ba3901d59f74735964ec91b080925 +size 118810 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPad-en-GB.matrix-org.png b/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPad-en-GB.matrix-org.png index a1f7851aaf..1f927a5e97 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPad-en-GB.matrix-org.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPad-en-GB.matrix-org.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d91c005148ea502989e7683d686ac3dc54ae9cbe461ae06ca5d6c3b67e8f641 -size 118811 +oid sha256:c79f3b0e2984b1e1d7001738052b1ac4375ba3901d59f74735964ec91b080925 +size 118810 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPad-pseudo.Credentials-Entered.png b/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPad-pseudo.Credentials-Entered.png index ef8b32ae8b..01fee7a58a 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPad-pseudo.Credentials-Entered.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPad-pseudo.Credentials-Entered.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9b6cedf9a6d499c35924c8f1ec1829b90d567d9f9f22cb064d9d8516f12ef32e -size 135554 +oid sha256:078bc451219b405e0c7c7088989853452201abd6d842d06b63614da213bdfeba +size 135542 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPad-pseudo.OIDC-Fallback.png b/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPad-pseudo.OIDC-Fallback.png index e09f4fcba5..9accdf9cab 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPad-pseudo.OIDC-Fallback.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPad-pseudo.OIDC-Fallback.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5575322d1bf4fbf7c7611351ee0c1ef63c7da21182a4f6ec27c7a93b65e4eb72 -size 148031 +oid sha256:2473d563ef125fa0ff5877644687db6a4ec4616c6298ab13a7341009ce9d95a8 +size 148021 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPad-pseudo.Unsupported.png b/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPad-pseudo.Unsupported.png index e09f4fcba5..9accdf9cab 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPad-pseudo.Unsupported.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPad-pseudo.Unsupported.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5575322d1bf4fbf7c7611351ee0c1ef63c7da21182a4f6ec27c7a93b65e4eb72 -size 148031 +oid sha256:2473d563ef125fa0ff5877644687db6a4ec4616c6298ab13a7341009ce9d95a8 +size 148021 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPad-pseudo.matrix-org.png b/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPad-pseudo.matrix-org.png index e09f4fcba5..9accdf9cab 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPad-pseudo.matrix-org.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPad-pseudo.matrix-org.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5575322d1bf4fbf7c7611351ee0c1ef63c7da21182a4f6ec27c7a93b65e4eb72 -size 148031 +oid sha256:2473d563ef125fa0ff5877644687db6a4ec4616c6298ab13a7341009ce9d95a8 +size 148021 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPhone-15-en-GB.Credentials-Entered.png b/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPhone-15-en-GB.Credentials-Entered.png index 07d0adef9f..4738c51d49 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPhone-15-en-GB.Credentials-Entered.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPhone-15-en-GB.Credentials-Entered.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:868f5ad220d167378e466ce56812c6207886e8071cc05133ae960a7e72a4c0ca -size 69140 +oid sha256:24e54885d2e015d6b18df41e9dd366ddb52dca36227b396fbc08ce2f3f8bd5a6 +size 69129 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPhone-15-en-GB.OIDC-Fallback.png b/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPhone-15-en-GB.OIDC-Fallback.png index 05d0680ad7..330cd4b9e0 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPhone-15-en-GB.OIDC-Fallback.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPhone-15-en-GB.OIDC-Fallback.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:212b5bfe37a12a9afd7c090d50fd523502dae0d20518146290d86be502a84699 -size 72987 +oid sha256:4a8b33c26ad18ded190ad9b359ce3a19f18960d06312b178a5cbbe368328ced1 +size 72978 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPhone-15-en-GB.Unsupported.png b/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPhone-15-en-GB.Unsupported.png index 05d0680ad7..330cd4b9e0 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPhone-15-en-GB.Unsupported.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPhone-15-en-GB.Unsupported.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:212b5bfe37a12a9afd7c090d50fd523502dae0d20518146290d86be502a84699 -size 72987 +oid sha256:4a8b33c26ad18ded190ad9b359ce3a19f18960d06312b178a5cbbe368328ced1 +size 72978 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPhone-15-en-GB.matrix-org.png b/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPhone-15-en-GB.matrix-org.png index 05d0680ad7..330cd4b9e0 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPhone-15-en-GB.matrix-org.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPhone-15-en-GB.matrix-org.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:212b5bfe37a12a9afd7c090d50fd523502dae0d20518146290d86be502a84699 -size 72987 +oid sha256:4a8b33c26ad18ded190ad9b359ce3a19f18960d06312b178a5cbbe368328ced1 +size 72978 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPhone-15-pseudo.Credentials-Entered.png b/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPhone-15-pseudo.Credentials-Entered.png index 2061ccf2ee..e471bc4ceb 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPhone-15-pseudo.Credentials-Entered.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPhone-15-pseudo.Credentials-Entered.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:072123f46a190bb08ef5ceb53a2ce6107da1e2aa1b41e980696e4678b45d8d9c -size 91405 +oid sha256:867f1ed93df6966237d512e6b1f0c07c101a0a6c6c18a29ccd35342a117e4830 +size 91382 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPhone-15-pseudo.OIDC-Fallback.png b/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPhone-15-pseudo.OIDC-Fallback.png index 0b5f5ed263..e0e3e07147 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPhone-15-pseudo.OIDC-Fallback.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPhone-15-pseudo.OIDC-Fallback.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:26a5f2424c527164a46c8faf634dcd1972546905cc517fa04455bbe1c8fcebc1 -size 103112 +oid sha256:88bca7c74aafd1e828cfe64e6265e1dd60655e895e728ebaeaeca3032bdee787 +size 103094 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPhone-15-pseudo.Unsupported.png b/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPhone-15-pseudo.Unsupported.png index 0b5f5ed263..e0e3e07147 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPhone-15-pseudo.Unsupported.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPhone-15-pseudo.Unsupported.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:26a5f2424c527164a46c8faf634dcd1972546905cc517fa04455bbe1c8fcebc1 -size 103112 +oid sha256:88bca7c74aafd1e828cfe64e6265e1dd60655e895e728ebaeaeca3032bdee787 +size 103094 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPhone-15-pseudo.matrix-org.png b/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPhone-15-pseudo.matrix-org.png index 0b5f5ed263..e0e3e07147 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPhone-15-pseudo.matrix-org.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen-iPhone-15-pseudo.matrix-org.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:26a5f2424c527164a46c8faf634dcd1972546905cc517fa04455bbe1c8fcebc1 -size 103112 +oid sha256:88bca7c74aafd1e828cfe64e6265e1dd60655e895e728ebaeaeca3032bdee787 +size 103094 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_notificationPermissionsScreen-iPad-en-GB.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_notificationPermissionsScreen-iPad-en-GB.1.png index eb2a2ec292..ec771f1f51 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_notificationPermissionsScreen-iPad-en-GB.1.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_notificationPermissionsScreen-iPad-en-GB.1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cb87c3886425e3da5d5ca5f74e1f9724aeb70da50930eadbc4e31fa181d1e083 -size 119480 +oid sha256:f7122fad920bd76cbe3db48c24d9b668531de44fc7b76f85031444b394c4b9bf +size 442541 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_notificationPermissionsScreen-iPad-pseudo.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_notificationPermissionsScreen-iPad-pseudo.1.png index 88ef7b9714..8baf1562ac 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_notificationPermissionsScreen-iPad-pseudo.1.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_notificationPermissionsScreen-iPad-pseudo.1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4b3fbb0eb5f08fb4e0f85f093be1870702ba100ab9adb4b5b2e7416213943d82 -size 172321 +oid sha256:86acb5f409e7be8c9360d25b3a95d33641148f8fe162ff16383a51bfd8ca8061 +size 485330 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_notificationPermissionsScreen-iPhone-15-en-GB.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_notificationPermissionsScreen-iPhone-15-en-GB.1.png index 079e1d719c..34d53e60ca 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_notificationPermissionsScreen-iPhone-15-en-GB.1.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_notificationPermissionsScreen-iPhone-15-en-GB.1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a9c7e275c694e779a48aea59d1c0b9f59606e77bba6a4a48a9d6ee872e9b11dd -size 75525 +oid sha256:df045547c010d46ac1161ad9d53bb587f5649b9f75c6e394f15a90e824bc327b +size 261174 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_notificationPermissionsScreen-iPhone-15-pseudo.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_notificationPermissionsScreen-iPhone-15-pseudo.1.png index af616bb5bd..a92dd63b40 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_notificationPermissionsScreen-iPhone-15-pseudo.1.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_notificationPermissionsScreen-iPhone-15-pseudo.1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:191f33b03c8ded270278c7edb50c70ec9a3b64c0dd353c163668d4915708a152 -size 114913 +oid sha256:4fa6c1a88e8dd8ec9979977a9ac297982cfecf286f2fb0dbdd06e855b089cbb9 +size 300640 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPad-en-GB.Messages-and-Content.png b/PreviewTests/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPad-en-GB.Messages-and-Content.png index f215553b22..d1a1d3ac2e 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPad-en-GB.Messages-and-Content.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPad-en-GB.Messages-and-Content.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3a65b0ae7ecaf2479ca6615154b59c613bb7c0a0c457c0660a285285732b8f6d -size 157299 +oid sha256:88fd16ff426bf0a0d611aac81f9f7a7b0e88051ca992a0ce0d6a268e53cdd10d +size 158559 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPad-pseudo.Messages-and-Content.png b/PreviewTests/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPad-pseudo.Messages-and-Content.png index b28e3e0ee7..b3124a07c0 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPad-pseudo.Messages-and-Content.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPad-pseudo.Messages-and-Content.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e6f9ff85795b3adf88a5aa68a1c3fc38f38e5520c7996f105d4616bddcf0799d -size 213902 +oid sha256:b8503be3cd71675cc2b9014ca2aed33fac140fdeb14b060b86847e9ca7ed8b15 +size 215884 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPhone-15-en-GB.Messages-and-Content.png b/PreviewTests/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPhone-15-en-GB.Messages-and-Content.png index 5441041d6f..9c41a5ac7e 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPhone-15-en-GB.Messages-and-Content.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPhone-15-en-GB.Messages-and-Content.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:77a8e52fa0472c7526891562f29441e932ca9eb12a2a2929875c4cdeb9ccddac -size 105619 +oid sha256:e30b22313140bc11e9bb17ce3c973f2f8a5056a55427efe6ac05fd2280a2e5b0 +size 106733 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPhone-15-pseudo.Messages-and-Content.png b/PreviewTests/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPhone-15-pseudo.Messages-and-Content.png index f5f123bb9b..35f770e3f3 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPhone-15-pseudo.Messages-and-Content.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPhone-15-pseudo.Messages-and-Content.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5014e5e525409afbafeafd3e5a0cc9d87739a4124167a21f288bcd8a3d6d7673 -size 154115 +oid sha256:67338270442eb5c113765956d6c8522ab2ee7a1010edc9c9261061294090d060 +size 155977 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupKeyBackupScreen-iPad-en-GB.Set-up.png b/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupKeyBackupScreen-iPad-en-GB.Set-up.png index 4f0918d3da..3aefedf2e4 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupKeyBackupScreen-iPad-en-GB.Set-up.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupKeyBackupScreen-iPad-en-GB.Set-up.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a961330081c52fb6d358ee458351c5a9e9b482e2dc129fc30bd4365877ff6bd5 -size 188454 +oid sha256:b1bcc8f3f68b83deac68763ee6ce8191fe7785c74b1649bde22be9d3fca85934 +size 188438 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupKeyBackupScreen-iPad-pseudo.Set-up.png b/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupKeyBackupScreen-iPad-pseudo.Set-up.png index 10d69526f5..74c991b23e 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupKeyBackupScreen-iPad-pseudo.Set-up.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupKeyBackupScreen-iPad-pseudo.Set-up.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6d7f02dcad9dd8ded74b8d3ae51b010085ea800143426d32eaa41084ba142e7f -size 287728 +oid sha256:bdea7502ea6e66926df9e54d7856d2fb917c072a147a21abbe4ff1a019270cdd +size 287712 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupKeyBackupScreen-iPhone-15-en-GB.Set-up.png b/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupKeyBackupScreen-iPhone-15-en-GB.Set-up.png index 800ebb2850..4ddbdc108e 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupKeyBackupScreen-iPhone-15-en-GB.Set-up.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupKeyBackupScreen-iPhone-15-en-GB.Set-up.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:92e84ea5a58fb3b0337e5221c91aae1c640c1d79ac3f5d1002fddb301cfe35e0 -size 146863 +oid sha256:47b7deaf354f2a52a937537cd642eca3749f479a61c9a520f2e81a4646fa72c9 +size 146849 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupKeyBackupScreen-iPhone-15-pseudo.Set-up.png b/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupKeyBackupScreen-iPhone-15-pseudo.Set-up.png index ee6bfd7dce..e153603846 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupKeyBackupScreen-iPhone-15-pseudo.Set-up.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupKeyBackupScreen-iPhone-15-pseudo.Set-up.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fb6d2272487d56ad6c91d206ebcae25734d1b2ddf41106cbe29ceb9a8c92c2e4 -size 228920 +oid sha256:54b8d45a86570fa8e75602f445e5540388153e2046aa8e388952af8775bb84dd +size 228875 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupLogoutConfirmationScreen-iPad-en-GB.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupLogoutConfirmationScreen-iPad-en-GB.1.png index 649037ec2a..45501bdf77 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupLogoutConfirmationScreen-iPad-en-GB.1.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupLogoutConfirmationScreen-iPad-en-GB.1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d0e94ed0775d91f4b05caebdac22c73f120a6861b621269108a35c30a8f478a5 -size 143570 +oid sha256:a9ded624fa08ec7954101b0d3e9f7f2402c99910132e4b121b2dad68b7b8d247 +size 143485 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupLogoutConfirmationScreen-iPad-pseudo.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupLogoutConfirmationScreen-iPad-pseudo.1.png index 2cefcd6c02..e5d68b8b16 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupLogoutConfirmationScreen-iPad-pseudo.1.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupLogoutConfirmationScreen-iPad-pseudo.1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5805c22d5fd0e778eee4ab6f6e2065c4500abe121edb94c2a4a2e4d0f9eab4f8 -size 202973 +oid sha256:77dfa427eadb182ba3db699debc08c4a89b3e00dae636f475c4c0aaedea50d89 +size 202882 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupLogoutConfirmationScreen-iPhone-15-en-GB.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupLogoutConfirmationScreen-iPhone-15-en-GB.1.png index 61533439eb..d1d575a41f 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupLogoutConfirmationScreen-iPhone-15-en-GB.1.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupLogoutConfirmationScreen-iPhone-15-en-GB.1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d3b7ea1241f90e40c8677c0ee085b6c9a4e4df35b6492e61b7aaa7f20fa673a2 -size 94098 +oid sha256:1e9ff46f24994c059fbca2829a50bc9e9566ced8e119db54fe2b62d660f95c08 +size 94064 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupLogoutConfirmationScreen-iPhone-15-pseudo.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupLogoutConfirmationScreen-iPhone-15-pseudo.1.png index 0deac24878..028edeee1f 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupLogoutConfirmationScreen-iPhone-15-pseudo.1.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupLogoutConfirmationScreen-iPhone-15-pseudo.1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1979f42f8b6e8c3a40d24af8731d5d843bab9452c007ea477dee7a299ee28273 -size 146888 +oid sha256:35e539dbe8bab5f122db8ba4af080af4e604a2dd3cb1bf34c4b3f6d3b0665fad +size 146834 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen-iPad-en-GB.Incomplete.png b/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen-iPad-en-GB.Incomplete.png index 44fc2709ed..4a305c6865 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen-iPad-en-GB.Incomplete.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen-iPad-en-GB.Incomplete.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:30240be156fa9702ab5a06af238f883c3729c4d67787c512c3afd8e4c5380201 -size 137295 +oid sha256:b1ff92b4e240052eb03be7fba16dbdcd09675d7735b092348b7f1fba44eb494e +size 137362 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen-iPad-en-GB.Not-set-up.png b/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen-iPad-en-GB.Not-set-up.png index d932844a13..349c1e4d0f 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen-iPad-en-GB.Not-set-up.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen-iPad-en-GB.Not-set-up.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2ceb94c28825aee0aba729eb8c236488a5b8aa44fdb8f7721df6f4a4682e89e6 -size 172886 +oid sha256:05eae336b16db7cf79db11fbdc27fa788ef49e03c70117fb21211a9ce0eac302 +size 172953 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen-iPad-en-GB.Set-up.png b/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen-iPad-en-GB.Set-up.png index 7f6d022aa9..c80934e453 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen-iPad-en-GB.Set-up.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen-iPad-en-GB.Set-up.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:72e2785a7cbd3449ad18851156c5ad20c4cf39f23e88f6cc2fd9f3664f52da5f -size 171608 +oid sha256:6ee3f2efb2b503609ae3a852912c526afb2f2b4fd0ebf4a25b5ff8a9e2a3213b +size 171680 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen-iPad-pseudo.Incomplete.png b/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen-iPad-pseudo.Incomplete.png index 1dacba460d..bd05075c70 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen-iPad-pseudo.Incomplete.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen-iPad-pseudo.Incomplete.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a1b51a5fab01b184ade32cbc30e7dcd0cc7b9c41d8d9de97ae010890f0735adb -size 182447 +oid sha256:b541833cc0e990ddd8bb2662e9fd7c49e9fdd73a34df774edddecb6e550c42a6 +size 182509 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen-iPad-pseudo.Not-set-up.png b/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen-iPad-pseudo.Not-set-up.png index e5a57a4d1f..2f7cd83631 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen-iPad-pseudo.Not-set-up.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen-iPad-pseudo.Not-set-up.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ac04fbf081d504bbc9f048bdf69bfa1aaa274182a1398dbc4f4453cf69d37ab5 -size 259583 +oid sha256:842498bce3c74b039cad9ae3ee85929d565bb7b4d7cc6fe21dc2fcadfee7acdc +size 259669 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen-iPad-pseudo.Set-up.png b/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen-iPad-pseudo.Set-up.png index e9d8e956f1..fbafdd87ee 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen-iPad-pseudo.Set-up.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen-iPad-pseudo.Set-up.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:074bf361c6a7d4df4768ccdeb12bf2a13608fd307b6b2ce2539d9e69d3ab6cda -size 251075 +oid sha256:601b26c33c75e1ce16a10dcae4ee94ee37ba89fd980812733c5825f88980386a +size 251147 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen-iPhone-15-en-GB.Incomplete.png b/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen-iPhone-15-en-GB.Incomplete.png index 11096840b4..e58956bb20 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen-iPhone-15-en-GB.Incomplete.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen-iPhone-15-en-GB.Incomplete.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ac47db578faa7c4744ad058955324090b20ce8e531c4f5d0bcdd4533f6830483 -size 89728 +oid sha256:84422396b8b77ab442d34be93050f94180219c991f1f52ee6f997bcaa73306bc +size 89702 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen-iPhone-15-en-GB.Not-set-up.png b/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen-iPhone-15-en-GB.Not-set-up.png index 1d10f35de9..468e020a6c 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen-iPhone-15-en-GB.Not-set-up.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen-iPhone-15-en-GB.Not-set-up.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0fea447cd269455d6324e27ee2c24e702fa6f7d55929ab0d4367b31c18d9fa8e -size 124048 +oid sha256:755b1ab5a27bb75a7d01aded623ebfaa41347eba9a9563a57f6fd6b3853a3064 +size 123967 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen-iPhone-15-en-GB.Set-up.png b/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen-iPhone-15-en-GB.Set-up.png index 1318c28adf..9b1c8ba4bd 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen-iPhone-15-en-GB.Set-up.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen-iPhone-15-en-GB.Set-up.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3515b93222d228e5e2dcaec8e1de42cace4a520354423418d3c5b1bb1f212efe -size 126061 +oid sha256:5ea1396f914269cdd619d034487d5c69fdcedf64804de19e82322782e168f567 +size 126005 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen-iPhone-15-pseudo.Incomplete.png b/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen-iPhone-15-pseudo.Incomplete.png index 77c35dcb50..b144fce9c9 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen-iPhone-15-pseudo.Incomplete.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen-iPhone-15-pseudo.Incomplete.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c7a93826727cdd4f3cbfb2b04079b23f07efe2d43bf30eaaebd9124a6d14df2f -size 131666 +oid sha256:3d8a239c3047eda0304b5629d4912eed1a30678ea84f82ec5b303e36bf441eb0 +size 131616 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen-iPhone-15-pseudo.Not-set-up.png b/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen-iPhone-15-pseudo.Not-set-up.png index cef354b327..59def7b4a7 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen-iPhone-15-pseudo.Not-set-up.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen-iPhone-15-pseudo.Not-set-up.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:af863478b0d63e57d2c8e876ed7911bf98c65830748cea0fb582c3d29e285a8f -size 212546 +oid sha256:a0a9286d9fddaaaf3db6a53e23d296d5ee503010bd8bd044083077644edcd627 +size 212497 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen-iPhone-15-pseudo.Set-up.png b/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen-iPhone-15-pseudo.Set-up.png index 1a27c71fd9..53f07c10fd 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen-iPhone-15-pseudo.Set-up.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen-iPhone-15-pseudo.Set-up.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8dba9aac09c608abf637c9527d2ab6f026f4443fe4671de7376582b089493a78 -size 202804 +oid sha256:bc5f75b93e8866240141723f11e7c45492910e46fe98ad05166707be4bda7308 +size 202758 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen-iPad-en-GB.Login.png b/PreviewTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen-iPad-en-GB.Login.png index 0c905746f8..7a32e69abd 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen-iPad-en-GB.Login.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen-iPad-en-GB.Login.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d9e3fc9a58e924341dd9e816ef4204c1c7cfece9e0b2900365522804ac761e32 -size 141118 +oid sha256:7e806c825d34cfb57d2da06d1d81175c5371233b601f6a42fda68262a02a662d +size 141302 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen-iPad-en-GB.Register.png b/PreviewTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen-iPad-en-GB.Register.png index 8050b6769f..e1391ea425 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen-iPad-en-GB.Register.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen-iPad-en-GB.Register.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:879bc2642d6339b8a12d88b06abb9d0944759904897c1c5260013a2b1a53f63a -size 153601 +oid sha256:13434651e8ff75cc5fd3de909b5e604e77503d24a8bb5347db8614feaa01b5f5 +size 153821 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen-iPad-pseudo.Login.png b/PreviewTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen-iPad-pseudo.Login.png index 50618054fa..27e7178aa9 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen-iPad-pseudo.Login.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen-iPad-pseudo.Login.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ca29c16317095e7274a6eace38a30ad709e5aac3e2466d172d072f1aa8a5bff5 -size 190128 +oid sha256:1b2ec8248b45082a65e1bf205bb11237a7a2e0bf20035c3d51631861d2b5bbdb +size 190342 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen-iPad-pseudo.Register.png b/PreviewTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen-iPad-pseudo.Register.png index 432b64d7a6..7e0de75c2f 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen-iPad-pseudo.Register.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen-iPad-pseudo.Register.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:94d5b17c1b17946bff0f031c4b465bfb1da6b3c9f8eb47ba7ebb81a03e564e53 -size 221102 +oid sha256:712e890dab819a694f907926d4688380db8e12373fc8be52a942f6dfc7919727 +size 221327 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen-iPhone-15-en-GB.Login.png b/PreviewTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen-iPhone-15-en-GB.Login.png index 8e100c922b..10f0f5370b 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen-iPhone-15-en-GB.Login.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen-iPhone-15-en-GB.Login.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fbcd1610dd6f69313f2b8d7acd2c9d4c8142d889270b2ede5d5e509f6f25d1cc -size 91133 +oid sha256:f0a0c93d9bf5388ea93f8e726c02ba3cb7773cd676894908e9e8d05cf5b8f55e +size 91269 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen-iPhone-15-en-GB.Register.png b/PreviewTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen-iPhone-15-en-GB.Register.png index c5e228c606..e87d3835ae 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen-iPhone-15-en-GB.Register.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen-iPhone-15-en-GB.Register.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2ee209dfafc319226a0dda8e5b7d94d5c059e9ac1f9287a95545816ae094f7b1 -size 108250 +oid sha256:2b46ad8371200ead5b57f4825aa5ca8008a77691596a59c5bbbda338bd7fa156 +size 108377 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen-iPhone-15-pseudo.Login.png b/PreviewTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen-iPhone-15-pseudo.Login.png index 9d01b2c9b1..99d21a9c27 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen-iPhone-15-pseudo.Login.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen-iPhone-15-pseudo.Login.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e29306dc189c4ed19acbeb3f9b216b81d317c067ede9d1b5819deff64a1a63c8 -size 140220 +oid sha256:dea7eee9db0f93e05ba817c9b67476f756bf3657daf0c381a76cff3310133539 +size 140337 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen-iPhone-15-pseudo.Register.png b/PreviewTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen-iPhone-15-pseudo.Register.png index b150ddd716..8b404638d2 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen-iPhone-15-pseudo.Register.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen-iPhone-15-pseudo.Register.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:38b1b47abb3b7d6f573cc2587420649223615f5271797e7b94800ff868cbb70d -size 164485 +oid sha256:3fad2e2461dd662995242d686dcbf52dbd02b55a8060b5b75a21e2085ea0275f +size 164599 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPad-en-GB.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPad-en-GB.1.png index e71f60784c..1a8a6c5161 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPad-en-GB.1.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPad-en-GB.1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:555f131062208efa1b3a6229aa7ceea316bc68d490a217b4ef2b460046dbb864 -size 155475 +oid sha256:9d3809b16d81a6aad9dd66de7f907bb662a37b66bd994e911261b1a1d8cda8fd +size 155377 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPad-en-GB.2.png b/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPad-en-GB.2.png index a3ae5dc3fe..a21fe28a2c 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPad-en-GB.2.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPad-en-GB.2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d8fb0f1d2162e219b4a6fd27bac6e579e9f767ea585a7649da3ff89d2feb0186 -size 151963 +oid sha256:884ed1b589fb4822b3f0aa492ee892c49c9f412444d6183259c499a14aea80aa +size 151859 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPad-en-GB.3.png b/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPad-en-GB.3.png index b2ccebdd1b..91f56fdced 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPad-en-GB.3.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPad-en-GB.3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:648322a646b974f54e81064246354f5e3ef53f0d504354e3e03a7d4597cd4abc -size 129819 +oid sha256:d86a4fd79b5c13c8f389eb659be4e0bee166cb62ac9855162246b83224cbc472 +size 129725 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPad-en-GB.4.png b/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPad-en-GB.4.png index e25158dea5..a6fdd0f864 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPad-en-GB.4.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPad-en-GB.4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a33e198c70258143be5075e9870cef7333ee47cd7d40de1954cf14031d1df2b2 -size 147450 +oid sha256:6a26d6e787998e0eecae34dfca928afd12d1bab3dc61fcd6ecbeb945119654d2 +size 147405 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPad-pseudo.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPad-pseudo.1.png index 6e16f9ae7d..4d94e04b6c 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPad-pseudo.1.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPad-pseudo.1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9789f21421dc2806c5b500774f17a1f9ce1e2699a351e43ac45e91c311a2a9e1 -size 213874 +oid sha256:dfb370011ee48628fd895ca0b08a80d5990cb45f4b977acc9459d06bc4dd96ce +size 213780 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPad-pseudo.2.png b/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPad-pseudo.2.png index 66dc7d1665..e584a965ed 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPad-pseudo.2.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPad-pseudo.2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2ce325921a4ebe02589d500358c1cfb5711f9511e919d3ad8f7e2c5244b669be -size 214293 +oid sha256:0f57215677358fae18bcb78d5a65c90ee6512aec56be4f5bfff31ba0929ae3b6 +size 214217 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPad-pseudo.3.png b/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPad-pseudo.3.png index f085ac104f..bfeb4880e8 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPad-pseudo.3.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPad-pseudo.3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e9987c929ccd825ccf78967c6689671bb42010b9854523b3526d117ccd5955fe -size 163530 +oid sha256:f58353f93451b23b1c923e26403d52de467109554342986fb3bb41d3cd10c624 +size 163449 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPad-pseudo.4.png b/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPad-pseudo.4.png index 903b83d502..29c5442d6e 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPad-pseudo.4.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPad-pseudo.4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fb7e51cacb0744a719691a0522ac0e8abcc6b7a514966ecc85ed4689a7a15068 -size 201979 +oid sha256:a370677b939e5b0303d3096318947d3a82a88fbd83acede99de39f9be38d9c26 +size 201914 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPhone-15-en-GB.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPhone-15-en-GB.1.png index a4f4bc1525..56dd545688 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPhone-15-en-GB.1.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPhone-15-en-GB.1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6d8d4c42bb123a9473100f07163512e7e10d62eb17a800d5ead00344f5ecf139 -size 108279 +oid sha256:21edce25c37d08cc3a21d3b0a87a6245ed460ce23a72fa4ccf5769a2a2cb85ac +size 108267 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPhone-15-en-GB.2.png b/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPhone-15-en-GB.2.png index 5c46456e06..56d8388680 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPhone-15-en-GB.2.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPhone-15-en-GB.2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6c1191c928148da4b20e1718e77134df56526c4d6a45dfa6d044d88a8bf8badf -size 105592 +oid sha256:8550e3d2c939ee4802b8c7cec424a6d3ccf9d6e03b15beac6f7443aa4481fbf0 +size 105579 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPhone-15-en-GB.3.png b/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPhone-15-en-GB.3.png index ef2753a413..71d8b4eda6 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPhone-15-en-GB.3.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPhone-15-en-GB.3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e0f1200b64dd875db563ae061797b43e5d34f0c0d6817f4f01ce9efa7931ee0e -size 82906 +oid sha256:68fe21e7c0adf647ba6351dfa4ac4d1cb3af9f9fd47225e7936000fafa25468a +size 82893 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPhone-15-en-GB.4.png b/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPhone-15-en-GB.4.png index caee17ef03..d4d9e6d4db 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPhone-15-en-GB.4.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPhone-15-en-GB.4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c8ea8a31e3c640ad21ae0d309bf0cc4f2a2532abfba608fa63857bbec9337d01 -size 101233 +oid sha256:218bbf3903be30e82b45fa595fd83132d0bc2f36437052966f9d19b4b7e64ada +size 101201 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPhone-15-pseudo.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPhone-15-pseudo.1.png index 2c34d6ccec..78321b4e7f 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPhone-15-pseudo.1.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPhone-15-pseudo.1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1a1e85ea304c1584edc055a7872f4a8e16e399947b4d5f17b4b5cd0ecb6b6ff8 -size 169818 +oid sha256:6009506a213dcef8a97be2f1ccd9c9a9156743da41d791450a0bbe53bd6d5d61 +size 169819 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPhone-15-pseudo.2.png b/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPhone-15-pseudo.2.png index ed78a98b7b..618f471d4c 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPhone-15-pseudo.2.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPhone-15-pseudo.2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2bb107431618d40a0e2875eea080b202bb4253554e7839042d4866203bc88d7e -size 170247 +oid sha256:ff5996ca2b94e7589ea52f776ef33d5523430350668c8f10a256da9890f1f5b3 +size 170249 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPhone-15-pseudo.3.png b/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPhone-15-pseudo.3.png index 0c90256b6b..4fe132fd12 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPhone-15-pseudo.3.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPhone-15-pseudo.3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:26c39d6bba15a1ba962ec8ee0831df097ba6550310ae3f58710147ee93222109 -size 122379 +oid sha256:7d55fd0dce1792087e0929fc6bc0cdf3e437b07f88010671e8438e307c3180c0 +size 122381 diff --git a/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPhone-15-pseudo.4.png b/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPhone-15-pseudo.4.png index 5668e2673d..c676d6ecbe 100644 --- a/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPhone-15-pseudo.4.png +++ b/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection-iPhone-15-pseudo.4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f5d7f08ce10cfad7959213250d0a260a32fa6d57ec985b17b22126d42b5a8b52 -size 160775 +oid sha256:eedbc113dee7e5fc7c77ad78370e2b1897f28f56d67384aea237f3d40f587372 +size 160767