From 59c175ebe0803506021612b5ecc3ff0be7874470 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 8 Jan 2026 15:53:09 +0100 Subject: [PATCH 1/6] Remove BigIcon loading state. Loading is rendered in the buttons now. --- .../impl/incoming/IncomingVerificationView.kt | 85 +++++++------------ .../impl/outgoing/OutgoingVerificationView.kt | 57 +++++-------- .../designsystem/components/BigIcon.kt | 85 +++++++------------ 3 files changed, 86 insertions(+), 141 deletions(-) diff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationView.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationView.kt index 286d826a6a..1d37daf82b 100644 --- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationView.kt +++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationView.kt @@ -21,10 +21,8 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource -import androidx.compose.ui.semantics.ProgressBarRangeInfo import androidx.compose.ui.semantics.contentDescription import androidx.compose.ui.semantics.focused -import androidx.compose.ui.semantics.progressBarRangeInfo import androidx.compose.ui.semantics.semantics import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview @@ -45,7 +43,6 @@ import io.element.android.libraries.designsystem.components.button.BackButton import io.element.android.libraries.designsystem.preview.ElementPreview import io.element.android.libraries.designsystem.preview.PreviewsDayNight import io.element.android.libraries.designsystem.theme.components.Button -import io.element.android.libraries.designsystem.theme.components.InvisibleButton import io.element.android.libraries.designsystem.theme.components.Text import io.element.android.libraries.designsystem.theme.components.TextButton import io.element.android.libraries.designsystem.theme.components.TopAppBar @@ -103,19 +100,11 @@ fun IncomingVerificationView( private fun IncomingVerificationHeader(step: Step, request: VerificationRequest.Incoming) { val iconStyle = when (step) { Step.Canceled -> BigIcon.Style.AlertSolid - is Step.Initial -> if (step.isWaiting) { - BigIcon.Style.Loading - } else { - when (request) { - is VerificationRequest.Incoming.OtherSession -> BigIcon.Style.Default(CompoundIcons.LockSolid()) - is VerificationRequest.Incoming.User -> BigIcon.Style.Default(CompoundIcons.UserProfileSolid()) - } - } - is Step.Verifying -> if (step.isWaiting) { - BigIcon.Style.Loading - } else { - BigIcon.Style.Default(CompoundIcons.ReactionSolid()) + is Step.Initial -> when (request) { + is VerificationRequest.Incoming.OtherSession -> BigIcon.Style.Default(CompoundIcons.LockSolid()) + is VerificationRequest.Incoming.User -> BigIcon.Style.Default(CompoundIcons.UserProfileSolid()) } + is Step.Verifying -> BigIcon.Style.Default(CompoundIcons.ReactionSolid()) Step.Completed -> BigIcon.Style.SuccessSolid Step.Failure -> BigIcon.Style.AlertSolid } @@ -159,10 +148,6 @@ private fun IncomingVerificationHeader(step: Step, request: VerificationRequest. .semantics(mergeDescendants = true) { contentDescription = timeLimitMessage focused = true - if (iconStyle == BigIcon.Style.Loading) { - // Same code than Modifier.progressSemantics() - progressBarRangeInfo = ProgressBarRangeInfo.Indeterminate - } } .focusable(), iconStyle = iconStyle, @@ -232,43 +217,37 @@ private fun IncomingVerificationBottomMenu( when (step) { is Step.Initial -> { - if (step.isWaiting) { - // Show nothing - } else { - VerificationBottomMenu { - Button( - modifier = Modifier.fillMaxWidth(), - text = stringResource(CommonStrings.action_start_verification), - onClick = { eventSink(IncomingVerificationViewEvents.StartVerification) }, - ) - TextButton( - modifier = Modifier.fillMaxWidth(), - text = stringResource(CommonStrings.action_ignore), - onClick = { eventSink(IncomingVerificationViewEvents.IgnoreVerification) }, - ) - } + VerificationBottomMenu { + Button( + modifier = Modifier.fillMaxWidth(), + text = stringResource(CommonStrings.action_start_verification), + enabled = !step.isWaiting, + showProgress = step.isWaiting, + onClick = { eventSink(IncomingVerificationViewEvents.StartVerification) }, + ) + TextButton( + modifier = Modifier.fillMaxWidth(), + text = stringResource(CommonStrings.action_ignore), + enabled = !step.isWaiting, + onClick = { eventSink(IncomingVerificationViewEvents.IgnoreVerification) }, + ) } } is Step.Verifying -> { - if (step.isWaiting) { - // Add invisible buttons to keep the same screen layout - VerificationBottomMenu { - InvisibleButton() - InvisibleButton() - } - } else { - VerificationBottomMenu { - Button( - modifier = Modifier.fillMaxWidth(), - text = stringResource(R.string.screen_session_verification_they_match), - onClick = { eventSink(IncomingVerificationViewEvents.ConfirmVerification) }, - ) - TextButton( - modifier = Modifier.fillMaxWidth(), - text = stringResource(R.string.screen_session_verification_they_dont_match), - onClick = { eventSink(IncomingVerificationViewEvents.DeclineVerification) }, - ) - } + VerificationBottomMenu { + Button( + modifier = Modifier.fillMaxWidth(), + text = stringResource(R.string.screen_session_verification_they_match), + enabled = !step.isWaiting, + showProgress = step.isWaiting, + onClick = { eventSink(IncomingVerificationViewEvents.ConfirmVerification) }, + ) + TextButton( + modifier = Modifier.fillMaxWidth(), + text = stringResource(R.string.screen_session_verification_they_dont_match), + enabled = !step.isWaiting, + onClick = { eventSink(IncomingVerificationViewEvents.DeclineVerification) }, + ) } } Step.Canceled, diff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationView.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationView.kt index f2d3ccfee2..51f288b303 100644 --- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationView.kt +++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationView.kt @@ -24,10 +24,8 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource -import androidx.compose.ui.semantics.ProgressBarRangeInfo import androidx.compose.ui.semantics.contentDescription import androidx.compose.ui.semantics.focused -import androidx.compose.ui.semantics.progressBarRangeInfo import androidx.compose.ui.semantics.semantics import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.unit.dp @@ -129,20 +127,16 @@ fun OutgoingVerificationView( private fun OutgoingVerificationHeader(step: Step, request: VerificationRequest.Outgoing) { val iconStyle = when (step) { Step.Loading -> error("Should not happen") + Step.AwaitingOtherDeviceResponse, Step.Initial -> when (request) { is VerificationRequest.Outgoing.CurrentSession -> BigIcon.Style.Default(CompoundIcons.Devices()) is VerificationRequest.Outgoing.User -> BigIcon.Style.Default(CompoundIcons.LockSolid()) } - Step.AwaitingOtherDeviceResponse -> BigIcon.Style.Loading Step.Canceled -> BigIcon.Style.AlertSolid Step.Ready -> BigIcon.Style.Default(CompoundIcons.ReactionSolid()) Step.Completed -> BigIcon.Style.SuccessSolid is Step.Verifying -> { - if (step.state is AsyncData.Loading) { - BigIcon.Style.Loading - } else { - BigIcon.Style.Default(CompoundIcons.ReactionSolid()) - } + BigIcon.Style.Default(CompoundIcons.ReactionSolid()) } is Step.Exit -> return } @@ -201,10 +195,6 @@ private fun OutgoingVerificationHeader(step: Step, request: VerificationRequest. .semantics(mergeDescendants = true) { contentDescription = timeLimitMessage focused = true - if (iconStyle == BigIcon.Style.Loading) { - // Same code than Modifier.progressSemantics() - progressBarRangeInfo = ProgressBarRangeInfo.Indeterminate - } } .focusable(), iconStyle = iconStyle, @@ -264,11 +254,15 @@ private fun OutgoingVerificationViewBottomMenu( when (verificationViewState) { Step.Loading -> error("Should not happen") + is Step.AwaitingOtherDeviceResponse, is Step.Initial -> { VerificationBottomMenu { + val isWaiting = verificationViewState is Step.AwaitingOtherDeviceResponse Button( modifier = Modifier.fillMaxWidth(), text = stringResource(CommonStrings.action_start_verification), + enabled = !isWaiting, + showProgress = isWaiting, onClick = { eventSink(OutgoingVerificationViewEvents.RequestVerification) }, ) InvisibleButton() @@ -298,30 +292,23 @@ private fun OutgoingVerificationViewBottomMenu( ) } } - is Step.AwaitingOtherDeviceResponse -> Unit is Step.Verifying -> { - if (isVerifying) { - // Add invisible buttons to keep the same screen layout - VerificationBottomMenu { - InvisibleButton() - InvisibleButton() - } - } else { - VerificationBottomMenu { - Button( - modifier = Modifier.fillMaxWidth(), - text = stringResource(R.string.screen_session_verification_they_match), - onClick = { - eventSink(OutgoingVerificationViewEvents.ConfirmVerification) - }, - ) + VerificationBottomMenu { + Button( + modifier = Modifier.fillMaxWidth(), + text = stringResource(R.string.screen_session_verification_they_match), + enabled = !isVerifying, + showProgress = isVerifying, + onClick = { + eventSink(OutgoingVerificationViewEvents.ConfirmVerification) + }, + ) - TextButton( - modifier = Modifier.fillMaxWidth(), - text = stringResource(R.string.screen_session_verification_they_dont_match), - onClick = { eventSink(OutgoingVerificationViewEvents.DeclineVerification) }, - ) - } + TextButton( + modifier = Modifier.fillMaxWidth(), + text = stringResource(R.string.screen_session_verification_they_dont_match), + onClick = { eventSink(OutgoingVerificationViewEvents.DeclineVerification) }, + ) } } is Step.Completed -> { @@ -334,7 +321,7 @@ private fun OutgoingVerificationViewBottomMenu( InvisibleButton() } } - is Step.Exit -> return + is Step.Exit -> Unit } } diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/BigIcon.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/BigIcon.kt index 40e84b34c3..639d365625 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/BigIcon.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/BigIcon.kt @@ -34,7 +34,6 @@ import io.element.android.compound.theme.ElementTheme import io.element.android.compound.tokens.generated.CompoundIcons import io.element.android.libraries.designsystem.preview.ElementPreview import io.element.android.libraries.designsystem.preview.PreviewsDayNight -import io.element.android.libraries.designsystem.theme.components.CircularProgressIndicator import io.element.android.libraries.designsystem.theme.components.Icon import io.element.android.libraries.ui.strings.CommonStrings @@ -82,11 +81,6 @@ object BigIcon { * A success style with a tinted background. */ data object SuccessSolid : Style - - /** - * A loading style with the default background color. - */ - data object Loading : Style } /** @@ -110,7 +104,6 @@ object BigIcon { Style.Success -> Color.Transparent Style.AlertSolid -> ElementTheme.colors.bgCriticalSubtle Style.SuccessSolid -> ElementTheme.colors.bgSuccessSubtle - Style.Loading -> ElementTheme.colors.bgSubtleSecondary } Box( modifier = modifier @@ -119,52 +112,39 @@ object BigIcon { .background(backgroundColor), contentAlignment = Alignment.Center, ) { - if (style is Style.Loading) { - CircularProgressIndicator( - modifier = Modifier.size(27.dp), - color = ElementTheme.colors.iconSecondary, - trackColor = Color.Transparent, - strokeWidth = 3.dp, - ) - } else { - val icon = when (style) { - is Style.Default -> style.vectorIcon - Style.Alert, - Style.AlertSolid -> CompoundIcons.ErrorSolid() - Style.Success, - Style.SuccessSolid -> CompoundIcons.CheckCircleSolid() - Style.Loading -> error("This should never be reached") - } - val contentDescription = when (style) { - is Style.Default -> style.contentDescription - Style.Alert, - Style.AlertSolid -> stringResource(CommonStrings.common_error) - Style.Success, - Style.SuccessSolid -> stringResource(CommonStrings.common_success) - Style.Loading -> error("This should never be reached") - } - val iconTint = when (style) { - is Style.Default -> if (style.useCriticalTint) { - ElementTheme.colors.iconCriticalPrimary - } else if (style.usePrimaryTint) { - ElementTheme.colors.iconPrimary - } else { - ElementTheme.colors.iconSecondary - } - Style.Alert, - Style.AlertSolid -> ElementTheme.colors.iconCriticalPrimary - Style.Success, - Style.SuccessSolid -> ElementTheme.colors.iconSuccessPrimary - Style.Loading -> error("This should never be reached") - } - - Icon( - modifier = Modifier.size(32.dp), - tint = iconTint, - imageVector = icon, - contentDescription = contentDescription - ) + val icon = when (style) { + is Style.Default -> style.vectorIcon + Style.Alert, + Style.AlertSolid -> CompoundIcons.ErrorSolid() + Style.Success, + Style.SuccessSolid -> CompoundIcons.CheckCircleSolid() } + val contentDescription = when (style) { + is Style.Default -> style.contentDescription + Style.Alert, + Style.AlertSolid -> stringResource(CommonStrings.common_error) + Style.Success, + Style.SuccessSolid -> stringResource(CommonStrings.common_success) + } + val iconTint = when (style) { + is Style.Default -> if (style.useCriticalTint) { + ElementTheme.colors.iconCriticalPrimary + } else if (style.usePrimaryTint) { + ElementTheme.colors.iconPrimary + } else { + ElementTheme.colors.iconSecondary + } + Style.Alert, + Style.AlertSolid -> ElementTheme.colors.iconCriticalPrimary + Style.Success, + Style.SuccessSolid -> ElementTheme.colors.iconSuccessPrimary + } + Icon( + modifier = Modifier.size(32.dp), + tint = iconTint, + imageVector = icon, + contentDescription = contentDescription + ) } } } @@ -199,6 +179,5 @@ internal class BigIconStyleProvider : PreviewParameterProvider { BigIcon.Style.Default(Icons.Filled.CatchingPokemon, useCriticalTint = true), BigIcon.Style.Success, BigIcon.Style.SuccessSolid, - BigIcon.Style.Loading, ) } From 070c80bd51dbd70ca64cb1069694f9b8bd7a9e93 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 8 Jan 2026 16:14:53 +0100 Subject: [PATCH 2/6] Verification of other session: use Devices icon. Verification of other user: use UserProfileSolid icon. --- .../verifysession/impl/incoming/IncomingVerificationView.kt | 2 +- .../verifysession/impl/outgoing/OutgoingVerificationView.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationView.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationView.kt index 1d37daf82b..ca81e033d2 100644 --- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationView.kt +++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationView.kt @@ -101,7 +101,7 @@ private fun IncomingVerificationHeader(step: Step, request: VerificationRequest. val iconStyle = when (step) { Step.Canceled -> BigIcon.Style.AlertSolid is Step.Initial -> when (request) { - is VerificationRequest.Incoming.OtherSession -> BigIcon.Style.Default(CompoundIcons.LockSolid()) + is VerificationRequest.Incoming.OtherSession -> BigIcon.Style.Default(CompoundIcons.Devices()) is VerificationRequest.Incoming.User -> BigIcon.Style.Default(CompoundIcons.UserProfileSolid()) } is Step.Verifying -> BigIcon.Style.Default(CompoundIcons.ReactionSolid()) diff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationView.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationView.kt index 51f288b303..072eb9451b 100644 --- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationView.kt +++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationView.kt @@ -130,7 +130,7 @@ private fun OutgoingVerificationHeader(step: Step, request: VerificationRequest. Step.AwaitingOtherDeviceResponse, Step.Initial -> when (request) { is VerificationRequest.Outgoing.CurrentSession -> BigIcon.Style.Default(CompoundIcons.Devices()) - is VerificationRequest.Outgoing.User -> BigIcon.Style.Default(CompoundIcons.LockSolid()) + is VerificationRequest.Outgoing.User -> BigIcon.Style.Default(CompoundIcons.UserProfileSolid()) } Step.Canceled -> BigIcon.Style.AlertSolid Step.Ready -> BigIcon.Style.Default(CompoundIcons.ReactionSolid()) From 1dfe26e67a6d9caa537362dd566cc6125a4bb8df Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 8 Jan 2026 16:19:46 +0100 Subject: [PATCH 3/6] Verification: always render the back button. --- .../impl/incoming/IncomingVerificationView.kt | 26 ++++++++----------- .../impl/outgoing/OutgoingVerificationView.kt | 6 ++--- 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationView.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationView.kt index ca81e033d2..bb8e65578e 100644 --- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationView.kt +++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationView.kt @@ -70,11 +70,7 @@ fun IncomingVerificationView( TopAppBar( title = {}, navigationIcon = { - when { - step is Step.Initial && !step.isWaiting -> Unit - step is Step.Completed -> Unit - else -> BackButton(onClick = { state.eventSink(IncomingVerificationViewEvents.GoBack) }) - } + BackButton(onClick = { state.eventSink(IncomingVerificationViewEvents.GoBack) }) }, colors = topAppBarColors(containerColor = Color.Transparent), ) @@ -144,12 +140,12 @@ private fun IncomingVerificationHeader(step: Step, request: VerificationRequest. } IconTitleSubtitleMolecule( modifier = Modifier - .padding(bottom = 16.dp) - .semantics(mergeDescendants = true) { - contentDescription = timeLimitMessage - focused = true - } - .focusable(), + .padding(bottom = 16.dp) + .semantics(mergeDescendants = true) { + contentDescription = timeLimitMessage + focused = true + } + .focusable(), iconStyle = iconStyle, title = stringResource(id = titleTextId), subTitle = stringResource(id = subtitleTextId), @@ -186,8 +182,8 @@ private fun ContentInitial( ) Text( modifier = Modifier - .align(Alignment.CenterHorizontally) - .padding(bottom = 16.dp), + .align(Alignment.CenterHorizontally) + .padding(bottom = 16.dp), text = stringResource(R.string.screen_session_verification_request_footer), style = ElementTheme.typography.fontBodyMdMedium, textAlign = TextAlign.Center, @@ -197,8 +193,8 @@ private fun ContentInitial( is VerificationRequest.Incoming.User -> { Column( modifier = Modifier - .fillMaxWidth() - .padding(top = 24.dp), + .fillMaxWidth() + .padding(top = 24.dp), ) { VerificationUserProfileContent( user = request.details.senderProfile, diff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationView.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationView.kt index 072eb9451b..d2bf5a4bba 100644 --- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationView.kt +++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationView.kt @@ -94,10 +94,8 @@ fun OutgoingVerificationView( topBar = { TopAppBar( title = {}, - navigationIcon = if (step != Step.Completed) { - { BackButton(onClick = ::cancelOrResetFlow) } - } else { - {} + navigationIcon = { + BackButton(onClick = ::cancelOrResetFlow) }, colors = topAppBarColors(containerColor = Color.Transparent) ) From 49434c12a2b06ad8afe4a84c5558efa8c91cb1c8 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 8 Jan 2026 16:31:56 +0100 Subject: [PATCH 4/6] tom --- .../verifysession/impl/outgoing/OutgoingVerificationView.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationView.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationView.kt index d2bf5a4bba..95258ba336 100644 --- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationView.kt +++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationView.kt @@ -301,10 +301,10 @@ private fun OutgoingVerificationViewBottomMenu( eventSink(OutgoingVerificationViewEvents.ConfirmVerification) }, ) - TextButton( modifier = Modifier.fillMaxWidth(), text = stringResource(R.string.screen_session_verification_they_dont_match), + enabled = !isVerifying, onClick = { eventSink(OutgoingVerificationViewEvents.DeclineVerification) }, ) } From 492e5d61e5737bbaadaba964952684b7ada520f9 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 8 Jan 2026 16:34:09 +0100 Subject: [PATCH 5/6] Code cleanup. --- .../impl/incoming/IncomingVerificationView.kt | 40 +++++++++-------- .../impl/outgoing/OutgoingVerificationView.kt | 44 ++++++++----------- 2 files changed, 40 insertions(+), 44 deletions(-) diff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationView.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationView.kt index bb8e65578e..e86c83825b 100644 --- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationView.kt +++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationView.kt @@ -140,12 +140,12 @@ private fun IncomingVerificationHeader(step: Step, request: VerificationRequest. } IconTitleSubtitleMolecule( modifier = Modifier - .padding(bottom = 16.dp) - .semantics(mergeDescendants = true) { - contentDescription = timeLimitMessage - focused = true - } - .focusable(), + .padding(bottom = 16.dp) + .semantics(mergeDescendants = true) { + contentDescription = timeLimitMessage + focused = true + } + .focusable(), iconStyle = iconStyle, title = stringResource(id = titleTextId), subTitle = stringResource(id = subtitleTextId), @@ -166,7 +166,7 @@ private fun IncomingVerificationContent( @Composable private fun ContentInitial( - initialIncoming: Step.Initial, + stepInitial: Step.Initial, request: VerificationRequest.Incoming, ) { when (request) { @@ -176,14 +176,14 @@ private fun ContentInitial( verticalArrangement = Arrangement.spacedBy(24.dp), ) { SessionDetailsView( - deviceName = initialIncoming.deviceDisplayName, - deviceId = initialIncoming.deviceId, - signInFormattedTimestamp = initialIncoming.formattedSignInTime, + deviceName = stepInitial.deviceDisplayName, + deviceId = stepInitial.deviceId, + signInFormattedTimestamp = stepInitial.formattedSignInTime, ) Text( modifier = Modifier - .align(Alignment.CenterHorizontally) - .padding(bottom = 16.dp), + .align(Alignment.CenterHorizontally) + .padding(bottom = 16.dp), text = stringResource(R.string.screen_session_verification_request_footer), style = ElementTheme.typography.fontBodyMdMedium, textAlign = TextAlign.Center, @@ -193,8 +193,8 @@ private fun ContentInitial( is VerificationRequest.Incoming.User -> { Column( modifier = Modifier - .fillMaxWidth() - .padding(top = 24.dp), + .fillMaxWidth() + .padding(top = 24.dp), ) { VerificationUserProfileContent( user = request.details.senderProfile, @@ -208,10 +208,8 @@ private fun ContentInitial( private fun IncomingVerificationBottomMenu( state: IncomingVerificationState, ) { - val step = state.step val eventSink = state.eventSink - - when (step) { + when (val step = state.step) { is Step.Initial -> { VerificationBottomMenu { Button( @@ -236,7 +234,9 @@ private fun IncomingVerificationBottomMenu( text = stringResource(R.string.screen_session_verification_they_match), enabled = !step.isWaiting, showProgress = step.isWaiting, - onClick = { eventSink(IncomingVerificationViewEvents.ConfirmVerification) }, + onClick = { + eventSink(IncomingVerificationViewEvents.ConfirmVerification) + }, ) TextButton( modifier = Modifier.fillMaxWidth(), @@ -253,7 +253,9 @@ private fun IncomingVerificationBottomMenu( Button( modifier = Modifier.fillMaxWidth(), text = stringResource(CommonStrings.action_done), - onClick = { eventSink(IncomingVerificationViewEvents.GoBack) }, + onClick = { + eventSink(IncomingVerificationViewEvents.GoBack) + }, ) } } diff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationView.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationView.kt index 95258ba336..2dd2850174 100644 --- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationView.kt +++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationView.kt @@ -35,7 +35,6 @@ import io.element.android.features.verifysession.impl.R import io.element.android.features.verifysession.impl.outgoing.OutgoingVerificationState.Step import io.element.android.features.verifysession.impl.ui.VerificationBottomMenu import io.element.android.features.verifysession.impl.ui.VerificationContentVerifying -import io.element.android.libraries.architecture.AsyncData import io.element.android.libraries.designsystem.atomic.molecules.IconTitleSubtitleMolecule import io.element.android.libraries.designsystem.atomic.pages.HeaderFooterPage import io.element.android.libraries.designsystem.components.BigIcon @@ -97,15 +96,15 @@ fun OutgoingVerificationView( navigationIcon = { BackButton(onClick = ::cancelOrResetFlow) }, - colors = topAppBarColors(containerColor = Color.Transparent) + colors = topAppBarColors(containerColor = Color.Transparent), ) }, header = { OutgoingVerificationHeader(step = step, request = state.request) }, footer = { - OutgoingVerificationViewBottomMenu( - screenState = state, + OutgoingVerificationBottomMenu( + state = state, onCancelClick = ::cancelOrResetFlow, onContinueClick = onFinish, ) @@ -113,7 +112,7 @@ fun OutgoingVerificationView( isScrollable = true, ) { OutgoingVerificationContent( - flowState = step, + step = step, request = state.request, onLearnMoreClick = onLearnMoreClick, ) @@ -203,20 +202,16 @@ private fun OutgoingVerificationHeader(step: Step, request: VerificationRequest. @Composable private fun OutgoingVerificationContent( - flowState: Step, + step: Step, request: VerificationRequest.Outgoing, onLearnMoreClick: () -> Unit, ) { - when (flowState) { - is Step.Initial -> { - when (request) { - is VerificationRequest.Outgoing.CurrentSession -> Unit - is VerificationRequest.Outgoing.User -> ContentInitial(onLearnMoreClick) - } - } - is Step.Verifying -> { - VerificationContentVerifying(flowState.data) + when (step) { + is Step.Initial -> when (request) { + is VerificationRequest.Outgoing.CurrentSession -> Unit + is VerificationRequest.Outgoing.User -> ContentInitial(onLearnMoreClick) } + is Step.Verifying -> VerificationContentVerifying(step.data) else -> Unit } } @@ -240,22 +235,18 @@ private fun ContentInitial( } @Composable -private fun OutgoingVerificationViewBottomMenu( - screenState: OutgoingVerificationState, +private fun OutgoingVerificationBottomMenu( + state: OutgoingVerificationState, onCancelClick: () -> Unit, onContinueClick: () -> Unit, ) { - val verificationViewState = screenState.step - val eventSink = screenState.eventSink - - val isVerifying = (verificationViewState as? Step.Verifying)?.state is AsyncData.Loading - - when (verificationViewState) { + val eventSink = state.eventSink + when (val step = state.step) { Step.Loading -> error("Should not happen") is Step.AwaitingOtherDeviceResponse, is Step.Initial -> { VerificationBottomMenu { - val isWaiting = verificationViewState is Step.AwaitingOtherDeviceResponse + val isWaiting = step is Step.AwaitingOtherDeviceResponse Button( modifier = Modifier.fillMaxWidth(), text = stringResource(CommonStrings.action_start_verification), @@ -291,6 +282,7 @@ private fun OutgoingVerificationViewBottomMenu( } } is Step.Verifying -> { + val isVerifying = step.state.isLoading() VerificationBottomMenu { Button( modifier = Modifier.fillMaxWidth(), @@ -305,7 +297,9 @@ private fun OutgoingVerificationViewBottomMenu( modifier = Modifier.fillMaxWidth(), text = stringResource(R.string.screen_session_verification_they_dont_match), enabled = !isVerifying, - onClick = { eventSink(OutgoingVerificationViewEvents.DeclineVerification) }, + onClick = { + eventSink(OutgoingVerificationViewEvents.DeclineVerification) + }, ) } } From f33223559bcb26189bd9ea6bf610f3ec2f484b96 Mon Sep 17 00:00:00 2001 From: ElementBot Date: Thu, 8 Jan 2026 15:49:32 +0000 Subject: [PATCH 6/6] Update screenshots --- ...ysession.impl.incoming_IncomingVerificationViewA11y_en.png | 4 ++-- ...ession.impl.incoming_IncomingVerificationView_Day_0_en.png | 4 ++-- ...ssion.impl.incoming_IncomingVerificationView_Day_10_en.png | 4 ++-- ...ssion.impl.incoming_IncomingVerificationView_Day_11_en.png | 4 ++-- ...ession.impl.incoming_IncomingVerificationView_Day_1_en.png | 4 ++-- ...ession.impl.incoming_IncomingVerificationView_Day_2_en.png | 4 ++-- ...ession.impl.incoming_IncomingVerificationView_Day_3_en.png | 4 ++-- ...ession.impl.incoming_IncomingVerificationView_Day_4_en.png | 4 ++-- ...ession.impl.incoming_IncomingVerificationView_Day_7_en.png | 4 ++-- ...ession.impl.incoming_IncomingVerificationView_Day_8_en.png | 4 ++-- ...sion.impl.incoming_IncomingVerificationView_Night_0_en.png | 4 ++-- ...ion.impl.incoming_IncomingVerificationView_Night_10_en.png | 4 ++-- ...ion.impl.incoming_IncomingVerificationView_Night_11_en.png | 4 ++-- ...sion.impl.incoming_IncomingVerificationView_Night_1_en.png | 4 ++-- ...sion.impl.incoming_IncomingVerificationView_Night_2_en.png | 4 ++-- ...sion.impl.incoming_IncomingVerificationView_Night_3_en.png | 4 ++-- ...sion.impl.incoming_IncomingVerificationView_Night_4_en.png | 4 ++-- ...sion.impl.incoming_IncomingVerificationView_Night_7_en.png | 4 ++-- ...sion.impl.incoming_IncomingVerificationView_Night_8_en.png | 4 ++-- ...ssion.impl.outgoing_OutgoingVerificationView_Day_10_en.png | 4 ++-- ...ssion.impl.outgoing_OutgoingVerificationView_Day_11_en.png | 4 ++-- ...ession.impl.outgoing_OutgoingVerificationView_Day_1_en.png | 4 ++-- ...ession.impl.outgoing_OutgoingVerificationView_Day_2_en.png | 4 ++-- ...ession.impl.outgoing_OutgoingVerificationView_Day_3_en.png | 4 ++-- ...ession.impl.outgoing_OutgoingVerificationView_Day_6_en.png | 4 ++-- ...ion.impl.outgoing_OutgoingVerificationView_Night_10_en.png | 4 ++-- ...ion.impl.outgoing_OutgoingVerificationView_Night_11_en.png | 4 ++-- ...sion.impl.outgoing_OutgoingVerificationView_Night_1_en.png | 4 ++-- ...sion.impl.outgoing_OutgoingVerificationView_Night_2_en.png | 4 ++-- ...sion.impl.outgoing_OutgoingVerificationView_Night_3_en.png | 4 ++-- ...sion.impl.outgoing_OutgoingVerificationView_Night_6_en.png | 4 ++-- .../libraries.designsystem.components_BigIcon_Day_0_en.png | 4 ++-- .../libraries.designsystem.components_BigIcon_Night_0_en.png | 4 ++-- 33 files changed, 66 insertions(+), 66 deletions(-) diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationViewA11y_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationViewA11y_en.png index 48d1f990a4..2aeca4411f 100644 --- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationViewA11y_en.png +++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationViewA11y_en.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fc82b350fa0905ffa7fdb86042157aa9577e4b60dd04cd0c875d6c26f8f18a05 -size 74382 +oid sha256:b8edbc22543c204a226c3acc78dbe346c90a5806f374b97fce320777e6a4d97f +size 77061 diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_0_en.png index 8ab592672a..b21e718ace 100644 --- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_0_en.png +++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_0_en.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2c51ecde00a75a74fb6b654f58f8c6507fe1af50f5f996c27bafa355d01f3f58 -size 42097 +oid sha256:1535ae46ff8d99e1205966bee0c7a0455505f4ab4499805350f7aeff4931a3e8 +size 42380 diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_10_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_10_en.png index c12918bef2..16c02a582c 100644 --- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_10_en.png +++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_10_en.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:11df4acac503d00011ea5b0c3bf59495f5ad50268dc88b253bb60e4f47dcca10 -size 23217 +oid sha256:20f8ace2bb54a25e6044e6b63f09378b1ad9d6b8e0a8690aadb33d07aef32b2b +size 23595 diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_11_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_11_en.png index d281cca5e7..e0c6f6554f 100644 --- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_11_en.png +++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_11_en.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:42a9af1521e18b0edcd05743b9dc598324c68657afa293e304576348598f4b7b -size 24492 +oid sha256:e8e40d09036dfab63b0ce06886a4951958a00e4aa54cd8760201c71b32da0e60 +size 24895 diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_1_en.png index 8ab592672a..b21e718ace 100644 --- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_1_en.png +++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_1_en.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2c51ecde00a75a74fb6b654f58f8c6507fe1af50f5f996c27bafa355d01f3f58 -size 42097 +oid sha256:1535ae46ff8d99e1205966bee0c7a0455505f4ab4499805350f7aeff4931a3e8 +size 42380 diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_2_en.png index b4dae88c36..8cde33fcb0 100644 --- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_2_en.png +++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_2_en.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c398ef341651bd7b0b067183b0b6566c515df3204512fd8f32df5abfe71f2e2e -size 38450 +oid sha256:e13e3252a9550a34dbf35c2f93f7bd19168597556f402bb8c3a4cf02c34b3603 +size 38850 diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_3_en.png index 71a7750d12..2566d896ff 100644 --- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_3_en.png +++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_3_en.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6d731d3b312cd4535d953365b1de7817c2c6d07c1ae460567f3e333cd00f8d2e -size 37142 +oid sha256:1fec4bf898d1edc02c93cdf07dea16395cbb18779b2990fb234ce1f5d957aa2d +size 42228 diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_4_en.png index 090d0d88c1..1a1e10796b 100644 --- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_4_en.png +++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_4_en.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:323370a1128d2629752159610719fd49de99a448f0278bdcce85f4f836bf3ef5 -size 32384 +oid sha256:ddf2b23bd2990e6c30e5afada8a552af02aeaf5168f47fc8dd9dfd3a3b948c06 +size 38584 diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_7_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_7_en.png index 5402804a6a..c402304f17 100644 --- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_7_en.png +++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_7_en.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2cb056d627f504947058b3512873e91a792c98d6cc485d4d866fd63589c957bc -size 40073 +oid sha256:b3af87959334905f1de9e014978dafbd2fa5834db9c3296bc5353218bc09a3f5 +size 46207 diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_8_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_8_en.png index 2a156d2e59..aaebb6fcea 100644 --- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_8_en.png +++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Day_8_en.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:626d47274ead934c9c4d2831d14abc011954a627d63dac7193d881826371654c -size 40688 +oid sha256:d26dfb3d8efcc93b7e0f25cb2067b5288edba8a9a35edc3b74863f3cd2962ce5 +size 46820 diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_0_en.png index 2917893392..2a4761bd51 100644 --- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_0_en.png +++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_0_en.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a008fa7c1f333a1ea380d6d7b2401bd3cc3ac70e32c2618359640d73962c31a2 -size 40874 +oid sha256:b5816a7b77f64889d51988d286a05be318930076972b7a29c7506bedf091aebd +size 41107 diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_10_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_10_en.png index 1a73c71f81..6c3dfcc678 100644 --- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_10_en.png +++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_10_en.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f739091f305037dc09fb7b6a083a30172f45c576a2ccbc08b4de1d97c37523d6 -size 22569 +oid sha256:e765b16cfe3beca19b9f3f256512e6048a7cc22b0344f5e57d655409c2262156 +size 22893 diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_11_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_11_en.png index 5987a85f48..d549a5965f 100644 --- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_11_en.png +++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_11_en.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:320fecc889eb76fb0201dec4c299d2fd82f6a21e48544f5d45e537bec49fa3b6 -size 23870 +oid sha256:16699f8b48a72e2336a83e2fb80cd28cdc5b7b4b5a2e065767f2d6416a372b96 +size 24204 diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_1_en.png index 2917893392..2a4761bd51 100644 --- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_1_en.png +++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_1_en.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a008fa7c1f333a1ea380d6d7b2401bd3cc3ac70e32c2618359640d73962c31a2 -size 40874 +oid sha256:b5816a7b77f64889d51988d286a05be318930076972b7a29c7506bedf091aebd +size 41107 diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_2_en.png index 6c99c4bacb..e5e262843b 100644 --- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_2_en.png +++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_2_en.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d077bd218282f4d5d17d319efad0b921c7e3a17e94bee4fa220390f4988d7295 -size 37601 +oid sha256:454d58e8c2ec04dff4ba7410e284b4b7e5439df68996f42be6181036d799f739 +size 37916 diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_3_en.png index d1905ffbdb..e738748f23 100644 --- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_3_en.png +++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_3_en.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5d87afe654be2a6d0cfb9a1fe5a900f01809dacf23f0639b87cfd08e90650e09 -size 36161 +oid sha256:d3420774cfe02db1e94c4bc71d41de8ab754c9de96ab8283bd8e6f7555f85ce2 +size 40908 diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_4_en.png index d337c136ef..6eb0f48cc3 100644 --- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_4_en.png +++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_4_en.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:19f1f3eb197a48bcd1ec0ab3acc1d46ac2597fb3ffd325f221c3a87a2ae56b6b -size 31689 +oid sha256:082dff0fdb2c9d6de2fcbdd059b3f1d3859f2265df5fd92f9c74911a5852fcfc +size 37528 diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_7_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_7_en.png index 9005aa52dc..0b20aeaeb9 100644 --- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_7_en.png +++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_7_en.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:08c9db896d4de76c9466675bad777591985e9b9d6d39dfae2711a95ae6de6be7 -size 39285 +oid sha256:14ea71faf7394d985620c36093a3015b23fafd6657213ebf243ba660ff99bea2 +size 44943 diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_8_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_8_en.png index fad6ffe0df..166ce71cc6 100644 --- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_8_en.png +++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.incoming_IncomingVerificationView_Night_8_en.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fcda36810020f172928338753ad986294b17ff705b1720d3f358ca471a8f8fb1 -size 39930 +oid sha256:3aef62da412a0dea0108fc4f2edb84acb3e40eab6d44e69b74e9dee3689d9725 +size 45566 diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_10_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_10_en.png index f1872614ce..60e66d0f8f 100644 --- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_10_en.png +++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_10_en.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4db4fc94f8c80bc45d241ccb8e67b18f687b2fb00fef5f4c7de5fbfbc07ede05 -size 26551 +oid sha256:caa57bfcdb7f285e0b3e82844d83fb0b525d56ddb627c202f8d2eccdb5a79d84 +size 26912 diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_11_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_11_en.png index 59d977bcfa..2ec32fe145 100644 --- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_11_en.png +++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_11_en.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ca7819814008b5365e1c11cfd530587277fa8636e183eae35464c627c0a1d174 -size 25163 +oid sha256:0514ecaaf5a91487316e36a1549049b51e50dee20eed90bc9542a6e8672fbdb7 +size 25552 diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_1_en.png index 63af02a9b2..43d4cbb36f 100644 --- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_1_en.png +++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_1_en.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:db7af309219038951c742535c24f2bf6995438a3e9850bd9f69aa8ac2636cbf5 -size 33037 +oid sha256:6c7de8a2a9ef5374d56fc641ac71d25be186082fa7b5a6ed979def8e3f59808e +size 33985 diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_2_en.png index ea3b9ed3fa..f88a2b853b 100644 --- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_2_en.png +++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_2_en.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:da0a3a6b89ba22da85d8834a8b9dbc4216ee0085b7ef6f8e55203e0abb789b57 -size 23203 +oid sha256:fb0c099c3480108b8ce842618123e95e6f302a58a56633f2ed91ed96ad8639da +size 27074 diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_3_en.png index dad425d03d..aba82f25ac 100644 --- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_3_en.png +++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_3_en.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d2993f8eb15e1d7dd869bad474a954db52a2b8f9769f4d1d3f0c6ab0449b7fbe -size 20421 +oid sha256:8834781b2e2d5d4811b0ff030d0c741d08c5659d94711d6d550f81c4b0d47ebe +size 25382 diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_6_en.png index 5402804a6a..c402304f17 100644 --- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_6_en.png +++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Day_6_en.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2cb056d627f504947058b3512873e91a792c98d6cc485d4d866fd63589c957bc -size 40073 +oid sha256:b3af87959334905f1de9e014978dafbd2fa5834db9c3296bc5353218bc09a3f5 +size 46207 diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_10_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_10_en.png index de49708cf6..62d6f23e20 100644 --- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_10_en.png +++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_10_en.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8ee603c36dea38a3adda22c45294a45225e44f9638f7292159019993aafd1ec7 -size 25902 +oid sha256:465e7198dd7773d5dbd953cf3022e35f513add880d68af161a70df5ddfd00b17 +size 26234 diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_11_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_11_en.png index 45e9f22955..dd1983dca0 100644 --- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_11_en.png +++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_11_en.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bc1980e0ce3bc900f6703fe4f5f12eabbcc351b0aca873215e414af86125a0fd -size 24521 +oid sha256:d2e530f6abdcbaf236f60aadcecaa97de715f39473069fa164c894ef0f899c35 +size 24852 diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_1_en.png index addf2b47cb..c4a26627ed 100644 --- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_1_en.png +++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_1_en.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d4d968e867119149bb7cfcfdb2c993603c60b427f4f3810ecf9784198c6804b6 -size 32158 +oid sha256:96c4965a16f7c0d246586941230799cb4dae61ad18120420df11ea744e0730ec +size 32993 diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_2_en.png index 9e3ec35297..b74bf5aba6 100644 --- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_2_en.png +++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_2_en.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:352e0673fd2802c418657e9a0532a504d736234f28df1119437e3035dde06804 -size 22685 +oid sha256:8ef0a07a8d811cb6fb59160b0003cabbf6d3437a41f912dc31b63851be549e2d +size 26222 diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_3_en.png index b334380e3d..8a192d376c 100644 --- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_3_en.png +++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_3_en.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a477acdebee14e91f9e15ef9f10f318ae0fcb081a0f6bdacb91c68e5d9234b30 -size 20011 +oid sha256:e08c58571c5252779e3dd783f0c60768e408260dc901cf6310a927b3da948172 +size 24619 diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_6_en.png index 9005aa52dc..0b20aeaeb9 100644 --- a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_6_en.png +++ b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_OutgoingVerificationView_Night_6_en.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:08c9db896d4de76c9466675bad777591985e9b9d6d39dfae2711a95ae6de6be7 -size 39285 +oid sha256:14ea71faf7394d985620c36093a3015b23fafd6657213ebf243ba660ff99bea2 +size 44943 diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components_BigIcon_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components_BigIcon_Day_0_en.png index cc09282faa..d2d1c16252 100644 --- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components_BigIcon_Day_0_en.png +++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components_BigIcon_Day_0_en.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3ae5556afe4e26f417c598e116dee6c7c913fe668a15ec2d98d2f1ed81b5371f -size 14269 +oid sha256:29c51a698521fcc83604aafed9747c92b84f4077e7ea79ba35ce8a07b991fbcd +size 12563 diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components_BigIcon_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components_BigIcon_Night_0_en.png index fff990dc70..ebad5af87d 100644 --- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.components_BigIcon_Night_0_en.png +++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.components_BigIcon_Night_0_en.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7ec9f20978244f8b933140f074bf586a174b9448a602294b95f4773ee7758323 -size 14406 +oid sha256:f899705e82a54ee0525fd36dd5993538c51dcc9fa0b224a820407bd22827b33c +size 12724