From d62e7647e0feb9c3c7d363c50f31f1aaf101ecd0 Mon Sep 17 00:00:00 2001
From: Jules Aguillon
Date: Sun, 3 Apr 2022 13:30:24 +0200
Subject: Move keys away from the edges of the screen

These keys are harder to hit as the finger might exit the screen before
traveling enough to hit a corner. It might be particularly harder for
people that use a phone case.

Every layouts are changed, the notable changes are:

- The Escape key is in the bottom-right corner of the first key.
  This position looks weird at first but is a lot easier to type.

- The 0 key is on the top-left of the last key on the first row.
  It is not like the other digits.

- The Tab key is on the top-right. This might be hard to re-learn.

- Some layouts had more changes to accomodate these new positions.

Co-authored-by: Raphael <rapha.a.r@gmail.com>
---
 res/xml/azerty.xml          | 12 ++++++------
 res/xml/dvorak.xml          |  6 +++---
 res/xml/local_bgph1.xml     | 14 +++++++-------
 res/xml/local_ru_jcuken.xml |  6 +++---
 res/xml/numeric.xml         | 10 +++++-----
 res/xml/qwerty.xml          |  8 ++++----
 res/xml/qwerty_es.xml       | 12 ++++++------
 res/xml/qwerty_ko.xml       |  8 ++++----
 res/xml/qwerty_lv.xml       | 16 ++++++++--------
 res/xml/qwerty_pt.xml       | 16 ++++++++--------
 res/xml/qwerty_sv_se.xml    |  8 ++++----
 res/xml/qwertz.xml          | 12 ++++++------
 12 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/res/xml/azerty.xml b/res/xml/azerty.xml
index 6e59882..c081d56 100644
--- a/res/xml/azerty.xml
+++ b/res/xml/azerty.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <keyboard>
   <row>
-    <key key0="a" key1="esc" key2="1" key3="&amp;"/>
-    <key key0="z" key2="2" key4="~"/>
+    <key key0="a" key2="1" key4="esc"/>
+    <key key0="z" key2="2" key3="&amp;" key4="~"/>
     <key key0="e" key2="3" key3="&quot;" key4="\#"/>
     <key key0="r" key2="4" key3="'"/>
     <key key0="t" key2="5" key3="(" key4=")"/>
     <key key0="y" key2="6" key3="-" key4="|"/>
     <key key0="u" key2="7" key4="`"/>
     <key key0="i" key2="8" key3="_" key4="\\"/>
-    <key key0="o" key2="9" key3="f11_placeholder"/>
-    <key key0="p" key2="0" key3="f12_placeholder" key4="\@"/>
+    <key key0="o" key2="9" key3="\@" key4="f11_placeholder"/>
+    <key key0="p" key1="0" key3="f12_placeholder"/>
   </row>
   <row>
-    <key key0="q" key1="tab"/>
+    <key key0="q" key2="tab"/>
     <key key0="s" key1="accent_ring" key3="ß"/>
     <key key0="d" key1="accent_grave" key3="accent_aigu"/>
     <key key0="f" key3="{" key4="}"/>
@@ -22,7 +22,7 @@
     <key key0="j" key1="accent_trema" key2="accent_circonflexe" key3="^"/>
     <key key0="k" key2="€" key3="$" key4="£"/>
     <key key0="l" key2="%"/>
-    <key key0="m" key4="*"/>
+    <key key0="m" key3="*"/>
   </row>
   <row>
     <key width="2.0" key0="shift"/>
diff --git a/res/xml/dvorak.xml b/res/xml/dvorak.xml
index 5fe2741..24d2117 100644
--- a/res/xml/dvorak.xml
+++ b/res/xml/dvorak.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <keyboard>
   <row>
-    <key key0="shift" width="1.5" key1="esc" key2="tab"/>
+    <key key0="shift" width="1.5" key2="esc" key4="tab"/>
     <key key0="p" key1="accent_ring" key2="." key3="&lt;" key4="f11_placeholder"/>
     <key key0="y" key1="accent_grave" key2="," key3="&gt;" key4="f12_placeholder"/>
     <key key0="f" key4="€"/>
@@ -12,7 +12,7 @@
     <key key0="backspace" key2="delete" width="1.5"/>
   </row>
   <row>
