From 30983b53d2a6ebf483dafaf9b1a886acdfa86988 Mon Sep 17 00:00:00 2001
From: ronniedroid <ronnie.nissan@proton.me>
Date: Tue, 28 May 2024 08:59:21 +0300
Subject: [PATCH 1/3] FEAT: added arabic language support

---
 .../fossify/keyboard/extensions/Context.kt    |   1 +
 .../org/fossify/keyboard/helpers/Constants.kt |   2 +
 .../keyboard/services/SimpleKeyboardIME.kt    |   1 +
 app/src/main/res/xml/keys_letters_arabic.xml  | 173 ++++++++++++++++++
 4 files changed, 177 insertions(+)
 create mode 100644 app/src/main/res/xml/keys_letters_arabic.xml

diff --git a/app/src/main/kotlin/org/fossify/keyboard/extensions/Context.kt b/app/src/main/kotlin/org/fossify/keyboard/extensions/Context.kt
index c13ca1a9..bd8e69f8 100644
--- a/app/src/main/kotlin/org/fossify/keyboard/extensions/Context.kt
+++ b/app/src/main/kotlin/org/fossify/keyboard/extensions/Context.kt
@@ -186,6 +186,7 @@ fun Context.getKeyboardLanguagesRadioItems(): ArrayList<RadioItem> {
 
 fun Context.getKeyboardLanguageText(language: Int): String {
     return when (language) {
+        LANGUAGE_ARABIC -> "${getString(R.string.translation_arabic)} (العربية)"
         LANGUAGE_BENGALI -> getString(R.string.translation_bengali)
         LANGUAGE_BULGARIAN -> getString(R.string.translation_bulgarian)
         LANGUAGE_DANISH -> getString(R.string.translation_danish)
diff --git a/app/src/main/kotlin/org/fossify/keyboard/helpers/Constants.kt b/app/src/main/kotlin/org/fossify/keyboard/helpers/Constants.kt
index 1b7f3bf8..1ef18032 100644
--- a/app/src/main/kotlin/org/fossify/keyboard/helpers/Constants.kt
+++ b/app/src/main/kotlin/org/fossify/keyboard/helpers/Constants.kt
@@ -48,9 +48,11 @@ const val LANGUAGE_FRENCH_BEPO = 17
 const val LANGUAGE_VIETNAMESE_TELEX = 18
 const val LANGUAGE_POLISH = 19
 const val LANGUAGE_UKRAINIAN = 20
+const val LANGUAGE_ARABIC = 21
 
 // Keep this sorted
 val SUPPORTED_LANGUAGES = listOf(
+    LANGUAGE_ARABIC,
     LANGUAGE_BENGALI,
     LANGUAGE_BULGARIAN,
     LANGUAGE_DANISH,
diff --git a/app/src/main/kotlin/org/fossify/keyboard/services/SimpleKeyboardIME.kt b/app/src/main/kotlin/org/fossify/keyboard/services/SimpleKeyboardIME.kt
index 613babc8..604c8e08 100644
--- a/app/src/main/kotlin/org/fossify/keyboard/services/SimpleKeyboardIME.kt
+++ b/app/src/main/kotlin/org/fossify/keyboard/services/SimpleKeyboardIME.kt
@@ -409,6 +409,7 @@ class SimpleKeyboardIME : InputMethodService(), OnKeyboardActionListener, Shared
 
     private fun getKeyboardLayoutXML(): Int {
         return when (baseContext.config.keyboardLanguage) {
+            LANGUAGE_ARABIC -> R.xml.keys_letters_arabic
             LANGUAGE_BENGALI -> R.xml.keys_letters_bengali
             LANGUAGE_BULGARIAN -> R.xml.keys_letters_bulgarian
             LANGUAGE_DANISH -> R.xml.keys_letters_danish
diff --git a/app/src/main/res/xml/keys_letters_arabic.xml b/app/src/main/res/xml/keys_letters_arabic.xml
new file mode 100644
index 00000000..8734b40a
--- /dev/null
+++ b/app/src/main/res/xml/keys_letters_arabic.xml
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Keyboard xmlns:app="http://schemas.android.com/apk/res-auto">
+    <Row app:isNumbersRow="true">
+        <Key
+            app:keyEdgeFlags="left"
+            app:keyLabel="١"
+            app:topSmallNumber="1" />
+        <Key
+            app:keyLabel="٢"
+            app:topSmallNumber="2" />
+        <Key
+            app:keyLabel="٣"
+            app:topSmallNumber="3" />
+        <Key
+            app:keyLabel="٤"
+            app:topSmallNumber="4" />
+        <Key
+            app:keyLabel="٥"
+            app:topSmallNumber="5" />
+        <Key
+            app:keyLabel="٦"
+            app:topSmallNumber="6" />
+        <Key
+            app:keyLabel="٧"
+            app:topSmallNumber="7" />
+        <Key
+            app:keyLabel="٨"
+            app:topSmallNumber="8" />
+        <Key
+            app:keyLabel="9"
+            app:topSmallNumber="9" />
+        <Key
+            app:keyEdgeFlags="right"
+            app:keyLabel="٠"
+            app:topSmallNumber="٠" />
+    </Row>
+    <Row>
+        <Key
+            app:keyEdgeFlags="left"
+            app:keyLabel="ض"
+            app:popupCharacters="ًٌٍَُِّْ١"
+            app:popupKeyboard="@xml/keyboard_popup_template"
+            app:topSmallNumber="َ١" />
+        <Key
+            app:keyLabel="ص"
+            app:popupCharacters="٢"
+            app:popupKeyboard="@xml/keyboard_popup_template"
+            app:topSmallNumber="٢" />
+        <Key
+            app:keyLabel="ق"
+            app:popupCharacters="٣"
+            app:popupKeyboard="@xml/keyboard_popup_template"
+            app:topSmallNumber="٣" />
+        <Key
+            app:keyLabel="ف"
+            app:popupCharacters="ڤ٤"
+            app:popupKeyboard="@xml/keyboard_popup_template"
+            app:topSmallNumber="٤" />
+        <Key
+            app:keyLabel="غ"
+            app:popupCharacters="٥"
+            app:popupKeyboard="@xml/keyboard_popup_template"
+            app:topSmallNumber="٥" />
+        <Key
+            app:keyLabel="ع"
+            app:popupCharacters="٦"
+            app:popupKeyboard="@xml/keyboard_popup_template"
+            app:topSmallNumber="٦" />
+        <Key
+            app:keyLabel="ه"
+            app:popupCharacters="٧"
+            app:popupKeyboard="@xml/keyboard_popup_template"
+            app:topSmallNumber="٧" />
+        <Key
+            app:keyLabel="خ"
+            app:popupCharacters="٨"
+            app:popupKeyboard="@xml/keyboard_popup_template"
+            app:topSmallNumber="٨" />
+        <Key
+            app:keyLabel="ح"
+            app:popupCharacters="٩"
+            app:popupKeyboard="@xml/keyboard_popup_template"
+            app:topSmallNumber="٩" />
+        <Key
+            app:keyEdgeFlags="right"
+            app:keyLabel="ج"
+            app:popupCharacters="ڇ٠"
+            app:popupKeyboard="@xml/keyboard_popup_template" />
+    </Row>
+    <Row>
+        <Key
+            app:keyEdgeFlags="left"
+            app:keyLabel="ش" />
+        <Key app:keyLabel="س" />
+        <Key
+            app:keyLabel="ي"
+            app:popupCharacters="ىئ"
+            app:popupKeyboard="@xml/keyboard_popup_template" />
+        <Key
+            app:keyLabel="ب"
+            app:popupCharacters="پ"
+            app:popupKeyboard="@xml/keyboard_popup_template" />
+        <Key app:keyLabel="ل" />
+        <Key
+            app:keyLabel="ا"
+            app:popupCharacters="أإآٱء"
+            app:popupKeyboard="@xml/keyboard_popup_template" />
+        <Key app:keyLabel="ت" />
+        <Key app:keyLabel="ن" />
+
+        <Key app:keyLabel="م" />
+
+        <Key
+            app:keyEdgeFlags="right"
+            app:keyLabel="ك"
+            app:popupCharacters="گ"
+            app:popupKeyboard="@xml/keyboard_popup_template" />
+    </Row>
+    <Row app:keyWidth="9.50%p">
+        <Key
+            app:keyLabel="ظ"
+            app:popupCharacters="؟؛،"
+            app:popupKeyboard="@xml/keyboard_popup_template" />
+        <Key app:keyLabel="ط" />
+        <Key app:keyLabel="ذ" />
+        <Key app:keyLabel="د" />
+        <Key
+            app:keyLabel="ز"
+            app:popupCharacters="ژ"
+            app:popupKeyboard="@xml/keyboard_popup_template" />
+        <Key app:keyLabel="ر" />
+        <Key
+            app:keyLabel="و"
+            app:popupCharacters="ۆ"
+            app:popupKeyboard="@xml/keyboard_popup_template" />
+        <Key app:keyLabel="ة" />
+        <Key app:keyLabel="ث" />
+        <Key
+            app:code="-5"
+            app:isRepeatable="true"
+            app:keyEdgeFlags="right"
+            app:keyIcon="@drawable/ic_clear_vector"
+            app:keyWidth="15%p" />
+    </Row>
+    <Row>
+        <Key
+            app:code="-2"
+            app:keyEdgeFlags="left"
+            app:keyLabel="123"
+            app:keyWidth="15%p" />
+
+        <Key
+            app:code="-6"
+            app:keyEdgeFlags="left"
+            app:keyIcon="@drawable/ic_emoji_emotions_outline_vector"
+            app:keyWidth="12%p"
+            app:secondaryKeyIcon="@drawable/ic_language_outlined" />
+        <Key
+            app:code="32"
+            app:isRepeatable="true"
+            app:keyWidth="46%p" />
+        <Key
+            app:keyLabel="."
+            app:keyWidth="12%p"
+            app:popupCharacters=":؛؍،؟!"
+            app:popupKeyboard="@xml/keyboard_popup_template" />
+        <Key
+            app:code="-4"
+            app:keyEdgeFlags="right"
+            app:keyIcon="@drawable/ic_enter_vector"
+            app:keyWidth="15%p" />
+    </Row>
+</Keyboard>

From 4ef4fc1740ec10460e26283682ea33763644b0e7 Mon Sep 17 00:00:00 2001
From: Ronnie Nissan <ronnie.nissan@proton.me>
Date: Sun, 9 Jun 2024 10:10:09 +0300
Subject: [PATCH 2/3] removed unneeded translation text

---
 app/src/main/kotlin/org/fossify/keyboard/extensions/Context.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/kotlin/org/fossify/keyboard/extensions/Context.kt b/app/src/main/kotlin/org/fossify/keyboard/extensions/Context.kt
index bd8e69f8..bf049248 100644
--- a/app/src/main/kotlin/org/fossify/keyboard/extensions/Context.kt
+++ b/app/src/main/kotlin/org/fossify/keyboard/extensions/Context.kt
@@ -186,7 +186,7 @@ fun Context.getKeyboardLanguagesRadioItems(): ArrayList<RadioItem> {
 
 fun Context.getKeyboardLanguageText(language: Int): String {
     return when (language) {
-        LANGUAGE_ARABIC -> "${getString(R.string.translation_arabic)} (العربية)"
+        LANGUAGE_ARABIC -> getString(R.string.translation_arabic)
         LANGUAGE_BENGALI -> getString(R.string.translation_bengali)
         LANGUAGE_BULGARIAN -> getString(R.string.translation_bulgarian)
         LANGUAGE_DANISH -> getString(R.string.translation_danish)

From 4a07ecd29e282146ceb96d5e803b76c5ea4c5b22 Mon Sep 17 00:00:00 2001
From: Naveen Singh <snaveen935@gmail.com>
Date: Tue, 11 Jun 2024 07:39:40 +0530
Subject: [PATCH 3/3] Update Arabic key width

---
 app/src/main/res/xml/keys_letters_arabic.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/xml/keys_letters_arabic.xml b/app/src/main/res/xml/keys_letters_arabic.xml
index 8734b40a..af316059 100644
--- a/app/src/main/res/xml/keys_letters_arabic.xml
+++ b/app/src/main/res/xml/keys_letters_arabic.xml
@@ -116,7 +116,7 @@
             app:popupCharacters="گ"
             app:popupKeyboard="@xml/keyboard_popup_template" />
     </Row>
-    <Row app:keyWidth="9.50%p">
+    <Row app:keyWidth="9.4444%p">
         <Key
             app:keyLabel="ظ"
             app:popupCharacters="؟؛،"
@@ -146,7 +146,7 @@
         <Key
             app:code="-2"
             app:keyEdgeFlags="left"
-            app:keyLabel="123"
+            app:keyLabel="\?123"
             app:keyWidth="15%p" />
 
         <Key