luckyimnotanigger/HeliBoard
1
0
Fork 0
mirror of https://github.com/Helium314/HeliBoard.git synced 2025-04-20 14:19:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

consider script when evaluating hint locales

Browse source
This commit is contained in:
Helium314 2024-02-01 10:56:41 +01:00
parent 9cce029e06
commit 5e5f045495
3 changed files with 27 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/helium314/keyboard/latin/LatinIME.java
View file

@ -914,15 +914,15 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
}
// Try switching to a subtype matching the hint language.
for (final Locale hintLocale : hintLocales) {
final InputMethodSubtype newSubtype = mRichImm.findSubtypeByLocale(hintLocale);
final InputMethodSubtype newSubtype = mRichImm.findSubtypeForHintLocale(hintLocale);
if (newSubtype == null) continue;
if (newSubtype.equals(mRichImm.getCurrentSubtype().getRawSubtype()))
return; // no need to switch, we already use the correct locale
mHandler.postSwitchLanguage(newSubtype);
break;
}
}
@SuppressWarnings("deprecation")
void onStartInputViewInternal(final EditorInfo editorInfo, final boolean restarting) {
super.onStartInputView(editorInfo, restarting);

89
app/src/main/java/helium314/keyboard/latin/RichInputMethodManager.java
View file

@ -17,6 +17,7 @@ import android.view.inputmethod.InputMethodSubtype;
import helium314.keyboard.annotations.UsedForTesting;
import helium314.keyboard.compat.ConfigurationCompatKt;
import helium314.keyboard.latin.common.LocaleUtils;
import helium314.keyboard.latin.settings.Settings;
import helium314.keyboard.latin.utils.DeviceProtectedUtils;
import helium314.keyboard.latin.utils.LanguageOnSpacebarUtils;
@ -309,82 +310,34 @@ public class RichInputMethodManager {
return null;
}
public InputMethodSubtype findSubtypeByLocale(final Locale locale) {
// Find the best subtype based on a straightforward matching algorithm.
final List<InputMethodSubtype> subtypes =
getMyEnabledInputMethodSubtypeList(true /* allowsImplicitlySelectedSubtypes */);
final int count = subtypes.size();
// search for exact match
for (int i = 0; i < count; ++i) {
final InputMethodSubtype subtype = subtypes.get(i);
final Locale subtypeLocale = SubtypeUtilsKt.locale(subtype);
if (subtypeLocale.equals(locale)) {
return subtype;
}
}
// search for language + country + variant match
for (int i = 0; i < count; ++i) {
final InputMethodSubtype subtype = subtypes.get(i);
final Locale subtypeLocale = SubtypeUtilsKt.locale(subtype);
if (subtypeLocale.getLanguage().equals(locale.getLanguage()) &&
subtypeLocale.getCountry().equals(locale.getCountry()) &&
subtypeLocale.getVariant().equals(locale.getVariant())) {
return subtype;
}
}
// search for language + country match
for (int i = 0; i < count; ++i) {
final InputMethodSubtype subtype = subtypes.get(i);
final Locale subtypeLocale = SubtypeUtilsKt.locale(subtype);
if (subtypeLocale.getLanguage().equals(locale.getLanguage()) &&
subtypeLocale.getCountry().equals(locale.getCountry())) {
return subtype;
}
}
// search for secondary locale match
final SharedPreferences prefs = DeviceProtectedUtils.getSharedPreferences(mContext);
for (int i = 0; i < count; ++i) {
final InputMethodSubtype subtype = subtypes.get(i);
final Locale subtypeLocale = SubtypeUtilsKt.locale(subtype);
final List<Locale> secondaryLocales = Settings.getSecondaryLocales(prefs, subtypeLocale);
for (final Locale secondaryLocale : secondaryLocales) {
if (secondaryLocale.equals(locale)) {
return subtype;
}
}
}
// search for language match
for (int i = 0; i < count; ++i) {
final InputMethodSubtype subtype = subtypes.get(i);
final Locale subtypeLocale = SubtypeUtilsKt.locale(subtype);
if (subtypeLocale.getLanguage().equals(locale.getLanguage())) {
return subtype;
}
}
// search for secondary language match
for (int i = 0; i < count; ++i) {
final InputMethodSubtype subtype = subtypes.get(i);
final Locale subtypeLocale = SubtypeUtilsKt.locale(subtype);
final List<Locale> secondaryLocales = Settings.getSecondaryLocales(prefs, subtypeLocale);
for (final Locale secondaryLocale : secondaryLocales) {
if (secondaryLocale.getLanguage().equals(locale.getLanguage())) {
return subtype;
}
}
}
public InputMethodSubtype findSubtypeForHintLocale(final Locale locale) {
// Find the best subtype based on a locale matching
final List<InputMethodSubtype> subtypes = getMyEnabledInputMethodSubtypeList(true);
InputMethodSubtype bestMatch = LocaleUtils.getBestMatch(locale, subtypes, SubtypeUtilsKt::locale);
if (bestMatch != null) return bestMatch;
// extra: if current script is not compatible to current subtype, search for compatible script
// this is acceptable only because this function is only used for switching to a certain locale using EditorInfo.hintLocales
// search for first secondary language & script match
final int count = subtypes.size();
final SharedPreferences prefs = DeviceProtectedUtils.getSharedPreferences(mContext);
final String language = locale.getLanguage();
final String script = ScriptUtils.script(locale);
if (!script.equals(ScriptUtils.script(getCurrentSubtypeLocale()))) {
for (int i = 0; i < count; ++i) {
final InputMethodSubtype subtype = subtypes.get(i);
final Locale subtypeLocale = SubtypeUtilsKt.locale(subtype);
if (ScriptUtils.script(subtypeLocale).equals(script)) {
return subtype;
if (!ScriptUtils.script(subtypeLocale).equals(script))
continue; // need compatible script
bestMatch = subtype;
final List<Locale> secondaryLocales = Settings.getSecondaryLocales(prefs, subtypeLocale);
for (final Locale secondaryLocale : secondaryLocales) {
if (secondaryLocale.getLanguage().equals(language)) {
return bestMatch;
}
}
}
// if wanted script is not compatible to current subtype, return a subtype with compatible script if possible
if (!script.equals(ScriptUtils.script(getCurrentSubtypeLocale()))) {
return bestMatch;
}
return null;
}

1
app/src/main/java/helium314/keyboard/latin/common/LocaleUtils.kt
View file

@ -110,6 +110,7 @@ object LocaleUtils {
else LOCALE_LANGUAGE_AND_COUNTRY_MATCH_VARIANT_DIFFER
}
@JvmStatic
fun <T> getBestMatch(locale: Locale, collection: Collection<T>, toLocale: (T) -> Locale): T? {
var best: T? = null
var bestLevel = 0