From 6c75203dfc163d6dceadcd9e9c442243ab9851b8 Mon Sep 17 00:00:00 2001
From: Helium314 <helium314@mailbox.org>
Date: Wed, 19 Jul 2023 23:56:49 +0200
Subject: [PATCH] add armenian, russian and turkish currency keys

and move pound and rupee key styles to separate files, to match others
---
 app/src/main/res/xml/key_styles_currency.xml  | 83 +++++--------------
 .../main/res/xml/key_styles_currency_dram.xml | 30 +++++++
 .../xml/key_styles_currency_indian_rupee.xml  | 48 +++++++++++
 .../res/xml/key_styles_currency_pound.xml     | 49 +++++++++++
 .../res/xml/key_styles_currency_ruble.xml     | 30 +++++++
 .../xml/key_styles_currency_turkish_lira.xml  | 30 +++++++
 .../res/xml/rowkeys_armenian_phonetic3.xml    |  5 +-
 7 files changed, 212 insertions(+), 63 deletions(-)
 create mode 100644 app/src/main/res/xml/key_styles_currency_dram.xml
 create mode 100644 app/src/main/res/xml/key_styles_currency_indian_rupee.xml
 create mode 100644 app/src/main/res/xml/key_styles_currency_pound.xml
 create mode 100644 app/src/main/res/xml/key_styles_currency_ruble.xml
 create mode 100644 app/src/main/res/xml/key_styles_currency_turkish_lira.xml

diff --git a/app/src/main/res/xml/key_styles_currency.xml b/app/src/main/res/xml/key_styles_currency.xml
index 9a7230ff7..ba7ca070a 100644
--- a/app/src/main/res/xml/key_styles_currency.xml
+++ b/app/src/main/res/xml/key_styles_currency.xml
@@ -91,9 +91,8 @@
              sl: Slovenia (sl_SL)
              sq: Kosovo (sq_XK)
              sr: Kosovo (sq_SR), Montenegro (sr_ME)
-             sv: Sweden (sv_SV)
-             tr: Cyprus (tr_CY) -->
-        <case latin:localeCode="bg|ca|cs|da|de|el|en|es|et|eu|fi|fr|ga|gl|hr|hu|it|lb|lt|lv|mt|nl|pl|pt|ro|sk|sl|sq|sr|sv|tr">
+             sv: Sweden (sv_SV) -->
+        <case latin:localeCode="bg|ca|cs|da|de|el|en|es|et|eu|fi|fr|ga|gl|hr|hu|it|lb|lt|lv|mt|nl|pl|pt|ro|sk|sl|sq|sr|sv">
             <include latin:keyboardLayout="@xml/key_styles_currency_euro" />
         </case>
         <!-- ca: Catalan (Andorra, Spain)
@@ -104,8 +103,6 @@
             <include latin:keyboardLayout="@xml/key_styles_currency_euro" />
         </case>
         <!-- fa: Persian (Rial and Afgahni)
-             hi: Hindi (Indian Rupee)
-             hi_ZZ: Hinglish (Indian Rupee)
              iw: Hebrew (New Sheqel)
              lo: Lao (Kip)
              mn: Mongolian (Tugrik)
@@ -113,15 +110,21 @@
              th: Thai (Baht)
              uk: Ukrainian (Hryvnia)
              vi: Vietnamese (Dong)  -->
-        <!-- TODO: The currency sign of Turkish Lira was created in 2012 and assigned U+20BA for
-             its unicode, although there is no font glyph for it as of November 2012. -->
-        <!-- TODO: The currency sign of Armenian Dram was created in 2012 and assigned U+058F for
-             its unicode, although there is no font glyph for it as of September 2013. -->
-        <!-- TODO: The currency sign of Russian Ruble was created in 2014 and assigned U+20BD for
-             its unicode, although there is no font glyph for it as of August 2014. -->
         <case latin:languageCode="fa|hi|iw|lo|mn|ne|th|uk|vi">
             <include latin:keyboardLayout="@xml/key_styles_currency_generic" />
         </case>
