From 5165a3e9f84cf73555eca39b0cb1326130a329ab Mon Sep 17 00:00:00 2001
From: angrezichatterbox <gouthammohanraj@gmail.com>
Date: Wed, 10 Jul 2024 21:36:03 +0530
Subject: [PATCH] feat:Added seperate keyboard selection for all languages

---
 app/src/main/AndroidManifest.xml              | 92 ++++++++++++++++++-
 .../org/scribe/services/EnglishKeyboardIME.kt |  7 ++
 .../org/scribe/services/FrenchKeyboardIME.kt  |  8 ++
 .../org/scribe/services/GermanKeyboardIME.kt  |  7 ++
 .../org/scribe/services/ItalianKeyboardIME.kt |  8 ++
 .../scribe/services/PortugueseKeyboardIME.kt  |  8 ++
 .../org/scribe/services/RussianKeyboardIME.kt |  7 ++
 .../org/scribe/services/SimpleKeyboardIME.kt  | 17 +---
 .../org/scribe/services/SpanishKeyboardIME.kt |  7 ++
 .../org/scribe/services/SwedishKeyboardIME.kt |  7 ++
 app/src/main/res/values/strings.xml           |  8 ++
 app/src/main/res/xml/method_english.xml       |  9 ++
 app/src/main/res/xml/method_french.xml        |  9 ++
 app/src/main/res/xml/method_german.xml        |  6 ++
 app/src/main/res/xml/method_italian.xml       |  9 ++
 app/src/main/res/xml/method_portuguese.xml    |  9 ++
 app/src/main/res/xml/method_russian.xml       |  9 ++
 app/src/main/res/xml/method_spanish.xml       |  9 ++
 app/src/main/res/xml/method_swedish.xml       |  9 ++
 19 files changed, 229 insertions(+), 16 deletions(-)
 create mode 100644 app/src/main/kotlin/org/scribe/services/EnglishKeyboardIME.kt
 create mode 100644 app/src/main/kotlin/org/scribe/services/FrenchKeyboardIME.kt
 create mode 100644 app/src/main/kotlin/org/scribe/services/GermanKeyboardIME.kt
 create mode 100644 app/src/main/kotlin/org/scribe/services/ItalianKeyboardIME.kt
 create mode 100644 app/src/main/kotlin/org/scribe/services/PortugueseKeyboardIME.kt
 create mode 100644 app/src/main/kotlin/org/scribe/services/RussianKeyboardIME.kt
 create mode 100644 app/src/main/kotlin/org/scribe/services/SpanishKeyboardIME.kt
 create mode 100644 app/src/main/kotlin/org/scribe/services/SwedishKeyboardIME.kt
 create mode 100644 app/src/main/res/xml/method_english.xml
 create mode 100644 app/src/main/res/xml/method_french.xml
 create mode 100644 app/src/main/res/xml/method_german.xml
 create mode 100644 app/src/main/res/xml/method_italian.xml
 create mode 100644 app/src/main/res/xml/method_portuguese.xml
 create mode 100644 app/src/main/res/xml/method_russian.xml
 create mode 100644 app/src/main/res/xml/method_spanish.xml
 create mode 100644 app/src/main/res/xml/method_swedish.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 044ead9d..4b8d8737 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -31,16 +31,102 @@
             android:exported="false" />
 
         <service
-            android:name=".services.SimpleKeyboardIME"
             android:exported="true"
-            android:label="@string/app_name"
+            android:name=".services.EnglishKeyboardIME"
+            android:label="Scribe"
             android:permission="android.permission.BIND_INPUT_METHOD">
+            <intent-filter>
+                <action android:name="android.view.InputMethod" />
+            </intent-filter>
             <meta-data
                 android:name="android.view.im"
