From fadedfd58f1bc62aea8e913662984f84f20631bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacob=20Str=C3=B6mgren?= <thabubble(at)gmail(dot)com>
Date: Mon, 14 Mar 2022 22:43:19 +0100
Subject: [PATCH] Add Swedish layout

---
 res/values/arrays.xml            |  2 ++
 res/xml/method.xml               |  2 +-
 res/xml/qwerty_sv_se.xml         | 42 ++++++++++++++++++++++++++++++++
 srcs/juloo.keyboard2/Config.java | 11 +++++----
 4 files changed, 51 insertions(+), 6 deletions(-)
 create mode 100644 res/xml/qwerty_sv_se.xml

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index edf8af6..26d807e 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -6,6 +6,7 @@
     <item>qwerty</item>
     <item>qwerty_es</item>
     <item>qwerty_lv</item>
+    <item>qwerty_sv_se</item>
     <item>ru_jcuken</item>
     <item>qwertz</item>
     <item>bgph1</item>
@@ -17,6 +18,7 @@
     <item>QWERTY</item>
     <item>QWERTY (Español)</item>
     <item>QWERTY (Latvian)</item>
+    <item>QWERTY (Swedish)</item>
     <item>ЙЦУКЕН (Русский)</item>
     <item>QWERTZ</item>
     <item>Bulgarian (Phonetic Traditional)</item>
diff --git a/res/xml/method.xml b/res/xml/method.xml
index 91c4329..015aaba 100644
--- a/res/xml/method.xml
+++ b/res/xml/method.xml
@@ -10,5 +10,5 @@
   <subtype android:label="%s" android:languageTag="lv" android:imeSubtypeLocale="lv_LV" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty_lv,extra_keys=accent_caron|accent_cedille|accent_macron|€"/>
   <subtype android:label="%s" android:languageTag="pt" android:imeSubtypeLocale="pt_BR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty,extra_keys=accent_aigu|accent_cedille|accent_circonflexe|accent_grave|accent_tilde|€"/>
   <subtype android:label="%s" android:languageTag="ru" android:imeSubtypeLocale="ru_RU" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=ru_jcuken"/>
-  <subtype android:label="%s" android:languageTag="sv" android:imeSubtypeLocale="sv_SE" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty,extra_keys=accent_aigu|accent_trema|accent_ring|€"/>
+  <subtype android:label="%s" android:languageTag="sv" android:imeSubtypeLocale="sv_SE" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty_sv_se,extra_keys=accent_aigu|accent_trema|accent_ring|€"/>
 </input-method>
diff --git a/res/xml/qwerty_sv_se.xml b/res/xml/qwerty_sv_se.xml
new file mode 100644
index 0000000..26a8fe5
--- /dev/null
+++ b/res/xml/qwerty_sv_se.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<keyboard>
+  <row>
+    <key key0="q" key1="esc" key2="1"/>
+    <key key0="w" key2="2" key4="\@"/>
+    <key key0="e" key2="3" key4="\#" key3="€"/>
+    <key key0="r" key2="4" key4="$"/>
+    <key key0="t" key2="5" key3="&amp;" key4="|" />
+    <key key0="y" key2="6" key3="^" key4="%"/>
+    <key key0="u" key2="7" key3="~" key4="\\" />
+    <key key0="i" key2="8" key3="*" key4="/" />
+    <key key0="o" key2="9" key3="+" key4="-"/>
+    <key key0="p" key2="0" key3="=" />
+    <key key0="å" key1="\?" key3="!" key2="`" />
+  </row>
+  <row>
+    <key key0="a" key1="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"/>
+    <key key0="g"  />
+    <key key0="h" />
+    <key key0="j" key1="{" key4="}" />
+    <key key0="k" key1="[" key4="]" />
+    <key key0="l" key1="(" key4=")" />
+    <key key0="ö" key1="&lt;" key4="&gt;" />
+    <key key0="ä" key1="'" key3="&quot;"/>
+
+  </row>
+  <row>
+    <key width="1.5" key0="shift"/>
+    <key key0="z" />
+    <key key0="x" />
+    <key key0="c" />
+    <key key0="v" />
+    <key key0="b" key2=";" key4=","/>
+    <key key0="n" key2=":" key4="."/>
+    <key key0="m" key2="-" key4="_"/>
+    <key width="1.0" key0="." key1="!" key2="\?" key3="'" key4="," />
+    <key width="1.5" key0="backspace" key2="delete"/>
+  </row>
+</keyboard>
diff --git a/srcs/juloo.keyboard2/Config.java b/srcs/juloo.keyboard2/Config.java
index 0c92c76..e78a45a 100644
--- a/srcs/juloo.keyboard2/Config.java
+++ b/srcs/juloo.keyboard2/Config.java
@@ -201,13 +201,14 @@ final class Config
     switch (name)
     {
       case "azerty": return R.xml.azerty;
-      case "qwerty": return R.xml.qwerty;
-      case "qwerty_lv": return R.xml.qwerty_lv;
-      case "qwerty_es": return R.xml.qwerty_es;
-      case "ru_jcuken": return R.xml.local_ru_jcuken;
-      case "qwertz": return R.xml.qwertz;
       case "bgph1": return R.xml.local_bgph1;
       case "dvorak": return R.xml.dvorak;
+      case "qwerty_es": return R.xml.qwerty_es;
+      case "qwerty_lv": return R.xml.qwerty_lv;
+      case "qwerty": return R.xml.qwerty;
+      case "qwerty_sv_se": return R.xml.qwerty_sv_se;
+      case "qwertz": return R.xml.qwertz;
+      case "ru_jcuken": return R.xml.local_ru_jcuken;
       case "system": default: return -1;
     }
   }