Merge branch 'replace-numberpassword-keyboard-on-firestick-tv-droid-1…

…398'
mullvad · Oct 24, 2024 · eba4129 · eba4129
2 parents 9fe50f7 + 13f2951
commit eba4129
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/LoginScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/LoginScreen.kt
@@ -81,6 +81,7 @@ import net.mullvad.mullvadvpn.compose.textfield.mullvadWhiteTextFieldColors
 import net.mullvad.mullvadvpn.compose.transitions.LoginTransition
 import net.mullvad.mullvadvpn.compose.util.CollectSideEffectWithLifecycle
 import net.mullvad.mullvadvpn.compose.util.OnNavResultValue
+import net.mullvad.mullvadvpn.compose.util.accountNumberKeyboardType
 import net.mullvad.mullvadvpn.compose.util.accountNumberVisualTransformation
 import net.mullvad.mullvadvpn.compose.util.showSnackbarImmediately
 import net.mullvad.mullvadvpn.lib.theme.AppTheme
@@ -285,7 +286,7 @@ private fun ColumnScope.LoginInput(
         keyboardOptions =
             KeyboardOptions(
                 imeAction = if (state.loginButtonEnabled) ImeAction.Done else ImeAction.None,
-                keyboardType = KeyboardType.NumberPassword,
+                keyboardType = KeyboardType.accountNumberKeyboardType(LocalContext.current),
             ),
         onValueChange = onAccountNumberChange,
         singleLine = true,

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/util/Keyboard.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/util/Keyboard.kt
@@ -0,0 +1,15 @@
+package net.mullvad.mullvadvpn.compose.util
+
+import android.content.Context
+import androidx.compose.ui.text.input.KeyboardType
+
+fun KeyboardType.Companion.accountNumberKeyboardType(context: Context): KeyboardType =
+    if (isFireStick(context)) {
+        Number
+    } else {
+        NumberPassword
+    }
+
+// See: https://developer.amazon.com/docs/fire-tv/identify-amazon-fire-tv-devices.html
+private fun isFireStick(context: Context): Boolean =
+    context.packageManager.hasSystemFeature("amazon.hardware.fire_tv")