From dad5f57a036e3f0ad7278ccee5bd248192cbbad2 Mon Sep 17 00:00:00 2001
From: Jules Aguillon
Date: Sat, 29 Jul 2023 18:37:06 +0200
Subject: Allow more than 2 layouts

The two layout selection options are replaced by a ListGroupPreference
that allow to enter an arbitrary amount of layouts.

The "switch_second" and "switch_second_back" keys are replaced by
"switch_forward" and "switch_backward", which allow to cycle through the
selected layouts in two directions.

Layouts are changed to place these two key on the space bar.
The backward key is not shown if there's only two layouts.
---
 res/values/layouts.xml | 4 ++--
 res/values/strings.xml | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'res/values')

diff --git a/res/values/layouts.xml b/res/values/layouts.xml
index 3a972be..4c9779f 100644
--- a/res/values/layouts.xml
+++ b/res/values/layouts.xml
@@ -2,7 +2,7 @@
 <resources>
   <!--DO NOT EDIT. This file is generated, see gen_layouts.py.-->
   <string-array name="pref_layout_values">
-    <item>none</item>
+    <item>system</item>
     <item>latn_qwerty_us</item>
     <item>latn_colemak</item>
     <item>latn_dvorak</item>
@@ -43,7 +43,7 @@
     <item>custom</item>
   </string-array>
   <string-array name="pref_layout_entries">
-    <item>None</item>
+    <item>@string/pref_layout_e_system</item>
     <item>QWERTY (US)</item>
     <item>Colemak</item>
     <item>Dvorak</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6a280f5..a3e50d3 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -10,9 +10,10 @@
   <string name="pref_keyboard_opacity">Adjust keyboard background opacity</string>
   <string name="pref_key_opacity">Adjust key opacity</string>
   <string name="pref_key_activated_opacity">Adjust pressed key opacity</string>
-  <string name="pref_layout_title">Change keyboard layout</string>
   <string name="pref_layout_e_system">System settings</string>
   <string name="pref_layout_e_custom">Custom layout</string>
+  <string name="pref_layouts_add">Add an alternate layout</string>
+  <string name="pref_layouts_item">Layout %1$d: %2$s</string>
   <string name="pref_accents_title">Accents</string>
   <string name="pref_accents_e_all_installed">Show accents for all installed languages</string>
   <string name="pref_accents_e_selected">Only show accents for the selected language</string>
-- 
cgit v1.2.3