Merge pull request #3049 from element-hq/feature/bma/hiddenText

Fix recovery key field hidden when keyboard is opened.

features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerStateProvider.kt

@@ -17,16 +17,22 @@
 package io.element.android.features.login.impl.changeserver
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import io.element.android.features.login.impl.error.ChangeServerError
 import io.element.android.libraries.architecture.AsyncData
+import io.element.android.libraries.ui.strings.CommonStrings
 
 open class ChangeServerStateProvider : PreviewParameterProvider<ChangeServerState> {
     override val values: Sequence<ChangeServerState>
         get() = sequenceOf(
             aChangeServerState(),
+            aChangeServerState(changeServerAction = AsyncData.Failure(ChangeServerError.Error(CommonStrings.error_unknown))),
+            aChangeServerState(changeServerAction = AsyncData.Failure(ChangeServerError.SlidingSyncAlert)),
         )
 }
 
-fun aChangeServerState() = ChangeServerState(
+fun aChangeServerState(
-    changeServerAction = AsyncData.Uninitialized,
+    changeServerAction: AsyncData<Unit> = AsyncData.Uninitialized,
+) = ChangeServerState(
+    changeServerAction = changeServerAction,
     eventSink = {}
 )

features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyView.kt

@@ -55,6 +55,7 @@ fun SecureBackupEnterRecoveryKeyView(
 
     FlowStepPage(
         modifier = modifier,
+        isScrollable = true,
         onBackClick = onBackClick,
         iconStyle = BigIcon.Style.Default(CompoundIcons.KeySolid()),
         title = stringResource(id = R.string.screen_recovery_key_confirm_title),
@@ -70,7 +71,7 @@ private fun Content(
     state: SecureBackupEnterRecoveryKeyState,
 ) {
     RecoveryKeyView(
-        modifier = Modifier.padding(top = 52.dp),
+        modifier = Modifier.padding(top = 52.dp, bottom = 32.dp),
         state = state.recoveryKeyViewState,
         onClick = null,
         onChange = {

features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyViewTest.kt

@@ -19,8 +19,12 @@ package io.element.android.features.securebackup.impl.enter
 import androidx.activity.ComponentActivity
 import androidx.compose.ui.test.junit4.AndroidComposeTestRule
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.performImeAction
+import androidx.compose.ui.test.performTextInput
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.element.android.features.securebackup.impl.R
+import io.element.android.features.securebackup.impl.setup.views.aFormattedRecoveryKey
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.tests.testutils.EnsureNeverCalled
@@ -33,6 +37,7 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.TestRule
 import org.junit.runner.RunWith
+import org.robolectric.annotation.Config
 
 @RunWith(AndroidJUnit4::class)
 class SecureBackupEnterRecoveryKeyViewTest {
@@ -61,6 +66,7 @@ class SecureBackupEnterRecoveryKeyViewTest {
     }
 
     @Test
+    @Config(qualifiers = "h1024dp")
     fun `tapping on Continue when key is valid - calls expected action`() {
         val recorder = EventsRecorder<SecureBackupEnterRecoveryKeyEvents>()
         rule.setSecureBackupEnterRecoveryKeyView(
@@ -72,6 +78,31 @@ class SecureBackupEnterRecoveryKeyViewTest {
     }
 
     @Test
+    fun `entering a char emits the expected event`() {
+        val recorder = EventsRecorder<SecureBackupEnterRecoveryKeyEvents>()
+        val keyValue = aFormattedRecoveryKey()
+        rule.setSecureBackupEnterRecoveryKeyView(
+            aSecureBackupEnterRecoveryKeyState(isSubmitEnabled = true, eventSink = recorder),
+        )
+        rule.onNodeWithText(keyValue).performTextInput("X")
+        recorder.assertSingle(
+            SecureBackupEnterRecoveryKeyEvents.OnRecoveryKeyChange("X$keyValue")
+        )
+    }
+
+    @Test
+    fun `validating from keyboard emits the expected event`() {
+        val recorder = EventsRecorder<SecureBackupEnterRecoveryKeyEvents>()
+        val keyValue = aFormattedRecoveryKey()
+        rule.setSecureBackupEnterRecoveryKeyView(
+            aSecureBackupEnterRecoveryKeyState(isSubmitEnabled = true, eventSink = recorder),
+        )
+        rule.onNodeWithText(keyValue).performImeAction()
+        recorder.assertSingle(SecureBackupEnterRecoveryKeyEvents.Submit)
+    }
+
+    @Test
+    @Config(qualifiers = "h1024dp")
     fun `tapping on Lost your recovery key - calls onCreateNewRecoveryKey`() {
         ensureCalledOnce { callback ->
             rule.setSecureBackupEnterRecoveryKeyView(
@@ -98,7 +129,7 @@ class SecureBackupEnterRecoveryKeyViewTest {
         onBackClick: () -> Unit = EnsureNeverCalled(),
         onCreateNewRecoveryKey: () -> Unit = EnsureNeverCalled(),
     ) {
-        rule.setContent {
+        setContent {
             SecureBackupEnterRecoveryKeyView(
                 state = state,
                 onSuccess = onDone,

features/verifysession/impl/src/test/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionViewTest.kt

@@ -218,7 +218,7 @@ class VerifySelfSessionViewTest {
         onEnterRecoveryKey: () -> Unit = EnsureNeverCalled(),
         onFinished: () -> Unit = EnsureNeverCalled(),
     ) {
-        rule.setContent {
+        setContent {
             VerifySelfSessionView(
                 state = state,
                 onEnterRecoveryKey = onEnterRecoveryKey,

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/pages/FlowStepPage.kt

@@ -52,6 +52,7 @@ fun FlowStepPage(
     iconStyle: BigIcon.Style,
     title: String,
     modifier: Modifier = Modifier,
+    isScrollable: Boolean = false,
     onBackClick: (() -> Unit)? = null,
     subTitle: String? = null,
     buttons: @Composable ColumnScope.() -> Unit = {},
@@ -62,6 +63,7 @@ fun FlowStepPage(
     }
     HeaderFooterPage(
         modifier = modifier,
+        isScrollable = isScrollable,
         topBar = {
             TopAppBar(
                 navigationIcon = {

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/pages/HeaderFooterPage.kt

@@ -22,7 +22,9 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
@@ -39,6 +41,7 @@ import io.element.android.libraries.designsystem.theme.components.Text
  * @param modifier Classical modifier.
  * @param paddingValues padding values to apply to the content.
  * @param containerColor color of the container. Set to [Color.Transparent] if you provide a background in the [modifier].
+ * @param isScrollable if the whole content should be scrollable.
  * @param background optional background component.
  * @param topBar optional topBar.
  * @param header optional header.
@@ -50,6 +53,7 @@ fun HeaderFooterPage(
     modifier: Modifier = Modifier,
     paddingValues: PaddingValues = PaddingValues(20.dp),
     containerColor: Color = MaterialTheme.colorScheme.background,
+    isScrollable: Boolean = false,
     background: @Composable () -> Unit = {},
     topBar: @Composable () -> Unit = {},
     header: @Composable () -> Unit = {},
@@ -63,25 +67,53 @@ fun HeaderFooterPage(
     ) { padding ->
         Box {
             background()
-            Column(
+            if (isScrollable) {
-                modifier = Modifier
+                // Render in a LazyColumn
-                    .padding(paddingValues = paddingValues)
+                LazyColumn(
-                    .padding(padding)
+                    modifier = Modifier
-                    .consumeWindowInsets(padding)
+                        .padding(paddingValues = paddingValues)
-            ) {
+                        .padding(padding)
-                // Header
+                        .consumeWindowInsets(padding)
-                header()
+                        .imePadding()
-                // Content
+                ) {
+                    // Header
+                    item {
+                        header()
+                    }
+                    // Content
+                    item {
+                        content()
+                    }
+                    // Footer
+                    item {
+                        Box(modifier = Modifier.padding(horizontal = 16.dp)) {
+                            footer()
+                        }
+                    }
+                }
+            } else {
+                // Render in a Column
                 Column(
                     modifier = Modifier
-                        .weight(1f)
+                        .padding(paddingValues = paddingValues)
-                        .fillMaxWidth(),
+                        .padding(padding)
+                        .consumeWindowInsets(padding)
+                        .imePadding()
                 ) {
-                    content()
+                    // Header
-                }
+                    header()
-                // Footer
+                    // Content
-                Box(modifier = Modifier.padding(horizontal = 16.dp)) {
+                    Column(
-                    footer()
+                        modifier = Modifier
+                            .weight(1f)
+                            .fillMaxWidth(),
+                    ) {
+                        content()
+                    }
+                    // Footer
+                    Box(modifier = Modifier.padding(horizontal = 16.dp)) {
+                        footer()
+                    }
                 }
             }
         }

libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/roomlist/FakeRoomListService.kt

@@ -26,7 +26,6 @@ import kotlinx.coroutines.flow.StateFlow
 
 class FakeRoomListService : RoomListService {
     private val allRoomSummariesFlow = MutableStateFlow<List<RoomSummary>>(emptyList())
-    private val inviteRoomSummariesFlow = MutableStateFlow<List<RoomSummary>>(emptyList())
     private val allRoomsLoadingStateFlow = MutableStateFlow<RoomList.LoadingState>(RoomList.LoadingState.NotLoaded)
     private val roomListStateFlow = MutableStateFlow<RoomListService.State>(RoomListService.State.Idle)
     private val syncIndicatorStateFlow = MutableStateFlow<RoomListService.SyncIndicator>(RoomListService.SyncIndicator.Hide)
@@ -35,10 +34,6 @@ class FakeRoomListService : RoomListService {
         allRoomSummariesFlow.emit(roomSummaries)
     }
 
-    suspend fun postInviteRooms(roomSummaries: List<RoomSummary>) {
-        inviteRoomSummariesFlow.emit(roomSummaries)
-    }
-
     suspend fun postAllRoomsLoadingState(loadingState: RoomList.LoadingState) {
         allRoomsLoadingStateFlow.emit(loadingState)
     }

libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/markdown/StableCharSequence.kt

@@ -37,6 +37,6 @@ class StableCharSequence(initialText: CharSequence = "") {
     fun needsDisplaying(): Boolean = needsDisplaying
 
     override fun toString(): String {
-        return "ImmutableCharSequence(value='$value', needsDisplaying=$needsDisplaying)"
+        return "StableCharSequence(value='$value', needsDisplaying=$needsDisplaying)"
     }
 }

libraries/textcomposer/impl/src/test/kotlin/io/element/android/libraries/textcomposer/impl/components/markdown/MarkdownTextInputTest.kt

@@ -183,7 +183,7 @@ class MarkdownTextInputTest {
         onTyping: (Boolean) -> Unit = {},
         onSuggestionReceived: (Suggestion?) -> Unit = {},
     ) {
-        rule.setContent {
+        setContent {
             val style = ElementRichTextEditorStyle.composerStyle(hasFocus = state.hasFocus)
             MarkdownTextInput(
                 state = state,

tests/uitests/src/test/snapshots/images/ui_S_t[f.login.impl.changeserver_ChangeServerView_null_ChangeServerView-Day-1_2_null_1,NEXUS_5,1.0,en].png

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

tests/uitests/src/test/snapshots/images/ui_S_t[f.login.impl.changeserver_ChangeServerView_null_ChangeServerView-Day-1_2_null_2,NEXUS_5,1.0,en].png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:73d053268a0b2e968a35c02ab58dc5f0a9ff8e9b3412a6c88f5bfeb94031bc9a
+size 18742

tests/uitests/src/test/snapshots/images/ui_S_t[f.login.impl.changeserver_ChangeServerView_null_ChangeServerView-Night-1_3_null_1,NEXUS_5,1.0,en].png

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

tests/uitests/src/test/snapshots/images/ui_S_t[f.login.impl.changeserver_ChangeServerView_null_ChangeServerView-Night-1_3_null_2,NEXUS_5,1.0,en].png

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

tests/uitests/src/test/snapshots/images/ui_S_t[f.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_null_SecureBackupEnterRecoveryKeyView-Day-3_4_null_0,NEXUS_5,1.0,en].png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d703bbf9fa2dd21d4b7e1dea3f9096520e04dddc61a66286f28e1be2b6deae41
+oid sha256:485585964998ee6bb7bb6ba208f2f465795a1b1ef59b3e44535b2d60ba9ef8a4
-size 37724
+size 37761

tests/uitests/src/test/snapshots/images/ui_S_t[f.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_null_SecureBackupEnterRecoveryKeyView-Day-3_4_null_1,NEXUS_5,1.0,en].png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:278063037575311b7ad24f91c2403c5e9656871ab956938d163fa94a89a2b23e
+oid sha256:95a05799a39675cfbb8c2df269131e5dd236c3298a1dadafe15b7c89a62be962
-size 49038
+size 49077

tests/uitests/src/test/snapshots/images/ui_S_t[f.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_null_SecureBackupEnterRecoveryKeyView-Day-3_4_null_2,NEXUS_5,1.0,en].png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eeca1217caff14f715fcc214dc7f2a01c5d022778c1d9331d41858b836df2abc
+oid sha256:254973e1b41987fb6dd9db63b5acae4557467e2541867a4fb9448b88851e5fe4
-size 46971
+size 46993

tests/uitests/src/test/snapshots/images/ui_S_t[f.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_null_SecureBackupEnterRecoveryKeyView-Day-3_4_null_3,NEXUS_5,1.0,en].png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6c6277560b3b430a446fb4e87b3db59331e5e024798d85bf6be6672a6508c6ef
+oid sha256:cb58ee8ee32d1e308b898980f27317193bff4b0e00f800037834b02793b34dce
-size 41076
+size 41111

tests/uitests/src/test/snapshots/images/ui_S_t[f.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_null_SecureBackupEnterRecoveryKeyView-Night-3_5_null_0,NEXUS_5,1.0,en].png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:700e9c08e7407d2d81e1a090720885cc59b92ab95106258a646532a277cf2012
+oid sha256:2d2fc075202325aece0e74f962e5e6a387934d7782a1b39a9226c2b529ecf0b1
-size 36646
+size 36809

tests/uitests/src/test/snapshots/images/ui_S_t[f.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_null_SecureBackupEnterRecoveryKeyView-Night-3_5_null_1,NEXUS_5,1.0,en].png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:db6b5ec486e460be8cc3df6d827ae04d67ba136d2cdf20b14d1c1ab08198136b
+oid sha256:6909fcc10374f46d14ed628a4c1df0f4aba1fba874d2aa1b5554a74409dae861
-size 47557
+size 47737

tests/uitests/src/test/snapshots/images/ui_S_t[f.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_null_SecureBackupEnterRecoveryKeyView-Night-3_5_null_2,NEXUS_5,1.0,en].png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cf789850fac3937f98b7d0fc27f030fd0245212bc6087cb34e7d1aebae850e27
+oid sha256:48e95b0eac9a83ce6abf5d82e904faf4081496d399eed9f8e4d806393f042a14
-size 46279
+size 46286

tests/uitests/src/test/snapshots/images/ui_S_t[f.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_null_SecureBackupEnterRecoveryKeyView-Night-3_5_null_3,NEXUS_5,1.0,en].png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:549c3981541b71058c6608a9cffee28a6cb95b1eab819db5de86c43eed9961e3
+oid sha256:83c91d4e1bc3b9021c91d353b63a63c1893fdc79de57f91d8a6446b84bae657a
-size 38319
+size 38441