dahjah/Lime3DS
1
0
Fork 0
mirror of https://github.com/Lime3DS/Lime3DS.git synced 2026-04-04 20:27:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Code cleanup and bug fix to properly map values.

Browse Source
This commit is contained in:
ADAS2024 2026-03-29 15:53:46 -04:00
parent 13e80ec1fe
commit 244a1e1fdf
3 changed files with 4 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/Settings.kt
View File

@ -228,8 +228,6 @@ class Settings {
R.string.turbo_limit_hotkey
)
val comboSelection = mutableSetOf<String>()
// TODO: Move these in with the other setting keys in GenerateSettingKeys.cmake
const val PREF_FIRST_APP_LAUNCH = "FirstApplicationLaunch"
const val PREF_MATERIAL_YOU = "MaterialYouTheme"

89
src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsAdapter.kt
View File

@ -624,7 +624,7 @@ class SettingsAdapter(
val value = it.getValueAt(which)
if (it.selectedValues.contains(value) != isChecked) {
val setting =
it.setSelectedValue((if (isChecked) it.selectedValues + value.toString() else it.selectedValues - value.toString()).sorted())
it.setSelectedValue((if (isChecked) it.selectedValues + value.toString() else it.selectedValues - value.toString()))
fragmentView?.putSetting(setting)
fragmentView?.onSettingChanged()
}
@ -803,14 +803,14 @@ class SettingsAdapter(
private fun getSelectionForStringMultiChoiceValue(item: StringMultiChoiceSetting): BooleanArray {
val values = item.selectedValues;
val available_values = item.values;
val res = BooleanArray(available_values?.size ?: 0){false}
var index = 0;
val res = BooleanArray(available_values?.size ?: 10){false}
if (available_values != null) {
for (choice_val in available_values) {
if (values.contains(choice_val)) {
val index = available_values.indexOf(choice_val)
res[index] = true;
index++;
}
}
}
@ -820,85 +820,4 @@ class SettingsAdapter(
BooleanArray(1) { false };
}
}
//TODO: I only added MultiChoice for fleshing out backend, debating whether to remove MultiChoiceSetting and related code for cleaning up
/*
override fun onClick(dialog: DialogInterface?, which: Int, is_checked: Boolean) {
when (clickedItem) {
/*
is MultiChoiceSetting -> {
val scSetting = clickedItem as? MultiChoiceSetting
scSetting?.let {
val setting = when (it.setting) {
is AbstractMultiIntSetting -> {
val value = getValueForMultiChoiceSelection(it, which, is_checked)
if (value !in it.selectedValues) {
it.removeSelectedValue(value)
fragmentView?.onSettingChanged()
} else {
it.addSelectedValue(value)
}
}
is AbstractMultiShortSetting -> {
val value = getValueForMultiChoiceSelection(it, which, is_checked).toShort()
if (value !in it.selectedValues.map { it.toShort() }) {
it.removeSelectedValue(value)
fragmentView?.onSettingChanged()
} else {
it.addSelectedValue(value)
}
}
else -> throw IllegalStateException("Unrecognized type used for MultiChoiceSetting!")
}
fragmentView?.putSetting(setting as AbstractSetting)
//fragmentView.loadSettingsList()
//closeDialog()
}
}
*/
//TODO: Don't fully know how to grab the setting itself for the buttons so I'm adding them to a backing array to be called later
//TODO: Likely need to be reimplemented
is StringMultiChoiceSetting -> {
val mcSetting = clickedItem as? StringMultiChoiceSetting
mcSetting?.let {
val setting = when (it.setting) {
is AbstractMultiStringSetting -> {
val value = it.getValueAt(which)
if (value in it.selectedValues && !is_checked) {
Settings.comboSelection.remove(value ?: "")
it.removeSelectedValue(value ?: "")
} else {
Settings.comboSelection.add(value ?: "")
it.addSelectedValue(value ?: "")
}
}
is AbstractMultiShortSetting -> {
if (is_checked != it.selectValueIndices[which]) {
Settings.comboSelection.remove((it.getValueAt(which)?.toShort() ?: 1).toString())
it.removeSelectedValue(it.getValueAt(which)?.toShort() ?: 1)
} else {
Settings.comboSelection.add((it.getValueAt(which)?.toShort() ?: 1).toString())
it.addSelectedValue(it.getValueAt(which)?.toShort() ?: 1)
}
}
else -> throw IllegalStateException("Unrecognized type used for StringMultiChoiceSetting!")
}
fragmentView?.onSettingChanged()
fragmentView?.putSetting(setting as AbstractSetting)
//fragmentView.loadSettingsList()
//closeDialog()
}
}
}
*/
}

1
src/android/app/src/main/java/org/citra/citra_emu/utils/ComboHelper.kt
View File

@ -5,7 +5,6 @@
package org.citra.citra_emu.utils
import org.citra.citra_emu.NativeLibrary
import org.citra.citra_emu.features.settings.model.Settings
import org.citra.citra_emu.overlay.InputOverlayDrawableButton
import org.citra.citra_emu.features.settings.model.StringListSetting