Separate option for horizontal margin in landscape mode

A separate option is needed, the +25dp offset wasn't enough.
2023-01-15 19:11:08 +01:00 · 2023-01-15 19:11:08 +01:00 · a199962117
commit a199962117
parent 8a3c0566e7
18 changed files with 56 additions and 20 deletions
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@ -3,6 +3,8 @@
  <string name="app_name" product="debug">Klávesnice Unexpected (pro ladění)</string>
  <string name="app_name" product="default">Klávesnice Unexpected</string>
  <string name="settings_activity_label">Nastavení Klávesnice Unexpected</string>
+  <!-- <string name="pref_portrait">In portrait mode</string> -->
+  <!-- <string name="pref_landscape">In landscape mode</string> -->
  <string name="pref_category_layout">Rozvržení</string>
  <!-- <string name="pref_label_brightness">Adjust label brightness</string> -->
  <!-- <string name="pref_keyboard_opacity">Adjust keyboard background opacity</string> -->
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@ -3,6 +3,8 @@
  <string name="app_name" product="debug">Unexpected Keyboard (Debug)</string>
  <string name="app_name" product="default">Unexpected Keyboard</string>
  <string name="settings_activity_label">Unexpected Keyboard - Einstellungen</string>
+  <!-- <string name="pref_portrait">In portrait mode</string> -->
+  <!-- <string name="pref_landscape">In landscape mode</string> -->
  <string name="pref_category_layout">Layout</string>
  <!-- <string name="pref_label_brightness">Adjust label brightness</string> -->
  <!-- <string name="pref_keyboard_opacity">Adjust keyboard background opacity</string> -->
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@ -3,6 +3,8 @@
  <!-- <string name="app_name" product="debug">Unexpected Keyboard (debug)</string> -->
  <!-- <string name="app_name" product="default">Unexpected Keyboard</string> -->
  <string name="settings_activity_label">Ajustes de Unexpected Keyboard</string>
+  <!-- <string name="pref_portrait">In portrait mode</string> -->
+  <!-- <string name="pref_landscape">In landscape mode</string> -->
  <string name="pref_category_layout">Formato</string>
  <!-- <string name="pref_label_brightness">Adjust label brightness</string> -->
  <!-- <string name="pref_keyboard_opacity">Adjust keyboard background opacity</string> -->
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@ -3,6 +3,8 @@
  <!-- <string name="app_name" product="debug">Unexpected Keyboard (debug)</string> -->
  <!-- <string name="app_name" product="default">Unexpected Keyboard</string> -->
  <string name="settings_activity_label">Unexpected Keyboard Paramètres</string>
+  <string name="pref_portrait">En mode portrait</string>
+  <string name="pref_landscape">En mode landscape</string>
  <string name="pref_category_layout">Disposition</string>
  <string name="pref_label_brightness">Luminosité des symboles</string>
  <!-- <string name="pref_keyboard_opacity">Adjust keyboard background opacity</string> -->
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@ -3,6 +3,8 @@
  <string name="app_name" product="debug">Unexpected Keyboard (debug)</string>
  <string name="app_name" product="default">Unexpected Keyboard</string>
  <string name="settings_activity_label">Impostazioni di Unexpected Keyboard</string>
+  <!-- <string name="pref_portrait">In portrait mode</string> -->
+  <!-- <string name="pref_landscape">In landscape mode</string> -->
  <string name="pref_category_layout">Layout</string>
  <!-- <string name="pref_label_brightness">Adjust label brightness</string> -->
  <!-- <string name="pref_keyboard_opacity">Adjust keyboard background opacity</string> -->
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@ -3,6 +3,8 @@
  <!-- <string name="app_name" product="debug">Unexpected Keyboard (debug)</string> -->
  <!-- <string name="app_name" product="default">Unexpected Keyboard</string> -->
  <string name="settings_activity_label">Unexpected Keyboard 설정</string>
+  <!-- <string name="pref_portrait">In portrait mode</string> -->
+  <!-- <string name="pref_landscape">In landscape mode</string> -->
  <string name="pref_category_layout">레이아웃</string>
  <!-- <string name="pref_label_brightness">Adjust label brightness</string> -->
  <!-- <string name="pref_keyboard_opacity">Adjust keyboard background opacity</string> -->
--- a/res/values-land/dimens.xml
+++ b/res/values-land/dimens.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+  <dimen name="horizontal_margin">28dp</dimen>
  <dimen name="emoji_type_button_height">48dp</dimen>
