File tree 2 files changed +17
-1
lines changed
android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose
2 files changed +17
-1
lines changed Original file line number Diff line number Diff line change @@ -81,6 +81,7 @@ import net.mullvad.mullvadvpn.compose.textfield.mullvadWhiteTextFieldColors
81
81
import net.mullvad.mullvadvpn.compose.transitions.LoginTransition
82
82
import net.mullvad.mullvadvpn.compose.util.CollectSideEffectWithLifecycle
83
83
import net.mullvad.mullvadvpn.compose.util.OnNavResultValue
84
+ import net.mullvad.mullvadvpn.compose.util.accountNumberKeyboardType
84
85
import net.mullvad.mullvadvpn.compose.util.accountNumberVisualTransformation
85
86
import net.mullvad.mullvadvpn.compose.util.showSnackbarImmediately
86
87
import net.mullvad.mullvadvpn.lib.theme.AppTheme
@@ -285,7 +286,7 @@ private fun ColumnScope.LoginInput(
285
286
keyboardOptions =
286
287
KeyboardOptions (
287
288
imeAction = if (state.loginButtonEnabled) ImeAction .Done else ImeAction .None ,
288
- keyboardType = KeyboardType .NumberPassword ,
289
+ keyboardType = KeyboardType .accountNumberKeyboardType( LocalContext .current) ,
289
290
),
290
291
onValueChange = onAccountNumberChange,
291
292
singleLine = true ,
Original file line number Diff line number Diff line change
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" )
You can’t perform that action at this time.
0 commit comments