diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml index 5d63986..dc7f653 100644 --- a/res/values-land/dimens.xml +++ b/res/values-land/dimens.xml @@ -1,11 +1,5 @@ - 12dp - 3dp - 3dp - 36dp - 0.4 - 0.3 48dp 25dp diff --git a/res/values/values.xml b/res/values/values.xml index c092ff1..07fb654 100644 --- a/res/values/values.xml +++ b/res/values/values.xml @@ -7,8 +7,6 @@ 2dp 2dp 51dp - 0.33 - 0.22 56dp 250dp 28dp diff --git a/srcs/juloo.keyboard2/Config.java b/srcs/juloo.keyboard2/Config.java index 43c11a6..39d1c25 100644 --- a/srcs/juloo.keyboard2/Config.java +++ b/srcs/juloo.keyboard2/Config.java @@ -57,8 +57,8 @@ final class Config // static values marginTop = res.getDimension(R.dimen.margin_top); keyPadding = res.getDimension(R.dimen.key_padding); - labelTextSize = Float.valueOf(res.getString(R.integer.label_text_size)); - sublabelTextSize = Float.valueOf(res.getString(R.integer.sublabel_text_size)); + labelTextSize = 0.33f; + sublabelTextSize = 0.22f; // default values layout = -1; programming_layout = -1; @@ -97,12 +97,14 @@ final class Config // The height of the keyboard is relative to the height of the screen. // This is the height of the keyboard if it have 4 rows. int keyboardHeightPercent; - // Increase the horizontal space between the keys + // Scale some dimensions depending on orientation float horizontalIntervalScale = 1.f; + float characterSizeScale = 1.f; if (res.getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) // Landscape mode { keyboardHeightPercent = prefs.getInt("keyboard_height_landscape", 50); horizontalIntervalScale = 2.f; + characterSizeScale = 1.25f; } else { @@ -142,7 +144,9 @@ final class Config if (prefs.getBoolean("lockable_sup", false)) lockable_modifiers.add(KeyValue.Modifier.SUPERSCRIPT); if (prefs.getBoolean("lockable_sub", false)) lockable_modifiers.add(KeyValue.Modifier.SUBSCRIPT); if (prefs.getBoolean("lockable_box", false)) lockable_modifiers.add(KeyValue.Modifier.BOX); - characterSize = prefs.getFloat("character_size", characterSize); + characterSize = + prefs.getFloat("character_size", characterSize) + * characterSizeScale; accents = Integer.valueOf(prefs.getString("accents", "1")); theme = getThemeId(res, prefs.getString("theme", "")); }