Update existing incomplete bn-IN layout (#1374)

app/build.gradle.kts

@@ -13,7 +13,7 @@ android {
         applicationId = "helium314.keyboard"
         minSdk = 21
         targetSdk = 34
-        versionCode = 2310
+        versionCode = 2311
         versionName = "2.3+dev9"
         ndk {
             abiFilters.clear()

app/src/main/assets/layouts/main/bengali.txt

@@ -1,34 +0,0 @@
-ঔ
-ঐ
-আ
-ঈ
-ঊ
-ব
-হ
-গ
-দ
-জ
-ড
-
-ও
-এ
-অ
-ই
-উ
-প
-র
-ক
-ত
-চ
-ট
-
-ঁ
-ঢ
-ম
-ন
-ঞ
-ল
-ষ
-স
-য়
-।

app/src/main/assets/layouts/main/bengali_inscript.json

@@ -0,0 +1,142 @@
+[
+  [
+    { "$": "shift_state_selector",
+      "manualOrLocked": { "label": "ঔ", "labelFlags": 1073741824 },
+      "default": { "label": "ৌ", "popup": { "relevant": [{"label": "ঔ" }]}}
+    },
+    { "$": "shift_state_selector",
+      "manualOrLocked": { "label": "ঐ", "labelFlags": 1073741824 },
+      "default": { "label": "ৈ", "popup": { "relevant": [{"label": "ঐ" }]}}
+    },
+    { "$": "shift_state_selector",
+      "manualOrLocked": { "label": "আ", "labelFlags": 1073741824 },
+      "default": { "label": "া", "popup": { "relevant": [{"label": "আ" }]}}
+    },
+    { "$": "shift_state_selector",
+      "manualOrLocked": { "label": "ঈ", "labelFlags": 1073741824 },
+      "default": { "label": "ী", "popup": { "relevant": [{"label": "ঈ" }]}}
+    },
+    { "$": "shift_state_selector",
+      "manualOrLocked": { "label": "ঊ", "labelFlags": 1073741824 },
+      "default": { "label": "ূ", "popup": { "relevant": [{"label": "ঊ" }]}}
+    },
+    { "$": "shift_state_selector",
+      "manualOrLocked": { "label": "ভ", "labelFlags": 1073741824 },
+      "default": { "label": "ব", "popup": { "relevant": [{"label": "ভ" }]}}
+    },
+    { "$": "shift_state_selector",
+      "manualOrLocked": { "label": "ঙ", "labelFlags": 1073741824 },
+      "default": { "label": "হ", "popup": { "relevant": [{"label": "ঙ" }]}}
+    },
+    { "$": "shift_state_selector",
+      "manualOrLocked": { "label": "ঘ", "labelFlags": 1073741824 },
+      "default": { "label": "গ", "popup": { "relevant": [{"label": "ঘ" }]}}
+    },
+    { "$": "shift_state_selector",
+      "manualOrLocked": { "label": "ধ", "labelFlags": 1073741824 },
+      "default": { "label": "দ", "popup": { "relevant": [{"label": "ধ" }]}}
+    },
+    { "$": "shift_state_selector",
+      "manualOrLocked": { "label": "ঝ", "labelFlags": 1073741824 },
+      "default": { "label": "জ", "popup": { "relevant": [{"label": "ঝ" }]}}
+    },
+    { "$": "shift_state_selector",
+      "manualOrLocked": { "label": "ঢ", "labelFlags": 1073741824 },
+      "default": { "label": "ড", "popup": { "relevant": [{"label": "ঢ" }]}}
+    }
+  ],
+  [
+    { "$": "shift_state_selector",
+      "manualOrLocked": { "label": "ও", "labelFlags": 1073741824 },
+      "default": { "label": "ো", "popup": { "relevant": [{"label": "ও" }]}}
+    },
+    { "$": "shift_state_selector",
+      "manualOrLocked": { "label": "এ", "labelFlags": 1073741824 },
+      "default": { "label": "ে", "popup": { "relevant": [{"label": "এ" }]}}
+    },
+    { "$": "shift_state_selector",
+      "manualOrLocked": { "label": "অ", "labelFlags": 1073741824 },
+      "default": { "label": "্", "popup": { "relevant": [{"label": "অ" }]}}
+    },
+    { "$": "shift_state_selector",
+      "manualOrLocked": { "label": "ই", "labelFlags": 1073741824 },
+      "default": { "label": "ি", "popup": { "relevant": [{"label": "ই" }]}}
+    },
+    { "$": "shift_state_selector",
+      "manualOrLocked": { "label": "উ", "labelFlags": 1073741824 },
+      "default": { "label": "ু", "popup": { "relevant": [{"label": "উ" }]}}
+    },
+    { "$": "shift_state_selector",
+      "manualOrLocked": { "label": "ফ", "labelFlags": 1073741824 },
+      "default": { "label": "প", "popup": { "relevant": [{"label": "ফ" }]}}
+    },
+    { "$": "shift_state_selector",
+      "manualOrLocked": { "label": "ড়", "labelFlags": 1073741824 },
+      "default": { "label": "র", "popup": { "main": { "label": "ড়" }, "relevant": [{ "label": "র‍্য" }]}}
+    },
+    { "$": "shift_state_selector",
+      "manualOrLocked": { "label": "খ", "labelFlags": 1073741824 },
+      "default": { "label": "ক", "popup": { "relevant": [{"label": "খ" }]}}
+    },
+    { "$": "shift_state_selector",
+      "manualOrLocked": { "label": "থ", "labelFlags": 1073741824 },
+      "default": { "label": "ত", "popup": { "main": { "label": "থ" }, "relevant": [{ "label": "ৎ" }]}}
+    },
+    { "$": "shift_state_selector",
+      "manualOrLocked": { "label": "ছ", "labelFlags": 1073741824 },
+      "default": { "label": "চ", "popup": { "relevant": [{"label": "ছ" }]}}
+    },
+    { "$": "shift_state_selector",
+      "manualOrLocked": { "label": "ঠ", "labelFlags": 1073741824 },
+      "default": { "label": "ট", "popup": { "relevant": [{"label": "ঠ" }]}}
+    }
+  ],
+  [
+    { "$": "shift_state_selector",
+      "manualOrLocked": { "label": "ঋ", "labelFlags": 1073741824 },
+      "default": { "label": "ৃ", "popup": { "relevant": [{"label": "ঋ" }]}}
+    },
+    { "$": "shift_state_selector",
+      "manualOrLocked": { "label": "ঁ", "labelFlags": 1073741824, "popup": { "relevant": [
+            {"label": "!autoColumnOrder!6" },
+            { "label": "়" },
+            { "label": "ৄ" },
+            { "label": "ঽ" },
+            { "label": "ৢ" },
+            { "label": "ৱ" },
+            { "label": "ৣ" },
+            { "label": "ৗ" },
+            { "label": "ৠ" },
+            { "label": "৺" },
+            { "label": "ঌ" },
+            { "label": "ৰ" },
+            { "label": "ৡ" }
+          ]}},
+      "default": { "label": "ং", "popup": { "main": { "label": "ঁ" }, "relevant": [{ "label": "ঃ" }]}}
+    },
+    { "$": "shift_state_selector",
+      "manualOrLocked": { "label": "ণ", "labelFlags": 1073741824 },
+      "default": { "label": "ম", "popup": { "relevant": [{"label": "ণ" }]}}
+    },
+    { "$": "shift_state_selector",
+      "manualOrLocked": { "label": "ঞ", "labelFlags": 1073741824 },
+      "default": { "label": "ন", "popup": { "relevant": [{"label": "ঞ" }]}}
+    },
+    { "$": "shift_state_selector",
+      "manualOrLocked": { "label": "ঢ়", "labelFlags": 1073741824 },
+      "default": { "label": "ব", "popup": { "relevant": [{"label": "ঢ়" }]}}
+    },
+    { "$": "shift_state_selector",
+      "manualOrLocked": { "label": "ষ", "labelFlags": 1073741824 },
+      "default": { "label": "ল", "popup": { "relevant": [{"label": "ষ" }]}}
+    },
+    { "$": "shift_state_selector",
+      "manualOrLocked": { "label": "শ", "labelFlags": 1073741824 },
+      "default": { "label": "স", "popup": { "relevant": [{"label": "শ" }]}}
+    },
+    { "$": "shift_state_selector",
+      "manualOrLocked": { "label": "য", "labelFlags": 1073741824 },
+      "default": { "label": "য়", "popup": { "relevant": [{"label": "য" }]}}
+    }
+  ]
+]

app/src/main/assets/locale_key_texts/bn-IN.txt

@@ -1,36 +1,41 @@
 [popup_keys]
+ৌ ঔ
+ৈ ঐ
+া আ
+ী ঈ
+ূ ঊ
 ব ভ
+হ ঙ
 গ ঘ
 দ ধ
-জ ঝ জ্ঞ
+জ ঝ
-ড ড়
+ড ঢ
-ও ো
+ো ও
-এ ে
+ে এ
-অ ্
+্ অ
-ই ি
+ি ই
-উ ু
+ু উ
 প ফ
-র ৃ ঋ ত্র
+র ড় র‍্য
 ক খ
-ত ৎ থ ত্ত
+ত থ ৎ
 চ ছ
 ট ঠ
-ঁ ঃ ং
+ৃ ঋ
-ঢ ঢ়
+ং ঁ ঃ
-ন ণ
+ঁ !autoColumnOrder!6 ় ৄ ঽ ৢ ৱ ৣ ৗ ৠ ৺ ঌ ৰ ৡ
-ঞ ঙ ঞ্জ
+ম ণ
-ষ ক্ষ
+ন ঞ
+ব ঢ়
+ল ষ
 স শ
 য় য
-। ॥
+punctuation !autoColumnOrder!8 \, ॥ ? ! !icon/zwnj_key|‌ !icon/zwj_key|‍ # @ ( ) / ; : - + \%
-ঔ ৌ
-ঐ ৈ
-আ া
-ঈ ী
-ঊ ূ
 
 [labels]
 alphabet: কখগ
+symbol: ?১২৩
+period: ।
 
 [number_row]
 ১ ২ ৩ ৪ ৫ ৬ ৭ ৮ ৯ ০

app/src/main/java/helium314/keyboard/latin/App.kt

@@ -530,6 +530,18 @@ fun checkVersionUpgrade(context: Context) {
             prefs.edit().remove("auto_correction_confidence").putFloat(Settings.PREF_AUTO_CORRECT_THRESHOLD, value).apply()
         }
     }
+   if (oldVersion <= 2310) {
+    listOf(
+        Settings.PREF_ENABLED_SUBTYPES,
+        Settings.PREF_SELECTED_SUBTYPE,
+        Settings.PREF_ADDITIONAL_SUBTYPES
+    ).forEach { key ->
+        val value = prefs.getString(key, "")!!
+        if ("bengali," in value) {
+            prefs.edit().putString(key, value.replace("bengali,", "bengali_inscript,")).apply()
+        }
+    }
+}
     upgradeToolbarPrefs(prefs)
     LayoutUtilsCustom.onLayoutFileChanged() // just to be sure
     prefs.edit { putInt(Settings.PREF_VERSION_CODE, BuildConfig.VERSION_CODE) }

app/src/main/res/xml/method.xml

@@ -20,7 +20,7 @@
     bg: Bulgarian/bulgarian_bekl
     bn_BD: Bengali (Bangladesh)/bengali_unijoy
     bn_BD: Bengali (Bangladesh) (Akkhor)/bengali_akkhor
-    bn_IN: Bengali (India)/bengali
+    bn_IN: Bengali (India)/bengali_inscript
     bn_IN: Bengali (India)/Baishakhi
     ca: Catalan/qwerty+
     cs: Czech/qwertz
@@ -266,7 +266,7 @@
             android:imeSubtypeLocale="bn_IN"
             android:languageTag="bn-IN"
             android:imeSubtypeMode="keyboard"
-            android:imeSubtypeExtraValue="KeyboardLayoutSet=MAIN:bengali,NoShiftKey,EmojiCapable"
+            android:imeSubtypeExtraValue="KeyboardLayoutSet=MAIN:bengali_inscript,EmojiCapable"
             android:isAsciiCapable="false"
     />
     <subtype android:icon="@drawable/ic_ime_switcher"