-                android:resource="@xml/method" />
+                android:resource="@xml/method_english" />
+        </service>
+
+        <service
+            android:exported="true"
+            android:name=".services.GermanKeyboardIME"
+            android:label="Scribe"
+            android:permission="android.permission.BIND_INPUT_METHOD">
             <intent-filter>
                 <action android:name="android.view.InputMethod" />
             </intent-filter>
+            <meta-data
+                android:name="android.view.im"
+                android:resource="@xml/method_german" />
+        </service>
+
+        <service
+            android:exported="true"
+            android:name=".services.FrenchKeyboardIME"
+            android:label="Scribe"
+            android:permission="android.permission.BIND_INPUT_METHOD">
+            <intent-filter>
+                <action android:name="android.view.InputMethod" />
+            </intent-filter>
+            <meta-data
+                android:name="android.view.im"
+                android:resource="@xml/method_french" />
+        </service>
+        <service
+            android:exported="true"
+            android:name=".services.ItalianKeyboardIME"
+            android:label="Scribe"
+            android:permission="android.permission.BIND_INPUT_METHOD">
+            <intent-filter>
+                <action android:name="android.view.InputMethod" />
+            </intent-filter>
+            <meta-data
+                android:name="android.view.im"
+                android:resource="@xml/method_italian" />
+        </service>
+        <service
+            android:exported="true"
+            android:name=".services.PortugueseKeyboardIME"
+            android:label="Scribe"
+            android:permission="android.permission.BIND_INPUT_METHOD">
+            <intent-filter>
+                <action android:name="android.view.InputMethod" />
+            </intent-filter>
+            <meta-data
+                android:name="android.view.im"
+                android:resource="@xml/method_portuguese" />
+        </service>
+        <service
+            android:exported="true"
+            android:name=".services.RussianKeyboardIME"
+            android:label="Scribe"
+            android:permission="android.permission.BIND_INPUT_METHOD">
+            <intent-filter>
+                <action android:name="android.view.InputMethod" />
+            </intent-filter>
+            <meta-data
+                android:name="android.view.im"
+                android:resource="@xml/method_russian" />
+        </service>
+        <service
+            android:exported="true"
+            android:name=".services.SpanishKeyboardIME"
+            android:label="Scribe"
+            android:permission="android.permission.BIND_INPUT_METHOD">
+            <intent-filter>
+                <action android:name="android.view.InputMethod" />
+            </intent-filter>
+            <meta-data
+                android:name="android.view.im"
+                android:resource="@xml/method_spanish" />
+        </service>
+        <service
+            android:exported="true"
+            android:name=".services.SwedishKeyboardIME"
+            android:label="Scribe"
+            android:permission="android.permission.BIND_INPUT_METHOD">
+            <intent-filter>
+                <action android:name="android.view.InputMethod" />
+            </intent-filter>
+            <meta-data
+                android:name="android.view.im"
+                android:resource="@xml/method_swedish" />
         </service>
 
         <activity
