luckyimnotanigger/HeliBoard
1
0
Fork 0
mirror of https://github.com/Helium314/HeliBoard.git synced 2025-06-08 07:37:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename language settings fragment

Browse source
This commit is contained in:
Helium314 2023-09-12 14:50:36 +02:00
parent d867eb13bf
commit 042bd14a71
7 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/dslul/openboard/inputmethod/latin/BinaryDictionaryGetter.java
View file

@ -16,7 +16,7 @@
package org.dslul.openboard.inputmethod.latin; 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.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;

4
app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/LanguageFilterList.kt
View file

@ -26,7 +26,7 @@ class LanguageFilterListFakePreference(searchField: EditText, recyclerView: Recy
private val adapter = LanguageAdapter(emptyList(), recyclerView.context) private val adapter = LanguageAdapter(emptyList(), recyclerView.context)
private val sortedSubtypes = mutableListOf<MutableList<SubtypeInfo>>() private val sortedSubtypes = mutableListOf<MutableList<SubtypeInfo>>()
fun setSettingsFragment(newFragment: LanguageFakeSettingsFragment?) { fun setSettingsFragment(newFragment: LanguageSettingsFragment?) {
adapter.fragment = newFragment adapter.fragment = newFragment
} }
@ -50,7 +50,7 @@ class LanguageAdapter(list: List<MutableList<SubtypeInfo>> = listOf(), context:
RecyclerView.Adapter<LanguageAdapter.ViewHolder>() { RecyclerView.Adapter<LanguageAdapter.ViewHolder>() {
var onlySystemLocales = false var onlySystemLocales = false
private val prefs = DeviceProtectedUtils.getSharedPreferences(context) private val prefs = DeviceProtectedUtils.getSharedPreferences(context)
var fragment: LanguageFakeSettingsFragment? = null var fragment: LanguageSettingsFragment? = null
var list: List<MutableList<SubtypeInfo>> = list var list: List<MutableList<SubtypeInfo>> = list
set(value) { set(value) {

4
app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/LanguageSettingsDialog.kt
View file

@ -22,10 +22,10 @@ import java.util.*
class LanguageSettingsDialog( class LanguageSettingsDialog(
context: Context, context: Context,
private val infos: MutableList<SubtypeInfo>, private val infos: MutableList<SubtypeInfo>,
private val fragment: LanguageFakeSettingsFragment?, private val fragment: LanguageSettingsFragment?,
private val onlySystemLocales: Boolean, private val onlySystemLocales: Boolean,
private val onSubtypesChanged: () -> Unit private val onSubtypesChanged: () -> Unit
) : AlertDialog(context), LanguageFakeSettingsFragment.Listener { ) : AlertDialog(context), LanguageSettingsFragment.Listener {
private val prefs = DeviceProtectedUtils.getSharedPreferences(context)!! private val prefs = DeviceProtectedUtils.getSharedPreferences(context)!!
private val view = LayoutInflater.from(context).inflate(R.layout.locale_settings_dialog, null) private val view = LayoutInflater.from(context).inflate(R.layout.locale_settings_dialog, null)
private val mainLocaleString = infos.first().subtype.locale() private val mainLocaleString = infos.first().subtype.locale()

2
app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/LanguageFakeSettingsFragment.kt → app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/LanguageSettingsFragment.kt
View file

@ -24,7 +24,7 @@ import java.util.*
// not a SettingsFragment, because with androidx.preferences it's very complicated or // 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) // 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<String, MutableList<SubtypeInfo>>() private val sortedSubtypes = LinkedHashMap<String, MutableList<SubtypeInfo>>()
private val enabledSubtypes = mutableListOf<InputMethodSubtype>() private val enabledSubtypes = mutableListOf<InputMethodSubtype>()
private val systemLocales = mutableListOf<Locale>() private val systemLocales = mutableListOf<Locale>()

4
app/src/main/java/org/dslul/openboard/inputmethod/latin/utils/FragmentUtils.java
View file

@ -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.CorrectionSettingsFragment;
import org.dslul.openboard.inputmethod.latin.settings.DebugSettingsFragment; import org.dslul.openboard.inputmethod.latin.settings.DebugSettingsFragment;
import org.dslul.openboard.inputmethod.latin.settings.GestureSettingsFragment; 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.PreferencesSettingsFragment;
import org.dslul.openboard.inputmethod.latin.settings.SettingsFragment; import org.dslul.openboard.inputmethod.latin.settings.SettingsFragment;
import org.dslul.openboard.inputmethod.latin.settings.AboutFragment; import org.dslul.openboard.inputmethod.latin.settings.AboutFragment;
@ -49,7 +49,7 @@ public class FragmentUtils {
sLatinImeFragments.add(UserDictionaryList.class.getName()); sLatinImeFragments.add(UserDictionaryList.class.getName());
sLatinImeFragments.add(UserDictionaryLocalePicker.class.getName()); sLatinImeFragments.add(UserDictionaryLocalePicker.class.getName());
sLatinImeFragments.add(UserDictionarySettings.class.getName()); sLatinImeFragments.add(UserDictionarySettings.class.getName());
sLatinImeFragments.add(LanguageFakeSettingsFragment.class.getName()); sLatinImeFragments.add(LanguageSettingsFragment.class.getName());
} }
public static boolean isValidFragment(String fragmentName) { public static boolean isValidFragment(String fragmentName) {

0
app/src/main/res/layout/language_fake_settings.xml → app/src/main/res/layout/language_settings.xml
View file

2
app/src/main/res/xml/prefs.xml
View file

@ -17,7 +17,7 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
android:key="english_ime_settings"> android:key="english_ime_settings">
<PreferenceScreen <PreferenceScreen
android:fragment="org.dslul.openboard.inputmethod.latin.settings.LanguageFakeSettingsFragment" android:fragment="org.dslul.openboard.inputmethod.latin.settings.LanguageSettingsFragment"
android:title="@string/language_selection_title" android:title="@string/language_selection_title"
android:key="screen_languages" android:key="screen_languages"
android:icon="@drawable/ic_settings_languages"/> android:icon="@drawable/ic_settings_languages"/>