Merge pull request #3832 from element-hq/feature/bma/waitingtoMatch

bmarty · web-flow · commit cf9dbc60f606 · 2024-11-08T14:07:38.000+01:00
Disable button during the "verifying" step.
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
@@ -10,9 +10,7 @@ package io.element.android.features.verifysession.impl.incoming
 import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.runtime.Composable
@@ -35,6 +33,7 @@ import io.element.android.libraries.designsystem.components.PageTitle
 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
@@ -166,8 +165,7 @@ private fun IncomingVerificationBottomMenu(
                         enabled = false,
                         showProgress = true,
                     )
-                    // Placeholder so the 1st button keeps its vertical position
-                    Spacer(modifier = Modifier.height(40.dp))
+                    InvisibleButton()
                 }
             } else {
                 VerificationBottomMenu {
@@ -194,8 +192,7 @@ private fun IncomingVerificationBottomMenu(
                         enabled = false,
                         showProgress = true,
                     )
-                    // Placeholder so the 1st button keeps its vertical position
-                    Spacer(modifier = Modifier.height(40.dp))
+                    InvisibleButton()
                 }
             } else {
                 VerificationBottomMenu {
diff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/VerifySelfSessionView.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/VerifySelfSessionView.kt
@@ -12,10 +12,8 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.runtime.Composable
@@ -44,6 +42,7 @@ 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.CircularProgressIndicator
+import io.element.android.libraries.designsystem.theme.components.InvisibleButton
 import io.element.android.libraries.designsystem.theme.components.OutlinedButton
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.components.TextButton
@@ -282,8 +281,7 @@ private fun VerifySelfSessionBottomMenu(
                     text = stringResource(CommonStrings.action_start_verification),
                     onClick = { eventSink(VerifySelfSessionViewEvents.RequestVerification) },
                 )
-                // Placeholder so the 1st button keeps its vertical position
-                Spacer(modifier = Modifier.height(40.dp))
+                InvisibleButton()
             }
         }
         is Step.Canceled -> {
@@ -293,8 +291,7 @@ private fun VerifySelfSessionBottomMenu(
                     text = stringResource(CommonStrings.action_done),
                     onClick = onCancelClick,
                 )
-                // Placeholder so the 1st button keeps its vertical position
-                Spacer(modifier = Modifier.height(40.dp))
+                InvisibleButton()
             }
         }
         is Step.Ready -> {
@@ -320,8 +317,7 @@ private fun VerifySelfSessionBottomMenu(
                     showProgress = true,
                     enabled = false,
                 )
-                // Placeholder so the 1st button keeps its vertical position
-                Spacer(modifier = Modifier.height(40.dp))
+                InvisibleButton()
             }
         }
         is Step.Verifying -> {
@@ -335,17 +331,22 @@ private fun VerifySelfSessionBottomMenu(
                     modifier = Modifier.fillMaxWidth(),
                     text = positiveButtonTitle,
                     showProgress = isVerifying,
+                    enabled = !isVerifying,
                     onClick = {
                         if (!isVerifying) {
                             eventSink(VerifySelfSessionViewEvents.ConfirmVerification)
                         }
                     },
                 )
-                TextButton(
-                    modifier = Modifier.fillMaxWidth(),
-                    text = stringResource(R.string.screen_session_verification_they_dont_match),
-                    onClick = { eventSink(VerifySelfSessionViewEvents.DeclineVerification) },
-                )
+                if (isVerifying) {
+                    InvisibleButton()
+                } else {
+                    TextButton(
+                        modifier = Modifier.fillMaxWidth(),
+                        text = stringResource(R.string.screen_session_verification_they_dont_match),
+                        onClick = { eventSink(VerifySelfSessionViewEvents.DeclineVerification) },
+                    )
+                }
             }
         }
         is Step.Completed -> {
@@ -355,8 +356,7 @@ private fun VerifySelfSessionBottomMenu(
                     text = stringResource(CommonStrings.action_continue),
                     onClick = onContinueClick,
                 )
-                // Placeholder so the 1st button keeps its vertical position
-                Spacer(modifier = Modifier.height(48.dp))
+                InvisibleButton()
             }
         }
         is Step.Skipped -> return
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Button.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Button.kt
@@ -17,6 +17,7 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
@@ -118,6 +119,14 @@ fun TextButton(
     leadingIcon = leadingIcon
 )
 
