From e90d4a163386c2031b0847a6e0a196e1e4a61c01 Mon Sep 17 00:00:00 2001
From: Helium314 <helium314@mailbox.org>
Date: Sun, 31 Dec 2023 11:12:33 +0100
Subject: [PATCH] re-add som symbol keys on a few layouts

were removed in 2c03623b8ab1b70a4335d9c9ed55a20de6a08465
better would be adding them to the symbols layout
  would require different symbols layout for those layouts
  or symbol layout that gets cut down to number of keys of base layout
---
 app/src/main/assets/layouts/azerty.json     |  2 +-
 app/src/main/assets/layouts/be.txt          |  4 +--
 app/src/main/assets/layouts/bepo.txt        |  2 +-
 app/src/main/assets/layouts/colemak.json    |  2 +-
 app/src/main/assets/layouts/colemak_dh.json |  2 +-
 app/src/main/assets/layouts/halmak.txt      |  2 +-
 app/src/main/assets/layouts/kk.txt          | 33 ---------------------
 app/src/main/assets/layouts/ky.txt          | 33 ---------------------
 app/src/main/assets/layouts/ru.txt          |  4 +--
 app/src/main/assets/layouts/uk.txt          |  4 +--
 app/src/main/assets/layouts/workman.txt     |  2 +-
 app/src/main/res/xml/method.xml             |  8 ++---
 12 files changed, 16 insertions(+), 82 deletions(-)
 delete mode 100644 app/src/main/assets/layouts/kk.txt
 delete mode 100644 app/src/main/assets/layouts/ky.txt

diff --git a/app/src/main/assets/layouts/azerty.json b/app/src/main/assets/layouts/azerty.json
index 92b5a95b..19ae671e 100644
--- a/app/src/main/assets/layouts/azerty.json
+++ b/app/src/main/assets/layouts/azerty.json
@@ -21,7 +21,7 @@
     { "label": "j" },
     { "label": "k" },
     { "label": "l" },