diff --git a/app/src/main/kotlin/org/scribe/services/EnglishKeyboardIME.kt b/app/src/main/kotlin/org/scribe/services/EnglishKeyboardIME.kt
new file mode 100644
index 00000000..78231b88
--- /dev/null
+++ b/app/src/main/kotlin/org/scribe/services/EnglishKeyboardIME.kt
@@ -0,0 +1,7 @@
+package org.scribe.services
+
+import org.scribe.R
+
+class EnglishKeyboardIME : SimpleKeyboardIME() {
+    override fun getKeyboardLayoutXML(): Int = R.xml.keys_letters_english
+}
diff --git a/app/src/main/kotlin/org/scribe/services/FrenchKeyboardIME.kt b/app/src/main/kotlin/org/scribe/services/FrenchKeyboardIME.kt
new file mode 100644
index 00000000..d6c7bb46
--- /dev/null
+++ b/app/src/main/kotlin/org/scribe/services/FrenchKeyboardIME.kt
@@ -0,0 +1,8 @@
+package org.scribe.services
+
+import org.scribe.R
+
+class FrenchKeyboardIME : SimpleKeyboardIME() {
+    override fun getKeyboardLayoutXML(): Int = R.xml.keys_letters_french
+}
+
diff --git a/app/src/main/kotlin/org/scribe/services/GermanKeyboardIME.kt b/app/src/main/kotlin/org/scribe/services/GermanKeyboardIME.kt
new file mode 100644
index 00000000..c7e8f6f2
--- /dev/null
+++ b/app/src/main/kotlin/org/scribe/services/GermanKeyboardIME.kt
@@ -0,0 +1,7 @@
+package org.scribe.services
+
+import org.scribe.R
+
+class GermanKeyboardIME : SimpleKeyboardIME() {
+    override fun getKeyboardLayoutXML(): Int = R.xml.keys_letters_german
+}
diff --git a/app/src/main/kotlin/org/scribe/services/ItalianKeyboardIME.kt b/app/src/main/kotlin/org/scribe/services/ItalianKeyboardIME.kt
new file mode 100644
index 00000000..c6180366
--- /dev/null
+++ b/app/src/main/kotlin/org/scribe/services/ItalianKeyboardIME.kt
@@ -0,0 +1,8 @@
+package org.scribe.services
+
+import org.scribe.R
+
+class ItalianKeyboardIME : SimpleKeyboardIME() {
+    override fun getKeyboardLayoutXML(): Int = R.xml.keys_letters_italian
+}
+
diff --git a/app/src/main/kotlin/org/scribe/services/PortugueseKeyboardIME.kt b/app/src/main/kotlin/org/scribe/services/PortugueseKeyboardIME.kt
new file mode 100644
index 00000000..695c37e5
--- /dev/null
+++ b/app/src/main/kotlin/org/scribe/services/PortugueseKeyboardIME.kt
@@ -0,0 +1,8 @@
+package org.scribe.services
+
+import org.scribe.R
+
+class PortugueseKeyboardIME : SimpleKeyboardIME() {
+    override fun getKeyboardLayoutXML(): Int = R.xml.keys_letters_portuguese
+}
+
diff --git a/app/src/main/kotlin/org/scribe/services/RussianKeyboardIME.kt b/app/src/main/kotlin/org/scribe/services/RussianKeyboardIME.kt
new file mode 100644
index 00000000..c0668ee2
--- /dev/null
+++ b/app/src/main/kotlin/org/scribe/services/RussianKeyboardIME.kt
@@ -0,0 +1,7 @@
+package org.scribe.services
+
+import org.scribe.R
+
+class RussianKeyboardIME : SimpleKeyboardIME() {
+    override fun getKeyboardLayoutXML(): Int = R.xml.keys_letters_russian
+}
diff --git a/app/src/main/kotlin/org/scribe/services/SimpleKeyboardIME.kt b/app/src/main/kotlin/org/scribe/services/SimpleKeyboardIME.kt
index a6f1104b..cfa28327 100644
--- a/app/src/main/kotlin/org/scribe/services/SimpleKeyboardIME.kt
+++ b/app/src/main/kotlin/org/scribe/services/SimpleKeyboardIME.kt
@@ -22,7 +22,10 @@ import org.scribe.helpers.*
 import org.scribe.views.MyKeyboardView
 
 // based on https://www.androidauthority.com/lets-build-custom-keyboard-android-832362/
-class SimpleKeyboardIME : InputMethodService(), MyKeyboardView.OnKeyboardActionListener {
+
+
+abstract class SimpleKeyboardIME : InputMethodService(), MyKeyboardView.OnKeyboardActionListener {
+    abstract fun getKeyboardLayoutXML(): Int
     private var SHIFT_PERM_TOGGLE_SPEED = 500   // how quickly do we have to doubletap shift to enable permanent caps lock
     private val KEYBOARD_LETTERS = 0
     private val KEYBOARD_SYMBOLS = 1
@@ -258,16 +261,4 @@ class SimpleKeyboardIME : InputMethodService(), MyKeyboardView.OnKeyboardActionL
         }
     }
 
