MirrorRepos/azahar
1
0
Fork 0
mirror of https://github.com/azahar-emu/azahar.git synced 2026-06-06 02:33:44 -04:00
Code Issues Projects Releases Packages Wiki Activity

Deleted Multi String Setting, added basic error handling, added comment explaining hardcoded size

Browse source
This commit is contained in:
ADAS2024 2026-03-30 12:36:57 -04:00
parent 244a1e1fdf
commit 485778be95
3 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/AbstractMultiStringSetting.kt
View file

@ -1,9 +0,0 @@
// Copyright Citra Emulator Project / Azahar Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
package org.citra.citra_emu.features.settings.model
interface AbstractMultiStringSetting : AbstractSetting {
var strings: MutableSet<String>
}

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

@ -38,7 +38,6 @@ import org.citra.citra_emu.databinding.ListItemSettingsHeaderBinding
import org.citra.citra_emu.features.settings.model.AbstractBooleanSetting
import org.citra.citra_emu.features.settings.model.AbstractFloatSetting
import org.citra.citra_emu.features.settings.model.AbstractIntSetting
import org.citra.citra_emu.features.settings.model.AbstractMultiStringSetting
import org.citra.citra_emu.features.settings.model.AbstractSetting
import org.citra.citra_emu.features.settings.model.AbstractStringSetting
import org.citra.citra_emu.features.settings.model.FloatSetting
@ -803,7 +802,8 @@ class SettingsAdapter(
private fun getSelectionForStringMultiChoiceValue(item: StringMultiChoiceSetting): BooleanArray {
val values = item.selectedValues;
val available_values = item.values;
val res = BooleanArray(available_values?.size ?: 10){false}
val res = BooleanArray(available_values?.size ?: 10){false} // 10 is used because we have 10 reasonable options.
// prob shouldn't hardcode the size value here
if (available_values != null) {

8
src/android/app/src/main/java/org/citra/citra_emu/utils/ComboHelper.kt
View file

@ -27,13 +27,13 @@ object ComboHelper {
}
fun comboActivate(button: InputOverlayDrawableButton) {
var comboArray = StringListSetting.COMBO_KEYS.list
val comboArray = StringListSetting.COMBO_KEYS.list
for (selected_button in comboArray) {
var native_button = getButton(selected_button)
val native_button = getButton(selected_button)
if (native_button == -1)
{
//TODO: Need proper error handling here
println("Bad Button")
val cause = IllegalStateException("Button is not in bindable inputs.")
throw IllegalArgumentException("Input must be non-negative.", cause)
}
else
{