luckyimnotanigger/HeliBoard
1
0
Fork 0
mirror of https://github.com/Helium314/HeliBoard.git synced 2025-06-23 17:40:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

sort and highlight enabled subtypes in language settings

Browse source
This commit is contained in:
Helium314 2023-08-27 10:07:06 +02:00
parent 0dc4ef8805
commit babbbed908
1 changed files with 26 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

32
app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/LanguageFilterListPreference.kt
View file

@ -2,7 +2,12 @@ package org.dslul.openboard.inputmethod.latin.settings
import android.content.Context import android.content.Context
import android.graphics.Rect import android.graphics.Rect
import android.graphics.Typeface
import android.preference.Preference import android.preference.Preference
import android.text.Spannable
import android.text.SpannableString
import android.text.SpannableStringBuilder
import android.text.style.StyleSpan
import android.util.AttributeSet import android.util.AttributeSet
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
@ -84,16 +89,26 @@ class LanguageAdapter(list: List<MutableList<SubtypeInfo>> = listOf(), context:
inner class ViewHolder(val view: View) : RecyclerView.ViewHolder(view) { inner class ViewHolder(val view: View) : RecyclerView.ViewHolder(view) {
fun onBind(infos: MutableList<SubtypeInfo>) { fun onBind(infos: MutableList<SubtypeInfo>) {
sort(infos)
fun setupDetailsTextAndSwitch() { fun setupDetailsTextAndSwitch() {
// this is unrelated -> rename it // this is unrelated -> rename it
view.findViewById<TextView>(R.id.language_details).apply { view.findViewById<TextView>(R.id.language_details).apply {
// input styles if more than one in infos // input styles if more than one in infos
val sb = StringBuilder() val sb = SpannableStringBuilder()
if (infos.size > 1) { if (infos.size > 1) {
sb.append(infos.joinToString(", ") {// separator ok? because for some languages it might not be... var start = true
SubtypeLocaleUtils.getKeyboardLayoutSetDisplayName(it.subtype) infos.forEach {
?: SubtypeLocaleUtils.getSubtypeDisplayNameInSystemLocale(it.subtype) val string = SpannableString(SubtypeLocaleUtils.getKeyboardLayoutSetDisplayName(it.subtype)
}) ?: SubtypeLocaleUtils.getSubtypeDisplayNameInSystemLocale(it.subtype))
if (it.isEnabled)
string.setSpan(StyleSpan(Typeface.BOLD), 0, string.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
if (!start) {
sb.append(", ")
}
start = false
sb.append(string)
}
// })
} }
val secondaryLocales = Settings.getSecondaryLocales(prefs, infos.first().subtype.locale) val secondaryLocales = Settings.getSecondaryLocales(prefs, infos.first().subtype.locale)
if (secondaryLocales.isNotEmpty()) { if (secondaryLocales.isNotEmpty()) {
@ -104,7 +119,7 @@ class LanguageAdapter(list: List<MutableList<SubtypeInfo>> = listOf(), context:
it.getDisplayName(context.resources.configuration.locale) it.getDisplayName(context.resources.configuration.locale)
}) })
} }
text = sb.toString() text = sb
if (onlySystemLocales || text.isBlank()) isGone = true if (onlySystemLocales || text.isBlank()) isGone = true
else isVisible = true else isVisible = true
} }
@ -142,5 +157,10 @@ class LanguageAdapter(list: List<MutableList<SubtypeInfo>> = listOf(), context:
} }
setupDetailsTextAndSwitch() setupDetailsTextAndSwitch()
} }
private fun sort(infos: MutableList<SubtypeInfo>) {
if (infos.size <= 1) return
infos.sortWith(compareBy({ isAdditionalSubtype(it.subtype) }, { it.displayName }))
}
} }
} }