+        <!-- hy: Armenian (Armenian Dram) -->
+        <case latin:languageCode="hy">
+            <include latin:keyboardLayout="@xml/key_styles_currency_dram" />
+        </case>
+        <!-- tr: Turkish (Turkish Lira, also Euro for tr_CY) -->
+        <case latin:languageCode="tr">
+            <include latin:keyboardLayout="@xml/key_styles_currency_turkish_lira" />
+        </case>
+        <!-- ru: Russian (Ruble) -->
+        <case latin:languageCode="ru">
+            <include latin:keyboardLayout="@xml/key_styles_currency_ruble" />
+        </case>
         <!-- si_LK: Sinhala (Sri Lanka) (Sri Lanka Rupee)
              ta_LK: Tamil (Sri Lanka) (Sri Lanka Rupee)
              bn_BD: Bengali (Bangladesh) (Taka) -->
@@ -137,60 +140,16 @@
              te_IN: Telugu (India) (Indian Rupee)
          -->
         <case latin:countryCode="IN">
-            <!-- U+20B9: "₹" INDIAN RUPEE SIGN
-                 U+00A3: "£" POUND SIGN
-                 U+20AC: "€" EURO SIGN
-                 U+00A2: "¢" CENT SIGN -->
-            <key-style
-                    latin:styleName="currencyKeyStyle"
-                    latin:keySpec="&#x20B9;"
-                    latin:moreKeys="!text/morekeys_currency_generic" />
-            <key-style
-                    latin:styleName="moreCurrency1KeyStyle"
-                    latin:keySpec="&#x00A3;" />
-            <key-style
-                    latin:styleName="moreCurrency2KeyStyle"
-                    latin:keySpec="&#x20AC;" />
-            <key-style
-                    latin:styleName="moreCurrency3KeyStyle"
-                    latin:keySpec="$"
-                    latin:moreKeys="&#x00A2;" />
-            <key-style
-                    latin:styleName="moreCurrency4KeyStyle"
-                    latin:keySpec="&#x00A2;" />
-            <key-style
-                    latin:styleName="currencyHintStyle"
-                    latin:keyHintLabel="&#x20B9;"
-                    latin:additionalMoreKeys="&#x20B9;" />
+            <include latin:keyboardLayout="@xml/key_styles_currency_indian_rupee" />
+        </case>
+        <!-- hi: Hindi (Indian Rupee)
+             hi_ZZ: Hinglish (Indian Rupee) -->
+        <case latin:countryCode="IN">
+            <include latin:keyboardLayout="@xml/key_styles_currency_indian_rupee" />
         </case>
         <!-- GB: United Kingdom (Pound) -->
         <case latin:countryCode="GB">
-            <!-- U+00A3: "£" POUND SIGN
-                 U+20AC: "€" EURO SIGN
-                 U+00A5: "¥" YEN SIGN
-                 U+00A2: "¢" CENT SIGN
-                 U+20B1: "₱" PESO SIGN -->
-            <key-style
-                    latin:styleName="currencyKeyStyle"
-                    latin:keySpec="&#x00A3;"
-                    latin:moreKeys="&#x00A2;,$,&#x20AC;,&#x00A5;,&#x20B1;" />
-            <key-style
-                    latin:styleName="moreCurrency1KeyStyle"
-                    latin:keySpec="&#x20AC;" />
-            <key-style
-                    latin:styleName="moreCurrency2KeyStyle"
-                    latin:keySpec="&#x00A5;" />
-            <key-style
-                    latin:styleName="moreCurrency3KeyStyle"
-                    latin:keySpec="$"
-                    latin:moreKeys="&#x00A2;" />
-            <key-style
-                    latin:styleName="moreCurrency4KeyStyle"
-                    latin:keySpec="&#x00A2;" />
-            <key-style
-                    latin:styleName="currencyHintStyle"
-                    latin:keyHintLabel="&#x00A3;"
-                    latin:additionalMoreKeys="&#x00A3;" />
+            <include latin:keyboardLayout="@xml/key_styles_currency_pound" />
         </case>
         <!-- ar: Arabic (Dollar and Rial) -->
         <default>
