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

Added Combo Button Submenu and associated strings. Need to implement button displaying for user to interact with.

Browse Source
This commit is contained in:
adas20 2025-07-21 15:44:46 -04:00 committed by OpenSauce04
parent e2e216bcde
commit a31634c28a
3 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -112,6 +112,7 @@ class Settings {
const val SECTION_CUSTOM_LANDSCAPE = "Custom Landscape Layout"
const val SECTION_CUSTOM_PORTRAIT = "Custom Portrait Layout"
const val SECTION_PERFORMANCE_OVERLAY = "Performance Overlay"
const val SECTION_COMBO = "Combo Button"
const val KEY_BUTTON_A = "button_a"
const val KEY_BUTTON_B = "button_b"

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

@ -104,6 +104,7 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
Settings.SECTION_CUSTOM_LANDSCAPE -> addCustomLandscapeSettings(sl)
Settings.SECTION_CUSTOM_PORTRAIT -> addCustomPortraitSettings(sl)
Settings.SECTION_PERFORMANCE_OVERLAY -> addPerformanceOverlaySettings(sl)
Settings.SECTION_COMBO -> addComboButtonSettings(sl)
else -> {
fragmentView.showToastMessage("Unimplemented menu", false)
return
@ -795,9 +796,47 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
BooleanSetting.USE_ARTIC_BASE_CONTROLLER.defaultValue
)
)
add(
SubmenuSetting(
R.string.combo_key_options,
R.string.combo_key_description,
R.drawable.button_combo,
Settings.SECTION_COMBO
)
)
}
}
private fun addComboButtonSettings(sl: ArrayList<SettingsItem>) {
settingsActivity.setToolbarTitle(settingsActivity.getString(R.string.combo_key))
sl.apply {
add(
SwitchSetting(
BooleanSetting.ENABLE_COMBO_KEY,
R.string.combo_key_enable,
R.string.combo_key_submenu_description,
BooleanSetting.ENABLE_COMBO_KEY.key,
BooleanSetting.ENABLE_COMBO_KEY.defaultValue,
)
)
add(HeaderSetting(R.string.combo_key_options))
// TODO: Implement displaying selectable buttons
/*
add(
StringSingleChoiceSetting(
comboSetting,
R.string.emulated_language,
0,
R.array.n3dsButtons,
R.array.
)
)
*/
}
}
private fun getInputObject(key: String): AbstractStringSetting {
return object : AbstractStringSetting {
override var string: String

5
src/android/app/src/main/res/values/strings.xml
View File

@ -153,6 +153,11 @@
<string name="turbo_limit_hotkey">Turbo Speed</string>
<string name="turbo_enabled_toast">Turbo Speed Enabled</string>
<string name="turbo_disabled_toast">Turbo Speed Disabled</string>
<string name="combo_key">Combo Key</string>
<string name="combo_key_enable">Enable Combo Button</string>
<string name="combo_key_options">Combo Key Settings</string>
<string name="combo_key_description">Enable and Change Combo Button Bindings.</string>
<string name="combo_key_submenu_description">Changes whether or not Combo Button can be displayed and used in game.</string>
<!-- System files strings -->
<string name="setup_system_files">System Files</string>