From a4b07d6de2942265b843576dbc720ea2253748a1 Mon Sep 17 00:00:00 2001
From: Arsen Abdusalamov <mekegi@users.noreply.github.com>
Date: Mon, 13 Jan 2025 22:26:46 +0300
Subject: [PATCH] Add Dargwa(Urakhi) layout (#1127)

---
 app/src/main/assets/layouts/dargwa_urakhi.txt | 35 +++++++++++++++++++
 .../keyboard/latin/common/LocaleUtils.kt      |  2 +-
 .../keyboard/latin/utils/ScriptUtils.kt       |  2 +-
 app/src/main/res/values-ru/strings.xml        |  2 ++
 app/src/main/res/values/donottranslate.xml    |  5 ++-
 app/src/main/res/values/strings.xml           |  2 ++
 app/src/main/res/xml/method.xml               | 10 ++++++
 7 files changed, 55 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/assets/layouts/dargwa_urakhi.txt

diff --git a/app/src/main/assets/layouts/dargwa_urakhi.txt b/app/src/main/assets/layouts/dargwa_urakhi.txt
new file mode 100644
index 000000000..44da4e910
--- /dev/null
+++ b/app/src/main/assets/layouts/dargwa_urakhi.txt
@@ -0,0 +1,35 @@
+й
+ц
+у ӯ ӱ ý ӱ́
+к ҟ ҝ ҡ
+е ē ë е́ ë́
+н
+г ґ ғ ꚕ
+ш
+щ
+з ҙ
+х ҳ ẋ
+ъ
+
+ф
+ы
+в w
+а ā ӓ á ӓ́
+п ԥ
+р ҏ
+о о̄ ӧ ó ӧ́
+л
+д
+ж җ
+э э̄ э́
+Ӏ
+
+я я̄ я́ ǽ æ ǣ
+ч ҹ
+с
+м
+и ӣ и́
+т ԏ
+ь
+б ҕ
+ю ю́
\ No newline at end of file
diff --git a/app/src/main/java/helium314/keyboard/latin/common/LocaleUtils.kt b/app/src/main/java/helium314/keyboard/latin/common/LocaleUtils.kt
index e33efc73e..577cb96cf 100644
--- a/app/src/main/java/helium314/keyboard/latin/common/LocaleUtils.kt
+++ b/app/src/main/java/helium314/keyboard/latin/common/LocaleUtils.kt
@@ -190,7 +190,7 @@ object LocaleUtils {
     fun getLocaleDisplayNameInLocale(locale: Locale, resources: Resources, displayLocale: Locale): String {
         val languageTag = locale.toLanguageTag()
         if (languageTag == SubtypeLocaleUtils.NO_LANGUAGE) return resources.getString(R.string.subtype_no_language)
-        if (locale.script() != locale.language.constructLocale().script() || locale.language == "mns" || locale.language == "xdq") {
+        if (locale.script() != locale.language.constructLocale().script() || locale.language == "mns" || locale.language == "xdq" || locale.language=="dru") {
             val resId = resources.getIdentifier(
                 "subtype_${languageTag.replace("-", "_")}",
                 "string",
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 6daec94bc..df442089d 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", "mhr", "mns" -> SCRIPT_CYRILLIC
+            "sr", "mk", "ru", "uk", "mn", "be", "kk", "ky", "bg", "xdq", "cv", "mhr", "mns", "dru" -> SCRIPT_CYRILLIC
             "ka" -> SCRIPT_GEORGIAN
             "el" -> SCRIPT_GREEK
             "iw" -> SCRIPT_HEBREW
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index f2fef6c6a..a5147a345 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -60,6 +60,7 @@
     <string name="subtype_with_layout_es_US">Испанский (США) (<xliff:g id="KEYBOARD_LAYOUT" example="QWERTY">%s</xliff:g>)</string>
     <string name="subtype_with_layout_hi_Latn">Хинглиш (<xliff:g id="KEYBOARD_LAYOUT" example="QWERTY">%s</xliff:g>)</string>
     <string name="subtype_with_layout_mns">Мансийский (<xliff:g id="KEYBOARD_LAYOUT" example="QWERTY">%s</xliff:g>)</string>
+    <string name="subtype_with_layout_dru">Урахинский (<xliff:g id="KEYBOARD_LAYOUT" example="QWERTY">%s</xliff:g>)</string>
     <string name="subtype_with_layout_xdq">Кайтагский (<xliff:g id="KEYBOARD_LAYOUT" example="QWERTY">%s</xliff:g>)</string>
     <string name="subtype_with_layout_sr_Latn">Сербский (<xliff:g id="KEYBOARD_LAYOUT" example="QWERTY">%s</xliff:g>)</string>
     <string name="subtype_generic_traditional"><xliff:g id="LANGUAGE_NAME" example="Непальский">%s</xliff:g> (Традиционная)</string>
@@ -153,6 +154,7 @@
     <string name="settings_no_limit">Без ограничения</string>
     <string name="clipboard_history_retention_time">Время хранения журнала буфера обмена</string>
     <string name="subtype_with_layout_bn_BD"><xliff:g id="LANGUAGE_NAME" example="Бенгальский">%s</xliff:g> (Акхор)</string>
+    <string name="subtype_dru">Даргинский (Урахи)</string>
     <string name="subtype_no_language_workman">Латиница (Workman)</string>
     <string name="key_borders">Контуры клавиш</string>
     <string name="day_night_mode">Использовать тему системы</string>
diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml
index aad83ab52..1825f14d5 100644
--- a/app/src/main/res/values/donottranslate.xml
+++ b/app/src/main/res/values/donottranslate.xml
@@ -15,6 +15,7 @@
         <item>es-US</item>
         <item>hi-Latn</item>
         <item>mns</item>
+        <item>dru</item>
         <item>xdq</item>
         <item>sr-Latn</item>
     </string-array>
@@ -23,12 +24,14 @@
     <string-array name="subtype_locale_displayed_in_root_locale">
         <item>hi-Latn</item>
         <item>mns</item>
+        <item>dru</item>
         <item>xdq</item>
         <item>sr-Latn</item>
     </string-array>
     <string name="subtype_in_root_locale_hi_Latn" translatable="false" tools:keep="@string/subtype_in_root_locale_hi_Latn">Hinglish</string>
     <string name="subtype_in_root_locale_mns" translatable="false" tools:keep="@string/subtype_in_root_locale_mns">Ма̄ньси</string>
-     <string name="subtype_in_root_locale_xdq" translatable="false" tools:keep="@string/subtype_in_root_locale_xdq">Хайдаҡьан</string>
+    <string name="subtype_in_root_locale_dru" translatable="false" tools:keep="@string/subtype_in_root_locale_dru">ХӀурухъла лугъат</string>
+    <string name="subtype_in_root_locale_xdq" translatable="false" tools:keep="@string/subtype_in_root_locale_xdq">Хайдаҡьан</string>
     <string name="subtype_in_root_locale_sr_Latn" translatable="false" tools:keep="@string/subtype_in_root_locale_sr_Latn">Srpski</string>
 
     <!-- Generic subtype label -->
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8445414d1..64937dbaf 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -348,6 +348,8 @@
     <!-- Description for Serbian (Latin) keyboard subtype with explicit keyboard layout [CHAR LIMIT=25]
          This should be identical to subtype_sr_ZZ aside from the trailing (%s). -->
     <string name="subtype_with_layout_mns" tools:keep="@string/subtype_with_layout_mns">Mansi (<xliff:g id="KEYBOARD_LAYOUT" example="QWERTY">%s</xliff:g>)</string>
+    <string name="subtype_dru">Dargwa (Urakhi)</string>
+    <string name="subtype_with_layout_dru" tools:keep="@string/subtype_with_layout_dru">Urakhi (<xliff:g id="KEYBOARD_LAYOUT" example="QWERTY">%s</xliff:g>)</string>
     <string name="subtype_with_layout_xdq" tools:keep="@string/subtype_with_layout_xdq">Kaitag (<xliff:g id="KEYBOARD_LAYOUT" example="QWERTY">%s</xliff:g>)</string>
     <!-- Description for Serbian (Latin) keyboard subtype with explicit keyboard layout [CHAR LIMIT=25]
          This should be identical to subtype_sr_ZZ aside from the trailing (%s). -->      
diff --git a/app/src/main/res/xml/method.xml b/app/src/main/res/xml/method.xml
index 3241ec6af..e545ff288 100644
--- a/app/src/main/res/xml/method.xml
+++ b/app/src/main/res/xml/method.xml
@@ -25,6 +25,7 @@
     cs: Czech/qwertz
     cv: Chuvash/chuvash
     da: Danish/qwerty+
+    dru: Dargwa (Urakhi)/dargwa_urakhi
     de: German/qwertz
     de_DE: German (Germany)/qwertz+
     de_CH: German (Switzerland)/qwertz+
@@ -667,6 +668,15 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=russian,EmojiCapable"
             android:isAsciiCapable="false"
     />
+    <subtype android:icon="@drawable/ic_ime_switcher"
+        android:label="@string/subtype_dru"
+        android:subtypeId="0x0e7f02d3"
+        android:imeSubtypeLocale="dru"
+        android:languageTag="dru"
+        android:imeSubtypeMode="keyboard"
+        android:imeSubtypeExtraValue="KeyboardLayoutSet=dargwa_urakhi,EmojiCapable"
+        android:isAsciiCapable="false"
+    />
     <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_xdq"
             android:subtypeId="0xa3f4d8e2"