-    { "label": "m" }
+    { "label": "m", "popup": { "main": { "label": "/" } } }
   ],
   [
     { "label": "w" },
diff --git a/app/src/main/assets/layouts/be.txt b/app/src/main/assets/layouts/be.txt
index 8547d38f..44408c56 100644
--- a/app/src/main/assets/layouts/be.txt
+++ b/app/src/main/assets/layouts/be.txt
@@ -29,5 +29,5 @@
 і
 т
 ь
-б
-ю
+б <
+ю >
diff --git a/app/src/main/assets/layouts/bepo.txt b/app/src/main/assets/layouts/bepo.txt
index de5b027f..0aaa74a6 100644
--- a/app/src/main/assets/layouts/bepo.txt
+++ b/app/src/main/assets/layouts/bepo.txt
@@ -18,7 +18,7 @@ t
 s
 r
 n
-m
+m /
 
 y
 x
diff --git a/app/src/main/assets/layouts/colemak.json b/app/src/main/assets/layouts/colemak.json
index 1e5f898c..46c8f2f5 100644
--- a/app/src/main/assets/layouts/colemak.json
+++ b/app/src/main/assets/layouts/colemak.json
@@ -24,7 +24,7 @@
     { "label": "n" },
     { "label": "e" },
     { "label": "i" },
-    { "label": "o" }
+    { "label": "o", "popup": { "main": { "label": "…" } } }
   ],
   [
     { "label": "z" },
diff --git a/app/src/main/assets/layouts/colemak_dh.json b/app/src/main/assets/layouts/colemak_dh.json
index 31ca390a..7579a5d6 100644
--- a/app/src/main/assets/layouts/colemak_dh.json
+++ b/app/src/main/assets/layouts/colemak_dh.json
@@ -24,7 +24,7 @@
     { "label": "n" },
     { "label": "e" },
     { "label": "i" },
-    { "label": "o" }
+    { "label": "o", "popup": { "main": { "label": "…" } } }
   ],
   [
     { "label": "z" },
diff --git a/app/src/main/assets/layouts/halmak.txt b/app/src/main/assets/layouts/halmak.txt
index 2b1d7007..22f0ad77 100644
--- a/app/src/main/assets/layouts/halmak.txt
+++ b/app/src/main/assets/layouts/halmak.txt
@@ -18,7 +18,7 @@ t
 a
 e
 o
-i
+i /
 
 m
 v
diff --git a/app/src/main/assets/layouts/kk.txt b/app/src/main/assets/layouts/kk.txt
deleted file mode 100644
index c7cd4c1c..00000000
--- a/app/src/main/assets/layouts/kk.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-й
-ц
-у
-к
-е
-н
-г
-ш
-щ
-з
-х
-
-ф
-ы
-в
-а
-п
-р
-о
-л
-д
-ж
-э
-
-я
-ч
-с
-м
-и
-т
-ь
-б
-ю
diff --git a/app/src/main/assets/layouts/ky.txt b/app/src/main/assets/layouts/ky.txt
deleted file mode 100644
index c7cd4c1c..00000000
--- a/app/src/main/assets/layouts/ky.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-й
-ц
-у
-к
-е
-н
-г
-ш
-щ
-з
-х
-
-ф
-ы
-в
-а
-п
-р
-о
-л
-д
-ж
-э
-
-я
-ч
-с
-м
-и
-т
-ь
-б
-ю
diff --git a/app/src/main/assets/layouts/ru.txt b/app/src/main/assets/layouts/ru.txt
index c7cd4c1c..7ceb2435 100644
--- a/app/src/main/assets/layouts/ru.txt
+++ b/app/src/main/assets/layouts/ru.txt
@@ -29,5 +29,5 @@
 и
 т
 ь
-б
-ю
+б <
+ю >
diff --git a/app/src/main/assets/layouts/uk.txt b/app/src/main/assets/layouts/uk.txt
index 93e84e93..7e01cde3 100644
--- a/app/src/main/assets/layouts/uk.txt
+++ b/app/src/main/assets/layouts/uk.txt
@@ -29,5 +29,5 @@
 и
 т
 ь
-б
-ю
+б <
+ю >
diff --git a/app/src/main/assets/layouts/workman.txt b/app/src/main/assets/layouts/workman.txt
index be1d1d8e..ef03de51 100644
--- a/app/src/main/assets/layouts/workman.txt
+++ b/app/src/main/assets/layouts/workman.txt
@@ -18,7 +18,7 @@ y
 n
 e
 o
-i
+i /
 
 z
 x
diff --git a/app/src/main/res/xml/method.xml b/app/src/main/res/xml/method.xml
index 6930f74f..2f2ec9e9 100644
--- a/app/src/main/res/xml/method.xml
+++ b/app/src/main/res/xml/method.xml
@@ -57,10 +57,10 @@
     it_CH: Italian (Switzerland)/qwertz+
     iw: Hebrew/hebrew        # "he" is the official language code of Hebrew.
     ka_GE: Georgian (Georgia)/georgian
-    kk: Kazakh/kk
+    kk: Kazakh/ru
     km_KH: Khmer (Cambodia)/khmer
     kn_IN: Kannada (India)/kannada
-    ky: Kyrgyz/ky
+    ky: Kyrgyz/ru
     lo_LA: Lao (Laos)/lao
     lt: Lithuanian/qwerty
     lv: Latvian/qwerty
@@ -539,7 +539,7 @@
             android:imeSubtypeLocale="kk"
             android:languageTag="kk"
             android:imeSubtypeMode="keyboard"
-            android:imeSubtypeExtraValue="KeyboardLayoutSet=kk,EmojiCapable"
+            android:imeSubtypeExtraValue="KeyboardLayoutSet=ru,EmojiCapable"
             android:isAsciiCapable="false"
     />
     <subtype android:icon="@drawable/ic_ime_switcher"
@@ -593,7 +593,7 @@
             android:imeSubtypeLocale="ky"
             android:languageTag="ky"
             android:imeSubtypeMode="keyboard"
-            android:imeSubtypeExtraValue="KeyboardLayoutSet=ky,EmojiCapable"
+            android:imeSubtypeExtraValue="KeyboardLayoutSet=ru,EmojiCapable"
             android:isAsciiCapable="false"
     />
     <subtype android:icon="@drawable/ic_ime_switcher"