From 51b330c6168a8b0e0c16482254d4674fbe5476c7 Mon Sep 17 00:00:00 2001
From: Jules Aguillon
Date: Sun, 13 Nov 2022 00:24:23 +0100
Subject: Allow switching quickly between two layouts

A new option allow to choose a secondary layout, the switching key is
placed on the top edge of the space bar.

The "Programming layout" option was basically doing that but it was
possible to choose from a few layouts only. It is improved and renamed.

The 'LayoutListPreference' allows setting the string for the first entry
but otherwise share the rest of the array.

Add nice icons from materialdesignicons.
---
 res/values/arrays.xml  | 16 ++--------------
 res/values/attrs.xml   |  3 +++
 res/values/strings.xml |  4 ++--
 3 files changed, 7 insertions(+), 16 deletions(-)

(limited to 'res/values')

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 50c140e..17c4bd9 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string-array name="pref_layout_values">
-    <item>system</item>
+    <item>none</item>
     <item>azerty</item>
     <item>qwerty</item>
     <item>qwerty_pt</item>
@@ -28,7 +28,7 @@
     <item>hindi</item>
   </string-array>
   <string-array name="pref_layout_entries">
-    <item>@string/pref_layout_e_system</item>
+    <item>None</item>
     <item>AZERTY</item>
     <item>QWERTY</item>
     <item>QWERTY (Brasileiro)</item>
@@ -54,18 +54,6 @@
     <item>বাংলা</item>
     <item>हिन्दी</item>
   </string-array>
-  <string-array name="pref_programming_layout_values">
-    <item>none</item>
-    <item>qwerty</item>
-    <item>dvorak</item>
-    <item>colemak</item>
-  </string-array>
-  <string-array name="pref_programming_layout_entries">
-    <item>@string/pref_programming_layout_none</item>
-    <item>QWERTY</item>
-    <item>Dvorak</item>
-    <item>Colemak</item>
-  </string-array>
   <string-array name="pref_accents_entries">
     <item>@string/pref_accents_e_all_installed</item>
     <item>@string/pref_accents_e_selected</item>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index b012a7c..693ef89 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -3,4 +3,7 @@
   <declare-styleable name="ExtraKeyCheckBoxPreference">
     <attr name="index" format="integer"/>
   </declare-styleable>
+  <declare-styleable name="LayoutListPreference">
+    <attr name="defaultString" format="string"/>
+  </declare-styleable>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f7f3a8b..63c55ab 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -18,8 +18,8 @@
   <string name="pref_autocapitalisation_title">Automatic capitalisation</string>
   <string name="pref_autocapitalisation_summary">Press Shift at the beginning of a sentence</string>
   <string name="pref_extra_keys_title">Add keys to the keyboard</string>
-  <string name="pref_programming_layout_title">Keyboard layout for programming</string>
-  <string name="pref_programming_layout_none">None</string>
+  <string name="pref_second_layout_title">Secondary layout</string>
+  <string name="pref_second_layout_none">None</string>
   <string name="pref_category_typing">Typing</string>
   <string name="pref_swipe_dist_title">Swiping distance</string>
   <string name="pref_swipe_dist_summary">Distance of characters in the corners of the keys (%s)</string>
-- 
cgit v1.2.3