fix: width overflow during landscape viewing

perf: reduce duplicate keyboard loading

Author: nopdan

app/src/main/java/com/osfans/trime/ime/keyboard/Keyboard.kt

@@ -640,10 +640,12 @@ class Keyboard() {
         val keyboardSidePaddingLandscape = theme.style.getInt("keyboard_padding_land")
 
         val keyboardSidePaddingPx =
-            when (appContext.resources.configuration.orientation) {
-                Configuration.ORIENTATION_LANDSCAPE -> keyboardSidePaddingLandscape
-                else -> keyboardSidePadding
-            }.apply { appContext.dp(this) }
+            appContext.dp(
+                when (appContext.resources.configuration.orientation) {
+                    Configuration.ORIENTATION_LANDSCAPE -> keyboardSidePaddingLandscape
+                    else -> keyboardSidePadding
+                },
+            )
 
         mDisplayWidth = ScreenUtils.getAppScreenWidth() - 2 * keyboardSidePaddingPx
 

app/src/main/java/com/osfans/trime/ime/keyboard/KeyboardSwitcher.kt

@@ -16,7 +16,6 @@ object KeyboardSwitcher {
     private var currentKeyboardId = ".default"
     private var lastKeyboardId = ".default"
     private var lastLockKeyboardId = ".default"
-    private var currentDisplayWidth: Int = 0
     private val keyboardPrefs = KeyboardPrefs()
 
     lateinit var currentKeyboard: Keyboard
@@ -40,7 +39,6 @@ object KeyboardSwitcher {
         currentKeyboardId = ".default"
         lastKeyboardId = ".default"
         lastLockKeyboardId = ".default"
-        currentDisplayWidth = 0
         keyboardCache.clear()
         switchKeyboard(currentKeyboardId)
     }
@@ -138,13 +136,4 @@ object KeyboardSwitcher {
         Timber.d("Could not find keyboard layout $layout, fallback to default")
         return "default"
     }
-
-    /**
-     * Change current display width when e.g. rotate the screen.
-     */
-    fun resize(displayWidth: Int) {
-        if (displayWidth == currentDisplayWidth) return
-        currentDisplayWidth = displayWidth
-        newOrReset()
-    }
 }

app/src/main/java/com/osfans/trime/ime/text/TextInputManager.kt

@@ -200,7 +200,6 @@ class TextInputManager private constructor() :
                 }
 
             KeyboardSwitcher.run {
-                resize(trime.maxWidth)
                 // Select a keyboard based on the input type of the editing field.
                 switchKeyboard(keyboardType)
             }