luckyimnotanigger/HeliBoard
1
0
Fork 0
mirror of https://github.com/Helium314/HeliBoard.git synced 2025-05-17 15:32:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix some minor glitches in language settings

Browse source
This commit is contained in:
Helium314 2023-09-15 10:07:12 +02:00
parent d56f241b82
commit 41a24295ae
2 changed files with 74 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,6 +8,7 @@ import android.view.LayoutInflater
import android.view.View import android.view.View
import android.widget.* import android.widget.*
import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AlertDialog
import androidx.core.view.get
import androidx.core.view.isGone import androidx.core.view.isGone
import androidx.core.view.isVisible import androidx.core.view.isVisible
import androidx.core.view.size import androidx.core.view.size
@ -15,6 +16,8 @@ import org.dslul.openboard.inputmethod.dictionarypack.DictionaryPackConstants
import org.dslul.openboard.inputmethod.latin.BinaryDictionaryGetter import org.dslul.openboard.inputmethod.latin.BinaryDictionaryGetter
import org.dslul.openboard.inputmethod.latin.R import org.dslul.openboard.inputmethod.latin.R
import org.dslul.openboard.inputmethod.latin.common.LocaleUtils import org.dslul.openboard.inputmethod.latin.common.LocaleUtils
import org.dslul.openboard.inputmethod.latin.databinding.LanguageListItemBinding
import org.dslul.openboard.inputmethod.latin.databinding.LocaleSettingsDialogBinding
import org.dslul.openboard.inputmethod.latin.utils.* import org.dslul.openboard.inputmethod.latin.utils.*
import java.io.File import java.io.File
import java.util.* import java.util.*
@ -24,26 +27,28 @@ class LanguageSettingsDialog(
private val infos: MutableList<SubtypeInfo>, private val infos: MutableList<SubtypeInfo>,
private val fragment: LanguageSettingsFragment?, private val fragment: LanguageSettingsFragment?,
private val onlySystemLocales: Boolean, private val onlySystemLocales: Boolean,
private val onSubtypesChanged: () -> Unit private val reloadSetting: () -> Unit
) : AlertDialog(context), LanguageSettingsFragment.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 binding = LocaleSettingsDialogBinding.inflate(LayoutInflater.from(context))
private val mainLocaleString = infos.first().subtype.locale() private val mainLocaleString = infos.first().subtype.locale()
private val mainLocale = mainLocaleString.toLocale() private val mainLocale = mainLocaleString.toLocale()
private var hasInternalDictForLanguage = false
private lateinit var userDicts: MutableSet<File>
init { init {
setTitle(infos.first().displayName) setTitle(infos.first().displayName)
setView(ScrollView(context).apply { addView(view) }) setView(ScrollView(context).apply { addView(binding.root) })
setButton(BUTTON_NEGATIVE, context.getString(R.string.dialog_close)) { _, _ -> setButton(BUTTON_NEGATIVE, context.getString(R.string.dialog_close)) { _, _ ->
dismiss() dismiss()
} }
if (onlySystemLocales) if (onlySystemLocales)
view.findViewById<View>(R.id.subtypes).isGone = true binding.subtypes.isGone = true
else else
fillSubtypesView(view.findViewById(R.id.subtypes)) fillSubtypesView()
fillSecondaryLocaleView(view.findViewById(R.id.secondary_languages)) fillSecondaryLocaleView()
fillDictionariesView(view.findViewById(R.id.dictionaries)) fillDictionariesView()
} }
override fun onStart() { override fun onStart() {
@ -56,9 +61,9 @@ class LanguageSettingsDialog(
fragment?.setListener(null) fragment?.setListener(null)
} }
private fun fillSubtypesView(subtypesView: LinearLayout) { private fun fillSubtypesView() {
if (infos.any { it.subtype.isAsciiCapable }) { // currently can only add subtypes for latin keyboards if (infos.any { it.subtype.isAsciiCapable }) { // currently can only add subtypes for latin keyboards
subtypesView.findViewById<ImageView>(R.id.add_subtype).setOnClickListener { binding.addSubtype.setOnClickListener {
val layouts = context.resources.getStringArray(R.array.predefined_layouts) val layouts = context.resources.getStringArray(R.array.predefined_layouts)
.filterNot { layoutName -> infos.any { SubtypeLocaleUtils.getKeyboardLayoutSetName(it.subtype) == layoutName } } .filterNot { layoutName -> infos.any { SubtypeLocaleUtils.getKeyboardLayoutSetName(it.subtype) == layoutName } }
val displayNames = layouts.map { SubtypeLocaleUtils.getKeyboardLayoutSetDisplayName(it) } val displayNames = layouts.map { SubtypeLocaleUtils.getKeyboardLayoutSetDisplayName(it) }
@ -70,23 +75,23 @@ class LanguageSettingsDialog(
val newSubtypeInfo = newSubtype.toSubtypeInfo(mainLocale, context, true, infos.first().hasDictionary) // enabled by default, because why else add them val newSubtypeInfo = newSubtype.toSubtypeInfo(mainLocale, context, true, infos.first().hasDictionary) // enabled by default, because why else add them
addAdditionalSubtype(prefs, context.resources, newSubtype) addAdditionalSubtype(prefs, context.resources, newSubtype)
addEnabledSubtype(prefs, newSubtype) addEnabledSubtype(prefs, newSubtype)
addSubtypeToView(newSubtypeInfo, subtypesView) addSubtypeToView(newSubtypeInfo)
infos.add(newSubtypeInfo) infos.add(newSubtypeInfo)
onSubtypesChanged() reloadSetting()
} }
.setNegativeButton(android.R.string.cancel, null) .setNegativeButton(android.R.string.cancel, null)
.show() .show()
} }
} else } else
subtypesView.findViewById<View>(R.id.add_subtype).isGone = true binding.addSubtype.isGone = true
// add subtypes // add subtypes
infos.sortedBy { it.displayName }.forEach { infos.sortedBy { it.displayName }.forEach {
addSubtypeToView(it, subtypesView) addSubtypeToView(it)
} }
} }
private fun addSubtypeToView(subtype: SubtypeInfo, subtypesView: LinearLayout) { private fun addSubtypeToView(subtype: SubtypeInfo) {
val row = LayoutInflater.from(context).inflate(R.layout.language_list_item, listView) val row = LayoutInflater.from(context).inflate(R.layout.language_list_item, listView)
row.findViewById<TextView>(R.id.language_name).text = row.findViewById<TextView>(R.id.language_name).text =
SubtypeLocaleUtils.getKeyboardLayoutSetDisplayName(subtype.subtype) SubtypeLocaleUtils.getKeyboardLayoutSetDisplayName(subtype.subtype)
@ -104,7 +109,7 @@ class LanguageSettingsDialog(
else else
removeEnabledSubtype(prefs, subtype.subtype) removeEnabledSubtype(prefs, subtype.subtype)
subtype.isEnabled = b subtype.isEnabled = b
onSubtypesChanged() reloadSetting()
} }
} }
if (isAdditionalSubtype(subtype.subtype)) { if (isAdditionalSubtype(subtype.subtype)) {
@ -113,19 +118,19 @@ class LanguageSettingsDialog(
isVisible = true isVisible = true
setOnClickListener { setOnClickListener {
// can be re-added easily, no need for confirmation dialog // can be re-added easily, no need for confirmation dialog
subtypesView.removeView(row) binding.subtypes.removeView(row)
infos.remove(subtype) infos.remove(subtype)
removeAdditionalSubtype(prefs, context.resources, subtype.subtype) removeAdditionalSubtype(prefs, context.resources, subtype.subtype)
removeEnabledSubtype(prefs, subtype.subtype) removeEnabledSubtype(prefs, subtype.subtype)
onSubtypesChanged() reloadSetting()
} }
} }
} }
subtypesView.addView(row) binding.subtypes.addView(row)
} }
private fun fillSecondaryLocaleView(secondaryLocalesView: LinearLayout) { private fun fillSecondaryLocaleView() {
// can only use multilingual typing if there is more than one dictionary available // can only use multilingual typing if there is more than one dictionary available
val availableSecondaryLocales = getAvailableSecondaryLocales( val availableSecondaryLocales = getAvailableSecondaryLocales(
context, context,
@ -134,10 +139,10 @@ class LanguageSettingsDialog(
) )
val selectedSecondaryLocales = Settings.getSecondaryLocales(prefs, mainLocaleString) val selectedSecondaryLocales = Settings.getSecondaryLocales(prefs, mainLocaleString)
selectedSecondaryLocales.forEach { selectedSecondaryLocales.forEach {
addSecondaryLocaleView(it, secondaryLocalesView) addSecondaryLocaleView(it)
} }
if (availableSecondaryLocales.isNotEmpty()) { if (availableSecondaryLocales.isNotEmpty()) {
secondaryLocalesView.findViewById<ImageView>(R.id.add_secondary_language).apply { binding.addSecondaryLanguage.apply {
isVisible = true isVisible = true
setOnClickListener { setOnClickListener {
val locales = (availableSecondaryLocales - Settings.getSecondaryLocales(prefs, mainLocaleString)).sortedBy { it.displayName } val locales = (availableSecondaryLocales - Settings.getSecondaryLocales(prefs, mainLocaleString)).sortedBy { it.displayName }
@ -148,35 +153,37 @@ class LanguageSettingsDialog(
val locale = locales[i] val locale = locales[i]
val localeStrings = Settings.getSecondaryLocales(prefs, mainLocaleString).map { it.toString() } val localeStrings = Settings.getSecondaryLocales(prefs, mainLocaleString).map { it.toString() }
Settings.setSecondaryLocales(prefs, mainLocaleString, localeStrings + locale.toString()) Settings.setSecondaryLocales(prefs, mainLocaleString, localeStrings + locale.toString())
addSecondaryLocaleView(locale, secondaryLocalesView) addSecondaryLocaleView(locale)
di.dismiss() di.dismiss()
reloadSetting()
} }
.setNegativeButton(android.R.string.cancel, null) .setNegativeButton(android.R.string.cancel, null)
.show() .show()
} }
} }
} else if (selectedSecondaryLocales.isEmpty()) } else if (selectedSecondaryLocales.isEmpty())
secondaryLocalesView.isGone = true binding.secondaryLocales.isGone = true
} }
private fun addSecondaryLocaleView(locale: Locale, secondaryLocalesView: LinearLayout) { private fun addSecondaryLocaleView(locale: Locale) {
val row = LayoutInflater.from(context).inflate(R.layout.language_list_item, listView) val rowBinding = LanguageListItemBinding.inflate(LayoutInflater.from(context), listView, false)
row.findViewById<Switch>(R.id.language_switch).isGone = true rowBinding.languageSwitch.isGone = true
row.findViewById<Switch>(R.id.language_details).isGone = true rowBinding.languageDetails.isGone = true
row.findViewById<TextView>(R.id.language_name).text = locale.displayName rowBinding.languageName.text = locale.displayName
row.findViewById<ImageView>(R.id.delete_button).apply { rowBinding.deleteButton.apply {
isVisible = true isVisible = true
setOnClickListener { setOnClickListener {
val localeStrings = Settings.getSecondaryLocales(prefs, mainLocaleString).map { it.toString() } val localeStrings = Settings.getSecondaryLocales(prefs, mainLocaleString).map { it.toString() }
Settings.setSecondaryLocales(prefs, mainLocaleString, localeStrings - locale.toString()) Settings.setSecondaryLocales(prefs, mainLocaleString, localeStrings - locale.toString())
secondaryLocalesView.removeView(row) binding.secondaryLocales.removeView(rowBinding.root)
reloadSetting()
} }
} }
secondaryLocalesView.addView(row) binding.secondaryLocales.addView(rowBinding.root)
} }
private fun fillDictionariesView(dictionariesView: LinearLayout) { private fun fillDictionariesView() {
dictionariesView.findViewById<ImageView>(R.id.add_dictionary).setOnClickListener { binding.addDictionary.setOnClickListener {
val link = "<a href='$DICTIONARY_URL'>" + context.getString(R.string.dictionary_link_text) + "</a>" val link = "<a href='$DICTIONARY_URL'>" + context.getString(R.string.dictionary_link_text) + "</a>"
val message = SpannableStringUtils.fromHtml(context.getString(R.string.add_dictionary, link)) val message = SpannableStringUtils.fromHtml(context.getString(R.string.add_dictionary, link))
val dialog = Builder(context) val dialog = Builder(context)
@ -188,9 +195,11 @@ class LanguageSettingsDialog(
dialog.show() dialog.show()
(dialog.findViewById<View>(android.R.id.message) as? TextView)?.movementMethod = LinkMovementMethod.getInstance() (dialog.findViewById<View>(android.R.id.message) as? TextView)?.movementMethod = LinkMovementMethod.getInstance()
} }
val (userDicts, hasInternalDictForLanguage) = getUserAndInternalDictionaries(context, mainLocaleString) val (_userDicts, _hasInternalDictForLanguage) = getUserAndInternalDictionaries(context, mainLocaleString)
userDicts = _userDicts.toMutableSet()
hasInternalDictForLanguage = _hasInternalDictForLanguage
if (hasInternalDictForLanguage) { if (hasInternalDictForLanguage) {
dictionariesView.addView(TextView(context, null, R.style.PreferenceCategoryTitleText).apply { binding.dictionaries.addView(TextView(context, null, R.style.PreferenceCategoryTitleText).apply {
setText(R.string.internal_dictionary_summary) setText(R.string.internal_dictionary_summary)
textSize *= 0.8f textSize *= 0.8f
setPadding((context.resources.displayMetrics.scaledDensity * 16).toInt(), 0, 0, 0) setPadding((context.resources.displayMetrics.scaledDensity * 16).toInt(), 0, 0, 0)
@ -198,25 +207,31 @@ class LanguageSettingsDialog(
}) })
} }
userDicts.sorted().forEach { userDicts.sorted().forEach {
addDictionaryToView(it, dictionariesView) addDictionaryToView(it)
} }
} }
override fun onNewDictionary(uri: Uri?) { override fun onNewDictionary(uri: Uri?) {
NewDictionaryAdder(context) { replaced, dictFile -> NewDictionaryAdder(context) { replaced, dictFile ->
if (!replaced) if (!replaced) {
addDictionaryToView(dictFile, view.findViewById(R.id.dictionaries)) addDictionaryToView(dictFile)
userDicts.add(dictFile)
if (hasInternalDictForLanguage) {
binding.dictionaries[1].isEnabled =
userDicts.none { it.name == "${DictionaryInfoUtils.MAIN_DICT_PREFIX}${USER_DICTIONARY_SUFFIX}" }
}
}
}.addDictionary(uri, mainLocale) }.addDictionary(uri, mainLocale)
} }
private fun addDictionaryToView(dictFile: File, dictionariesView: LinearLayout) { private fun addDictionaryToView(dictFile: File) {
if (!infos.first().hasDictionary) { if (!infos.first().hasDictionary) {
infos.forEach { it.hasDictionary = true } infos.forEach { it.hasDictionary = true }
} }
val dictType = dictFile.name.substringBefore("_${USER_DICTIONARY_SUFFIX}") val dictType = dictFile.name.substringBefore("_${USER_DICTIONARY_SUFFIX}")
val row = LayoutInflater.from(context).inflate(R.layout.language_list_item, listView) val rowBinding = LanguageListItemBinding.inflate(LayoutInflater.from(context), listView, false)
row.findViewById<TextView>(R.id.language_name).text = dictType rowBinding.languageName.text = dictType
row.findViewById<TextView>(R.id.language_details).apply { rowBinding.languageDetails.apply {
val header = DictionaryInfoUtils.getDictionaryFileHeaderOrNull(dictFile, 0, dictFile.length()) val header = DictionaryInfoUtils.getDictionaryFileHeaderOrNull(dictFile, 0, dictFile.length())
if (header?.description == null) { if (header?.description == null) {
isGone = true isGone = true
@ -225,8 +240,8 @@ class LanguageSettingsDialog(
text = header.description text = header.description
} }
} }
row.findViewById<Switch>(R.id.language_switch).isGone = true rowBinding.languageSwitch.isGone = true
row.findViewById<ImageView>(R.id.delete_button).apply { rowBinding.deleteButton.apply {
isVisible = true isVisible = true
setOnClickListener { setOnClickListener {
confirmDialog(context, context.getString(R.string.remove_dictionary_message, dictType), context.getString( confirmDialog(context, context.getString(R.string.remove_dictionary_message, dictType), context.getString(
@ -237,15 +252,19 @@ class LanguageSettingsDialog(
parent.delete() parent.delete()
val newDictBroadcast = Intent(DictionaryPackConstants.NEW_DICTIONARY_INTENT_ACTION) val newDictBroadcast = Intent(DictionaryPackConstants.NEW_DICTIONARY_INTENT_ACTION)
fragment?.activity?.sendBroadcast(newDictBroadcast) fragment?.activity?.sendBroadcast(newDictBroadcast)
dictionariesView.removeView(row) binding.dictionaries.removeView(rowBinding.root)
if (dictionariesView.size < 2) { // first view is "Dictionaries" if (binding.dictionaries.size < 2) { // first view is "Dictionaries"
infos.forEach { it.hasDictionary = false } infos.forEach { it.hasDictionary = false }
} }
userDicts.remove(dictFile)
if (hasInternalDictForLanguage) {
binding.dictionaries[1].isEnabled =
userDicts.none { it.name == "${DictionaryInfoUtils.MAIN_DICT_PREFIX}${USER_DICTIONARY_SUFFIX}" }
}
} }
} }
} }
dictionariesView.addView(row) binding.dictionaries.addView(rowBinding.root)
} }
} }

9
app/src/main/res/layout/locale_settings_dialog.xml
View file

@ -1,11 +1,13 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical" android:orientation="vertical"
android:showDividers="middle" android:showDividers="middle"
android:divider="@drawable/ic_divider" android:divider="@drawable/ic_divider"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:padding="10dp"> android:padding="10dp">
<!-- layout appears unnecessary, but more views will be added -->
<LinearLayout <LinearLayout
android:id="@+id/subtypes" android:id="@+id/subtypes"
android:orientation="vertical" android:orientation="vertical"
@ -15,7 +17,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingHorizontal="16dp" android:paddingHorizontal="16dp"
android:orientation="horizontal"> android:orientation="horizontal"
tools:ignore="UseCompoundDrawables"> <!-- view gets an onClickListener -->
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -31,8 +34,9 @@
android:src="@drawable/ic_plus" /> android:src="@drawable/ic_plus" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<!-- layout appears unnecessary, but more views will be added -->
<LinearLayout <LinearLayout
android:id="@+id/secondary_languages" android:id="@+id/secondary_locales"
android:orientation="vertical" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
@ -57,6 +61,7 @@
android:src="@drawable/ic_plus" /> android:src="@drawable/ic_plus" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<!-- layout appears unnecessary, but more views will be added -->
<LinearLayout <LinearLayout
android:id="@+id/dictionaries" android:id="@+id/dictionaries"
android:orientation="vertical" android:orientation="vertical"