mirror of
https://github.com/Novaloop-AG/element-x-android.git
synced 2026-11-04 10:32:34 +00:00
Incoming verification: do not distinguish UI between cancelled and failed state.
This commit is contained in:
+3
-3
@@ -80,14 +80,14 @@ fun IncomingVerificationView(
|
|||||||
@Composable
|
@Composable
|
||||||
private fun IncomingVerificationHeader(step: Step) {
|
private fun IncomingVerificationHeader(step: Step) {
|
||||||
val iconStyle = when (step) {
|
val iconStyle = when (step) {
|
||||||
Step.Canceled,
|
Step.Canceled -> BigIcon.Style.AlertSolid
|
||||||
is Step.Initial -> BigIcon.Style.Default(CompoundIcons.LockSolid())
|
is Step.Initial -> BigIcon.Style.Default(CompoundIcons.LockSolid())
|
||||||
is Step.Verifying -> BigIcon.Style.Default(CompoundIcons.Reaction())
|
is Step.Verifying -> BigIcon.Style.Default(CompoundIcons.Reaction())
|
||||||
Step.Completed -> BigIcon.Style.SuccessSolid
|
Step.Completed -> BigIcon.Style.SuccessSolid
|
||||||
Step.Failure -> BigIcon.Style.AlertSolid
|
Step.Failure -> BigIcon.Style.AlertSolid
|
||||||
}
|
}
|
||||||
val titleTextId = when (step) {
|
val titleTextId = when (step) {
|
||||||
Step.Canceled -> CommonStrings.common_verification_cancelled
|
Step.Canceled -> R.string.screen_session_verification_request_failure_title
|
||||||
is Step.Initial -> R.string.screen_session_verification_request_title
|
is Step.Initial -> R.string.screen_session_verification_request_title
|
||||||
is Step.Verifying -> when (step.data) {
|
is Step.Verifying -> when (step.data) {
|
||||||
is SessionVerificationData.Decimals -> R.string.screen_session_verification_compare_numbers_title
|
is SessionVerificationData.Decimals -> R.string.screen_session_verification_compare_numbers_title
|
||||||
@@ -97,7 +97,7 @@ private fun IncomingVerificationHeader(step: Step) {
|
|||||||
Step.Failure -> R.string.screen_session_verification_request_failure_title
|
Step.Failure -> R.string.screen_session_verification_request_failure_title
|
||||||
}
|
}
|
||||||
val subtitleTextId = when (step) {
|
val subtitleTextId = when (step) {
|
||||||
Step.Canceled -> R.string.screen_session_verification_cancelled_subtitle
|
Step.Canceled -> R.string.screen_session_verification_request_failure_subtitle
|
||||||
is Step.Initial -> R.string.screen_session_verification_request_subtitle
|
is Step.Initial -> R.string.screen_session_verification_request_subtitle
|
||||||
is Step.Verifying -> when (step.data) {
|
is Step.Verifying -> when (step.data) {
|
||||||
is SessionVerificationData.Decimals -> R.string.screen_session_verification_compare_numbers_subtitle
|
is SessionVerificationData.Decimals -> R.string.screen_session_verification_compare_numbers_subtitle
|
||||||
|
|||||||
Reference in New Issue
Block a user