From ab05d8314b476dd0ef2258078738576945f6f90a Mon Sep 17 00:00:00 2001
From: Eluc <ElucGeek@users.noreply.github.com>
Date: Wed, 16 Aug 2023 14:14:38 +0000
Subject: [PATCH] Create latn_qwertz_fr_CH.xml (#390)

Adapted from qwertz DE to match qwertz fr_CH layout.

Added all missing characters with accents needed in French while leaving the most common Swiss German characters as it is on the Swiss layout PC keyboard.
Re-organized some special characters to be in a similar position than the PC layout.

* Add locale fr-CH
---
 check_layout.output           |  2 ++
 res/values/layouts.xml        |  3 +++
 res/xml/latn_qwertz_fr_ch.xml | 42 +++++++++++++++++++++++++++++++++++
 res/xml/method.xml            |  3 ++-
 4 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 res/xml/latn_qwertz_fr_ch.xml

diff --git a/check_layout.output b/check_layout.output
index 61b0a36..a8edbe5 100644
--- a/check_layout.output
+++ b/check_layout.output
@@ -97,6 +97,8 @@ Layout doesn't define some important keys, missing: f11_placeholder, f12_placeho
 1 warnings
 # res/xml/latn_qwertz_de.xml
 0 warnings
+# res/xml/latn_qwertz_fr_ch.xml
+0 warnings
 # res/xml/latn_qwertz_hu.xml
 0 warnings
 # res/xml/latn_qwertz_sk.xml
diff --git a/res/values/layouts.xml b/res/values/layouts.xml
index 4c9779f..73ae0d0 100644
--- a/res/values/layouts.xml
+++ b/res/values/layouts.xml
@@ -38,6 +38,7 @@
     <item>latn_qwertz_cz</item>
     <item>latn_qwertz_cz_multifunctional</item>
     <item>latn_qwertz_de</item>
+    <item>latn_qwertz_fr_ch</item>
     <item>latn_qwertz_hu</item>
     <item>latn_qwertz_sk</item>
     <item>custom</item>
@@ -79,6 +80,7 @@
     <item>QWERTZ (Czech)</item>
     <item>QWERTZ Multifunctional (Czech)</item>
     <item>QWERTZ (Deutsch)</item>
+    <item>QWERTZ (Swiss French)</item>
     <item>QWERTZ (Magyar)</item>
     <item>QWERTZ (Slovak)</item>
     <item>@string/pref_layout_e_custom</item>
@@ -120,6 +122,7 @@
     <item>@xml/latn_qwertz_cz</item>
     <item>@xml/latn_qwertz_cz_multifunctional</item>
     <item>@xml/latn_qwertz_de</item>
+    <item>@xml/latn_qwertz_fr_ch</item>
     <item>@xml/latn_qwertz_hu</item>
     <item>@xml/latn_qwertz_sk</item>
     <item>-1</item>
diff --git a/res/xml/latn_qwertz_fr_ch.xml b/res/xml/latn_qwertz_fr_ch.xml
new file mode 100644
index 0000000..ad10bc0
--- /dev/null
+++ b/res/xml/latn_qwertz_fr_ch.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Freely adapted from standard SN 074021:1999-01 by Eluc -->
+<keyboard name="QWERTZ (Swiss French)" script="latin">
+  <row>
+    <key key0="q" key1="§" key2="1" key4="esc"/>
+    <key key0="w" key1="^" key2="2" key3="&quot;" key4="\@"/>
+    <key key0="e" 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;"/>
+    <key key0="u" key1="ù" key2="7" key3="{" key4="}"/>
+    <key key0="i" key2="8" key3="[" key4="]"/>
+    <key key0="o" key1="œ" key2="9" key3="(" key4=")"/>
+    <key key0="p" key2="0" key3="=" key4="\?"/>
+    <key key0="è" key2="ü" key3="!"/>
+  </row>
+  <row>
+    <key key0="a" key1= "æ" key2="tab"/>
+    <key key0="s" key1="`" key3="ß" key4="£"/>
+    <key key0="d"/>
+    <key key0="f" key1="~"/>
+    <key key0="g"/>
+    <key key0="h" key3="+"/>
+    <key key0="j" key3="*"/>
+    <key key0="k" key3="/"/>
+    <key key0="l" key1="'" key3="\\"/>
+    <key key0="é" key1="ë" key2="ö"/>
+    <key key0="à" key1="ï" key2="ä"/>
+  </row>
+  <row>
+    <key width="1.5" key0="shift" key2="loc capslock"/>
+    <key key0="y" key1="&gt;" key2="|" key3="&lt;"/>
+    <key key0="x"/>
+    <key key0="c" key3="ç"/>
+    <key key0="v"/>
+    <key key0="b" key1=";" key3="," key4="₿"/>
+    <key key0="n" key1=":" key3="."/>
+    <key key0="m" key1="_" key3="-"/>
+    <key key0="ê" key1="â" key2="î" key3="ô" key4="û"/>
+    <key width="1.5" key0="backspace" key2="delete"/>
+  </row>
+</keyboard>
diff --git a/res/xml/method.xml b/res/xml/method.xml
index ace57f2..f602377 100644
--- a/res/xml/method.xml
+++ b/res/xml/method.xml
@@ -11,7 +11,8 @@
   <subtype android:label="%s" android:languageTag="en-US" android:imeSubtypeLocale="en_US" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_us"/>
   <subtype android:label="%s" android:languageTag="es" android:imeSubtypeLocale="es_ES" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_es,extra_keys=accent_aigu:á:é:í:ó:ú|accent_tilde:ñ|accent_grave|accent_trema|€"/>
   <subtype android:label="%s" android:languageTag="fa" android:imeSubtypeLocale="fa_IR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=arab_pc_ir"/>
-  <subtype android:label="%s" android:languageTag="fr" android:imeSubtypeLocale="fr_FR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_azerty_fr,extra_keys=accent_grave:à:è:ù|accent_aigu:é|accent_circonflexe:â:ê:ô|accent_cedille:ç|accent_trema:ë:ï:ü:ÿ|€"/>
+  <subtype android:label="%s" android:languageTag="fr-CH" android:imeSubtypeLocale="fr_CH" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwertz_fr_ch,extra_keys=accent_grave:à:è:ù|accent_aigu:é|accent_circonflexe:â:ê:ô|accent_cedille:ç|accent_trema:ë:ï:ü:ÿ|€"/>
+  <subtype android:label="%s" android:languageTag="fr-FR" android:imeSubtypeLocale="fr_FR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_azerty_fr,extra_keys=accent_grave:à:è:ù|accent_aigu:é|accent_circonflexe:â:ê:ô|accent_cedille:ç|accent_trema:ë:ï:ü:ÿ|€"/>
   <subtype android:label="%s" android:languageTag="he" android:imeSubtypeLocale="he_IL" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=hebrew,default_layout=hebr_1_il,extra_keys=₪|€"/>
   <subtype android:label="%s" android:languageTag="hi" android:imeSubtypeLocale="hi_IN" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=devanagari,default_layout=deva_inscript,extra_keys=₹"/>
   <subtype android:label="%s" android:languageTag="hu" android:imeSubtypeLocale="hu_HU" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwertz_hu,extra_keys=accent_aigu:á:é:í:ó:ú|accent_trema:ö:ü|accent_ogonek|accent_double_aigu:ő:ű|€"/>