diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/BinaryDictionaryGetter.java b/app/src/main/java/org/dslul/openboard/inputmethod/latin/BinaryDictionaryGetter.java index 41d209657..c5771e4b3 100644 --- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/BinaryDictionaryGetter.java +++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/BinaryDictionaryGetter.java @@ -16,7 +16,7 @@ package org.dslul.openboard.inputmethod.latin; -import static org.dslul.openboard.inputmethod.latin.settings.LanguageFakeSettingsFragmentKt.USER_DICTIONARY_SUFFIX; +import static org.dslul.openboard.inputmethod.latin.settings.LanguageSettingsFragmentKt.USER_DICTIONARY_SUFFIX; import android.content.Context; import android.content.SharedPreferences; diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/LanguageFilterList.kt b/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/LanguageFilterList.kt index 9e3141d7b..057bbd785 100644 --- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/LanguageFilterList.kt +++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/LanguageFilterList.kt @@ -26,7 +26,7 @@ class LanguageFilterListFakePreference(searchField: EditText, recyclerView: Recy private val adapter = LanguageAdapter(emptyList(), recyclerView.context) private val sortedSubtypes = mutableListOf>() - fun setSettingsFragment(newFragment: LanguageFakeSettingsFragment?) { + fun setSettingsFragment(newFragment: LanguageSettingsFragment?) { adapter.fragment = newFragment } @@ -50,7 +50,7 @@ class LanguageAdapter(list: List> = listOf(), context: RecyclerView.Adapter() { var onlySystemLocales = false private val prefs = DeviceProtectedUtils.getSharedPreferences(context) - var fragment: LanguageFakeSettingsFragment? = null + var fragment: LanguageSettingsFragment? = null var list: List> = list set(value) { diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/LanguageSettingsDialog.kt b/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/LanguageSettingsDialog.kt index cf5868984..c16257928 100644 --- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/LanguageSettingsDialog.kt +++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/LanguageSettingsDialog.kt @@ -22,10 +22,10 @@ import java.util.* class LanguageSettingsDialog( context: Context, private val infos: MutableList, - private val fragment: LanguageFakeSettingsFragment?, + private val fragment: LanguageSettingsFragment?, private val onlySystemLocales: Boolean, private val onSubtypesChanged: () -> Unit -) : AlertDialog(context), LanguageFakeSettingsFragment.Listener { +) : AlertDialog(context), LanguageSettingsFragment.Listener { private val prefs = DeviceProtectedUtils.getSharedPreferences(context)!! private val view = LayoutInflater.from(context).inflate(R.layout.locale_settings_dialog, null) private val mainLocaleString = infos.first().subtype.locale() diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/LanguageFakeSettingsFragment.kt b/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/LanguageSettingsFragment.kt similarity index 99% rename from app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/LanguageFakeSettingsFragment.kt rename to app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/LanguageSettingsFragment.kt index b3338847f..0820f13e9 100644 --- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/LanguageFakeSettingsFragment.kt +++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/LanguageSettingsFragment.kt @@ -24,7 +24,7 @@ import java.util.* // not a SettingsFragment, because with androidx.preferences it's very complicated or // impossible to have the languages RecyclerView scrollable (this way it works nicely out of the box) -class LanguageFakeSettingsFragment : Fragment(R.layout.language_fake_settings) { +class LanguageSettingsFragment : Fragment(R.layout.language_settings) { private val sortedSubtypes = LinkedHashMap>() private val enabledSubtypes = mutableListOf() private val systemLocales = mutableListOf() diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/utils/FragmentUtils.java b/app/src/main/java/org/dslul/openboard/inputmethod/latin/utils/FragmentUtils.java index 71becb10a..baa1fa1dc 100644 --- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/utils/FragmentUtils.java +++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/utils/FragmentUtils.java @@ -21,7 +21,7 @@ import org.dslul.openboard.inputmethod.latin.settings.AppearanceSettingsFragment import org.dslul.openboard.inputmethod.latin.settings.CorrectionSettingsFragment; import org.dslul.openboard.inputmethod.latin.settings.DebugSettingsFragment; import org.dslul.openboard.inputmethod.latin.settings.GestureSettingsFragment; -import org.dslul.openboard.inputmethod.latin.settings.LanguageFakeSettingsFragment; +import org.dslul.openboard.inputmethod.latin.settings.LanguageSettingsFragment; import org.dslul.openboard.inputmethod.latin.settings.PreferencesSettingsFragment; import org.dslul.openboard.inputmethod.latin.settings.SettingsFragment; import org.dslul.openboard.inputmethod.latin.settings.AboutFragment; @@ -49,7 +49,7 @@ public class FragmentUtils { sLatinImeFragments.add(UserDictionaryList.class.getName()); sLatinImeFragments.add(UserDictionaryLocalePicker.class.getName()); sLatinImeFragments.add(UserDictionarySettings.class.getName()); - sLatinImeFragments.add(LanguageFakeSettingsFragment.class.getName()); + sLatinImeFragments.add(LanguageSettingsFragment.class.getName()); } public static boolean isValidFragment(String fragmentName) { diff --git a/app/src/main/res/layout/language_fake_settings.xml b/app/src/main/res/layout/language_settings.xml similarity index 100% rename from app/src/main/res/layout/language_fake_settings.xml rename to app/src/main/res/layout/language_settings.xml diff --git a/app/src/main/res/xml/prefs.xml b/app/src/main/res/xml/prefs.xml index a767155e8..fe1dc5d1e 100644 --- a/app/src/main/res/xml/prefs.xml +++ b/app/src/main/res/xml/prefs.xml @@ -17,7 +17,7 @@