From 5440a3ec7d56e490f7dd1f3ba3194a80db284357 Mon Sep 17 00:00:00 2001
From: Radik Islamov <vizid1337@gmail.com>
Date: Thu, 2 May 2024 02:56:40 +0500
Subject: [PATCH] Add Eastern Mari layout (#755)

Co-authored-by: Helium314 <helium314@mailbox.org>
---
 .../main/assets/language_key_texts/mhr.txt    |  8 ++++
 app/src/main/assets/layouts/mari.txt          | 44 +++++++++++++++++++
 .../keyboard/latin/utils/ScriptUtils.kt       |  2 +-
 app/src/main/res/xml/method.xml               | 10 +++++
 4 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/assets/language_key_texts/mhr.txt
 create mode 100644 app/src/main/assets/layouts/mari.txt

diff --git a/app/src/main/assets/language_key_texts/mhr.txt b/app/src/main/assets/language_key_texts/mhr.txt
new file mode 100644
index 00000000..287860cb
--- /dev/null
+++ b/app/src/main/assets/language_key_texts/mhr.txt
@@ -0,0 +1,8 @@
+[popup_keys]
+" « » „ “ ”
+н ҥ
+о ӧ
+у ӱ
+
+[labels]
+alphabet: АБВ
diff --git a/app/src/main/assets/layouts/mari.txt b/app/src/main/assets/layouts/mari.txt
new file mode 100644
index 00000000..528cd828
--- /dev/null
+++ b/app/src/main/assets/layouts/mari.txt
@@ -0,0 +1,44 @@
+ё
+ҥ
+ӧ
+ӱ
+ъ
+-
+!
+?
+"
+/
+
+й
+ц
+у
+к
+е
+н
+г
+ш
+щ
+з
+х
+
+ф
+ы
+в
+а
+п
+р
+о
+л
+д
+ж
+э
+
+я
+ч
+с
+м
+и
+т
+ь
+б
+ю
diff --git a/app/src/main/java/helium314/keyboard/latin/utils/ScriptUtils.kt b/app/src/main/java/helium314/keyboard/latin/utils/ScriptUtils.kt
index 0de18167..5d55fab9 100644
--- a/app/src/main/java/helium314/keyboard/latin/utils/ScriptUtils.kt
+++ b/app/src/main/java/helium314/keyboard/latin/utils/ScriptUtils.kt
@@ -165,7 +165,7 @@ object ScriptUtils {
             "ar", "ur", "fa" -> SCRIPT_ARABIC
             "hy" -> SCRIPT_ARMENIAN
             "bn" -> SCRIPT_BENGALI
-            "sr", "mk", "ru", "uk", "mn", "be", "kk", "ky", "bg", "xdq", "cv" -> SCRIPT_CYRILLIC
+            "sr", "mk", "ru", "uk", "mn", "be", "kk", "ky", "bg", "xdq", "cv", "mhr" -> SCRIPT_CYRILLIC
             "ka" -> SCRIPT_GEORGIAN
             "el" -> SCRIPT_GREEK
             "iw" -> SCRIPT_HEBREW
diff --git a/app/src/main/res/xml/method.xml b/app/src/main/res/xml/method.xml
index b701d9f1..ea86e1ef 100644
--- a/app/src/main/res/xml/method.xml
+++ b/app/src/main/res/xml/method.xml
@@ -67,6 +67,7 @@
     lo_LA: Lao (Laos)/lao
     lt: Lithuanian/qwerty
     lv: Latvian/qwerty
+    mhr: Mari (Eastern)
     mk: Macedonian/macedonian
     ml_IN: Malayalam (India)/malayalam
     mn_MN: Mongolian (Mongolia)/mongolian
@@ -679,6 +680,15 @@
             android:imeSubtypeMode="keyboard"
             android:imeSubtypeExtraValue="AsciiCapable,EmojiCapable"
             android:isAsciiCapable="true"
+    />
+     <subtype android:icon="@drawable/ic_ime_switcher"
+            android:label="@string/subtype_generic"
+            android:subtypeId="0xb84023bf"
+            android:imeSubtypeLocale="mhr"
+            android:languageTag="mhr"
+            android:imeSubtypeMode="keyboard"
+            android:imeSubtypeExtraValue="KeyboardLayoutSet=mari,SupportTouchPositionCorrection,EmojiCapable"
+            android:isAsciiCapable="false"
     />
     <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"