From de3eb23a24903832cde2c47bbcf02245325c3b9a Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 9 Jun 2023 18:45:32 +0200
Subject: [PATCH] Improve accessibility with keyboard.

---
 .../searchaccountprovider/SearchAccountProviderView.kt | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderView.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderView.kt
index 9c6d91dfaa..5c280cba0e 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderView.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderView.kt
@@ -30,6 +30,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Close
@@ -43,6 +44,8 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusDirection
+import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardType
@@ -66,6 +69,7 @@ import io.element.android.libraries.designsystem.theme.components.Icon
 import io.element.android.libraries.designsystem.theme.components.IconButton
 import io.element.android.libraries.designsystem.theme.components.OutlinedTextField
 import io.element.android.libraries.designsystem.theme.components.Text
+import io.element.android.libraries.designsystem.theme.components.onTabOrEnterKeyFocusNext
 import io.element.android.libraries.testtags.TestTags
 import io.element.android.libraries.testtags.testTag
 import io.element.android.libraries.ui.strings.R as StringR
@@ -110,13 +114,14 @@ fun SearchAccountProviderView(
                 item {
                     // TextInput
                     var userInputState by textFieldState(stateValue = state.userInput)
-
+                    val focusManager = LocalFocusManager.current
                     OutlinedTextField(
                         value = userInputState,
                         // readOnly = isLoading,
                         modifier = Modifier
                             .fillMaxWidth()
                             .padding(start = 16.dp, end = 16.dp, bottom = 16.dp)
+                            .onTabOrEnterKeyFocusNext(focusManager)
                             .testTag(TestTags.changeServerServer),
                         onValueChange = {
                             userInputState = it
@@ -126,6 +131,9 @@ fun SearchAccountProviderView(
                             keyboardType = KeyboardType.Uri,
                             imeAction = ImeAction.Done,
                         ),
+                        keyboardActions = KeyboardActions(onDone = {
+                            focusManager.moveFocus(FocusDirection.Down)
+                        }),
                         singleLine = true,
                         trailingIcon = if (userInputState.isNotEmpty()) {
                             {