-  <dimen name="extra_horizontal_margin">25dp</dimen>
 </resources>
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@ -3,6 +3,8 @@
  <string name="app_name" product="debug">Unexpected Keyboard (atkļūdošana)</string>
  <string name="app_name" product="default">Unexpected Keyboard</string>
  <string name="settings_activity_label">Unexpected Keyboard iestatījumi</string>
+  <!-- <string name="pref_portrait">In portrait mode</string> -->
+  <!-- <string name="pref_landscape">In landscape mode</string> -->
  <string name="pref_category_layout">Izkārtojums</string>
  <!-- <string name="pref_label_brightness">Adjust label brightness</string> -->
  <!-- <string name="pref_keyboard_opacity">Adjust keyboard background opacity</string> -->
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@ -3,6 +3,8 @@
  <string name="app_name" product="debug">Unexpected Keyboard (debug)</string>
  <string name="app_name" product="default">Unexpected Keyboard</string>
  <string name="settings_activity_label">Ustawienia Unexpected Keyboard</string>
+  <!-- <string name="pref_portrait">In portrait mode</string> -->
+  <!-- <string name="pref_landscape">In landscape mode</string> -->
  <string name="pref_category_layout">Układ</string>
  <string name="pref_label_brightness">Dostosuj jasność znaków</string>
  <string name="pref_keyboard_opacity">Nieprzezroczystość tła klawiatury</string>
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@ -3,6 +3,8 @@
  <string name="app_name" product="debug">Teclado Unexpected</string>
  <string name="app_name" product="default">Teclado Unexpected</string>
  <string name="settings_activity_label">Configurar Teclado Unexpected</string>
+  <!-- <string name="pref_portrait">In portrait mode</string> -->
+  <!-- <string name="pref_landscape">In landscape mode</string> -->
  <string name="pref_category_layout">Layout</string>
  <!-- <string name="pref_label_brightness">Adjust label brightness</string> -->
  <!-- <string name="pref_keyboard_opacity">Adjust keyboard background opacity</string> -->
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@ -3,6 +3,8 @@
  <string name="app_name" product="debug">Unexpected Keyboard (отладка)</string>
  <!-- <string name="app_name" product="default">Unexpected Keyboard</string> -->
  <string name="settings_activity_label">Unexpected Keyboard Настройки</string>
+  <!-- <string name="pref_portrait">In portrait mode</string> -->
+  <!-- <string name="pref_landscape">In landscape mode</string> -->
  <string name="pref_category_layout">Расположение</string>
  <string name="pref_label_brightness">Изменить яркость клавиатуры</string>
  <string name="pref_keyboard_opacity">Изменить прозрачность фона</string>
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@ -3,6 +3,8 @@
  <string name="app_name" product="debug">Unexpected Keyboard (debug)</string>
  <string name="app_name" product="default">Unexpected Keyboard</string>
  <string name="settings_activity_label">Unexpected Keyboard Ayarları</string>
+  <!-- <string name="pref_portrait">In portrait mode</string> -->
+  <!-- <string name="pref_landscape">In landscape mode</string> -->
  <string name="pref_category_layout">Düzen</string>
  <!-- <string name="pref_label_brightness">Adjust label brightness</string> -->
  <!-- <string name="pref_keyboard_opacity">Adjust keyboard background opacity</string> -->
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@ -3,6 +3,8 @@
  <string name="app_name" product="debug">Unexpected Keyboard (debug)</string>
  <string name="app_name" product="default">Unexpected Keyboard</string>
  <string name="settings_activity_label">Unexpected Keyboard 设置</string>
+  <!-- <string name="pref_portrait">In portrait mode</string> -->
+  <!-- <string name="pref_landscape">In landscape mode</string> -->
  <string name="pref_category_layout">布局</string>
  <string name="pref_label_brightness">调整字母亮度</string>
  <!-- <string name="pref_keyboard_opacity">Adjust keyboard background opacity</string> -->
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@ -3,6 +3,8 @@
  <string name="app_name" product="debug">Unexpected Keyboard (debug)</string>
  <string name="app_name" product="default">Unexpected Keyboard</string>
  <string name="settings_activity_label">Unexpected Keyboard Settings</string>
