From 580986116f710d50f05212e272e99c1f79db9172 Mon Sep 17 00:00:00 2001 From: OpenSauce04 Date: Sun, 24 May 2026 12:10:20 +0100 Subject: [PATCH] Cleanup --- .../features/settings/model/IntListSetting.kt | 17 +++++------------ .../features/settings/model/Settings.kt | 3 +-- .../features/settings/ui/SettingsAdapter.kt | 3 --- .../settings/ui/SettingsFragmentPresenter.kt | 4 ++-- .../features/settings/utils/SettingsFile.kt | 2 +- .../org/citra/citra_emu/overlay/InputOverlay.kt | 1 - .../org/citra/citra_emu/utils/ComboHelper.kt | 14 ++------------ 7 files changed, 11 insertions(+), 33 deletions(-) diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/IntListSetting.kt b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/IntListSetting.kt index 06f2ebd52..bef41fb34 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/IntListSetting.kt +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/IntListSetting.kt @@ -4,7 +4,8 @@ package org.citra.citra_emu.features.settings.model -import org.citra.citra_emu.NativeLibrary +import org.citra.citra_emu.CitraApplication +import org.citra.citra_emu.R enum class IntListSetting( override val key: String, @@ -14,17 +15,9 @@ enum class IntListSetting( ) : AbstractListSetting { LAYOUTS_TO_CYCLE("layouts_to_cycle", Settings.SECTION_LAYOUT, listOf(0, 1, 2, 3, 4, 5), canBeEmpty = false), - COMBO_KEYS("combo_keys", Settings.SECTION_CONTROLS, listOf - (NativeLibrary.ButtonType.BUTTON_A, - NativeLibrary.ButtonType.BUTTON_B, - NativeLibrary.ButtonType.BUTTON_X, - NativeLibrary.ButtonType.BUTTON_Y, - NativeLibrary.ButtonType.TRIGGER_L, - NativeLibrary.ButtonType.TRIGGER_R, - NativeLibrary.ButtonType.BUTTON_ZL, - NativeLibrary.ButtonType.BUTTON_ZR, - NativeLibrary.ButtonType.BUTTON_START, - NativeLibrary.ButtonType.BUTTON_SELECT), canBeEmpty = true); + COMBO_KEYS("combo_keys", Settings.SECTION_CONTROLS, + CitraApplication.appContext.resources.getIntArray(R.array.comboOptionValues).toCollection(ArrayList()), + canBeEmpty = true); private var backingList: List = defaultValue private var lastValidList : List = defaultValue diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/Settings.kt b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/Settings.kt index 2c2be85c2..54d2700c8 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/Settings.kt +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/Settings.kt @@ -115,7 +115,6 @@ class Settings { const val SECTION_STORAGE = "Storage" const val SECTION_MISC = "Miscellaneous" - const val KEY_BUTTON_A = "button_a" const val KEY_BUTTON_B = "button_b" const val KEY_BUTTON_X = "button_x" @@ -255,4 +254,4 @@ class Settings { ) } } -} \ No newline at end of file +} diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsAdapter.kt b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsAdapter.kt index 81dbf597b..8603f4dcc 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsAdapter.kt +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsAdapter.kt @@ -199,7 +199,6 @@ class SettingsAdapter( SettingsItem.TYPE_SINGLE_CHOICE -> { (oldItem as SingleChoiceSetting).isEnabled == (newItem as SingleChoiceSetting).isEnabled } - SettingsItem.TYPE_MULTI_CHOICE -> { (oldItem as MultiChoiceSetting).isEnabled == (newItem as MultiChoiceSetting).isEnabled } @@ -721,7 +720,6 @@ class SettingsAdapter( } } - private fun getSelectionForSingleChoiceValue(item: SingleChoiceSetting): Int { val value = item.selectedValue val valuesId = item.valuesId @@ -754,5 +752,4 @@ class SettingsAdapter( } return BooleanArray(1){false}; } - } diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.kt b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.kt index 67d70b825..668023450 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.kt +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.kt @@ -799,6 +799,7 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView) onLongClick = { settingsAdapter.onLongClickAutoMap() } ) ) + add(HeaderSetting(R.string.generic_buttons)) Settings.buttonKeys.forEachIndexed { i: Int, key: String -> val button = getInputObject(key) @@ -839,6 +840,7 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView) val button = getInputObject(key) add(InputBindingSetting(button, Settings.hotkeyTitles[i])) } + add(HeaderSetting(R.string.miscellaneous)) add( SwitchSetting( @@ -864,8 +866,6 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView) } } - - private fun getInputObject(key: String): AbstractStringSetting { return object : AbstractStringSetting { override var string: String diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/utils/SettingsFile.kt b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/utils/SettingsFile.kt index fc75d9eeb..ef34520db 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/utils/SettingsFile.kt +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/utils/SettingsFile.kt @@ -255,7 +255,7 @@ object SettingsFile { stringSetting.string = value return stringSetting } - + val intListSetting = IntListSetting.from(key) if (intListSetting != null) { intListSetting.list = value.split(", ").mapNotNull { it.toIntOrNull() } diff --git a/src/android/app/src/main/java/org/citra/citra_emu/overlay/InputOverlay.kt b/src/android/app/src/main/java/org/citra/citra_emu/overlay/InputOverlay.kt index 85a04c741..45ead3d9d 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/overlay/InputOverlay.kt +++ b/src/android/app/src/main/java/org/citra/citra_emu/overlay/InputOverlay.kt @@ -159,7 +159,6 @@ class InputOverlay(context: Context?, attrs: AttributeSet?) : SurfaceView(contex NativeLibrary.onTouchEvent(0f, 0f, false) break // Up and down actions shouldn't loop } - } var anyOverlayStateChanged = false diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/ComboHelper.kt b/src/android/app/src/main/java/org/citra/citra_emu/utils/ComboHelper.kt index c346b9b8a..4c28696a1 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/utils/ComboHelper.kt +++ b/src/android/app/src/main/java/org/citra/citra_emu/utils/ComboHelper.kt @@ -10,23 +10,13 @@ import org.citra.citra_emu.features.settings.model.IntListSetting object ComboHelper { fun comboActivate(buttonStatus: Int) { val comboArray = IntListSetting.COMBO_KEYS.list - // Log.info("Combo Array: $comboArray") for (nativeButton in comboArray) { - // Log.info("Native Button: $nativeButton") - if (nativeButton == -1) - { + if (nativeButton == -1) { // We don't want to parse any bad inputs here so we continue loop continue - } - else - { - // Log.debug("Handling combo button press: $nativeButton") + } else { NativeLibrary.onGamePadEvent(NativeLibrary.TouchScreenDevice, nativeButton, buttonStatus) } } } - - - - }