-    <key key0="a" key2="1" key3="!"/>
+    <key key0="a" key2="1" key4="!"/>
     <key key0="o" key1="accent_macron" key2="2" key3="\@"/>
     <key key0="e" key1="accent_caron" key2="3" key3="\#"/>
     <key key0="u" key2="4" key3="$"/>
@@ -21,7 +21,7 @@
     <key key0="h" key2="7" key3="&amp;"/>
     <key key0="t" key2="8" key3="*"/>
     <key key0="n" key2="9" key3="(" key4=")"/>
-    <key key0="s" key2="0" key3="ß"/>
+    <key key0="s" key1="0" key3="ß"/>
   </row>
   <row>
     <key key0="q" shift="0.5" key1="accent_tilde" key2="`" key3="~"/>
diff --git a/res/xml/local_bgph1.xml b/res/xml/local_bgph1.xml
index 00dfbe7..0d71527 100644
--- a/res/xml/local_bgph1.xml
+++ b/res/xml/local_bgph1.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <keyboard>
   <row>
-    <key key0="я" key1="esc" key2="1" key3="ч" key4="!"/>
-    <key key0="в" key2="2" key3="\@"/>
+    <key key0="я" key2="1" key4="esc"/>
+    <key key0="в" key1="!" key2="2" key3="\@" key4="ч"/>
     <key key0="е" key2="3" key3="\#" key4="№"/>
-    <key key0="р" key2="4" key3="$" key4="f11_placeholder"/>
-    <key key0="т" key2="5" key3="%" key4="f12_placeholder"/>
+    <key key0="р" key2="4" key3="$"/>
+    <key key0="т" key2="5" key3="%"/>
     <key key0="ъ" key2="6" key3="^" key4="€"/>
     <key key0="у" key2="7" key3="&amp;" key4="§"/>
     <key key0="и" key2="8" key3="*"/>
     <key key0="о" key1="accent_macron" key2="9" key3="(" key4=")"/>
-    <key key0="п" key2="0" key3="ш" key4="щ"/>
+    <key key0="п" key1="0" key3="f11_placeholder" key4="f12_placeholder"/>
   </row>
   <row>
     <key shift="0.5" key0="а" key1="tab" key2="`"/>
@@ -20,8 +20,8 @@
     <key key0="г" key1="accent_caron" key2="-" key3="_"/>
     <key key0="х" key2="=" key3="+"/>
     <key key0="й" key1="accent_trema" key2="accent_circonflexe" key4="}" key3="{"/>
-    <key key0="к" key3="[" key4="]"/>
-    <key key0="л" key2="|" key3="\\" key4="ю"/>
+    <key key0="к" key2="ш" key3="[" key4="]"/>
+    <key key0="л" key1="щ" key2="|" key3="\\" key4="ю"/>
   </row>
   <row>
     <key width="1.5" key0="shift"/>
diff --git a/res/xml/local_ru_jcuken.xml b/res/xml/local_ru_jcuken.xml
index 3869eb2..a2a2837 100644
--- a/res/xml/local_ru_jcuken.xml
+++ b/res/xml/local_ru_jcuken.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <keyboard>
   <row>
-    <key key0="й" key1="esc" key2="1" key3="~" key4="!"/>
-    <key key0="ц" key2="2" key3="\@"/>
-    <key key0="у" key2="3" key3="\#"/>
+    <key key0="й" key2="1" key4="esc"/>
+    <key key0="ц" key2="2" key3="\@" key4="~"/>
+    <key key0="у" key2="3" key3="\#" key4="!"/>
     <key key0="к" key2="4" key3="$"/>
     <key key0="е" key1="ё" key2="5" key3="%"/>
     <key key0="н" key2="6" key3="^"/>
diff --git a/res/xml/numeric.xml b/res/xml/numeric.xml
index 0b7ef49..957b27b 100644
--- a/res/xml/numeric.xml
+++ b/res/xml/numeric.xml
@@ -10,13 +10,13 @@
     <key width="0.75" key0="/" key1="%" key3="÷"/>
   </row>
   <row>
-    <key width="0.75" key0="tab" key1=";" key2="|" key4="\\"/>
+    <key width="0.75" key0="tab" key2="|" key4="\\"/>
     <key width="0.75" key0=")" key2="]" key4="}"/>
     <key key0="4" key1="box" key3="arrows"/>
     <key key0="5" key1="up" key2="right" key3="left" key4="down" edgekeys="true"/>
     <key key0="6"/>
     <key width="0.75" key0="+" key1="Σ" key2="$"/>
