Skip to content

refactor: deduplicate isTablet method across language subclasses (#426) #667

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
prince-0408 wants to merge 2 commits into
base: main
Choose a base branch
from
+5 −49
Open

refactor: deduplicate isTablet method across language subclasses (#426) #667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56b60d9
refactor: deduplicate isTablet method across language subclasses (#426)
prince-0408 Aug 9, 2026
4341f6c
refactor: update KeyboardUIManager isTablet check for consistency (#426)
prince-0408 Aug 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/src/keyboards/java/be/scri/helpers/ui/KeyboardUIManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -697,7 +697,8 @@ class KeyboardUIManager(

val isTablet =
(context.resources.configuration.screenLayout and Configuration.SCREENLAYOUT_SIZE_MASK) >=
Configuration.SCREENLAYOUT_SIZE_LARGE
Configuration.SCREENLAYOUT_SIZE_LARGE ||
context.resources.configuration.smallestScreenWidthDp >= GeneralKeyboardIME.SMALLEST_SCREEN_WIDTH_TABLET

val emojiCount = if (isAutoSuggestEnabled) autoSuggestEmojis?.size ?: 0 else 0

Expand Down
6 changes: 0 additions & 6 deletions app/src/keyboards/java/be/scri/services/EnglishKeyboardIME.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,6 @@ import be.scri.helpers.KeyHandler
* The EnglishKeyboardIME class provides the input method for the English language keyboard.
*/
class EnglishKeyboardIME : GeneralKeyboardIME("English") {
companion object {
const val SMALLEST_SCREEN_WIDTH_TABLET = 600
}

private fun isTablet(): Boolean = resources.configuration.smallestScreenWidthDp >= SMALLEST_SCREEN_WIDTH_TABLET

override fun getKeyboardLayoutXML(): Int =
when {
isTablet() -> R.xml.keys_letters_english_tablet
Expand Down
6 changes: 0 additions & 6 deletions app/src/keyboards/java/be/scri/services/FrenchKeyboardIME.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,6 @@ import be.scri.helpers.KeyHandler
* The FrenchKeyboardIME class provides the input method for the French language keyboard.
*/
class FrenchKeyboardIME : GeneralKeyboardIME("French") {
companion object {
const val SMALLEST_SCREEN_WIDTH_TABLET = 600
}

private fun isTablet(): Boolean = resources.configuration.smallestScreenWidthDp >= SMALLEST_SCREEN_WIDTH_TABLET

override fun getKeyboardLayoutXML(): Int =
when {
isTablet() -> R.xml.keys_letters_french_tablet
Expand Down
3 changes: 3 additions & 0 deletions app/src/keyboards/java/be/scri/services/GeneralKeyboardIME.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,10 @@ abstract class GeneralKeyboardIME(
private var currentVerbForConjugation: String? = null
private var selectedConjugationSubCategory: String? = null

protected open fun isTablet(): Boolean = resources.configuration.smallestScreenWidthDp >= SMALLEST_SCREEN_WIDTH_TABLET

internal companion object {
const val SMALLEST_SCREEN_WIDTH_TABLET = 600
const val DEFAULT_SHIFT_PERM_TOGGLE_SPEED = 500
const val TEXT_LENGTH = 20
const val NOUN_TYPE_SIZE = 20f
Expand Down
6 changes: 0 additions & 6 deletions app/src/keyboards/java/be/scri/services/GermanKeyboardIME.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,6 @@ import be.scri.helpers.PreferencesHelper.getIsAccentCharacterDisabled
* The GermanKeyboardIME class provides the input method for the German language keyboard.
*/
class GermanKeyboardIME : GeneralKeyboardIME("German") {
companion object {
const val SMALLEST_SCREEN_WIDTH_TABLET = 600
}

private fun isTablet(): Boolean = resources.configuration.smallestScreenWidthDp >= SMALLEST_SCREEN_WIDTH_TABLET

override fun getKeyboardLayoutXML(): Int =
if (isTablet()) {
R.xml.keys_letters_german_tablet
Expand Down
6 changes: 0 additions & 6 deletions app/src/keyboards/java/be/scri/services/ItalianKeyboardIME.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,6 @@ import be.scri.helpers.KeyHandler
* The ItalianKeyboardIME class provides the input method for the Italian language keyboard.
*/
class ItalianKeyboardIME : GeneralKeyboardIME("Italian") {
companion object {
const val SMALLEST_SCREEN_WIDTH_TABLET = 600
}

private fun isTablet(): Boolean = resources.configuration.smallestScreenWidthDp >= SMALLEST_SCREEN_WIDTH_TABLET

override fun getKeyboardLayoutXML(): Int =
when {
isTablet() -> R.xml.keys_letters_italian_tablet
Expand Down
6 changes: 0 additions & 6 deletions app/src/keyboards/java/be/scri/services/PortugueseKeyboardIME.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,6 @@ import be.scri.helpers.KeyHandler
* The PortugueseKeyboardIME class provides the input method for the Portuguese language keyboard.
*/
class PortugueseKeyboardIME : GeneralKeyboardIME("Portuguese") {
companion object {
const val SMALLEST_SCREEN_WIDTH_TABLET = 600
}

private fun isTablet(): Boolean = resources.configuration.smallestScreenWidthDp >= SMALLEST_SCREEN_WIDTH_TABLET

override fun getKeyboardLayoutXML(): Int =
when {
isTablet() -> R.xml.keys_letters_portuguese_tablet
Expand Down
6 changes: 0 additions & 6 deletions app/src/keyboards/java/be/scri/services/RussianKeyboardIME.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,6 @@ import be.scri.helpers.KeyHandler
* The RussianKeyboardIME class provides the input method for the Russian language keyboard.
*/
class RussianKeyboardIME : GeneralKeyboardIME("Russian") {
companion object {
const val SMALLEST_SCREEN_WIDTH_TABLET = 600
}

private fun isTablet(): Boolean = resources.configuration.smallestScreenWidthDp >= SMALLEST_SCREEN_WIDTH_TABLET

override fun getKeyboardLayoutXML(): Int =
when {
isTablet() -> R.xml.keys_letters_russian_tablet
Expand Down
6 changes: 0 additions & 6 deletions app/src/keyboards/java/be/scri/services/SpanishKeyboardIME.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,6 @@ import be.scri.helpers.PreferencesHelper.getIsAccentCharacterDisabled
* The SpanishKeyboardIME class provides the input method for the Spanish language keyboard.
*/
class SpanishKeyboardIME : GeneralKeyboardIME("Spanish") {
companion object {
const val SMALLEST_SCREEN_WIDTH_TABLET = 600
}

private fun isTablet(): Boolean = resources.configuration.smallestScreenWidthDp >= SMALLEST_SCREEN_WIDTH_TABLET

override fun getKeyboardLayoutXML(): Int =
when {
isTablet() -> R.xml.keys_letters_spanish_tablet
Expand Down
6 changes: 0 additions & 6 deletions app/src/keyboards/java/be/scri/services/SwedishKeyboardIME.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,6 @@ import be.scri.helpers.PreferencesHelper.getIsAccentCharacterDisabled
* The SwedishKeyboardIME class provides the input method for the Swedish language keyboard.
*/
class SwedishKeyboardIME : GeneralKeyboardIME("Swedish") {
companion object {
const val SMALLEST_SCREEN_WIDTH_TABLET = 600
}

private fun isTablet(): Boolean = resources.configuration.smallestScreenWidthDp >= SMALLEST_SCREEN_WIDTH_TABLET

override fun getKeyboardLayoutXML(): Int =
when {
isTablet() -> R.xml.keys_letters_swedish_tablet
Expand Down
Loading