From a1999621178ad9fd1de713a9b9f485f110e4d899 Mon Sep 17 00:00:00 2001
From: Jules Aguillon
Date: Sun, 15 Jan 2023 19:11:08 +0100
Subject: Separate option for horizontal margin in landscape mode

A separate option is needed, the +25dp offset wasn't enough.
---
 res/values-cs/strings.xml     | 2 ++
 res/values-de/strings.xml     | 2 ++
 res/values-es/strings.xml     | 2 ++
 res/values-fr/strings.xml     | 2 ++
 res/values-it/strings.xml     | 2 ++
 res/values-ko/strings.xml     | 2 ++
 res/values-land/dimens.xml    | 2 +-
 res/values-lv/strings.xml     | 2 ++
 res/values-pl/strings.xml     | 2 ++
 res/values-pt/strings.xml     | 2 ++
 res/values-ru/strings.xml     | 2 ++
 res/values-tr/strings.xml     | 2 ++
 res/values-zh-rCN/strings.xml | 2 ++
 res/values/strings.xml        | 2 ++
 res/values/values.xml         | 1 -
 res/xml/settings.xml          | 5 ++++-
 16 files changed, 31 insertions(+), 3 deletions(-)

(limited to 'res')

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index fb2bf47..62d0e0a 100644
--- 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> -->
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index d8a472a..ef9c6a9 100644
--- 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> -->
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 198c59f..5fb0427 100644
--- 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> -->
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 52b8bc8..8248fbd 100644
--- 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> -->
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 1a250a0..34fe69f 100644
--- 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> -->
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 4674279..61df5e6 100644
--- 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> -->
diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml
index dc7f653..7cdc3b5 100644
--- 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>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 14cfc73..18f1293 100644
--- 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> -->
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 54c18c8..d861391 100644
--- 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>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index b10d86b..382346a 100644
--- 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> -->
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index ebe6e42..d4346b4 100644
--- 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>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index e1cce6b..aa3798e 100644
--- 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> -->
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index a160041..e03ddfb 100644
--- 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> -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 35ebbaa..8f7168a 100644
--- 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>
diff --git a/res/values/values.xml b/res/values/values.xml
index 05e10c1..3cf31e9 100644
--- 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>
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index 9ddebb9..5554b8f 100644
--- 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"/>
-- 
cgit v1.2.3