From 1ff8526d24787427bdaeffae63c88bbe12b031a5 Mon Sep 17 00:00:00 2001
From: Jules Aguillon
Date: Mon, 7 Feb 2022 00:55:32 +0100
Subject: Define the bottom row separately

Avoid divergences when the bottom row is modified.
---
 res/xml/azerty.xml      | 7 -------
 res/xml/bottom_row.xml  | 8 ++++++++
 res/xml/dvorak.xml      | 7 -------
 res/xml/local_bgph1.xml | 7 -------
 res/xml/numeric.xml     | 2 +-
 res/xml/qwerty.xml      | 7 -------
 res/xml/qwerty_lv.xml   | 7 -------
 res/xml/qwertz.xml      | 7 -------
 8 files changed, 9 insertions(+), 43 deletions(-)
 create mode 100644 res/xml/bottom_row.xml

(limited to 'res')

diff --git a/res/xml/azerty.xml b/res/xml/azerty.xml
index f8aae93..2369539 100644
--- a/res/xml/azerty.xml
+++ b/res/xml/azerty.xml
@@ -34,11 +34,4 @@
     <key key0="n" key1="accent_tilde" key2="§" key4="!"/>
     <key width="2.0" key0="backspace" key2="delete"/>
   </row>
-  <row height="0.95">
-    <key width="1.8" key0="ctrl" key2="meta" key3="switch_numeric"/>
-    <key width="1.2" key0="alt" key1="fn" key2="change_method" key3="switch_emoji" key4="config"/>
-    <key width="4.0" key0="space"/>
-    <key width="1.2" key1="up" key2="right" key3="left" key4="down" edgekeys="true"/>
-    <key width="1.8" key0="enter" key2="action"/>
-  </row>
 </keyboard>
diff --git a/res/xml/bottom_row.xml b/res/xml/bottom_row.xml
new file mode 100644
index 0000000..3f64a42
--- /dev/null
+++ b/res/xml/bottom_row.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<row height="0.95">
+  <key width="1.8" key0="ctrl" key2="meta" key3="switch_numeric"/>
+  <key width="1.2" key0="alt" key1="fn" key2="change_method" key3="switch_emoji" key4="config"/>
+  <key width="4.0" key0="space"/>
+  <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/dvorak.xml b/res/xml/dvorak.xml
index e1d38c0..c659925 100644
--- a/res/xml/dvorak.xml
+++ b/res/xml/dvorak.xml
@@ -34,11 +34,4 @@
     <key key0="v"/>
     <key key0="z" key2="-" key3="_"/>
   </row>
-  <row height="0.95">
-    <key width="1.8" key0="ctrl" key2="meta" key3="switch_numeric"/>
-    <key width="1.2" key0="alt" key1="fn" key2="change_method" key3="switch_emoji" key4="config"/>
-    <key width="4.0" key0="space"/>
-    <key width="1.2" key1="up" key2="right" key3="left" key4="down" edgekeys="true"/>
-    <key width="1.8" key0="enter" key2="action"/>
-  </row>
 </keyboard>
diff --git a/res/xml/local_bgph1.xml b/res/xml/local_bgph1.xml
index e4537a8..fce2a30 100644
--- a/res/xml/local_bgph1.xml
+++ b/res/xml/local_bgph1.xml
@@ -34,11 +34,4 @@
     <key key0="м" key2="&quot;" key3="'"/>
     <key width="1.5" key0="backspace" key2="delete"/>
   </row>
-  <row height="0.95">
-    <key width="1.8" key0="ctrl" key2="meta" key3="switch_numeric"/>
-    <key width="1.2" key0="alt" key1="fn" key2="change_method" key3="switch_emoji" key4="config"/>
-    <key width="4.0" key0="space"/>
-    <key width="1.2" key1="up" key2="right" key3="left" key4="down"/>
-    <key width="1.8" key0="enter" key2="action"/>
-  </row>
 </keyboard>
diff --git a/res/xml/numeric.xml b/res/xml/numeric.xml
index 334aa35..abd31d8 100644
--- a/res/xml/numeric.xml
+++ b/res/xml/numeric.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard>
+<keyboard bottom_row="false">
   <row>
     <key width="0.75" key0="esc" key2="~" key4="!"/>
     <key width="0.75" key0="(" key2="[" key4="{"/>
diff --git a/res/xml/qwerty.xml b/res/xml/qwerty.xml
index bbcc04e..47e1078 100644
--- a/res/xml/qwerty.xml
+++ b/res/xml/qwerty.xml
@@ -34,11 +34,4 @@
     <key key0="m" key2="&quot;" key3="'"/>
     <key width="1.5" key0="backspace" key2="delete"/>
   </row>
-  <row height="0.95">
-    <key width="1.8" key0="ctrl" key2="meta" key3="switch_numeric"/>
-    <key width="1.2" key0="alt" key1="fn" key2="change_method" key3="switch_emoji" key4="config"/>
-    <key width="4.0" key0="space"/>
-    <key width="1.2" key1="up" key2="right" key3="left" key4="down" edgekeys="true"/>
-    <key width="1.8" key0="enter" key2="action"/>
-  </row>
 </keyboard>
diff --git a/res/xml/qwerty_lv.xml b/res/xml/qwerty_lv.xml
index 78919d9..d181f5d 100644
--- a/res/xml/qwerty_lv.xml
+++ b/res/xml/qwerty_lv.xml
@@ -34,11 +34,4 @@
     <key key0="m" key1="'" key2="&quot;" key3="," key4="\?" />
     <key width="1.5" key0="backspace" key2="delete" />
   </row>
-  <row height="0.95">
-    <key width="1.8" key0="ctrl" key2="meta" key3="switch_numeric"/>
-    <key width="1.2" key0="alt" key1="fn" key2="change_method" key3="switch_emoji" key4="config" />
-    <key width="4.0" key0="space" />
-    <key width="1.2" key0="." key1="up" key2="right" key3="left" key4="down" edgekeys="true"/>
-    <key width="1.8" key0="enter" key2="action" />
-  </row>
 </keyboard>
diff --git a/res/xml/qwertz.xml b/res/xml/qwertz.xml
index e69a0b4..28a0026 100644
--- a/res/xml/qwertz.xml
+++ b/res/xml/qwertz.xml
@@ -34,11 +34,4 @@
     <key key0="m" key1="_" />
     <key width="1.5" key0="backspace" key2="delete"/>
   </row>
-  <row height="0.95">
-    <key width="1.8" key0="ctrl" key2="meta" key3="switch_numeric"/>
-    <key width="1.2" key0="alt" key1="fn" key2="change_method" key3="switch_emoji" key4="config"/>
-    <key width="4.0" key0="space"/>
-    <key width="1.2" key1="up" key2="right" key3="left" key4="down" edgekeys="true"/>
-    <key width="1.8" key0="enter" key2="action"/>
-  </row>
 </keyboard>
-- 
cgit v1.2.3