-    <key width="0.75" key0="-" key2="^"/>
+    <key width="0.75" key0="-" key1="^"/>
   </row>
   <row>
     <key shift="0.35" width="1.15" key0="shift" key2="fn" key4="alt"/>
@@ -27,9 +27,9 @@
   </row>
   <row height="0.95">
     <key width="1.5" key0="switch_text" key4="ctrl"/>
-    <key width="1.5" key0="0"/>
-    <key width="0.75" key0="." key1=":" key2="," key3="f11_placeholder"/>
-    <key width="0.75" key0="space" key1="&quot;" key2="'" key3="f12_placeholder" key4="_"/>
+    <key width="1.5" key0="0" key3="f11_placeholder" key4="f12_placeholder"/>
+    <key width="0.75" key0="." key1=":" key2="," key3=";"/>
+    <key width="0.75" key0="space" key1="&quot;" key2="'" key4="_"/>
     <key width="1.5" key0="enter" key1="±" key2="action" key3="="/>
   </row>
 </keyboard>
diff --git a/res/xml/qwerty.xml b/res/xml/qwerty.xml
index 70640c0..8f07441 100644
--- a/res/xml/qwerty.xml
+++ b/res/xml/qwerty.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <keyboard>
   <row>
-    <key key0="q" key1="esc" key2="1" key3="~" key4="!"/>
-    <key key0="w" key2="2" key3="\@"/>
-    <key key0="e" key2="3" key3="\#" key4="€"/>
+    <key key0="q" key2="1" key4="esc"/>
+    <key key0="w" key1="~" key2="2" key3="\@"/>
+    <key key0="e" key1="!" key2="3" key3="\#" key4="€"/>
     <key key0="r" key2="4" key3="$"/>
     <key key0="t" key2="5" key3="%"/>
     <key key0="y" key2="6" key3="^"/>
     <key key0="u" key2="7" key3="&amp;"/>
     <key key0="i" key2="8" key3="*"/>
     <key key0="o" key1="accent_macron" key2="9" key3="(" key4=")"/>
-    <key key0="p" key2="0" key3="f11_placeholder" key4="f12_placeholder"/>
+    <key key0="p" key1="0" key3="f11_placeholder" key4="f12_placeholder"/>
   </row>
   <row>
     <key shift="0.5" key0="a" key1="tab" key2="`"/>
diff --git a/res/xml/qwerty_es.xml b/res/xml/qwerty_es.xml
index 93a5298..3695996 100644
--- a/res/xml/qwerty_es.xml
+++ b/res/xml/qwerty_es.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <keyboard>
   <row>
-    <key key0="q" key1="esc" key2="1" key3="~" key4="!"/>
-    <key key0="w" key2="2" key3="\@"/>
-    <key key0="e" key2="3" key3="\#" key4="€"/>
+    <key key0="q" key2="1" key4="esc"/>
+    <key key0="w" key1="~" key2="2" key3="\@"/>
+    <key key0="e" key1="!" key2="3" key3="\#" key4="€"/>
     <key key0="r" key2="4" key3="$"/>
     <key key0="t" key2="5" key3="%"/>
     <key key0="y" key2="6" key3="^"/>
     <key key0="u" key2="7" key3="&amp;"/>
     <key key0="i" key2="8" key3="*"/>
     <key key0="o" key1="accent_macron" key2="9" key3="(" key4=")"/>
-    <key key0="p" key2="0" key3="f11_placeholder" key4="f12_placeholder"/>
+    <key key0="p" key1="0" key3="f11_placeholder" key4="f12_placeholder"/>
   </row>
   <row>
-    <key key0="a" key1="tab" key2="`" key4="¡"/>
-    <key key0="s" key1="accent_ring" key3="ß"/>
+    <key key0="a" key2="tab" key4="`"/>
+    <key key0="s" key1="accent_ring" key2="¡" key3="ß"/>
     <key key0="d" key1="accent_grave" key2="£" key3="accent_aigu"/>
     <key key0="f"/>
     <key key0="g" key1="accent_caron" key2="-" key3="_"/>
diff --git a/res/xml/qwerty_ko.xml b/res/xml/qwerty_ko.xml
index a886951..b945147 100644
--- a/res/xml/qwerty_ko.xml
+++ b/res/xml/qwerty_ko.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <keyboard>
   <row>