+  <string name="pref_portrait">In portrait mode</string>
+  <string name="pref_landscape">In landscape mode</string>
  <string name="pref_category_layout">Layout</string>
  <string name="pref_label_brightness">Adjust label brightness</string>
  <string name="pref_keyboard_opacity">Adjust keyboard background opacity</string>
--- a/res/values/values.xml
+++ b/res/values/values.xml
@ -9,7 +9,6 @@
  <dimen name="emoji_type_button_height">56dp</dimen>
  <dimen name="emoji_grid_height">250dp</dimen>
  <dimen name="emoji_text_size">28dp</dimen>
-  <dimen name="extra_horizontal_margin">0dp</dimen>
  <bool name="debug_logs" product="debug">true</bool>
  <bool name="debug_logs" product="default">false</bool>
 </resources>
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@ -60,7 +60,10 @@
    <juloo.common.IntSlideBarPreference android:key="margin_bottom" android:title="@string/pref_margin_bottom_title" android:summary="%sdp" android:defaultValue="5" min="0" max="100"/>
    <juloo.common.IntSlideBarPreference android:key="keyboard_height" android:title="@string/pref_keyboard_height_title" android:summary="%s%%" android:defaultValue="35" min="10" max="50"/>
    <juloo.common.IntSlideBarPreference android:key="keyboard_height_landscape" android:title="@string/pref_keyboard_height_landscape_title" android:summary="%s%%" android:defaultValue="50" min="20" max="65"/>
-    <juloo.common.IntSlideBarPreference android:key="horizontal_margin" android:title="@string/pref_horizontal_margin_title" android:summary="%sdp" android:defaultValue="3" min="0" max="20"/>
+    <PreferenceScreen android:title="@string/pref_horizontal_margin_title">
+      <juloo.common.IntSlideBarPreference android:key="horizontal_margin_portrait" android:title="@string/pref_portrait" android:summary="%sdp" android:defaultValue="3" min="0" max="30"/>
+      <juloo.common.IntSlideBarPreference android:key="horizontal_margin_landscape" android:title="@string/pref_landscape" android:summary="%sdp" android:defaultValue="28" min="0" max="200"/>
+    </PreferenceScreen>
    <juloo.common.SlideBarPreference android:key="character_size" android:title="@string/pref_character_size_title" android:summary="@string/pref_character_size_summary" android:defaultValue="1.0" min="0.8" max="1.2"/>
    <juloo.common.IntSlideBarPreference android:key="key_vertical_space" android:title="@string/pref_key_vertical_space" android:summary="%sdp" android:defaultValue="2" min="0" max="8"/>
    <juloo.common.IntSlideBarPreference android:key="key_horizontal_space" android:title="@string/pref_key_horizontal_space" android:summary="%sdp" android:defaultValue="2" min="0" max="8"/>
--- a/srcs/juloo.keyboard2/Config.java
+++ b/srcs/juloo.keyboard2/Config.java
@ -34,7 +34,7 @@ final class Config
  public long longPressInterval;
  public float marginBottom;
  public float keyHeight;
-  public float horizontalMargin;
+  public float horizontal_margin;
  public float keyVerticalInterval;
  public float keyHorizontalInterval;
  public int labelBrightness; // 0 - 255
@ -58,6 +58,7 @@ final class Config
  public Set<KeyValue> extra_keys_param;

  public final IKeyEventHandler handler;