diff --git a/app/src/main/res/xml/key_styles_currency_dram.xml b/app/src/main/res/xml/key_styles_currency_dram.xml
new file mode 100644
index 000000000..3a3ecbfde
--- /dev/null
+++ b/app/src/main/res/xml/key_styles_currency_dram.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
+    <!-- U+058F: "֏" DRAM SIGN
+         U+20BD: "₽" RUBLE SIGN
+         U+00A3: "£" POUND SIGN
+         U+20AC: "€" EURO SIGN -->
+    <key-style
+        latin:styleName="currencyKeyStyle"
+        latin:keySpec="&#x058F;"
+        latin:moreKeys="&#x20AC;,$,&#x20BD;,&#x00A3;" />
+    <key-style
+        latin:styleName="moreCurrency1KeyStyle"
+        latin:keySpec="&#x20AC;" />
+    <key-style
+        latin:styleName="moreCurrency2KeyStyle"
+        latin:keySpec="&#x20BD;" />
+    <key-style
+        latin:styleName="moreCurrency3KeyStyle"
+        latin:keySpec="$"
+        latin:moreKeys="&#x00A2;" />
+    <key-style
+        latin:styleName="moreCurrency4KeyStyle"
+        latin:keySpec="&#x00A3;" />
+    <key-style
+        latin:styleName="currencyHintStyle"
+        latin:keyHintLabel="&#x058F;"
+        latin:additionalMoreKeys="&#x058F;" />
+
+</merge>
diff --git a/app/src/main/res/xml/key_styles_currency_indian_rupee.xml b/app/src/main/res/xml/key_styles_currency_indian_rupee.xml
new file mode 100644
index 000000000..100279d06
--- /dev/null
+++ b/app/src/main/res/xml/key_styles_currency_indian_rupee.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2011, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
+    <!-- U+20B9: "₹" INDIAN RUPEE SIGN
+         U+00A3: "£" POUND SIGN
+         U+20AC: "€" EURO SIGN
+         U+00A2: "¢" CENT SIGN -->
+    <key-style
+        latin:styleName="currencyKeyStyle"
+        latin:keySpec="&#x20B9;"
+        latin:moreKeys="!text/morekeys_currency_generic" />
+    <key-style
+        latin:styleName="moreCurrency1KeyStyle"
+        latin:keySpec="&#x00A3;" />
+    <key-style
+        latin:styleName="moreCurrency2KeyStyle"
+        latin:keySpec="&#x20AC;" />
+    <key-style
+        latin:styleName="moreCurrency3KeyStyle"
+        latin:keySpec="$"
+        latin:moreKeys="&#x00A2;" />
+    <key-style
+        latin:styleName="moreCurrency4KeyStyle"
+        latin:keySpec="&#x00A2;" />
+    <key-style
+        latin:styleName="currencyHintStyle"
+        latin:keyHintLabel="&#x20B9;"
+        latin:additionalMoreKeys="&#x20B9;" />
+
+</merge>
diff --git a/app/src/main/res/xml/key_styles_currency_pound.xml b/app/src/main/res/xml/key_styles_currency_pound.xml
new file mode 100644
index 000000000..e601cc529
--- /dev/null
+++ b/app/src/main/res/xml/key_styles_currency_pound.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2011, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
+    <!-- U+00A3: "£" POUND SIGN
+         U+20AC: "€" EURO SIGN
+         U+00A5: "¥" YEN SIGN
+         U+00A2: "¢" CENT SIGN
+         U+20B1: "₱" PESO SIGN -->
+    <key-style
+        latin:styleName="currencyKeyStyle"
+        latin:keySpec="&#x00A3;"
+        latin:moreKeys="&#x00A2;,$,&#x20AC;,&#x00A5;,&#x20B1;" />
+    <key-style
+        latin:styleName="moreCurrency1KeyStyle"
+        latin:keySpec="&#x20AC;" />
+    <key-style
+        latin:styleName="moreCurrency2KeyStyle"
+        latin:keySpec="&#x00A5;" />
+    <key-style
+        latin:styleName="moreCurrency3KeyStyle"
+        latin:keySpec="$"
+        latin:moreKeys="&#x00A2;" />
+    <key-style
+        latin:styleName="moreCurrency4KeyStyle"
+        latin:keySpec="&#x00A2;" />
+    <key-style
+        latin:styleName="currencyHintStyle"
+        latin:keyHintLabel="&#x00A3;"
+        latin:additionalMoreKeys="&#x00A3;" />
+
+</merge>
diff --git a/app/src/main/res/xml/key_styles_currency_ruble.xml b/app/src/main/res/xml/key_styles_currency_ruble.xml
new file mode 100644
index 000000000..6cea1cb6a
--- /dev/null
+++ b/app/src/main/res/xml/key_styles_currency_ruble.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
+    <!-- U+20BD: "₽" RUBLE SIGN
+         U+00A3: "£" POUND SIGN
+         U+20AC: "€" EURO SIGN
+         U+00A5: "¥" YEN SIGN -->
+    <key-style
+        latin:styleName="currencyKeyStyle"
+        latin:keySpec="&#x20BD;"
+        latin:moreKeys="&#x20AC;,$,&#x00A3;,&#x00A5;" />
+    <key-style
+        latin:styleName="moreCurrency1KeyStyle"
+        latin:keySpec="&#x20AC;" />
+    <key-style
+        latin:styleName="moreCurrency2KeyStyle"
+        latin:keySpec="&#x00A5;" />
+    <key-style
+        latin:styleName="moreCurrency3KeyStyle"
+        latin:keySpec="$"
+        latin:moreKeys="&#x00A2;" />
+    <key-style
+        latin:styleName="moreCurrency4KeyStyle"
+        latin:keySpec="&#x00A3;" />
+    <key-style
+        latin:styleName="currencyHintStyle"
+        latin:keyHintLabel="&#x20BD;"
+        latin:additionalMoreKeys="&#x20BD;" />
+
+</merge>
diff --git a/app/src/main/res/xml/key_styles_currency_turkish_lira.xml b/app/src/main/res/xml/key_styles_currency_turkish_lira.xml
new file mode 100644
index 000000000..ddcadec52
--- /dev/null
+++ b/app/src/main/res/xml/key_styles_currency_turkish_lira.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
+    <!-- U+20BA: "₺" LIRA SIGN
+         U+00A3: "£" POUND SIGN
+         U+20AC: "€" EURO SIGN
+         U+00A5: "¥" YEN SIGN -->
+    <key-style
+        latin:styleName="currencyKeyStyle"
+        latin:keySpec="&#x20BA;"
+        latin:moreKeys="&#x20AC;,$,&#x00A3;,&#x00A5;" />
+    <key-style
+        latin:styleName="moreCurrency1KeyStyle"
+        latin:keySpec="&#x20AC;" />
+    <key-style
+        latin:styleName="moreCurrency2KeyStyle"
+        latin:keySpec="&#x00A5;" />
+    <key-style
+        latin:styleName="moreCurrency3KeyStyle"
+        latin:keySpec="$"
+        latin:moreKeys="&#x00A2;" />
+    <key-style
+        latin:styleName="moreCurrency4KeyStyle"
+        latin:keySpec="&#x00A3;" />
+    <key-style
+        latin:styleName="currencyHintStyle"
+        latin:keyHintLabel="&#x20BA;"
+        latin:additionalMoreKeys="&#x20BA;,&#x20AC;" />
+
+</merge>
diff --git a/app/src/main/res/xml/rowkeys_armenian_phonetic3.xml b/app/src/main/res/xml/rowkeys_armenian_phonetic3.xml
index fe911b5c3..54178b5fa 100644
--- a/app/src/main/res/xml/rowkeys_armenian_phonetic3.xml
+++ b/app/src/main/res/xml/rowkeys_armenian_phonetic3.xml
@@ -19,12 +19,15 @@
 -->
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
+    <include
+        latin:keyboardLayout="@xml/key_styles_currency" />
     <!-- U+0561: "ա" ARMENIAN SMALL LETTER AYB -->
     <Key latin:keySpec="&#x0561;" />
     <!-- U+057D: "ս" ARMENIAN SMALL LETTER SEH -->
     <Key latin:keySpec="&#x057D;" />
     <!-- U+0564: "դ" ARMENIAN SMALL LETTER DA -->
-    <Key latin:keySpec="&#x0564;" />
+    <Key latin:keySpec="&#x0564;"
+         latin:keyStyle="currencyHintStyle"/>
     <!-- U+0586: "ֆ" ARMENIAN SMALL LETTER FEH -->
     <Key latin:keySpec="&#x0586;" />
     <!-- U+0563: "գ" ARMENIAN SMALL LETTER GIM -->