Merge pull request #3409 from element-hq/feature/bma/recoveryKeyFormatting

Recovery key formatting and wording iteration

features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/views/RecoveryKeyView.kt

@@ -70,10 +70,7 @@ internal fun RecoveryKeyView(
         verticalArrangement = Arrangement.spacedBy(8.dp)
     ) {
         Text(
-            text = when (state.recoveryKeyUserStory) {
-                RecoveryKeyUserStory.Enter -> stringResource(R.string.screen_recovery_key_confirm_key_label)
-                else -> stringResource(id = CommonStrings.common_recovery_key)
-            },
+            text = stringResource(id = CommonStrings.common_recovery_key),
             modifier = Modifier.padding(start = 16.dp),
             style = ElementTheme.typography.fontBodyMdRegular,
         )

features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/views/RecoveryKeyViewStateProvider.kt

@@ -27,9 +27,11 @@ open class RecoveryKeyViewStateProvider : PreviewParameterProvider<RecoveryKeyVi
                     aRecoveryKeyViewState(recoveryKeyUserStory = it, inProgress = true),
                     aRecoveryKeyViewState(recoveryKeyUserStory = it, formattedRecoveryKey = aFormattedRecoveryKey()),
                     aRecoveryKeyViewState(recoveryKeyUserStory = it, formattedRecoveryKey = aFormattedRecoveryKey(), inProgress = true),
-                    // Add other states here
                 )
-            }
+            } + sequenceOf(
+            aRecoveryKeyViewState(recoveryKeyUserStory = RecoveryKeyUserStory.Enter, formattedRecoveryKey = aFormattedRecoveryKey().replace(" ", "")),
+            aRecoveryKeyViewState(recoveryKeyUserStory = RecoveryKeyUserStory.Enter, formattedRecoveryKey = "This is a passphrase with spaces"),
+        )
 }
 
 fun aRecoveryKeyViewState(

tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.reactionsummary_SheetContent_Day_0_en.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:65eb29b745fabe2587019c169a48a862b129a3ece30cf9bc82aff09c67878b35
-size 23180
+oid sha256:9490990c863318390d0f088ff82ad01a688c81cada63d749872b22b633fa12fe
+size 23040

tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.reactionsummary_SheetContent_Night_0_en.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c1cf0091d377d8018d14804433aaa67d1b0b510778b6f8a4e8a73faff2b4c782
-size 23280
+oid sha256:730c2c5ab52209366611546dbdbbed62214f6f5e13328be66cce5f08d8f4f0e5
+size 23125

tests/uitests/src/test/snapshots/images/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_0_en.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ed7c737e5e7cfa37f588f17723be581ad24d217e8f5fe8ce52de85ac32753641
-size 33292
+oid sha256:6c043c36734aaf81b2eebeb1ceb7b725c874a4ba4145f2c4155103e5e6e9527d
+size 31195

tests/uitests/src/test/snapshots/images/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_1_en.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:48077b5e8a98b426335219721e8da6b378c702cb0b0b3902656b22df24a50b6d
-size 44792
+oid sha256:807dd7c14346bf70b385490932838d642f13b54e9cd5847472305bbfda47fcbf
+size 42818

tests/uitests/src/test/snapshots/images/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_2_en.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8217fdb69d5fba3e7bf2241d32a2821c72c9c628b0f97f77154ea53ff4a7bba7
-size 43206
+oid sha256:af143e11a78611951982e2f1fcc29b1ebf70e5eda8c55b3e12060e9364e89d0f
+size 41211

tests/uitests/src/test/snapshots/images/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_0_en.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2a3f34a36986bf00253ec1d85ec440d3b823853559863076784379cb08aa0060
-size 32393
+oid sha256:73d75d63e2d9efa49cf8dbead654cda6c462a020d79925e02b5e9faa252747fe
+size 30325

tests/uitests/src/test/snapshots/images/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_1_en.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:78a85eb229e35238976a5dffa8afa2647fee534a205dc1621ce60eb82d1e5a06
-size 43530
+oid sha256:6ac738ed1679e698602b4937d8bd41ac0f84830d71a826b9525f82b33d93c12c
+size 41549

tests/uitests/src/test/snapshots/images/features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_2_en.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:28d59abaa2ac4185e3f2cd926557fd2a75cf7f60911d0af971fbbb34f8edd921
-size 42539
+oid sha256:be41bd7864680688143872e5c57276c01a0180d41bdf418f89404a582f973bec
+size 40578

tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Day_10_en.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5d1f6216f196ed4e98aad5395077f96df0066a41c94fd90a1ff52b1776205109
-size 27608
+oid sha256:85f2bf8742006a2d71432f8e35500df5efc58d023f20383f26f554aed074d286
+size 25876

tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Day_11_en.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:75080a6926e7e2704e18daa89a9c4ee941534532f8d2102f6be05cab1571a7d2
-size 25863
+oid sha256:cc4b02bc5704162839c3ec4dedb982cf7c1220bcbeeeb3274fcfd83780ff5347
+size 24008

tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Day_12_en.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:85f2bf8742006a2d71432f8e35500df5efc58d023f20383f26f554aed074d286
+size 25876

tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Day_13_en.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2c114cb5fe259c55edd038eb6ebe730e8c7cf3c415a4f02192b1610ec0f09132
+size 20800

tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Day_8_en.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a172e79630ca055e3bd0e461cee5c1dca304ac98a43f88255cfc92db5048875d
-size 17111
+oid sha256:5a7a11c7250ba0e10daad801bfe6a726598846b4e0283c0e8c776ea335322822
+size 15041

tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Day_9_en.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:971c93655064bc9b7d724af3fc998d0999931962636faf935714fa6e1679b8b2
-size 16925
+oid sha256:76c6a15c5c16839ad79f70686705f6e460d7f66934f446ddc27d97e80fc45093
+size 14845

tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Night_10_en.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e61951a6a62f331ae0d7f3362029b46a362dab80c813f05235930c70507549f7
-size 27188
+oid sha256:4c1ba64fc90f6ee86a5a560a93d09d4fdd4970fe4c489eed733916cea66569f3
+size 25454

tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Night_11_en.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8d03dca1600403d34ddd4add7b655df7c145abc21a052f11bc1f4b99c63ef73b
-size 25889
+oid sha256:6458795952b40cea0e4f9bbbaf615783700cb6cff2acf09c8c660d25e06326de
+size 24076

tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Night_12_en.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4c1ba64fc90f6ee86a5a560a93d09d4fdd4970fe4c489eed733916cea66569f3
+size 25454

tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Night_13_en.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:50e9ea5f2a25d304af22a92ee480b69d5486a339f8243dbf51a73b5464598bcd
+size 20331

tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Night_8_en.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3d16d170a0ea950486758873c3d47845aff920b7518114dd14167ed53705dc0e
-size 16901
+oid sha256:c71f8dd48aede422c0cf6fb0979052577a0f5381bc558521549388a415e0e7f1
+size 14869

tests/uitests/src/test/snapshots/images/features.securebackup.impl.setup.views_RecoveryKeyView_Night_9_en.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ebce451196e75b5a180ecb3feae942599dfe918e1813aea758a6e2d404e7a428
-size 16704
+oid sha256:4b80150effc46fbb667f2724ea31781a777231914389154142e0fbe341132bf2
+size 14681