Skip to content

Fix input focus flow in profile dialog #119

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

Merged
ProdigyV21 merged 1 commit into from
Apr 5, 2026
Merged

Fix input focus flow in profile dialog #119

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
87 changes: 71 additions & 16 deletions app/src/main/kotlin/com/arflix/tv/ui/screens/profile/ProfileDialogs.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.arflix.tv.ui.screens.profile

import android.text.InputType
import android.view.KeyEvent
import android.view.inputmethod.EditorInfo
import android.view.inputmethod.InputMethodManager
import android.widget.EditText
Expand Down Expand Up @@ -81,6 +82,7 @@ fun AddProfileDialog(
) {
ProfileDialogContent(
title = "Add Profile",
autoFocusNameInput = true,
name = name,
onNameChange = onNameChange,
selectedColorIndex = selectedColorIndex,
Expand Down Expand Up @@ -114,6 +116,7 @@ fun EditProfileDialog(
) {
ProfileDialogContent(
title = "Edit Profile",
autoFocusNameInput = false,
name = name,
onNameChange = onNameChange,
selectedColorIndex = selectedColorIndex,
Expand All @@ -135,6 +138,7 @@ fun EditProfileDialog(
@Composable
private fun ProfileDialogContent(
title: String,
autoFocusNameInput: Boolean,
name: String,
onNameChange: (String) -> Unit,
selectedColorIndex: Int,
Expand All @@ -151,15 +155,46 @@ private fun ProfileDialogContent(
var editTextRef by remember { mutableStateOf<EditText?>(null) }
val confirmButtonFocusRequester = remember { FocusRequester() }

LaunchedEffect(isTouchDevice) {
if (!isTouchDevice) {
fun showKeyboard(editText: EditText) {
editText.post {
val imm = context.getSystemService(android.content.Context.INPUT_METHOD_SERVICE) as? InputMethodManager
val shown = imm?.showSoftInput(editText, InputMethodManager.SHOW_IMPLICIT) ?: false
if (!shown) {
@Suppress("DEPRECATION")
imm?.showSoftInput(editText, InputMethodManager.SHOW_FORCED)
}
}
}

fun hideKeyboard(editText: EditText? = editTextRef) {
editText?.post {
val imm = context.getSystemService(android.content.Context.INPUT_METHOD_SERVICE) as? InputMethodManager
imm?.hideSoftInputFromWindow(editText.windowToken, 0)
editText.clearFocus()
}
}

LaunchedEffect(isTouchDevice, autoFocusNameInput) {
if (!isTouchDevice && !autoFocusNameInput) {
// Always give the dialog a visible focused control on TV.
runCatching { confirmButtonFocusRequester.requestFocus() }
}
}

LaunchedEffect(autoFocusNameInput, editTextRef) {
val editText = editTextRef ?: return@LaunchedEffect
if (autoFocusNameInput) {
editText.requestFocus()
editText.setSelection(editText.text?.length ?: 0)
showKeyboard(editText)
}
}

Dialog(
onDismissRequest = onDismiss,
onDismissRequest = {
hideKeyboard()
onDismiss()
},
properties = DialogProperties(usePlatformDefaultWidth = false)
) {
Box(
Expand Down Expand Up @@ -235,11 +270,7 @@ private fun ProfileDialogContent(
.clickable {
editTextRef?.let { et ->
et.requestFocus()
et.postDelayed({
val imm = context.getSystemService(android.content.Context.INPUT_METHOD_SERVICE) as? InputMethodManager
@Suppress("DEPRECATION")
imm?.showSoftInput(et, InputMethodManager.SHOW_FORCED)
}, 100)
et.postDelayed({ showKeyboard(et) }, 100)
}
}
) {
Expand All @@ -262,11 +293,14 @@ private fun ProfileDialogContent(
doAfterTextChanged { editable ->
onNameChange(editable?.toString() ?: "")
}
setOnEditorActionListener { _, actionId, _ ->
if (actionId == EditorInfo.IME_ACTION_DONE) {
val imm = ctx.getSystemService(android.content.Context.INPUT_METHOD_SERVICE) as? InputMethodManager
imm?.hideSoftInputFromWindow(windowToken, 0)
clearFocus()
setOnEditorActionListener { _, actionId, event ->
val isDoneAction = actionId == EditorInfo.IME_ACTION_DONE
val isEnterKey =
event?.keyCode == KeyEvent.KEYCODE_ENTER &&
event.action == KeyEvent.ACTION_UP
if (isDoneAction || isEnterKey) {
hideKeyboard(this)
runCatching { confirmButtonFocusRequester.requestFocus() }
true
} else false
}
Expand Down Expand Up @@ -294,7 +328,10 @@ private fun ProfileDialogContent(
text = confirmLabel,
isPrimary = true,
enabled = name.isNotBlank(),
onClick = onConfirm,
onClick = {
hideKeyboard()
onConfirm()
},
modifier = Modifier
.fillMaxWidth()
.focusRequester(confirmButtonFocusRequester)
Expand All @@ -303,9 +340,26 @@ private fun ProfileDialogContent(
modifier = Modifier.fillMaxWidth(),
horizontalArrangement = Arrangement.spacedBy(10.dp)
) {
DialogButton(text = "Cancel", isPrimary = false, onClick = onDismiss, modifier = Modifier.weight(1f))
DialogButton(
text = "Cancel",
isPrimary = false,
onClick = {
hideKeyboard()
onDismiss()
},
modifier = Modifier.weight(1f)
)
if (onDelete != null) {
DialogButton(text = "Delete", isPrimary = false, isDestructive = true, onClick = onDelete, modifier = Modifier.weight(1f))
DialogButton(
text = "Delete",
isPrimary = false,
isDestructive = true,
onClick = {
hideKeyboard()
onDelete()
},
modifier = Modifier.weight(1f)
)
}
}
}
Expand Down Expand Up @@ -520,6 +574,7 @@ private fun DialogButton(
if (isTouchDevice) {
Box(
modifier = modifier
.focusable()
.clip(RoundedCornerShape(6.dp))
.background(if (isFocused > 0) focusedContainerColor else containerColor)
.then(
Expand Down
Loading