From 4e98ab7515e58a1166acb36dc852166e3876fa56 Mon Sep 17 00:00:00 2001
From: Vladimir Chernov <56764829+carrot-cookie@users.noreply.github.com>
Date: Sun, 13 Feb 2022 15:56:46 +0300
Subject: [PATCH] Add Russian layout (#66)

* Add Russian layout

Co-authored-by: Jules Aguillon <jules@j3s.fr>
---
 res/values/arrays.xml            |  2 ++
 res/xml/local_ru_jcuken.xml      | 43 ++++++++++++++++++++++++++++++++
 res/xml/method.xml               |  1 +
 srcs/juloo.keyboard2/Config.java |  1 +
 4 files changed, 47 insertions(+)
 create mode 100644 res/xml/local_ru_jcuken.xml

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 4a9903a..d491fc2 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -5,6 +5,7 @@
     <item>azerty</item>
     <item>qwerty</item>
     <item>qwerty_lv</item>
+    <item>ru_jcuken</item>
     <item>qwertz</item>
     <item>bgph1</item>
     <item>dvorak</item>
@@ -14,6 +15,7 @@
     <item>AZERTY</item>
     <item>QWERTY</item>
     <item>QWERTY (Latvian)</item>
+    <item>ЙЦУКЕН (Русский)</item>
     <item>QWERTZ</item>
     <item>Bulgarian (Phonetic Traditional)</item>
     <item>Dvorak</item>
diff --git a/res/xml/local_ru_jcuken.xml b/res/xml/local_ru_jcuken.xml
new file mode 100644
index 0000000..6e8535f
--- /dev/null
+++ b/res/xml/local_ru_jcuken.xml
@@ -0,0 +1,43 @@
+<?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="4" key3="$"/>
+    <key key0="е" key1="ё" 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"/>
+    <key key0="х" key1="{" key2="}"/>
+    <key key0="ъ" key1="[" key2="]" />
+  </row>
+  <row>
+    <key shift="0.5" key0="ф" key1="tab" key2="`"/>
+    <key key0="ы"/>
+    <key key0="в"/>
+    <key key0="а"/>
+    <key key0="п"/>
+    <key key0="р"/>
+    <key key0="о"/>
+    <key key0="л"/>
+    <key key0="д" key2="-" key3="_"/>
+    <key key0="ж" key2="=" key3="+"/>
+    <key key0="э" key2="|" key3="\\"/>
+  </row>
+  <row>
+    <key width="1.5" key0="shift"/>
+    <key key0="я"/>
+    <key key0="ч"/>
+    <key key0="с"/>
+    <key key0="м"/>
+    <key key0="и" key2="&lt;" key3="."/>
+    <key key0="т" key2="&gt;" key3=","/>
+    <key key0="ь" key2="\?" key3="/"/>
+    <key key0="б" key2=":" key3=";"/>
+    <key key0="ю" key2="&quot;" key3="'"/>
+    <key width="1.5" key0="backspace" key2="delete"/>
+  </row>
+</keyboard>
diff --git a/res/xml/method.xml b/res/xml/method.xml
index 49ba586..c83ee35 100644
--- a/res/xml/method.xml
+++ b/res/xml/method.xml
@@ -6,6 +6,7 @@
   <subtype android:label="%s" android:languageTag="fr" android:imeSubtypeLocale="fr_FR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=azerty,extra_keys=grave|aigu|circonflexe|cedille|trema"/>
   <subtype android:label="%s" android:languageTag="it" android:imeSubtypeLocale="it_IT" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty,extra_keys=grave|aigu"/>
   <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=caron|cedille|macron"/>
+  <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="pt" android:imeSubtypeLocale="pt_BR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty,extra_keys=aigu|cedille|circonflexe|grave|tilde"/>
   <subtype android:label="%s" android:languageTag="sv" android:imeSubtypeLocale="sv_SE" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty,extra_keys=aigu|trema|ring"/>
   <subtype android:label="%s" android:languageTag="bg" android:imeSubtypeLocale="bg_BG" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=bgph1"/>
diff --git a/srcs/juloo.keyboard2/Config.java b/srcs/juloo.keyboard2/Config.java
index 2790cc2..66b9239 100644
--- a/srcs/juloo.keyboard2/Config.java
+++ b/srcs/juloo.keyboard2/Config.java
@@ -137,6 +137,7 @@ final class Config
       case "azerty": return R.xml.azerty;
       case "qwerty": return R.xml.qwerty;
       case "qwerty_lv": return R.xml.qwerty_lv;
+      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;