diff --git a/mobile/src/main/java/it/panov/musyx/mobile/ui/screens/Search.kt b/mobile/src/main/java/it/panov/musyx/mobile/ui/screens/Search.kt index b2af786..940dcf7 100644 --- a/mobile/src/main/java/it/panov/musyx/mobile/ui/screens/Search.kt +++ b/mobile/src/main/java/it/panov/musyx/mobile/ui/screens/Search.kt @@ -28,6 +28,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.platform.LocalFocusManager +import androidx.compose.ui.platform.LocalSoftwareKeyboardController import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.text.style.TextOverflow @@ -67,6 +68,13 @@ fun SearchScreen(state: AppState) { val search = state.search val space = MusyxTheme.space val focus = LocalFocusManager.current + val keyboard = LocalSoftwareKeyboardController.current + // Losing focus alone leaves some keyboards (Samsung's) up over the results. + val done = { + // Hidden while the field still has its input session; after, there's nothing to hide. + keyboard?.hide() + focus.clearFocus() + } PageColumn { item(key = "field") { OutlinedTextField( @@ -81,7 +89,7 @@ fun SearchScreen(state: AppState) { shape = RoundedCornerShape(MusyxTheme.radius.pill), keyboardOptions = KeyboardOptions(imeAction = ImeAction.Search), keyboardActions = KeyboardActions(onSearch = { - focus.clearFocus() + done() search.submit() }), modifier = Modifier.fillMaxWidth().padding(horizontal = space.gutter), @@ -92,7 +100,7 @@ fun SearchScreen(state: AppState) { Modifier .fillMaxWidth() .clickable { - focus.clearFocus() + done() search.pick(s) } .padding(horizontal = space.gutter + 4.dp, vertical = 10.dp),