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.

4 files changed, 5 insertions, 5 deletions

diff --git a/res/xml/bone.xml b/res/xml/bone.xml
index d84622a..b6488ee 100644
--- a/res/xml/bone.xml
+++ b/res/xml/bone.xml
@@ -38,7 +38,7 @@
 	<row height="0.95">
 		<key width="1.8" key0="ctrl"						key2="loc meta" 								key4="switch_numeric"/>
 		<key width="1.2" key0="fn"		key1="loc alt"			key2="change_method"	key3="switch_emoji" key4="config"/>
-		<key width="4.0" key0="space"	key1="switch_programming"					key2="0" 			edgekeys="true"/>
+		<key width="4.0" key0="space"	key1="switch_second"					key2="0" 			edgekeys="true"/>
 		<key width="1.2" 				key1="up"			key2="right" 			key3="left" 		key4="down" edgekeys="true"/>
 		<key width="1.8" key0="enter"												key3="action"/>
 	</row>
diff --git a/res/xml/bottom_row.xml b/res/xml/bottom_row.xml
index bfd4e90..64673fc 100644
--- a/res/xml/bottom_row.xml
+++ b/res/xml/bottom_row.xml
@@ -2,7 +2,7 @@
 <row height="0.95">
   <key width="1.8" key0="ctrl" key1="loc switch_greekmath" key2="loc meta" key4="switch_numeric"/>
   <key width="1.2" key0="fn" key1="loc alt" key2="change_method" key3="switch_emoji" key4="config"/>
-  <key width="4.0" key0="space" key1="switch_programming" edgekeys="true"/>
+  <key width="4.0" key0="space" key1="switch_second" edgekeys="true"/>
   <key width="1.2" key1="up" key2="right" key3="left" key4="down" edgekeys="true"/>
   <key width="1.8" key0="enter" key2="action"/>
 </row>
diff --git a/res/xml/neo2.xml b/res/xml/neo2.xml
index 96265f2..5bffb3c 100644
--- a/res/xml/neo2.xml
+++ b/res/xml/neo2.xml
@@ -41,7 +41,7 @@
   <row height="0.95">
 	  <key width="1.8" key0="ctrl" key2="loc meta" key4="switch_numeric"/>
 	  <key width="1.2" key0="fn" key1="loc alt" key2="change_method" key3="switch_emoji" key4="config"/>
-	  <key width="4.0" key0="space" key1="switch_programming" edgekeys="true"/>
+	  <key width="4.0" key0="space" key1="switch_second" edgekeys="true"/>
 	  <key width="1.2" key1="up" key2="right" key3="left" key4="down" edgekeys="true"/>
 	  <key key0="j" key4=";"/>
 	  <key width="1.8" key0="enter" key2="action"/>
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index 4920d6c..5d7f025 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
   <PreferenceCategory android:title="@string/pref_category_layout">
-    <ListPreference android:key="layout" android:title="@string/pref_layout_title" android:summary="%s" android:defaultValue="system" android:entries="@array/pref_layout_entries" android:entryValues="@array/pref_layout_values"/>
+    <juloo.keyboard2.LayoutListPreference android:key="layout" android:title="@string/pref_layout_title" app:defaultString="@string/pref_layout_e_system"/>
+    <juloo.keyboard2.LayoutListPreference android:key="second_layout" android:title="@string/pref_second_layout_title" app:defaultString="@string/pref_second_layout_none"/>
     <ListPreference android:key="accents" android:title="@string/pref_accents_title" android:summary="%s" android:defaultValue="1" android:entries="@array/pref_accents_entries" android:entryValues="@array/pref_accents_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="programming_layout" android:title="@string/pref_programming_layout_title" android:summary="%s" android:defaultValue="none" android:entries="@array/pref_programming_layout_entries" android:entryValues="@array/pref_programming_layout_values"/>
     <PreferenceScreen android:title="@string/pref_extra_keys_title">
       <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="0"/>
       <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="1"/>