luckyimnotanigger/HeliBoard
1
0
Fork 0
mirror of https://github.com/Helium314/HeliBoard.git synced 2025-06-26 02:50:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

clarify that changing layout is only possible if "use system languages" is disabled

Browse source
This commit is contained in:
Helium314 2024-02-20 11:05:34 +01:00
parent 5e4361b119
commit 6c6799e97e
2 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
app/src/main/java/helium314/keyboard/latin/settings/LanguageSettingsDialog.kt
View file

@ -39,7 +39,7 @@ class LanguageSettingsDialog(
private val onlySystemLocales: Boolean,
private val reloadSetting: () -> Unit
) : AlertDialog(context), LanguageSettingsFragment.Listener {
private val prefs = DeviceProtectedUtils.getSharedPreferences(context)!!
private val prefs = DeviceProtectedUtils.getSharedPreferences(context)
private val binding = LocaleSettingsDialogBinding.inflate(LayoutInflater.from(context))
private val mainLocale = infos.first().subtype.locale()
private var hasInternalDictForLanguage = false
@ -53,6 +53,10 @@ class LanguageSettingsDialog(
}
if (onlySystemLocales)
// don't allow setting subtypes, because
// a. subtypes are set purely based on system locales (in SubtypeSettings)
// b. extra handling needed if user disables all subtypes for a locale
// todo (later): fix above and allow it
binding.subtypes.isGone = true
else
fillSubtypesView()
@ -147,7 +151,7 @@ class LanguageSettingsDialog(
.setTitle(R.string.keyboard_layout_set)
.setItems(displayNames.toTypedArray()) { di, i ->
di.dismiss()
val fileName = context.assets.list("layouts")!!.firstOrNull { it.startsWith(layouts[i]) } ?: return@setItems
val fileName = context.assets.list("layouts")?.firstOrNull { it.startsWith(layouts[i]) } ?: return@setItems
loadCustomLayout(context.assets.open("layouts${File.separator}$fileName").reader().readText(),
displayNames[i], mainLocale.toLanguageTag(), context) { addSubtype(it) }
}
@ -161,11 +165,11 @@ class LanguageSettingsDialog(
private fun addSubtypeToView(subtype: SubtypeInfo) {
val row = LayoutInflater.from(context).inflate(R.layout.language_list_item, listView)
val layoutSetName: String? = subtype.subtype.getExtraValueOf(KEYBOARD_LAYOUT_SET)
val layoutSetName = subtype.subtype.getExtraValueOf(KEYBOARD_LAYOUT_SET) ?: "qwerty"
row.findViewById<TextView>(R.id.language_name).text =
SubtypeLocaleUtils.getKeyboardLayoutSetDisplayName(subtype.subtype)
?: SubtypeLocaleUtils.getSubtypeDisplayNameInSystemLocale(subtype.subtype)
if (layoutSetName?.startsWith(CUSTOM_LAYOUT_PREFIX) == true) {
if (layoutSetName.startsWith(CUSTOM_LAYOUT_PREFIX)) {
row.findViewById<TextView>(R.id.language_details).setText(R.string.edit_layout)
row.findViewById<View>(R.id.language_text).setOnClickListener { editCustomLayout(layoutSetName, context) }
} else {
@ -191,18 +195,18 @@ class LanguageSettingsDialog(
row.findViewById<ImageView>(R.id.delete_button).apply {
isVisible = true
setOnClickListener {
val isCustom = layoutSetName?.startsWith(CUSTOM_LAYOUT_PREFIX) == true
val isCustom = layoutSetName.startsWith(CUSTOM_LAYOUT_PREFIX)
fun delete() {
binding.subtypes.removeView(row)
infos.remove(subtype)
if (isCustom)
removeCustomLayoutFile(layoutSetName!!, context)
removeCustomLayoutFile(layoutSetName, context)
removeAdditionalSubtype(prefs, context.resources, subtype.subtype)
removeEnabledSubtype(prefs, subtype.subtype)
reloadSetting()
}
if (isCustom) {
confirmDialog(context, context.getString(R.string.delete_layout, getLayoutDisplayName(layoutSetName!!)), context.getString(R.string.delete)) { delete() }
confirmDialog(context, context.getString(R.string.delete_layout, getLayoutDisplayName(layoutSetName)), context.getString(R.string.delete)) { delete() }
} else {
delete()
}