-    <key key0="ㅂ" key1="esc" key2="1" key3="~" key4="!"/>
-    <key key0="ㅈ" key2="2" key3="\@"/>
-    <key key0="ㄷ" key2="3" key3="\#" key4="€"/>
+    <key key0="ㅂ" key2="1" key4="esc"/>
+    <key key0="ㅈ" key1="~" key2="2" key3="\@"/>
+    <key key0="ㄷ" key1="!" key2="3" key3="\#" key4="€"/>
     <key key0="ㄱ" key2="4" key3="$"/>
     <key key0="ㅅ" key2="5" key3="%"/>
     <key key0="ㅛ" key2="6" key3="^"/>
     <key key0="ㅕ" key2="7" key3="&amp;"/>
     <key key0="ㅑ" key2="8" key3="*"/>
     <key key0="ㅐ" key2="9" key3="(" key4=")"/>
-    <key key0="ㅔ" key2="0" key3="f11_placeholder" key4="f12_placeholder"/>
+    <key key0="ㅔ" key1="0" key3="f11_placeholder" key4="f12_placeholder"/>
   </row>
   <row>
     <key shift="0.5" key0="ㅁ" key1="tab" key2="`"/>
diff --git a/res/xml/qwerty_lv.xml b/res/xml/qwerty_lv.xml
index e828851..797aca2 100644
--- a/res/xml/qwerty_lv.xml
+++ b/res/xml/qwerty_lv.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <keyboard>
   <row>
-    <key key0="q" key1="esc" key2="1" key3="~" key4="!"/>
-    <key key0="w" key2="2" key3="\@"/>
+    <key key0="q" key2="1" key4="esc"/>
+    <key key0="w" key1="~" key2="2" key3="\@" key4="!"/>
     <key key0="e" key1="ē" key2="3" key3="\#" key4="€"/>
     <key key0="r" key1="ŗ" key2="4" key3="$" key4="f11_placeholder"/>
     <key key0="t" key2="5" key3="%" key4="f12_placeholder"/>
     <key key0="y" key2="6" key3="^"/>
-    <key key0="u" key1="ū" key2="7" key3="&amp;"/>
-    <key key0="i" key1="ī" key2="8" key3="*"/>
-    <key key0="o" key1="ō" key2="9" key3="(" key4=")"/>
-    <key key0="p" key2="0" key3="{" key4="}"/>
+    <key key0="u" key1="ū" key2="7" key3="&amp;" key4="*"/>
+    <key key0="i" key1="ī" key2="8" key3="(" key4=")"/>
+    <key key0="o" key1="ō" key2="9" key3="{" key4="}"/>
+    <key key0="p" key1="0"/>
   </row>
   <row>
-    <key shift="0.5" key0="a" key1="ā"/>
+    <key shift="0.5" key0="a" key1="ā" key2="tab"/>
     <key key0="s" key1="š" key3="ß"/>
     <key key0="d" key2="£"/>
     <key key0="f"/>
@@ -24,7 +24,7 @@
     <key key0="l" key1="ļ" key2="|" key3="/" key4="\\"/>
   </row>
   <row>
-    <key width="1.5" key0="shift" key1="tab"/>
+    <key width="1.5" key0="shift"/>
     <key key0="z" key1="ž"/>
     <key key0="x"/>
     <key key0="c" key1="č"/>
diff --git a/res/xml/qwerty_pt.xml b/res/xml/qwerty_pt.xml
index 3b02cec..40110da 100644
--- a/res/xml/qwerty_pt.xml
+++ b/res/xml/qwerty_pt.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <keyboard>
   <row>
-    <key key0="q" key1="esc" key2="1" key3="~" key4="!"/>
-    <key key0="w" key2="2" key3="\@"/>
+    <key key0="q" key2="1" key4="esc"/>
+    <key key0="w" key1="~" key2="2" key3="\@" key4="!"/>
     <key key0="e" key1="£" key2="3" key3="\#" key4="€"/>
     <key key0="r" key2="4" key3="$" key4="f11_placeholder"/>
     <key key0="t" key2="5" key3="%" key4="f12_placeholder"/>
@@ -10,19 +10,19 @@
     <key key0="u" key2="7" key3="&amp;"/>
     <key key0="i" key2="8" key3="*"/>
     <key key0="o" key2="9" key3="(" key4=")"/>
