From 6541054cce964b7243d8779b54b168cda6741aff Mon Sep 17 00:00:00 2001
From: Jules Aguillon
Date: Thu, 27 Mar 2025 23:25:32 +0100
Subject: Remove symbols from the number row by default (#964)

The number row option is changed into a ListPreference and controls whether the number row contains symbols or not.

Co-authored-by: Joey Schaff <j@jaoh.xyz>---
 res/values-cs/strings.xml         |  3 +++
 res/values-de/strings.xml         |  3 +++
 res/values-es/strings.xml         |  3 +++
 res/values-fa/strings.xml         |  3 +++
 res/values-fr/strings.xml         |  3 +++
 res/values-it/strings.xml         |  3 +++
 res/values-ja/strings.xml         |  3 +++
 res/values-ko/strings.xml         |  3 +++
 res/values-lv/strings.xml         |  3 +++
 res/values-pl/strings.xml         |  3 +++
 res/values-pt/strings.xml         |  3 +++
 res/values-ro/strings.xml         |  3 +++
 res/values-ru/strings.xml         |  3 +++
 res/values-tr/strings.xml         |  3 +++
 res/values-uk/strings.xml         |  3 +++
 res/values-vi/strings.xml         |  3 +++
 res/values-zh-rCN/strings.xml     |  3 +++
 res/values/arrays.xml             | 10 ++++++++++
 res/values/strings.xml            |  3 +++
 res/xml/number_row.xml            | 21 +++++++++++----------
 res/xml/number_row_no_symbols.xml | 13 +++++++++++++
 res/xml/settings.xml              |  2 +-
 22 files changed, 89 insertions(+), 11 deletions(-)
 create mode 100644 res/xml/number_row_no_symbols.xml

(limited to 'res')

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 3c673e6..049a431 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -18,6 +18,9 @@
     <string name="pref_layouts_item">Rozložení %1$d: %2$s</string>
     <string name="pref_layouts_remove_custom">Odebrat rozložení</string>
     <string name="pref_custom_layout_title">Vlastní rozložení</string>
+    <!-- <string name="pref_show_number_row_no_number_row">No number row</string> -->
+    <!-- <string name="pref_show_number_row_no_symbols">Number row without symbols</string> -->
+    <!-- <string name="pref_show_number_row_symbols">Number row with symbols</string> -->
     <string name="pref_show_numpad_title">Zobrazit NumPad</string>
     <string name="pref_show_numpad_never">Nikdy</string>
     <string name="pref_show_numpad_landscape">Pouze v režimu na šířku</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index a14135e..2880667 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -18,6 +18,9 @@
     <string name="pref_layouts_item">Layout %1$d: %2$s</string>
     <string name="pref_layouts_remove_custom">Layout entfernen</string>
     <string name="pref_custom_layout_title">Eigenes Layout</string>
+    <!-- <string name="pref_show_number_row_no_number_row">No number row</string> -->
+    <!-- <string name="pref_show_number_row_no_symbols">Number row without symbols</string> -->
+    <!-- <string name="pref_show_number_row_symbols">Number row with symbols</string> -->
     <string name="pref_show_numpad_title">Ziffernblock anzeigen</string>
     <string name="pref_show_numpad_never">Nie</string>
     <string name="pref_show_numpad_landscape">Nur im Querformat</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index cb3a4a6..2ac33c0 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -18,6 +18,9 @@
     <string name="pref_layouts_item">Diseño %1$d: %2$s</string>
     <string name="pref_layouts_remove_custom">Quitar diseño</string>
     <string name="pref_custom_layout_title">Diseño personalizado</string>
+    <!-- <string name="pref_show_number_row_no_number_row">No number row</string> -->
+    <!-- <string name="pref_show_number_row_no_symbols">Number row without symbols</string> -->
+    <!-- <string name="pref_show_number_row_symbols">Number row with symbols</string> -->
     <string name="pref_show_numpad_title">Mostrar teclado numérico</string>
     <string name="pref_show_numpad_never">Nunca</string>
     <string name="pref_show_numpad_landscape">Solo en modo horizontal</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 10422fa..8df006e 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -18,6 +18,9 @@
     <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
     <!-- <string name="pref_layouts_remove_custom">Remove layout</string> -->
     <string name="pref_custom_layout_title">طرح شخصی</string>
+    <!-- <string name="pref_show_number_row_no_number_row">No number row</string> -->
+    <!-- <string name="pref_show_number_row_no_symbols">Number row without symbols</string> -->
+    <!-- <string name="pref_show_number_row_symbols">Number row with symbols</string> -->
     <string name="pref_show_numpad_title">نمایش پد شماره‌ها</string>
     <string name="pref_show_numpad_never">هرگز</string>
     <string name="pref_show_numpad_landscape">فقط در حالت افقی</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index cf263d3..7952316 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -18,6 +18,9 @@
     <string name="pref_layouts_item">Disposition %1$d: %2$s</string>
     <string name="pref_layouts_remove_custom">Supprimer</string>
     <string name="pref_custom_layout_title">Disposition personnalisée</string>
+    <!-- <string name="pref_show_number_row_no_number_row">No number row</string> -->
+    <!-- <string name="pref_show_number_row_no_symbols">Number row without symbols</string> -->
+    <!-- <string name="pref_show_number_row_symbols">Number row with symbols</string> -->
     <string name="pref_show_numpad_title">Afficher le pavé numérique</string>
     <string name="pref_show_numpad_never">Jamais</string>
     <string name="pref_show_numpad_landscape">Seulement en mode paysage</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 2a553ff..c64ae4b 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -18,6 +18,9 @@
     <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
     <!-- <string name="pref_layouts_remove_custom">Remove layout</string> -->
     <!-- <string name="pref_custom_layout_title">Custom layout</string> -->
+    <!-- <string name="pref_show_number_row_no_number_row">No number row</string> -->
+    <!-- <string name="pref_show_number_row_no_symbols">Number row without symbols</string> -->
+    <!-- <string name="pref_show_number_row_symbols">Number row with symbols</string> -->
     <!-- <string name="pref_show_numpad_title">Show NumPad</string> -->
     <!-- <string name="pref_show_numpad_never">Never</string> -->
     <!-- <string name="pref_show_numpad_landscape">Only in landscape mode</string> -->
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index e935308..a707fbe 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -18,6 +18,9 @@
     <string name="pref_layouts_item">レイアウト %1$d: %2$s</string>
     <string name="pref_layouts_remove_custom">レイアウトを削除</string>
     <string name="pref_custom_layout_title">カスタムレイアウト</string>
+    <!-- <string name="pref_show_number_row_no_number_row">No number row</string> -->
+    <!-- <string name="pref_show_number_row_no_symbols">Number row without symbols</string> -->
+    <!-- <string name="pref_show_number_row_symbols">Number row with symbols</string> -->
     <string name="pref_show_numpad_title">テンキーを表示</string>
     <string name="pref_show_numpad_never">表示しない</string>
     <string name="pref_show_numpad_landscape">横向きの時は表示</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index fae3e6c..48985ad 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -18,6 +18,9 @@
     <string name="pref_layouts_item">레이아웃 %1$d: %2$s</string>
     <string name="pref_layouts_remove_custom">레이아웃 제거</string>
     <string name="pref_custom_layout_title">사용자 정의 레이아웃</string>
+    <!-- <string name="pref_show_number_row_no_number_row">No number row</string> -->
+    <!-- <string name="pref_show_number_row_no_symbols">Number row without symbols</string> -->
+    <!-- <string name="pref_show_number_row_symbols">Number row with symbols</string> -->
     <string name="pref_show_numpad_title">NumPad 표시</string>
     <string name="pref_show_numpad_never">안 함</string>
     <string name="pref_show_numpad_landscape">가로 모드에서만</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 8d1ca38..a9677b4 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -18,6 +18,9 @@
     <string name="pref_layouts_item">Izkārtojums %1$d: %2$s</string>
     <string name="pref_layouts_remove_custom">Noņemt izkārtojumu</string>
     <string name="pref_custom_layout_title">Pielāgots izkārtojums</string>
+    <!-- <string name="pref_show_number_row_no_number_row">No number row</string> -->
+    <!-- <string name="pref_show_number_row_no_symbols">Number row without symbols</string> -->
+    <!-- <string name="pref_show_number_row_symbols">Number row with symbols</string> -->
     <string name="pref_show_numpad_title">Rādīt ciparnīcu</string>
     <string name="pref_show_numpad_never">Nekad</string>
     <string name="pref_show_numpad_landscape">Tikai guleniskajā skatā</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 039ca40..f181423 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -18,6 +18,9 @@
     <string name="pref_layouts_item">Układ %1$d: %2$s</string>
     <string name="pref_layouts_remove_custom">Usuń układ</string>
     <string name="pref_custom_layout_title">Własny układ</string>
+    <!-- <string name="pref_show_number_row_no_number_row">No number row</string> -->
+    <!-- <string name="pref_show_number_row_no_symbols">Number row without symbols</string> -->
+    <!-- <string name="pref_show_number_row_symbols">Number row with symbols</string> -->
     <string name="pref_show_numpad_title">Pokaż klawiaturę numeryczną</string>
     <string name="pref_show_numpad_never">Nigdy</string>
     <string name="pref_show_numpad_landscape">Tylko w orientacji poziomej</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index acee1fc..3d75d0d 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -18,6 +18,9 @@
     <string name="pref_layouts_item">Layout %1$d: %2$s</string>
     <string name="pref_layouts_remove_custom">Remover layout</string>
     <string name="pref_custom_layout_title">Layout personalizado</string>
+    <!-- <string name="pref_show_number_row_no_number_row">No number row</string> -->
+    <!-- <string name="pref_show_number_row_no_symbols">Number row without symbols</string> -->
+    <!-- <string name="pref_show_number_row_symbols">Number row with symbols</string> -->
     <string name="pref_show_numpad_title">Mostrar Teclado Numérico</string>
     <string name="pref_show_numpad_never">Nunca</string>
     <string name="pref_show_numpad_landscape">Somente no modo paisagem</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index fc5a53c..d39c4c5 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -18,6 +18,9 @@
     <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
     <!-- <string name="pref_layouts_remove_custom">Remove layout</string> -->
     <string name="pref_custom_layout_title">Aranjament personalizat</string>
+    <!-- <string name="pref_show_number_row_no_number_row">No number row</string> -->
+    <!-- <string name="pref_show_number_row_no_symbols">Number row without symbols</string> -->
+    <!-- <string name="pref_show_number_row_symbols">Number row with symbols</string> -->
     <string name="pref_show_numpad_title">Arată NumPad</string>
     <string name="pref_show_numpad_never">Niciodată</string>
     <string name="pref_show_numpad_landscape">Doar în mod panoramă</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index b3f0b7e..97366fd 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -18,6 +18,9 @@
     <string name="pref_layouts_item">Раскладка %1$d: %2$s</string>
     <string name="pref_layouts_remove_custom">Удалить раскладку</string>
     <string name="pref_custom_layout_title">Пользовательская раскладка</string>
+    <!-- <string name="pref_show_number_row_no_number_row">No number row</string> -->
+    <!-- <string name="pref_show_number_row_no_symbols">Number row without symbols</string> -->
+    <!-- <string name="pref_show_number_row_symbols">Number row with symbols</string> -->
     <string name="pref_show_numpad_title">Показывать цифровой блок</string>
     <string name="pref_show_numpad_never">Никогда</string>
     <string name="pref_show_numpad_landscape">Только в ландшафтном режиме</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 20f5ee2..7fdd356 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -18,6 +18,9 @@
     <string name="pref_layouts_item">Tuş düzeni %1$d: %2$s</string>
     <string name="pref_layouts_remove_custom">Tuş düzenini kaldır</string>
     <string name="pref_custom_layout_title">Özel tuş düzeni</string>
+    <!-- <string name="pref_show_number_row_no_number_row">No number row</string> -->
+    <!-- <string name="pref_show_number_row_no_symbols">Number row without symbols</string> -->
+    <!-- <string name="pref_show_number_row_symbols">Number row with symbols</string> -->
     <string name="pref_show_numpad_title">NumPadi göster</string>
     <string name="pref_show_numpad_never">Asla</string>
     <string name="pref_show_numpad_landscape">Sadece manzara modunda</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 6a94cb4..8f23c0e 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -18,6 +18,9 @@
     <string name="pref_layouts_item">Макет %1$d: %2$s</string>
     <string name="pref_layouts_remove_custom">Видалити макет</string>
     <string name="pref_custom_layout_title">Власний макет</string>
+    <!-- <string name="pref_show_number_row_no_number_row">No number row</string> -->
+    <!-- <string name="pref_show_number_row_no_symbols">Number row without symbols</string> -->
+    <!-- <string name="pref_show_number_row_symbols">Number row with symbols</string> -->
     <string name="pref_show_numpad_title">Показувати числову клавіатуру</string>
     <string name="pref_show_numpad_never">Ніколи</string>
     <string name="pref_show_numpad_landscape">Тільки в альбомному режимі</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 1ddcc93..7e5a173 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -18,6 +18,9 @@
     <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
     <!-- <string name="pref_layouts_remove_custom">Remove layout</string> -->
     <string name="pref_custom_layout_title">Tùy chỉnh bố cục</string>
+    <!-- <string name="pref_show_number_row_no_number_row">No number row</string> -->
+    <!-- <string name="pref_show_number_row_no_symbols">Number row without symbols</string> -->
+    <!-- <string name="pref_show_number_row_symbols">Number row with symbols</string> -->
     <string name="pref_show_numpad_title">Hiện NumPad</string>
     <string name="pref_show_numpad_never">Không bao giờ</string>
     <string name="pref_show_numpad_landscape">Chỉ trong chế độ phong cảnh</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index f397e8f..4bc2894 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -18,6 +18,9 @@
     <string name="pref_layouts_item">布局 %1$d：%2$s</string>
     <string name="pref_layouts_remove_custom">移除布局</string>
     <string name="pref_custom_layout_title">自定义布局</string>
+    <!-- <string name="pref_show_number_row_no_number_row">No number row</string> -->
+    <!-- <string name="pref_show_number_row_no_symbols">Number row without symbols</string> -->
+    <!-- <string name="pref_show_number_row_symbols">Number row with symbols</string> -->
     <string name="pref_show_numpad_title">显示数字小键盘</string>
     <string name="pref_show_numpad_never">从不</string>
     <string name="pref_show_numpad_landscape">只在横屏显示</string>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index a89c718..95e62df 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+  <string-array name="pref_show_number_row_values">
+    <item>no_number_row</item>
+    <item>no_symbols</item>
+    <item>symbols</item>
+  </string-array>
+  <string-array name="pref_show_number_row_entries">
+    <item>@string/pref_show_number_row_no_number_row</item>
+    <item>@string/pref_show_number_row_no_symbols</item>
+    <item>@string/pref_show_number_row_symbols</item>
+  </string-array>
   <string-array name="pref_show_numpad_values">
     <item>never</item>
     <item>landscape</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 50dc0ec..89cc6e1 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -18,6 +18,9 @@
     <string name="pref_layouts_item">Layout %1$d: %2$s</string>
     <string name="pref_layouts_remove_custom">Remove layout</string>
     <string name="pref_custom_layout_title">Custom layout</string>
+    <string name="pref_show_number_row_no_number_row">No number row</string>
+    <string name="pref_show_number_row_no_symbols">Number row without symbols</string>
+    <string name="pref_show_number_row_symbols">Number row with symbols</string>
     <string name="pref_show_numpad_title">Show NumPad</string>
     <string name="pref_show_numpad_never">Never</string>
     <string name="pref_show_numpad_landscape">Only in landscape mode</string>
diff --git a/res/xml/number_row.xml b/res/xml/number_row.xml
index 2320ade..459a730 100644
--- a/res/xml/number_row.xml
+++ b/res/xml/number_row.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- See [number_row_no_symbols.xml] for the number row with no symbols. -->
 <row height="0.75">
-    <key key0="1" se="!"/>
-    <key key0="2" se="@"/>
-    <key key0="3" se="#"/>
-    <key key0="4" se="$"/>
-    <key key0="5" se="%"/>
-    <key key0="6" sw="^"/>
-    <key key0="7" sw="&amp;"/>
-    <key key0="8" sw="*"/>
-    <key key0="9" sw="("/>
-    <key key0="0" sw=")"/>
+  <key key0="1" se="!"/>
+  <key key0="2" se="@"/>
+  <key key0="3" se="#"/>
+  <key key0="4" se="$"/>
+  <key key0="5" se="%"/>
+  <key key0="6" sw="^"/>
+  <key key0="7" sw="&amp;"/>
+  <key key0="8" sw="*"/>
+  <key key0="9" sw="("/>
+  <key key0="0" sw=")"/>
 </row>
diff --git a/res/xml/number_row_no_symbols.xml b/res/xml/number_row_no_symbols.xml
new file mode 100644
index 0000000..3e207af
--- /dev/null
+++ b/res/xml/number_row_no_symbols.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<row height="0.75">
+  <key key0="1"/>
+  <key key0="2"/>
+  <key key0="3"/>
+  <key key0="4"/>
+  <key key0="5"/>
+  <key key0="6"/>
+  <key key0="7"/>
+  <key key0="8"/>
+  <key key0="9"/>
+  <key key0="0"/>
+</row>
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index c6a0c51..d13a101 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -8,7 +8,7 @@
       </PreferenceCategory>
       <juloo.keyboard2.prefs.ExtraKeysPreference android:title="@string/pref_extra_keys_internal"/>
     </PreferenceScreen>
-    <CheckBoxPreference android:key="number_row" android:title="@string/pref_number_row_title" android:summary="@string/pref_number_row_summary" android:defaultValue="false"/>
+    <ListPreference android:key="number_row" android:title="@string/pref_number_row_title" android:summary="%s" android:defaultValue="no_number_row" android:entries="@array/pref_show_number_row_entries" android:entryValues="@array/pref_show_number_row_values"/>
     <ListPreference android:key="show_numpad" android:title="@string/pref_show_numpad_title" android:summary="%s" android:defaultValue="1" android:entries="@array/pref_show_numpad_entries" android:entryValues="@array/pref_show_numpad_values"/>
     <ListPreference android:key="numpad_layout" android:title="@string/pref_numpad_layout" android:summary="%s" android:defaultValue="high_first" android:entries="@array/pref_numpad_layout_entries" android:entryValues="@array/pref_numpad_layout_values"/>
   </PreferenceCategory>
-- 
cgit v1.2.3