Skip to content

Commit 073318d

Browse files
RHJihanRHJihan
authored
Update existing incomplete bn-IN layout (#1374)
1 parent 43d96e3 commit 073318d

File tree

6 files changed

+182
-57
lines changed

6 files changed

+182
-57
lines changed

Diff for: ‎app/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ android {
1313
applicationId = "helium314.keyboard"
1414
minSdk = 21
1515
targetSdk = 34
16-
versionCode = 2310
16+
versionCode = 2311
1717
versionName = "2.3+dev9"
1818
ndk {
1919
abiFilters.clear()

Diff for: ‎app/src/main/assets/layouts/main/bengali.txt

-34
This file was deleted.

Diff for: ‎app/src/main/assets/layouts/main/bengali_inscript.json

+142
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,142 @@
1+
[
2+
[
3+
{ "$": "shift_state_selector",
4+
"manualOrLocked": { "label": "ঔ", "labelFlags": 1073741824 },
5+
"default": { "label": "ৌ", "popup": { "relevant": [{"label": "ঔ" }]}}
6+
},
7+
{ "$": "shift_state_selector",
8+
"manualOrLocked": { "label": "ঐ", "labelFlags": 1073741824 },
9+
"default": { "label": "ৈ", "popup": { "relevant": [{"label": "ঐ" }]}}
10+
},
11+
{ "$": "shift_state_selector",
12+
"manualOrLocked": { "label": "আ", "labelFlags": 1073741824 },
13+
"default": { "label": "া", "popup": { "relevant": [{"label": "আ" }]}}
14+
},
15+
{ "$": "shift_state_selector",
16+
"manualOrLocked": { "label": "ঈ", "labelFlags": 1073741824 },
17+
"default": { "label": "ী", "popup": { "relevant": [{"label": "ঈ" }]}}
18+
},
19+
{ "$": "shift_state_selector",
20+
"manualOrLocked": { "label": "ঊ", "labelFlags": 1073741824 },
21+
"default": { "label": "ূ", "popup": { "relevant": [{"label": "ঊ" }]}}
22+
},
23+
{ "$": "shift_state_selector",
24+
"manualOrLocked": { "label": "ভ", "labelFlags": 1073741824 },
25+
"default": { "label": "ব", "popup": { "relevant": [{"label": "ভ" }]}}
26+
},
27+
{ "$": "shift_state_selector",
28+
"manualOrLocked": { "label": "ঙ", "labelFlags": 1073741824 },
29+
"default": { "label": "হ", "popup": { "relevant": [{"label": "ঙ" }]}}
30+
},
31+
{ "$": "shift_state_selector",
32+
"manualOrLocked": { "label": "ঘ", "labelFlags": 1073741824 },
33+
"default": { "label": "গ", "popup": { "relevant": [{"label": "ঘ" }]}}
34+
},
35+
{ "$": "shift_state_selector",
36+
"manualOrLocked": { "label": "ধ", "labelFlags": 1073741824 },
37+
"default": { "label": "দ", "popup": { "relevant": [{"label": "ধ" }]}}
38+
},
39+
{ "$": "shift_state_selector",
40+
"manualOrLocked": { "label": "ঝ", "labelFlags": 1073741824 },
41+
"default": { "label": "জ", "popup": { "relevant": [{"label": "ঝ" }]}}
42+
},
43+
{ "$": "shift_state_selector",
44+
"manualOrLocked": { "label": "ঢ", "labelFlags": 1073741824 },
45+
"default": { "label": "ড", "popup": { "relevant": [{"label": "ঢ" }]}}
46+
}
47+
],
48+
[
49+
{ "$": "shift_state_selector",
50+
"manualOrLocked": { "label": "ও", "labelFlags": 1073741824 },
51+
"default": { "label": "ো", "popup": { "relevant": [{"label": "ও" }]}}
52+
},
53+
{ "$": "shift_state_selector",
54+
"manualOrLocked": { "label": "এ", "labelFlags": 1073741824 },
55+
"default": { "label": "ে", "popup": { "relevant": [{"label": "এ" }]}}
56+
},
57+
{ "$": "shift_state_selector",
58+
"manualOrLocked": { "label": "অ", "labelFlags": 1073741824 },
59+
"default": { "label": "্", "popup": { "relevant": [{"label": "অ" }]}}
60+
},
61+
{ "$": "shift_state_selector",
62+
"manualOrLocked": { "label": "ই", "labelFlags": 1073741824 },
63+
"default": { "label": "ি", "popup": { "relevant": [{"label": "ই" }]}}
64+
},
65+
{ "$": "shift_state_selector",
66+
"manualOrLocked": { "label": "উ", "labelFlags": 1073741824 },
67+
"default": { "label": "ু", "popup": { "relevant": [{"label": "উ" }]}}
68+
},
69+
{ "$": "shift_state_selector",
70+
"manualOrLocked": { "label": "ফ", "labelFlags": 1073741824 },
71+
"default": { "label": "প", "popup": { "relevant": [{"label": "ফ" }]}}
72+
},
73+
{ "$": "shift_state_selector",
74+
"manualOrLocked": { "label": "ড়", "labelFlags": 1073741824 },
75+
"default": { "label": "র", "popup": { "main": { "label": "ড়" }, "relevant": [{ "label": "র‍্য" }]}}
76+
},
77+
{ "$": "shift_state_selector",
78+
"manualOrLocked": { "label": "খ", "labelFlags": 1073741824 },
79+
"default": { "label": "ক", "popup": { "relevant": [{"label": "খ" }]}}
80+
},
81+
{ "$": "shift_state_selector",
82+
"manualOrLocked": { "label": "থ", "labelFlags": 1073741824 },
83+
"default": { "label": "ত", "popup": { "main": { "label": "থ" }, "relevant": [{ "label": "ৎ" }]}}
84+
},
85+
{ "$": "shift_state_selector",
86+
"manualOrLocked": { "label": "ছ", "labelFlags": 1073741824 },
87+
"default": { "label": "চ", "popup": { "relevant": [{"label": "ছ" }]}}
88+
},
89+
{ "$": "shift_state_selector",
90+
"manualOrLocked": { "label": "ঠ", "labelFlags": 1073741824 },
91+
"default": { "label": "ট", "popup": { "relevant": [{"label": "ঠ" }]}}
92+
}
93+
],
94+
[
95+
{ "$": "shift_state_selector",
96+
"manualOrLocked": { "label": "ঋ", "labelFlags": 1073741824 },
97+
"default": { "label": "ৃ", "popup": { "relevant": [{"label": "ঋ" }]}}
98+
},
99+
{ "$": "shift_state_selector",
100+
"manualOrLocked": { "label": "ঁ", "labelFlags": 1073741824, "popup": { "relevant": [
101+
{"label": "!autoColumnOrder!6" },
102+
{ "label": "়" },
103+
{ "label": "ৄ" },
104+
{ "label": "ঽ" },
105+
{ "label": "ৢ" },
106+
{ "label": "ৱ" },
107+
{ "label": "ৣ" },
108+
{ "label": "ৗ" },
109+
{ "label": "ৠ" },
110+
{ "label": "৺" },
111+
{ "label": "ঌ" },
112+
{ "label": "ৰ" },
113+
{ "label": "ৡ" }
114+
]}},
115+
"default": { "label": "ং", "popup": { "main": { "label": "ঁ" }, "relevant": [{ "label": "ঃ" }]}}
116+
},
117+
{ "$": "shift_state_selector",
118+
"manualOrLocked": { "label": "ণ", "labelFlags": 1073741824 },
119+
"default": { "label": "ম", "popup": { "relevant": [{"label": "ণ" }]}}
120+
},
121+
{ "$": "shift_state_selector",
122+
"manualOrLocked": { "label": "ঞ", "labelFlags": 1073741824 },
123+
"default": { "label": "ন", "popup": { "relevant": [{"label": "ঞ" }]}}
124+
},
125+
{ "$": "shift_state_selector",
126+
"manualOrLocked": { "label": "ঢ়", "labelFlags": 1073741824 },
127+
"default": { "label": "ব", "popup": { "relevant": [{"label": "ঢ়" }]}}
128+
},
129+
{ "$": "shift_state_selector",
130+
"manualOrLocked": { "label": "ষ", "labelFlags": 1073741824 },
131+
"default": { "label": "ল", "popup": { "relevant": [{"label": "ষ" }]}}
132+
},
133+
{ "$": "shift_state_selector",
134+
"manualOrLocked": { "label": "শ", "labelFlags": 1073741824 },
135+
"default": { "label": "স", "popup": { "relevant": [{"label": "শ" }]}}
136+
},
137+
{ "$": "shift_state_selector",
138+
"manualOrLocked": { "label": "য", "labelFlags": 1073741824 },
139+
"default": { "label": "য়", "popup": { "relevant": [{"label": "য" }]}}
140+
}
141+
]
142+
]

Diff for: ‎app/src/main/assets/locale_key_texts/bn-IN.txt

+25-20
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,41 @@
11
[popup_keys]
2+
ৌ ঔ
3+
ৈ ঐ
4+
া আ
5+
ী ঈ
6+
ূ ঊ
27
ব ভ
8+
হ ঙ
39
গ ঘ
410
দ ধ
5-
জ ঝ জ্ঞ
6-
ড ড়
7-
ও ো
8-
এ ে
9-
অ ্
10-
ই ি
11-
উ ু
11+
জ ঝ
12+
ড ঢ
13+
ো ও
14+
ে এ
15+
্ অ
16+
ি ই
17+
ু উ
1218
প ফ
13-
র ৃ ঋ ত্র
19+
র ড় র‍্য
1420
ক খ
15-
ত ৎ থ ত্ত
21+
ত থ ৎ
1622
চ ছ
1723
ট ঠ
18-
ঁ ঃ ং
19-
ঢ ঢ়
20-
ন ণ
21-
ঞ ঙ ঞ্জ
22-
ষ ক্ষ
24+
ৃ ঋ
25+
ং ঁ ঃ
26+
ঁ !autoColumnOrder!6 ় ৄ ঽ ৢ ৱ ৣ ৗ ৠ ৺ ঌ ৰ ৡ
27+
ম ণ
28+
ন ঞ
29+
ব ঢ়
30+
ল ষ
2331
স শ
2432
য় য
25-
। ॥
26-
ঔ ৌ
27-
ঐ ৈ
28-
আ া
29-
ঈ ী
30-
ঊ ূ
33+
punctuation !autoColumnOrder!8 \, ॥ ? ! !icon/zwnj_key|‌ !icon/zwj_key|‍ # @ ( ) / ; : - + \%
3134

3235
[labels]
3336
alphabet: কখগ
37+
symbol: ?১২৩
38+
period: ।
3439

3540
[number_row]
3641
১ ২ ৩ ৪ ৫ ৬ ৭ ৮ ৯ ০

Diff for: ‎app/src/main/java/helium314/keyboard/latin/App.kt

+12
Original file line numberDiff line numberDiff line change
@@ -530,6 +530,18 @@ fun checkVersionUpgrade(context: Context) {
530530
prefs.edit().remove("auto_correction_confidence").putFloat(Settings.PREF_AUTO_CORRECT_THRESHOLD, value).apply()
531531
}
532532
}
533+
if (oldVersion <= 2310) {
534+
listOf(
535+
Settings.PREF_ENABLED_SUBTYPES,
536+
Settings.PREF_SELECTED_SUBTYPE,
537+
Settings.PREF_ADDITIONAL_SUBTYPES
538+
).forEach { key ->
539+
val value = prefs.getString(key, "")!!
540+
if ("bengali," in value) {
541+
prefs.edit().putString(key, value.replace("bengali,", "bengali_inscript,")).apply()
542+
}
543+
}
544+
}
533545
upgradeToolbarPrefs(prefs)
534546
LayoutUtilsCustom.onLayoutFileChanged() // just to be sure
535547
prefs.edit { putInt(Settings.PREF_VERSION_CODE, BuildConfig.VERSION_CODE) }

Diff for: ‎app/src/main/res/xml/method.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
bg: Bulgarian/bulgarian_bekl
2121
bn_BD: Bengali (Bangladesh)/bengali_unijoy
2222
bn_BD: Bengali (Bangladesh) (Akkhor)/bengali_akkhor
23-
bn_IN: Bengali (India)/bengali
23+
bn_IN: Bengali (India)/bengali_inscript
2424
bn_IN: Bengali (India)/Baishakhi
2525
ca: Catalan/qwerty+
2626
cs: Czech/qwertz
@@ -266,7 +266,7 @@
266266
android:imeSubtypeLocale="bn_IN"
267267
android:languageTag="bn-IN"
268268
android:imeSubtypeMode="keyboard"
269-
android:imeSubtypeExtraValue="KeyboardLayoutSet=MAIN:bengali,NoShiftKey,EmojiCapable"
269+
android:imeSubtypeExtraValue="KeyboardLayoutSet=MAIN:bengali_inscript,EmojiCapable"
270270
android:isAsciiCapable="false"
271271
/>
272272
<subtype android:icon="@drawable/ic_ime_switcher"

0 commit comments

Comments
 (0)