luckyimnotanigger/HeliBoard
1
0
Fork 0
mirror of https://github.com/Helium314/HeliBoard.git synced 2025-04-27 18:17:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

show secondary locales when using system languages, update comments

Browse source
This commit is contained in:
Helium314 2023-08-29 08:15:32 +02:00
parent 6475ed7d74
commit 0bcf0ee78d
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -42,7 +42,7 @@ class LanguageFilterListPreference(context: Context, attrs: AttributeSet) : Pref
} }
view?.doOnLayout { view?.doOnLayout {
// set correct height for recycler view, so there is no scrolling of the outside view happening // set correct height for recycler view, so there is no scrolling of the outside view happening
// not sure how, but probably this can be achieved in xml... // not sure how, but probably this can also be achieved in xml...
val windowFrame = Rect() val windowFrame = Rect()
it.getWindowVisibleDisplayFrame(windowFrame) // rect the app has, we want the bottom (above screen bottom/navbar/keyboard) it.getWindowVisibleDisplayFrame(windowFrame) // rect the app has, we want the bottom (above screen bottom/navbar/keyboard)
val globalRect = Rect() val globalRect = Rect()
@ -50,7 +50,8 @@ class LanguageFilterListPreference(context: Context, attrs: AttributeSet) : Pref
val recycler = it.findViewById<RecyclerView>(R.id.language_list) val recycler = it.findViewById<RecyclerView>(R.id.language_list)
val newHeight = windowFrame.bottom - globalRect.top - it.findViewById<View>(R.id.search_container).height val newHeight = windowFrame.bottom - globalRect.top - it.findViewById<View>(R.id.search_container).height
recycler.layoutParams = recycler.layoutParams.apply { height = newHeight } if (newHeight != recycler.layoutParams.height)
recycler.layoutParams = recycler.layoutParams.apply { height = newHeight }
} }
} }
@ -92,11 +93,10 @@ class LanguageAdapter(list: List<MutableList<SubtypeInfo>> = listOf(), context:
fun onBind(infos: MutableList<SubtypeInfo>) { fun onBind(infos: MutableList<SubtypeInfo>) {
sort(infos) sort(infos)
fun setupDetailsTextAndSwitch() { fun setupDetailsTextAndSwitch() {
// 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 = SpannableStringBuilder() val sb = SpannableStringBuilder()
if (infos.size > 1) { if (infos.size > 1 && !onlySystemLocales) {
var start = true var start = true
infos.forEach { infos.forEach {
val string = SpannableString(SubtypeLocaleUtils.getKeyboardLayoutSetDisplayName(it.subtype) val string = SpannableString(SubtypeLocaleUtils.getKeyboardLayoutSetDisplayName(it.subtype)
@ -109,7 +109,6 @@ class LanguageAdapter(list: List<MutableList<SubtypeInfo>> = listOf(), context:
start = false start = false
sb.append(string) 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()) {
@ -121,7 +120,7 @@ class LanguageAdapter(list: List<MutableList<SubtypeInfo>> = listOf(), context:
}) })
} }
text = sb text = sb
if (onlySystemLocales || text.isBlank()) isGone = true if (text.isBlank()) isGone = true
else isVisible = true else isVisible = true
} }
@ -138,6 +137,7 @@ class LanguageAdapter(list: List<MutableList<SubtypeInfo>> = listOf(), context:
addEnabledSubtype(prefs, infos.first().subtype) addEnabledSubtype(prefs, infos.first().subtype)
infos.single().isEnabled = true infos.single().isEnabled = true
} else { } else {
// currently switch is disabled in this case
LanguageSettingsDialog(view.context, infos, fragment, onlySystemLocales, { setupDetailsTextAndSwitch() }).show() LanguageSettingsDialog(view.context, infos, fragment, onlySystemLocales, { setupDetailsTextAndSwitch() }).show()
} }
} else { } else {
@ -145,6 +145,7 @@ class LanguageAdapter(list: List<MutableList<SubtypeInfo>> = listOf(), context:
removeEnabledSubtype(prefs, infos.first().subtype) removeEnabledSubtype(prefs, infos.first().subtype)
infos.single().isEnabled = false infos.single().isEnabled = false
} else { } else {
// currently switch is disabled in this case
LanguageSettingsDialog(view.context, infos, fragment, onlySystemLocales, { setupDetailsTextAndSwitch() }).show() LanguageSettingsDialog(view.context, infos, fragment, onlySystemLocales, { setupDetailsTextAndSwitch() }).show()
} }
} }