-    private fun getKeyboardLayoutXML(): Int {
-        return when (baseContext.config.keyboardLanguage) {
-            LANGUAGE_FRENCH -> R.xml.keys_letters_french
-            LANGUAGE_GERMAN -> R.xml.keys_letters_german
-            LANGUAGE_ITALIAN -> R.xml.keys_letters_italian
-            LANGUAGE_PORTUGUESE -> R.xml.keys_letters_portuguese
-            LANGUAGE_RUSSIAN -> R.xml.keys_letters_russian
-            LANGUAGE_SPANISH -> R.xml.keys_letters_spanish
-            LANGUAGE_SWEDISH -> R.xml.keys_letters_swedish
-            else -> R.xml.keys_letters_english
-        }
     }
-}
diff --git a/app/src/main/kotlin/org/scribe/services/SpanishKeyboardIME.kt b/app/src/main/kotlin/org/scribe/services/SpanishKeyboardIME.kt
new file mode 100644
index 00000000..a23bff7f
--- /dev/null
+++ b/app/src/main/kotlin/org/scribe/services/SpanishKeyboardIME.kt
@@ -0,0 +1,7 @@
+package org.scribe.services
+
+import org.scribe.R
+
+class SpanishKeyboardIME : SimpleKeyboardIME() {
+    override fun getKeyboardLayoutXML(): Int = R.xml.keys_letters_spanish
+}
diff --git a/app/src/main/kotlin/org/scribe/services/SwedishKeyboardIME.kt b/app/src/main/kotlin/org/scribe/services/SwedishKeyboardIME.kt
new file mode 100644
index 00000000..cb6c8c4c
--- /dev/null
+++ b/app/src/main/kotlin/org/scribe/services/SwedishKeyboardIME.kt
@@ -0,0 +1,7 @@
+package org.scribe.services
+
+import org.scribe.R
+
+class SwedishKeyboardIME : SimpleKeyboardIME() {
+    override fun getKeyboardLayoutXML(): Int = R.xml.keys_letters_spanish
+}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fd88b691..05541112 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1510,6 +1510,14 @@
 
     <!-- Message digest algorithms -->
     <string name="md5">MD5</string>
+    <string name="english_keyboard">English(US)</string>
+    <string name="german_keyboard">German</string>
+    <string name="french">French</string>
+    <string name="italian">Italian</string>
+    <string name="portugu_s">Português</string>
+    <string name="russian">Russian</string>
+    <string name="spanish">spanish</string>
+    <string name="swedish">swedish</string>
 
     <string-array name="months">
         <item>@string/january</item>
