From b97fa7b0e8b81292a6ee38780b3dafa9fae8ad89 Mon Sep 17 00:00:00 2001 From: merkost Date: Tue, 23 May 2023 18:56:57 +1000 Subject: [PATCH] Refactored inputTypeExceptions --- .../keyboard/helpers/Constants.kt | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Constants.kt index 8de2e5d..efe786b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Constants.kt @@ -12,6 +12,14 @@ enum class ShiftState { companion object { private const val MIN_TEXT_LENGTH = 2 + private val inputTypeExceptions = listOf( + InputType.TYPE_TEXT_VARIATION_PASSWORD, + InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD, + InputType.TYPE_TEXT_VARIATION_WEB_PASSWORD, + InputType.TYPE_NUMBER_VARIATION_PASSWORD, + InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS, + InputType.TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS + ) private val endOfSentenceChars: List = listOf('.', '?', '!') fun getDefaultShiftState(context: Context, inputTypeClassVariation: Int): ShiftState { @@ -32,6 +40,7 @@ enum class ShiftState { shouldCapitalize(context, text) -> { ON_ONE_CHAR } + else -> { OFF } @@ -63,12 +72,7 @@ enum class ShiftState { } fun isInputTypePasswordOrEmail(inputTypeVariation: Int): Boolean { - return inputTypeVariation == InputType.TYPE_TEXT_VARIATION_PASSWORD - || inputTypeVariation == InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD - || inputTypeVariation == InputType.TYPE_TEXT_VARIATION_WEB_PASSWORD - || inputTypeVariation == InputType.TYPE_NUMBER_VARIATION_PASSWORD - || inputTypeVariation == InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS - || inputTypeVariation == InputType.TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS + return inputTypeVariation in inputTypeExceptions } } }