+  public boolean orientation_landscape = false;

  private Config(SharedPreferences prefs, Resources res, IKeyEventHandler h)
  {
@ -85,6 +86,7 @@ final class Config
  public void refresh(Resources res)
  {
    DisplayMetrics dm = res.getDisplayMetrics();
+    orientation_landscape = res.getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE;
    // 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;
@ -93,7 +95,7 @@ final class Config
    float characterSizeScale = 1.f;
    String show_numpad_s = _prefs.getString("show_numpad", "never");
    show_numpad = "always".equals(show_numpad_s);
-    if (res.getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) // Landscape mode
+    if (orientation_landscape)
    {
      if ("landscape".equals(show_numpad_s))
        show_numpad = true;
@ -120,12 +122,12 @@ final class Config
    vibrateEnabled = _prefs.getBoolean("vibrate_enabled", true);
    longPressTimeout = _prefs.getInt("longpress_timeout", 600);
    longPressInterval = _prefs.getInt("longpress_interval", 65);
-    marginBottom = getDipPref(dm, _prefs, "margin_bottom",
+    marginBottom = get_dip_pref(dm, "margin_bottom",
        res.getDimension(R.dimen.margin_bottom));
-    keyVerticalInterval = getDipPref(dm, _prefs, "key_vertical_space",
+    keyVerticalInterval = get_dip_pref(dm, "key_vertical_space",
        res.getDimension(R.dimen.key_vertical_interval));
    keyHorizontalInterval =
-      getDipPref(dm, _prefs, "key_horizontal_space",
+      get_dip_pref(dm, "key_horizontal_space",
          res.getDimension(R.dimen.key_horizontal_interval))
      * horizontalIntervalScale;
    // Label brightness is used as the alpha channel
@ -137,10 +139,9 @@ final class Config
    // Do not substract keyVerticalInterval from keyHeight because this is done
    // during rendered.
    keyHeight = dm.heightPixels * keyboardHeightPercent / 100 / 4;
-    horizontalMargin =
-      getDipPref(dm, _prefs, "horizontal_margin",
-          res.getDimension(R.dimen.horizontal_margin))
-      + res.getDimension(R.dimen.extra_horizontal_margin);
+    horizontal_margin =
+      get_dip_pref(dm, oriented_pref("horizontal_margin"),
+          res.getDimension(R.dimen.horizontal_margin));
    preciseRepeat = _prefs.getBoolean("precise_repeat", true);
    double_tap_lock_shift = _prefs.getBoolean("lock_double_tap", false);
    characterSize =
@ -236,16 +237,23 @@ final class Config
    return kw;
  }

-  private float getDipPref(DisplayMetrics dm, SharedPreferences prefs, String pref_name, float def)
+  private float get_dip_pref(DisplayMetrics dm, String pref_name, float def)
  {
    float value;
-    try { value = prefs.getInt(pref_name, -1); }
-    catch (Exception e) { value = prefs.getFloat(pref_name, -1f); }
+    try { value = _prefs.getInt(pref_name, -1); }
+    catch (Exception e) { value = _prefs.getFloat(pref_name, -1f); }
    if (value < 0f)
      return (def);
    return (TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, value, dm));
  }

+  /** Returns preference name from a prefix depending on orientation. */
+  private String oriented_pref(String base_name)
+  {
+    String suffix = orientation_landscape ? "_landscape" : "_portrait";
+    return base_name + suffix;
+  }
+
  private int getThemeId(Resources res, String theme_name)
  {
    switch (theme_name)
--- a/srcs/juloo.keyboard2/Keyboard2View.java
+++ b/srcs/juloo.keyboard2/Keyboard2View.java
@ -195,7 +195,7 @@ public class Keyboard2View extends View
  private KeyboardData.Key getKeyAtPosition(float tx, float ty)
  {
    KeyboardData.Row row = getRowAtPosition(ty);
-    float x = _config.horizontalMargin;
+    float x = _config.horizontal_margin;
    if (row == null || tx < x)
      return null;
    for (KeyboardData.Key key : row.keys)
@ -232,7 +232,7 @@ public class Keyboard2View extends View
          + _keyboard.rows.size()
          + _config.marginTop + _config.marginBottom);
    setMeasuredDimension(width, height);
-    _keyWidth = (width - (_config.horizontalMargin * 2)) / _keyboard.keysWidth;
+    _keyWidth = (width - (_config.horizontal_margin * 2)) / _keyboard.keysWidth;
  }

  @Override
@ -244,9 +244,9 @@ public class Keyboard2View extends View
    {
      // Disable the back-gesture on the keyboard area
      Rect keyboard_area = new Rect(
-          left + (int)_config.horizontalMargin,
+          left + (int)_config.horizontal_margin,
          top + (int)_config.marginTop,
-          right - (int)_config.horizontalMargin,
+          right - (int)_config.horizontal_margin,
          bottom - (int)_config.marginBottom);
      setSystemGestureExclusionRects(Arrays.asList(keyboard_area));
    }
@ -266,7 +266,7 @@ public class Keyboard2View extends View
    for (KeyboardData.Row row : _keyboard.rows)
    {
      y += row.shift * _config.keyHeight;
-      float x = _config.horizontalMargin + _config.keyHorizontalInterval / 2;
+      float x = _config.horizontal_margin + _config.keyHorizontalInterval / 2;
      float keyH = row.height * _config.keyHeight - _config.keyVerticalInterval;
      for (KeyboardData.Key k : row.keys)
      {