Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix: keyboard visible even after search screen is dismissed #1377

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+11 −2
Open

Fix: keyboard visible even after search screen is dismissed #1377

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68074da
Fix: keyboard visible even after search screen is dismissed
Dinoy-Raj Apr 14, 2024
6030c66
Add: keyboardController as argument to SearchScreen
Dinoy-Raj Apr 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 11 additions & 2 deletions ...earch/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchScreen.kt
View file
Open in desktop
Expand Up @@ -63,6 +63,7 @@ import androidx.compose.ui.input.key.Key
import androidx.compose.ui.input.key.key
import androidx.compose.ui.input.key.onKeyEvent
import androidx.compose.ui.platform.LocalSoftwareKeyboardController
import androidx.compose.ui.platform.SoftwareKeyboardController
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.AnnotatedString
Expand Down Expand Up @@ -443,11 +444,18 @@ private fun SearchToolbar(
onBackClick: () -> Unit,
modifier: Modifier = Modifier,
) {
val keyboardController = LocalSoftwareKeyboardController.current

Row(
verticalAlignment = Alignment.CenterVertically,
modifier = modifier.fillMaxWidth(),
) {
IconButton(onClick = { onBackClick() }) {
IconButton(
onClick = {
keyboardController?.hide()
onBackClick()
},
) {
Icon(
imageVector = NiaIcons.ArrowBack,
contentDescription = stringResource(
Expand All @@ -459,18 +467,19 @@ private fun SearchToolbar(
onSearchQueryChanged = onSearchQueryChanged,
onSearchTriggered = onSearchTriggered,
searchQuery = searchQuery,
keyboardController = keyboardController
)
}
}

@Composable
private fun SearchTextField(
searchQuery: String,
keyboardController: SoftwareKeyboardController?,
onSearchQueryChanged: (String) -> Unit,
onSearchTriggered: (String) -> Unit,
) {
val focusRequester = remember { FocusRequester() }
val keyboardController = LocalSoftwareKeyboardController.current

val onSearchExplicitlyTriggered = {
keyboardController?.hide()
Expand Down