Skip to content

fix: dismiss keyboard properly in Settings search on TV #3217

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

Open
kiinshuk wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −1
Open

fix: dismiss keyboard properly in Settings search on TV #3217

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragmentScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ object SettingsFragmentScreen : Screen {
@SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
override fun Content() {
val textFieldState = rememberTextFieldState()
val keyboardController = LocalSoftwareKeyboardController.current

val outerListState = rememberScrollState()

Expand Down Expand Up @@ -256,6 +257,7 @@ object SettingsFragmentScreen : Screen {
searchKey = textFieldState.text.toString(),
deferredItems = ::generateSearchItems,
onItemClick = { item ->
keyboardController?.hide()
SearchableSettings.highlightKey = item.highlightKey
activity?.navigate(item.navigation)
}, empty = {
Expand Down Expand Up @@ -292,6 +294,7 @@ object SettingsFragmentScreen : Screen {
var hasFocus by remember { mutableStateOf(false) }
val focusProgress by animateFloatAsState(targetValue = if (hasFocus) 1.0f else 0.0f)
val focusManager = LocalFocusManager.current
val keyboardController = LocalSoftwareKeyboardController.current
val focusRequester = remember { FocusRequester() }
TextField(
state = textFieldState,
Expand All @@ -306,6 +309,9 @@ object SettingsFragmentScreen : Screen {
.focusOutline(enabled = isLayout(TV), CircleShape)
.onFocusChanged { newFocus ->
hasFocus = newFocus.hasFocus
if (!newFocus.hasFocus) {
keyboardController?.hide()
}
}.focusRequester(focusRequester),
placeholder = {
Text(text = stringResource(R.string.search_hint))
Expand All @@ -332,6 +338,7 @@ object SettingsFragmentScreen : Screen {
if (value) {
IconButton(onClick = {
textFieldState.edit { replace(0, length, "") }
keyboardController?.hide()
focusManager.clearFocus()
}) {
Icon(
Expand Down Expand Up @@ -359,6 +366,8 @@ object SettingsFragmentScreen : Screen {
if (value) {
IconButton(onClick = {
textFieldState.edit { replace(0, length, "") }
keyboardController?.hide()
focusManager.clearFocus()
}) {
Icon(
painter = painterResource(R.drawable.close_24px),
Expand All @@ -370,7 +379,6 @@ object SettingsFragmentScreen : Screen {
},
)

val keyboardController = LocalSoftwareKeyboardController.current
DisposableEffect(Unit) {
onDispose {
keyboardController?.hide()
Expand All @@ -380,6 +388,7 @@ object SettingsFragmentScreen : Screen {

@Composable
fun SettingsTab(settingsTab: SettingsNavigation) {
val keyboardController = LocalSoftwareKeyboardController.current
TextPreferenceWidget(
title = stringResource(settingsTab.title),
icon = painterResource(settingsTab.icon),
Expand All @@ -389,6 +398,7 @@ object SettingsFragmentScreen : Screen {
settingsTab.subtitle.map { stringResource(it) }.joinToString(),
// Clear it if we have already set it but navigated back instantly
onPreferenceClick = {
keyboardController?.hide()
SearchableSettings.highlightKey = null
activity?.navigate(settingsTab.navigation)
})
Expand Down
Loading