-    <key key0="p" key2="0" key3="\\" key4="|"/>
+    <key key0="p" key1="0" key3="\\"/>
   </row>
   <row>
-    <key key0="a" key1="tab" key2="'" key3="`" key4="&quot;"/>
-    <key key0="s" key1="accent_ring" key2="accent_caron" key3="ß" key4="accent_cedille"/>
-    <key key0="d"/>
-    <key key0="f"/>
+    <key key0="a" key2="tab" key4="`"/>
+    <key key0="s" key1="'" key3="ß" key4="accent_cedille"/>
+    <key key0="d" key1="&quot;" key2="accent_ring"/>
+    <key key0="f" key2="accent_caron"/>
     <key key0="g"/>
     <key key0="h"/>
     <key key0="j" key1="-" key2="=" key4="+" key3="_"/>
     <key key0="k" key1="accent_grave" key2="accent_aigu" key3="accent_tilde" key4="accent_circonflexe"/>
     <key key0="l" key1="[" key2="]" key3="{" key4="}"/>
-    <key key0="ç"/>
+    <key key0="ç" key1="|"/>
   </row>
   <row>
     <key width="1.5" key0="shift"/>
diff --git a/res/xml/qwerty_sv_se.xml b/res/xml/qwerty_sv_se.xml
index 3ecea43..15aa6ca 100644
--- a/res/xml/qwerty_sv_se.xml
+++ b/res/xml/qwerty_sv_se.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <keyboard>
   <row>
-    <key key0="q" key1="esc" key2="1"/>
-    <key key0="w" key2="2" key4="\@"/>
+    <key key0="q" key4="esc" key2="1"/>
+    <key key0="w" key2="2" key3="`" key4="\@"/>
     <key key0="e" key2="3" key4="\#" key3="€"/>
     <key key0="r" key2="4" key4="$"/>
     <key key0="t" key2="5" key3="&amp;" key4="|"/>
@@ -11,10 +11,10 @@
     <key key0="i" key2="8" key3="*" key4="/"/>
     <key key0="o" key2="9" key3="+" key4="-"/>
     <key key0="p" key2="0" key3="=" key4="f11_placeholder"/>
-    <key key0="å" key1="\?" key3="!" key2="`" key4="f12_placeholder"/>
+    <key key0="å" key1="\?" key3="!" key4="f12_placeholder"/>
   </row>
   <row>
-    <key key0="a" key1="tab"/>
+    <key key0="a" key2="tab"/>
     <key key0="s" key1="accent_ring" key2="accent_cedille" key3="ß" key4="accent_tilde"/>
     <key key0="d" key1="accent_grave" key2="accent_caron" key3="accent_aigu"/>
     <key key0="f" key1="accent_trema" key2="accent_circonflexe"/>
diff --git a/res/xml/qwertz.xml b/res/xml/qwertz.xml
index 6c9597b..77d0fc5 100644
--- a/res/xml/qwertz.xml
+++ b/res/xml/qwertz.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?> 
 <keyboard>
   <row>
-    <key key0="q" key1="esc" key2="1" key3="\@" key4="!"/>
-    <key key0="w" key1="^" key2="2" key3="&quot;"/>
-    <key key0="e" key1="§" key2="3" key4="€"/>
+    <key key0="q" key2="1" key4="esc"/>
+    <key key0="w" key1="^" key2="2" key3="&quot;" key4="\@"/>
+    <key key0="e" key1="§" key2="3" key3="!" key4="€"/>
     <key key0="r" key2="4" key3="$" key4="f11_placeholder"/>
     <key key0="t" key2="5" key3="%" key4="f12_placeholder"/>
     <key key0="z" key2="6" key3="&amp;" key4="{"/>
     <key key0="u" key2="7" key3="ü" key4="}"/>
-    <key key0="i" key1="(" key2="8" key4="["/>
-    <key key0="o" key1=")" key2="9" key3="ö" key4="]"/>
-    <key key0="p" key1="=" key2="0" key3="\?"/>
+    <key key0="i" key1="(" key2="8" key3="[" key4="]"/>
+    <key key0="o" key1=")" key2="9" key3="ö" key4="="/>
+    <key key0="p" key1="0" key3="\?"/>
   </row>
   <row>
     <key shift="0.5" key0="a" key1="tab" key2="`" key3="ä"/>
-- 
cgit v1.2.3