diff --git a/app/src/main/res/xml/method_english.xml b/app/src/main/res/xml/method_english.xml
new file mode 100644
index 00000000..e42ad3e2
--- /dev/null
+++ b/app/src/main/res/xml/method_english.xml
@@ -0,0 +1,9 @@
+<input-method xmlns:android="http://schemas.android.com/apk/res/android"
+    android:settingsActivity="org.scribe.activities.SettingsActivity"
+    android:icon="@mipmap/ic_launcher" >
+    <subtype
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/english_keyboard"
+        android:imeSubtypeLocale="en_US"
+        android:imeSubtypeMode="keyboard" />
+</input-method>
diff --git a/app/src/main/res/xml/method_french.xml b/app/src/main/res/xml/method_french.xml
new file mode 100644
index 00000000..64c820d7
--- /dev/null
+++ b/app/src/main/res/xml/method_french.xml
@@ -0,0 +1,9 @@
+<input-method xmlns:android="http://schemas.android.com/apk/res/android"
+    android:settingsActivity="org.scribe.activities.SettingsActivity"
+    android:icon="@mipmap/ic_launcher" >
+    <subtype
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/french"
+        android:imeSubtypeLocale="fr"
+        android:imeSubtypeMode="keyboard" />
+</input-method>
diff --git a/app/src/main/res/xml/method_german.xml b/app/src/main/res/xml/method_german.xml
new file mode 100644
index 00000000..36b3e1c4
--- /dev/null
+++ b/app/src/main/res/xml/method_german.xml
@@ -0,0 +1,6 @@
+<input-method xmlns:android="http://schemas.android.com/apk/res/android">
+    <subtype
+        android:label="@string/german_keyboard"
+        android:imeSubtypeLocale="ge"
+        android:imeSubtypeMode="keyboard" />
+</input-method>
diff --git a/app/src/main/res/xml/method_italian.xml b/app/src/main/res/xml/method_italian.xml
new file mode 100644
index 00000000..e3ef309e
--- /dev/null
+++ b/app/src/main/res/xml/method_italian.xml
@@ -0,0 +1,9 @@
+<input-method xmlns:android="http://schemas.android.com/apk/res/android"
+    android:settingsActivity="org.scribe.activities.SettingsActivity"
+    android:icon="@mipmap/ic_launcher" >
+    <subtype
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/italian"
+        android:imeSubtypeLocale="it"
+        android:imeSubtypeMode="keyboard" />
+</input-method>
diff --git a/app/src/main/res/xml/method_portuguese.xml b/app/src/main/res/xml/method_portuguese.xml
new file mode 100644
index 00000000..6f003bb0
--- /dev/null
+++ b/app/src/main/res/xml/method_portuguese.xml
@@ -0,0 +1,9 @@
+<input-method xmlns:android="http://schemas.android.com/apk/res/android"
+    android:settingsActivity="org.scribe.activities.SettingsActivity"
+    android:icon="@mipmap/ic_launcher" >
+    <subtype
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/portugu_s"
+        android:imeSubtypeLocale="po"
+        android:imeSubtypeMode="keyboard" />
+</input-method>
diff --git a/app/src/main/res/xml/method_russian.xml b/app/src/main/res/xml/method_russian.xml
new file mode 100644
index 00000000..3cffdf69
--- /dev/null
+++ b/app/src/main/res/xml/method_russian.xml
@@ -0,0 +1,9 @@
+<input-method xmlns:android="http://schemas.android.com/apk/res/android"
+    android:settingsActivity="org.scribe.activities.SettingsActivity"
+    android:icon="@mipmap/ic_launcher" >
+    <subtype
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/russian"
+        android:imeSubtypeLocale="ru"
+        android:imeSubtypeMode="keyboard" />
+</input-method>
diff --git a/app/src/main/res/xml/method_spanish.xml b/app/src/main/res/xml/method_spanish.xml
new file mode 100644
index 00000000..3025f4c1
--- /dev/null
+++ b/app/src/main/res/xml/method_spanish.xml
@@ -0,0 +1,9 @@
+<input-method xmlns:android="http://schemas.android.com/apk/res/android"
+    android:settingsActivity="org.scribe.activities.SettingsActivity"
+    android:icon="@mipmap/ic_launcher" >
+    <subtype
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/spanish"
+        android:imeSubtypeLocale="sp"
+        android:imeSubtypeMode="keyboard" />
+</input-method>
diff --git a/app/src/main/res/xml/method_swedish.xml b/app/src/main/res/xml/method_swedish.xml
new file mode 100644
index 00000000..50383bb0
--- /dev/null
+++ b/app/src/main/res/xml/method_swedish.xml
@@ -0,0 +1,9 @@
+<input-method xmlns:android="http://schemas.android.com/apk/res/android"
+    android:settingsActivity="org.scribe.activities.SettingsActivity"
+    android:icon="@mipmap/ic_launcher" >
+    <subtype
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/swedish"
+        android:imeSubtypeLocale="sw"
+        android:imeSubtypeMode="keyboard" />
+</input-method>