[ANDROAPP-5800] move focus to next item

dhis2 · Feb 15, 2024 · 10f2c2d · 10f2c2d
1 parent 397c30c
commit 10f2c2d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/...ain/java/org/dhis2/usescases/searchTrackEntity/searchparameters/SearchParametersScreen.kt b/...ain/java/org/dhis2/usescases/searchTrackEntity/searchparameters/SearchParametersScreen.kt
@@ -164,7 +164,7 @@ fun SearchParametersScreen(
                     .weight(1F)
                     .verticalScroll(rememberScrollState()),
             ) {
-                uiState.items.forEach { fieldUiModel ->
+                uiState.items.forEachIndexed { index, fieldUiModel ->
                     fieldUiModel.setCallback(callback)
                     ParameterSelectorItem(
                         modifier = Modifier
@@ -174,6 +174,10 @@ fun SearchParametersScreen(
                             focusManager = focusManager,
                             fieldUiModel = fieldUiModel,
                             callback = callback,
+                            onNextClicked = {
+                                val nextItemIndex = (index + 1) % uiState.items.size
+                                uiState.items[nextItemIndex].onItemClick()
+                            },
                         ),
                     )
                 }

diff --git a/...s2/usescases/searchTrackEntity/searchparameters/provider/ParameterSelectorItemProvider.kt b/...s2/usescases/searchTrackEntity/searchparameters/provider/ParameterSelectorItemProvider.kt
@@ -8,7 +8,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.FocusDirection
 import androidx.compose.ui.focus.FocusManager
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
@@ -29,6 +28,7 @@ fun provideParameterSelectorItem(
     focusManager: FocusManager,
     fieldUiModel: FieldUiModel,
     callback: FieldUiModel.Callback,
+    onNextClicked: () -> Unit,
 ): ParameterSelectorItemModel {
     val focusRequester = remember { FocusRequester() }
 
@@ -60,7 +60,7 @@ fun provideParameterSelectorItem(
                 intentHandler = callback::intent,
                 resources = resources,
                 focusManager = focusManager,
-                onNextClicked = { focusManager.moveFocus(FocusDirection.Down) },
+                onNextClicked = onNextClicked,
             )
         },
         status = status,