Update default keyboard sizing

java/src/org/futo/inputmethod/latin/uix/BasicThemeProvider.kt

@@ -26,9 +26,6 @@ val KeyBordersSetting = SettingsKey(booleanPreferencesKey("keyBorders"), true)
 val HiddenKeysSetting = SettingsKey(booleanPreferencesKey("hiddenKeys"), false)
 val KeyHintsSetting   = SettingsKey(booleanPreferencesKey("keyHints"), false)
 
-val KeyboardHeightMultiplierSetting = SettingsKey(floatPreferencesKey("keyboardHeightMultiplier"), 1.0f)
-val KeyboardBottomOffsetSetting = SettingsKey(floatPreferencesKey("keyboardOffset"), 0.0f)
-
 fun<T> Preferences.get(key: SettingsKey<T>): T {
     return this[key.key] ?: key.default
 }
@@ -72,10 +69,6 @@ class BasicThemeProvider(val context: Context, val colorScheme: KeyboardColorSch
         return icons[iconName]
     }
 
-    override fun getKeyboardHeightMultiplier(): Float {
-        return keyboardHeight
-    }
-
     val keyStyles: Map<KeyVisualStyle, VisualStyleDescriptor>
     override fun getKeyStyleDescriptor(visualStyle: KeyVisualStyle): VisualStyleDescriptor {
         return keyStyles[visualStyle]!!
@@ -137,13 +130,10 @@ class BasicThemeProvider(val context: Context, val colorScheme: KeyboardColorSch
     val expertMode: Boolean
     val showKeyHints: Boolean
 
-    val keyboardHeight: Float
-
     fun hasUpdated(np: Preferences): Boolean {
         return np.get(HiddenKeysSetting) != expertMode
                 || np.get(KeyBordersSetting) != keyBorders
                 || np.get(KeyHintsSetting) != showKeyHints
-                || np.get(KeyboardHeightMultiplierSetting) != keyboardHeight
     }
 
 
@@ -164,7 +154,6 @@ class BasicThemeProvider(val context: Context, val colorScheme: KeyboardColorSch
         expertMode = context.getSettingBlocking(HiddenKeysSetting)
         keyBorders = context.getSettingBlocking(KeyBordersSetting)
         showKeyHints = context.getSettingBlocking(KeyHintsSetting)
-        keyboardHeight = context.getSettingBlocking(KeyboardHeightMultiplierSetting)
 
         val primary = colorScheme.primary.toArgb()
         val secondary = colorScheme.secondary.toArgb()

java/src/org/futo/inputmethod/latin/uix/DynamicThemeProvider.kt

@@ -47,8 +47,6 @@ interface DynamicThemeProvider {
 
     fun getIcon(iconName: String): Drawable?
 
-    fun getKeyboardHeightMultiplier(): Float
-
     fun getKeyStyleDescriptor(visualStyle: KeyVisualStyle): VisualStyleDescriptor
 
     companion object {

java/src/org/futo/inputmethod/v2keyboard/KeyboardLayoutSet.kt

@@ -14,10 +14,8 @@ import org.futo.inputmethod.keyboard.internal.KeyboardLayoutKind
 import org.futo.inputmethod.keyboard.internal.KeyboardLayoutPage
 import org.futo.inputmethod.keyboard.internal.KeyboardParams
 import org.futo.inputmethod.latin.settings.LongPressKeySettings
-import org.futo.inputmethod.latin.uix.KeyboardHeightMultiplierSetting
 import org.futo.inputmethod.latin.uix.actions.BugInfo
 import org.futo.inputmethod.latin.uix.actions.BugViewerState
-import org.futo.inputmethod.latin.uix.getSettingBlocking
 import org.futo.inputmethod.latin.uix.settings.pages.CustomLayout
 import org.futo.inputmethod.latin.utils.InputTypeUtils
 import java.util.Locale
@@ -327,7 +325,6 @@ Stack trace: ${e.stackTrace.map { it.toString() }}
     }
 
     companion object {
-        var keyboardHeightMultiplier: Float = 1.0f
 
         @JvmStatic
         fun onSystemLocaleChanged() {
@@ -336,8 +333,6 @@ Stack trace: ${e.stackTrace.map { it.toString() }}
 
         @JvmStatic
         fun onKeyboardThemeChanged(context: Context) {
-            keyboardHeightMultiplier = context.getSettingBlocking(KeyboardHeightMultiplierSetting)
-
             // This is where we would clear all caches if we had any
         }
     }

java/src/org/futo/inputmethod/v2keyboard/KeyboardSizingCalculator.kt

@@ -6,6 +6,7 @@ import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.DpRect
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.width
+import androidx.datastore.preferences.core.floatPreferencesKey
 import androidx.datastore.preferences.core.stringPreferencesKey
 import androidx.window.layout.FoldingFeature
 import kotlinx.serialization.KSerializer
@@ -25,11 +26,15 @@ import org.futo.inputmethod.latin.LatinIME
 import org.futo.inputmethod.latin.settings.SettingsValues
 import org.futo.inputmethod.latin.uix.SettingsKey
 import org.futo.inputmethod.latin.uix.UixManager
+import org.futo.inputmethod.latin.uix.getSetting
 import org.futo.inputmethod.latin.uix.getSettingBlocking
 import org.futo.inputmethod.latin.uix.setSettingBlocking
 import org.futo.inputmethod.latin.utils.ResourceUtils
 import kotlin.math.roundToInt
 
+val OldKeyboardHeightMultiplierSetting = SettingsKey(floatPreferencesKey("keyboardHeightMultiplier"), 1.0f)
+val OldKeyboardBottomOffsetSetting = SettingsKey(floatPreferencesKey("keyboardOffset"), 0.0f)
+
 interface KeyboardSizeStateProvider {
     val currentSizeState: KeyboardSizeSettingKind
 }
@@ -173,56 +178,81 @@ data class SavedKeyboardSizingSettings(
     }
 }
 
+fun getDefaultSettingForKind(kind: KeyboardSizeSettingKind, context: Context): SavedKeyboardSizingSettings {
+    val oldHeightMultiplier = context.getSettingBlocking(OldKeyboardHeightMultiplierSetting)
+    val oldBottomOffset = context.getSettingBlocking(OldKeyboardBottomOffsetSetting).dp
+
+    val metrics = context.resources.displayMetrics
+    val density = metrics.density.toFloat()
+    val minDimDp = (minOf(metrics.widthPixels, metrics.heightPixels).toFloat() / density).dp
+
+    println("widthPx: ${metrics.widthPixels}, heightPx: ${metrics.heightPixels}, density: ${density}")
+    val extraSidePadding = when {
+        minDimDp > 600.dp -> 24.dp
+        else -> 0.dp
+    }
+
+    val portraitDeviceSizeHeightMultiplier = when {
+        minDimDp > 600.dp -> 0.8f
+        else -> 1.0f
+    }
+
+    val portraitSplitWidthFraction = when {
+        minDimDp > 600.dp -> 3.0f / 5.0f
+        else -> 4.0f / 5.0f
+    }
+
+    return when(kind) {
+        KeyboardSizeSettingKind.Portrait -> SavedKeyboardSizingSettings(
+            currentMode = KeyboardMode.Regular,
+            heightMultiplier = 1.0f * oldHeightMultiplier * portraitDeviceSizeHeightMultiplier,
+            paddingDp = DpRect(2.dp + extraSidePadding, 4.dp, 2.dp + extraSidePadding, 10.dp + oldBottomOffset),
+            splitPaddingDp = DpRect(2.dp, 4.dp, 2.dp, 10.dp + oldBottomOffset),
+            splitWidthFraction = portraitSplitWidthFraction,
+            oneHandedDirection = OneHandedDirection.Right,
+            oneHandedRectDp = DpRect(4.dp, 4.dp, 364.dp, 30.dp + oldBottomOffset),
+            floatingBottomOriginDp = Pair(0.0f, 0.0f),
+            floatingHeightDp = 240.0f,
+            floatingWidthDp = 360.0f,
+            prefersSplit = false
+        )
+
+        KeyboardSizeSettingKind.Landscape -> SavedKeyboardSizingSettings(
+            currentMode = KeyboardMode.Split,
+            heightMultiplier = 0.9f * oldHeightMultiplier,
+            paddingDp = DpRect(8.dp + extraSidePadding, 2.dp, 8.dp + extraSidePadding, 2.dp),
+            splitPaddingDp = DpRect(8.dp, 2.dp, 8.dp, 2.dp),
+            splitWidthFraction = 3.0f / 5.0f,
+            oneHandedDirection = OneHandedDirection.Right,
+            oneHandedRectDp = DpRect(4.dp, 4.dp, 364.dp, 30.dp),
+            floatingBottomOriginDp = Pair(0.0f, 0.0f),
+            floatingHeightDp = 240.0f,
+            floatingWidthDp = 360.0f,
+            prefersSplit = true
+        )
+
+        KeyboardSizeSettingKind.FoldableInnerDisplay -> SavedKeyboardSizingSettings(
+            currentMode = KeyboardMode.Split,
+            heightMultiplier = 0.67f * oldHeightMultiplier,
+            paddingDp = DpRect(44.dp, 4.dp, 44.dp, 8.dp),
+            splitPaddingDp = DpRect(44.dp, 4.dp, 44.dp, 8.dp),
+            splitWidthFraction = 3.0f / 5.0f,
+            oneHandedDirection = OneHandedDirection.Right,
+            oneHandedRectDp = DpRect(4.dp, 4.dp, 364.dp, 30.dp),
+            floatingBottomOriginDp = Pair(0.0f, 0.0f),
+            floatingHeightDp = 240.0f,
+            floatingWidthDp = 360.0f,
+            prefersSplit = true
+        )
+    }
+}
+
 enum class KeyboardSizeSettingKind {
     Portrait,
     Landscape,
     FoldableInnerDisplay
 }
 
-val DefaultKeyboardSettings = mapOf(
-    KeyboardSizeSettingKind.Portrait to SavedKeyboardSizingSettings(
-        currentMode = KeyboardMode.Regular,
-        heightMultiplier = 1.0f,
-        paddingDp = DpRect(2.dp, 4.dp, 2.dp, 10.dp),
-        splitPaddingDp = DpRect(2.dp, 4.dp, 2.dp, 10.dp),
-        splitWidthFraction = 4.0f / 5.0f,
-        oneHandedDirection = OneHandedDirection.Right,
-        oneHandedRectDp = DpRect(4.dp, 4.dp, 364.dp, 30.dp),
-        floatingBottomOriginDp = Pair(0.0f, 0.0f),
-        floatingHeightDp = 240.0f,
-        floatingWidthDp = 360.0f,
-        prefersSplit = false
-    ),
-
-    KeyboardSizeSettingKind.Landscape to SavedKeyboardSizingSettings(
-        currentMode = KeyboardMode.Split,
-        heightMultiplier = 0.9f,
-        paddingDp = DpRect(8.dp, 2.dp, 8.dp, 2.dp),
-        splitPaddingDp = DpRect(8.dp, 2.dp, 8.dp, 2.dp),
-        splitWidthFraction = 3.0f / 5.0f,
-        oneHandedDirection = OneHandedDirection.Right,
-        oneHandedRectDp = DpRect(4.dp, 4.dp, 364.dp, 30.dp),
-        floatingBottomOriginDp = Pair(0.0f, 0.0f),
-        floatingHeightDp = 240.0f,
-        floatingWidthDp = 360.0f,
-        prefersSplit = true
-    ),
-
-    KeyboardSizeSettingKind.FoldableInnerDisplay to SavedKeyboardSizingSettings(
-        currentMode = KeyboardMode.Split,
-        heightMultiplier = 0.67f,
-        paddingDp = DpRect(44.dp, 4.dp, 44.dp, 8.dp),
-        splitPaddingDp = DpRect(44.dp, 4.dp, 44.dp, 8.dp),
-        splitWidthFraction = 3.0f / 5.0f,
-        oneHandedDirection = OneHandedDirection.Right,
-        oneHandedRectDp = DpRect(4.dp, 4.dp, 364.dp, 30.dp),
-        floatingBottomOriginDp = Pair(0.0f, 0.0f),
-        floatingHeightDp = 240.0f,
-        floatingWidthDp = 360.0f,
-        prefersSplit = true
-    ),
-)
-
 val KeyboardSettings = mapOf(
     KeyboardSizeSettingKind.Portrait to SettingsKey(
         stringPreferencesKey("keyboard_settings_portrait"), ""),
@@ -250,14 +280,14 @@ class KeyboardSizingCalculator(val context: Context, val uixManager: UixManager)
     fun getSavedSettings(): SavedKeyboardSizingSettings =
         SavedKeyboardSizingSettings.fromJsonString(context.getSettingBlocking(
             KeyboardSettings[sizeStateProvider.currentSizeState]!!
-        )) ?: DefaultKeyboardSettings[sizeStateProvider.currentSizeState]!!
+        )) ?: getDefaultSettingForKind(sizeStateProvider.currentSizeState, context)
 
     fun editSavedSettings(transform: (SavedKeyboardSizingSettings) -> SavedKeyboardSizingSettings) {
         val sizeState = sizeStateProvider.currentSizeState
 
         val savedSettings = SavedKeyboardSizingSettings.fromJsonString(context.getSettingBlocking(
             KeyboardSettings[sizeState]!!
-        )) ?: DefaultKeyboardSettings[sizeState]!!
+        )) ?: getDefaultSettingForKind(sizeState, context)
 
         val transformed = transform(savedSettings)
 
@@ -267,7 +297,7 @@ class KeyboardSizingCalculator(val context: Context, val uixManager: UixManager)
     }
 
     fun resetCurrentMode() {
-        val defaultSettings = DefaultKeyboardSettings[sizeStateProvider.currentSizeState]!!
+        val defaultSettings = getDefaultSettingForKind(sizeStateProvider.currentSizeState, context)
         editSavedSettings {
             when(it.currentMode) {
                 KeyboardMode.Regular -> it.copy(