Skip to content

Commit eba4129

Browse files
committed
Merge branch 'replace-numberpassword-keyboard-on-firestick-tv-droid-1398'
2 parents 9fe50f7 + 13f2951 commit eba4129

File tree

2 files changed

+17
-1
lines changed

2 files changed

+17
-1
lines changed

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/LoginScreen.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ import net.mullvad.mullvadvpn.compose.textfield.mullvadWhiteTextFieldColors
8181
import net.mullvad.mullvadvpn.compose.transitions.LoginTransition
8282
import net.mullvad.mullvadvpn.compose.util.CollectSideEffectWithLifecycle
8383
import net.mullvad.mullvadvpn.compose.util.OnNavResultValue
84+
import net.mullvad.mullvadvpn.compose.util.accountNumberKeyboardType
8485
import net.mullvad.mullvadvpn.compose.util.accountNumberVisualTransformation
8586
import net.mullvad.mullvadvpn.compose.util.showSnackbarImmediately
8687
import net.mullvad.mullvadvpn.lib.theme.AppTheme
@@ -285,7 +286,7 @@ private fun ColumnScope.LoginInput(
285286
keyboardOptions =
286287
KeyboardOptions(
287288
imeAction = if (state.loginButtonEnabled) ImeAction.Done else ImeAction.None,
288-
keyboardType = KeyboardType.NumberPassword,
289+
keyboardType = KeyboardType.accountNumberKeyboardType(LocalContext.current),
289290
),
290291
onValueChange = onAccountNumberChange,
291292
singleLine = true,
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package net.mullvad.mullvadvpn.compose.util
2+
3+
import android.content.Context
4+
import androidx.compose.ui.text.input.KeyboardType
5+
6+
fun KeyboardType.Companion.accountNumberKeyboardType(context: Context): KeyboardType =
7+
if (isFireStick(context)) {
8+
Number
9+
} else {
10+
NumberPassword
11+
}
12+
13+
// See: https://developer.amazon.com/docs/fire-tv/identify-amazon-fire-tv-devices.html
14+
private fun isFireStick(context: Context): Boolean =
15+
context.packageManager.hasSystemFeature("amazon.hardware.fire_tv")

0 commit comments

Comments
 (0)