Skip to content

Commit b97fa7b

Browse files
committed
Refactored inputTypeExceptions
1 parent a7f1947 commit b97fa7b

File tree

1 file changed

+10
-6
lines changed
  • app/src/main/kotlin/com/simplemobiletools/keyboard/helpers

1 file changed

+10
-6
lines changed

app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Constants.kt

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,14 @@ enum class ShiftState {
1212

1313
companion object {
1414
private const val MIN_TEXT_LENGTH = 2
15+
private val inputTypeExceptions = listOf(
16+
InputType.TYPE_TEXT_VARIATION_PASSWORD,
17+
InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD,
18+
InputType.TYPE_TEXT_VARIATION_WEB_PASSWORD,
19+
InputType.TYPE_NUMBER_VARIATION_PASSWORD,
20+
InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS,
21+
InputType.TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS
22+
)
1523
private val endOfSentenceChars: List<Char> = listOf('.', '?', '!')
1624

1725
fun getDefaultShiftState(context: Context, inputTypeClassVariation: Int): ShiftState {
@@ -32,6 +40,7 @@ enum class ShiftState {
3240
shouldCapitalize(context, text) -> {
3341
ON_ONE_CHAR
3442
}
43+
3544
else -> {
3645
OFF
3746
}
@@ -63,12 +72,7 @@ enum class ShiftState {
6372
}
6473

6574
fun isInputTypePasswordOrEmail(inputTypeVariation: Int): Boolean {
66-
return inputTypeVariation == InputType.TYPE_TEXT_VARIATION_PASSWORD
67-
|| inputTypeVariation == InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD
68-
|| inputTypeVariation == InputType.TYPE_TEXT_VARIATION_WEB_PASSWORD
69-
|| inputTypeVariation == InputType.TYPE_NUMBER_VARIATION_PASSWORD
70-
|| inputTypeVariation == InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS
71-
|| inputTypeVariation == InputType.TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS
75+
return inputTypeVariation in inputTypeExceptions
7276
}
7377
}
7478
}

0 commit comments

Comments
 (0)