+@Composable
+fun InvisibleButton(
+    modifier: Modifier = Modifier,
+    size: ButtonSize = ButtonSize.Large,
+) {
+    Spacer(modifier = modifier.height(size.toMinHeight()))
+}
+
 @Composable
 private fun ButtonInternal(
     text: String,
@@ -131,14 +140,7 @@ private fun ButtonInternal(
     showProgress: Boolean = false,
     leadingIcon: IconSource? = null,
 ) {
-    val minHeight = when (size) {
-        ButtonSize.Small -> 32.dp
-        ButtonSize.Medium,
-        ButtonSize.MediumLowPadding -> 40.dp
-        ButtonSize.Large,
-        ButtonSize.LargeLowPadding -> 48.dp
-    }
-
+    val minHeight = size.toMinHeight()
     val hasStartDrawable = showProgress || leadingIcon != null
 
     val contentPadding = when (size) {
@@ -253,6 +255,14 @@ private fun ButtonInternal(
     }
 }
 
+private fun ButtonSize.toMinHeight() = when (this) {
+    ButtonSize.Small -> 32.dp
+    ButtonSize.Medium,
+    ButtonSize.MediumLowPadding -> 40.dp
+    ButtonSize.Large,
+    ButtonSize.LargeLowPadding -> 48.dp
+}
+
 @Immutable
 sealed interface IconSource {
     val contentDescription: String?
diff --git a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistComposableTest.kt b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistComposableTest.kt
@@ -32,9 +32,10 @@ class KonsistComposableTest {
             .withoutReceiverType()
             .withoutName(
                 // Add some exceptions...
+                "InvisibleButton",
                 "OutlinedButton",
-                "TextButton",
                 "SimpleAlertDialogContent",
+                "TextButton",
             )
             .assertTrue(
                 additionalMessage =
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
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dbf6f78ad928bcc9878e546345a98d334ae92c9b81d4d8404892a16d19b446c3
-size 41534
+oid sha256:bea78fb1bb813bedce30e5b13257892bcc23a7d6eb1a404d24e764337568d6cd
+size 41596
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
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dfc69dc6d93a62e23df2f817ad5a167b1e94d7fb0d408d6ec0051d666b6cf175
-size 44869
+oid sha256:5d8163be5e84aa851df9666822a4d9bc7a40d3a99d6fa8498243c256b729d58f
+size 44724
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
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b76212b5942484621b7a58044a958203d838807d50687e8f4e2f9c8bdb6ad37c
-size 40232
+oid sha256:db8b048d11f766a8e3db28bac99f3e8dea34e6f37fba1eacd9e6f98f6127462b
+size 40383
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
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1033af0fc84e2819509fc798c17e8f0b07d74a08da99d0e059b7ff19db2ce56a
-size 43674
+oid sha256:c1098ef994ad9552aca2f9ad9efe7b1239133544e561e73eced6fa96d08eaa3b
+size 43785
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_VerifySelfSessionView_Day_13_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_VerifySelfSessionView_Day_13_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:18dadaebe7a32aacde31afa0352a343913955b099ca4a07851e3ffe75e88b4d6
-size 31012
+oid sha256:104d1d386398aac789420babf33755e03d163f40ae596cd8d24f35da0363fac6
+size 30952
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_VerifySelfSessionView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_VerifySelfSessionView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:71b9f32b26b391ff3bf231ca9f364a157f535c1e6ff52ee3e3ead3630bb1b239
-size 30007
+oid sha256:145c85570217621cc576f305ed72e27205381c438e434205e07b7363cfd67f04
+size 30069
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_VerifySelfSessionView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_VerifySelfSessionView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c5435926f4a54e99902b78881c59d9d816110e401bcb92baf3b2fca844338f31
-size 48182
+oid sha256:5d8163be5e84aa851df9666822a4d9bc7a40d3a99d6fa8498243c256b729d58f
+size 44724
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_VerifySelfSessionView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_VerifySelfSessionView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:000374157cb5fbf6670b4af041fc385538df78bf4aecaf83ea24d39dfec84f23
-size 24278
+oid sha256:781d869dff205f99d5a9bc9986abbe489bef24551e6fb695280541741895a508
+size 24238
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_VerifySelfSessionView_Night_13_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_VerifySelfSessionView_Night_13_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4dd274f8c2ade6213a13a47400ec3a571844eafcc82b292b1c813bd9aa098236
-size 30241
+oid sha256:85b92d23ab2f690c3c15ded7f14c513371cd36482fbeda1478f62c82650f1829
+size 30274
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_VerifySelfSessionView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_VerifySelfSessionView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:994b39ba25e011cce97504a1f3d4ed0c420b7bce87daafae77ba481cc629cdae
-size 29051
+oid sha256:b848d50320f1494c9d0edbc21bddcc773de0cf9b1c36ce034235fd3fbbd77cf1
+size 29210
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_VerifySelfSessionView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_VerifySelfSessionView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a6c90e5be60738ded8312822f95279aa76d3ec8d86265164f4e3e31dbcce61c5
-size 47355
+oid sha256:c1098ef994ad9552aca2f9ad9efe7b1239133544e561e73eced6fa96d08eaa3b
+size 43785
diff --git a/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_VerifySelfSessionView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.verifysession.impl.outgoing_VerifySelfSessionView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3a3f08002e805fe5f7a4c96aa4b73c2fcd6e8b79e6a9e82bcc7bd3df50d8c22d
-size 24015
+oid sha256:5931dfac0337cf856282d9c62983aa185fe208f2926868097238d5b95e222fe6
+size 23953

Original file line number	Diff line number	Diff line change
`@@ -12,10 +12,8 @@ import androidx.compose.foundation.clickable`
`12`	`12`	`import androidx.compose.foundation.layout.Arrangement`
`13`	`13`	`import androidx.compose.foundation.layout.Box`
`14`	`14`	`import androidx.compose.foundation.layout.Row`
`15`		`-import androidx.compose.foundation.layout.Spacer`
`16`	`15`	`import androidx.compose.foundation.layout.fillMaxSize`
`17`	`16`	`import androidx.compose.foundation.layout.fillMaxWidth`
`18`		`-import androidx.compose.foundation.layout.height`
`19`	`17`	`import androidx.compose.foundation.layout.padding`
`20`	`18`	`import androidx.compose.material3.ExperimentalMaterial3Api`
`21`	`19`	`import androidx.compose.runtime.Composable`
`@@ -44,6 +42,7 @@ import io.element.android.libraries.designsystem.preview.ElementPreview`
`44`	`42`	`import io.element.android.libraries.designsystem.preview.PreviewsDayNight`
`45`	`43`	`import io.element.android.libraries.designsystem.theme.components.Button`
`46`	`44`	`import io.element.android.libraries.designsystem.theme.components.CircularProgressIndicator`
	`45`	`+import io.element.android.libraries.designsystem.theme.components.InvisibleButton`
`47`	`46`	`import io.element.android.libraries.designsystem.theme.components.OutlinedButton`
`48`	`47`	`import io.element.android.libraries.designsystem.theme.components.Text`
`49`	`48`	`import io.element.android.libraries.designsystem.theme.components.TextButton`
`@@ -282,8 +281,7 @@ private fun VerifySelfSessionBottomMenu(`
`282`	`281`	`text = stringResource(CommonStrings.action_start_verification),`
`283`	`282`	`onClick = { eventSink(VerifySelfSessionViewEvents.RequestVerification) },`
`284`	`283`	`)`
`285`		`- // Placeholder so the 1st button keeps its vertical position`
`286`		`- Spacer(modifier = Modifier.height(40.dp))`
	`284`	`+ InvisibleButton()`
`287`	`285`	`}`
`288`	`286`	`}`
`289`	`287`	`is Step.Canceled -> {`
`@@ -293,8 +291,7 @@ private fun VerifySelfSessionBottomMenu(`
`293`	`291`	`text = stringResource(CommonStrings.action_done),`
`294`	`292`	`onClick = onCancelClick,`
`295`	`293`	`)`
`296`		`- // Placeholder so the 1st button keeps its vertical position`
`297`		`- Spacer(modifier = Modifier.height(40.dp))`
	`294`	`+ InvisibleButton()`
`298`	`295`	`}`
`299`	`296`	`}`
`300`	`297`	`is Step.Ready -> {`
`@@ -320,8 +317,7 @@ private fun VerifySelfSessionBottomMenu(`
`320`	`317`	`showProgress = true,`
`321`	`318`	`enabled = false,`
`322`	`319`	`)`
`323`		`- // Placeholder so the 1st button keeps its vertical position`
`324`		`- Spacer(modifier = Modifier.height(40.dp))`
	`320`	`+ InvisibleButton()`
`325`	`321`	`}`
`326`	`322`	`}`
`327`	`323`	`is Step.Verifying -> {`
`@@ -335,17 +331,22 @@ private fun VerifySelfSessionBottomMenu(`
`335`	`331`	`modifier = Modifier.fillMaxWidth(),`
`336`	`332`	`text = positiveButtonTitle,`
`337`	`333`	`showProgress = isVerifying,`
	`334`	`+ enabled = !isVerifying,`
`338`	`335`	`onClick = {`
`339`	`336`	`if (!isVerifying) {`
`340`	`337`	`eventSink(VerifySelfSessionViewEvents.ConfirmVerification)`
`341`	`338`	`}`
`342`	`339`	`},`
`343`	`340`	`)`
`344`		`- TextButton(`
`345`		`- modifier = Modifier.fillMaxWidth(),`
`346`		`- text = stringResource(R.string.screen_session_verification_they_dont_match),`
`347`		`- onClick = { eventSink(VerifySelfSessionViewEvents.DeclineVerification) },`
`348`		`- )`
	`341`	`+ if (isVerifying) {`
	`342`	`+ InvisibleButton()`
	`343`	`+ } else {`
	`344`	`+ TextButton(`
	`345`	`+ modifier = Modifier.fillMaxWidth(),`
	`346`	`+ text = stringResource(R.string.screen_session_verification_they_dont_match),`
	`347`	`+ onClick = { eventSink(VerifySelfSessionViewEvents.DeclineVerification) },`
	`348`	`+ )`
	`349`	`+ }`
`349`	`350`	`}`
`350`	`351`	`}`
`351`	`352`	`is Step.Completed -> {`
`@@ -355,8 +356,7 @@ private fun VerifySelfSessionBottomMenu(`
`355`	`356`	`text = stringResource(CommonStrings.action_continue),`
`356`	`357`	`onClick = onContinueClick,`
`357`	`358`	`)`
`358`		`- // Placeholder so the 1st button keeps its vertical position`
`359`		`- Spacer(modifier = Modifier.height(48.dp))`
	`359`	`+ InvisibleButton()`
`360`	`360`	`}`
`361`	`361`	`}`
`362`	`362`	`is Step.Skipped -> return`