VERY experimental Nintendo Switch 2 emulator
C++
android: Allow SettingsItems to use String or StringRes
t8954e34af1a261a
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/DateTimeSetting.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/DateTimeSetting.ktindex 1d81f5f2b4..58febff1db 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/DateTimeSetting.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/DateTimeSetting.kt@@ -3,13 +3,16 @@package org.yuzu.yuzu_emu.features.settings.model.view+import androidx.annotation.StringResimport org.yuzu.yuzu_emu.features.settings.model.AbstractLongSettingclass DateTimeSetting(private val longSetting: AbstractLongSetting,- titleId: Int,- descriptionId: Int-) : SettingsItem(longSetting, titleId, descriptionId) {+ @StringRes titleId: Int = 0,+ titleString: String = "",+ @StringRes descriptionId: Int = 0,+ descriptionString: String = ""+) : SettingsItem(longSetting, titleId, titleString, descriptionId, descriptionString) {override val type = TYPE_DATETIME_SETTINGfun getValue(needsGlobal: Boolean = false): Long = longSetting.getLong(needsGlobal)diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/HeaderSetting.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/HeaderSetting.ktindex d31ce1c312..8a6a51d5c4 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/HeaderSetting.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/HeaderSetting.kt@@ -3,8 +3,11 @@package org.yuzu.yuzu_emu.features.settings.model.view+import androidx.annotation.StringRes+class HeaderSetting(- titleId: Int-) : SettingsItem(emptySetting, titleId, 0) {+ @StringRes titleId: Int = 0,+ titleString: String = ""+) : SettingsItem(emptySetting, titleId, titleString, 0, "") {override val type = TYPE_HEADER}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/RunnableSetting.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/RunnableSetting.ktindex 4251600241..1005a2b7d3 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/RunnableSetting.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/RunnableSetting.kt@@ -4,13 +4,16 @@package org.yuzu.yuzu_emu.features.settings.model.viewimport androidx.annotation.DrawableRes+import androidx.annotation.StringResclass RunnableSetting(- titleId: Int,- descriptionId: Int,val isRuntimeRunnable: Boolean,+ @StringRes titleId: Int = 0,+ titleString: String = "",+ @StringRes descriptionId: Int = 0,+ descriptionString: String = "",@DrawableRes val iconId: Int = 0,val runnable: () -> Unit-) : SettingsItem(emptySetting, titleId, descriptionId) {+) : SettingsItem(emptySetting, titleId, titleString, descriptionId, descriptionString) {override val type = TYPE_RUNNABLE}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.ktindex 21ca97bc1e..8f724835e1 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt@@ -3,8 +3,12 @@package org.yuzu.yuzu_emu.features.settings.model.view+import androidx.annotation.StringResimport org.yuzu.yuzu_emu.NativeLibraryimport org.yuzu.yuzu_emu.R+import org.yuzu.yuzu_emu.YuzuApplication+import org.yuzu.yuzu_emu.features.input.NativeInput+import org.yuzu.yuzu_emu.features.input.model.NpadStyleIndeximport org.yuzu.yuzu_emu.features.settings.model.AbstractBooleanSettingimport org.yuzu.yuzu_emu.features.settings.model.AbstractSettingimport org.yuzu.yuzu_emu.features.settings.model.BooleanSetting@@ -23,13 +27,34 @@ import org.yuzu.yuzu_emu.utils.NativeConfig*/abstract class SettingsItem(val setting: AbstractSetting,- val nameId: Int,- val descriptionId: Int+ @StringRes val titleId: Int,+ val titleString: String,+ @StringRes val descriptionId: Int,+ val descriptionString: String) {abstract val type: Int+ val title: String by lazy {+ if (titleId != 0) {+ return@lazy YuzuApplication.appContext.getString(titleId)+ }+ return@lazy titleString+ }++ val description: String by lazy {+ if (descriptionId != 0) {+ return@lazy YuzuApplication.appContext.getString(descriptionId)+ }+ return@lazy descriptionString+ }+val isEditable: Booleanget() {+ // Can't change docked mode toggle when using handheld mode+ if (setting.key == BooleanSetting.USE_DOCKED_MODE.key) {+ return NativeInput.getStyleIndex(0) != NpadStyleIndex.Handheld+ }+// Can't edit settings that aren't saveable in per-game config even if they are switchableif (NativeConfig.isPerGameConfigLoaded() && !setting.isSaveable) {return false@@ -59,6 +84,9 @@ abstract class SettingsItem(const val TYPE_STRING_SINGLE_CHOICE = 5const val TYPE_DATETIME_SETTING = 6const val TYPE_RUNNABLE = 7+ const val TYPE_INPUT = 8+ const val TYPE_INT_SINGLE_CHOICE = 9+ const val TYPE_INPUT_PROFILE = 10const val FASTMEM_COMBINED = "fastmem_combined"@@ -80,237 +108,242 @@ abstract class SettingsItem(put(SwitchSetting(BooleanSetting.RENDERER_USE_SPEED_LIMIT,- R.string.frame_limit_enable,- R.string.frame_limit_enable_description+ titleId = R.string.frame_limit_enable,+ descriptionId = R.string.frame_limit_enable_description))put(SliderSetting(ShortSetting.RENDERER_SPEED_LIMIT,- R.string.frame_limit_slider,- R.string.frame_limit_slider_description,- 1,- 400,- "%"+ titleId = R.string.frame_limit_slider,+ descriptionId = R.string.frame_limit_slider_description,+ min = 1,+ max = 400,+ units = "%"))put(SingleChoiceSetting(IntSetting.CPU_BACKEND,- R.string.cpu_backend,- 0,- R.array.cpuBackendArm64Names,- R.array.cpuBackendArm64Values+ titleId = R.string.cpu_backend,+ choicesId = R.array.cpuBackendArm64Names,+ valuesId = R.array.cpuBackendArm64Values))put(SingleChoiceSetting(IntSetting.CPU_ACCURACY,- R.string.cpu_accuracy,- 0,- R.array.cpuAccuracyNames,- R.array.cpuAccuracyValues+ titleId = R.string.cpu_accuracy,+ choicesId = R.array.cpuAccuracyNames,+ valuesId = R.array.cpuAccuracyValues))put(SwitchSetting(BooleanSetting.PICTURE_IN_PICTURE,- R.string.picture_in_picture,- R.string.picture_in_picture_description+ titleId = R.string.picture_in_picture,+ descriptionId = R.string.picture_in_picture_description))++ val dockedModeSetting = object : AbstractBooleanSetting {+ override val key = BooleanSetting.USE_DOCKED_MODE.key++ override fun getBoolean(needsGlobal: Boolean): Boolean {+ if (NativeInput.getStyleIndex(0) == NpadStyleIndex.Handheld) {+ return false+ }+ return BooleanSetting.USE_DOCKED_MODE.getBoolean(needsGlobal)+ }++ override fun setBoolean(value: Boolean) =+ BooleanSetting.USE_DOCKED_MODE.setBoolean(value)++ override val defaultValue = BooleanSetting.USE_DOCKED_MODE.defaultValue++ override fun getValueAsString(needsGlobal: Boolean): String =+ BooleanSetting.USE_DOCKED_MODE.getValueAsString(needsGlobal)++ override fun reset() = BooleanSetting.USE_DOCKED_MODE.reset()+ }put(SwitchSetting(- BooleanSetting.USE_DOCKED_MODE,- R.string.use_docked_mode,- R.string.use_docked_mode_description+ dockedModeSetting,+ titleId = R.string.use_docked_mode,+ descriptionId = R.string.use_docked_mode_description))+put(SingleChoiceSetting(IntSetting.REGION_INDEX,- R.string.emulated_region,- 0,- R.array.regionNames,- R.array.regionValues+ titleId = R.string.emulated_region,+ choicesId = R.array.regionNames,+ valuesId = R.array.regionValues))put(SingleChoiceSetting(IntSetting.LANGUAGE_INDEX,- R.string.emulated_language,- 0,- R.array.languageNames,- R.array.languageValues+ titleId = R.string.emulated_language,+ choicesId = R.array.languageNames,+ valuesId = R.array.languageValues))put(SwitchSetting(BooleanSetting.USE_CUSTOM_RTC,- R.string.use_custom_rtc,- R.string.use_custom_rtc_description+ titleId = R.string.use_custom_rtc,+ descriptionId = R.string.use_custom_rtc_description))- put(DateTimeSetting(LongSetting.CUSTOM_RTC, R.string.set_custom_rtc, 0))+ put(DateTimeSetting(LongSetting.CUSTOM_RTC, titleId = R.string.set_custom_rtc))put(SingleChoiceSetting(IntSetting.RENDERER_ACCURACY,- R.string.renderer_accuracy,- 0,- R.array.rendererAccuracyNames,- R.array.rendererAccuracyValues+ titleId = R.string.renderer_accuracy,+ choicesId = R.array.rendererAccuracyNames,+ valuesId = R.array.rendererAccuracyValues))put(SingleChoiceSetting(IntSetting.RENDERER_RESOLUTION,- R.string.renderer_resolution,- 0,- R.array.rendererResolutionNames,- R.array.rendererResolutionValues+ titleId = R.string.renderer_resolution,+ choicesId = R.array.rendererResolutionNames,+ valuesId = R.array.rendererResolutionValues))put(SingleChoiceSetting(IntSetting.RENDERER_VSYNC,- R.string.renderer_vsync,- 0,- R.array.rendererVSyncNames,- R.array.rendererVSyncValues+ titleId = R.string.renderer_vsync,+ choicesId = R.array.rendererVSyncNames,+ valuesId = R.array.rendererVSyncValues))put(SingleChoiceSetting(IntSetting.RENDERER_SCALING_FILTER,- R.string.renderer_scaling_filter,- 0,- R.array.rendererScalingFilterNames,- R.array.rendererScalingFilterValues+ titleId = R.string.renderer_scaling_filter,+ choicesId = R.array.rendererScalingFilterNames,+ valuesId = R.array.rendererScalingFilterValues))put(SliderSetting(IntSetting.FSR_SHARPENING_SLIDER,- R.string.fsr_sharpness,- R.string.fsr_sharpness_description,- 0,- 100,- "%"+ titleId = R.string.fsr_sharpness,+ descriptionId = R.string.fsr_sharpness_description,+ units = "%"))put(SingleChoiceSetting(IntSetting.RENDERER_ANTI_ALIASING,- R.string.renderer_anti_aliasing,- 0,- R.array.rendererAntiAliasingNames,- R.array.rendererAntiAliasingValues+ titleId = R.string.renderer_anti_aliasing,+ choicesId = R.array.rendererAntiAliasingNames,+ valuesId = R.array.rendererAntiAliasingValues))put(SingleChoiceSetting(IntSetting.RENDERER_SCREEN_LAYOUT,- R.string.renderer_screen_layout,- 0,- R.array.rendererScreenLayoutNames,- R.array.rendererScreenLayoutValues+ titleId = R.string.renderer_screen_layout,+ choicesId = R.array.rendererScreenLayoutNames,+ valuesId = R.array.rendererScreenLayoutValues))put(SingleChoiceSetting(IntSetting.RENDERER_ASPECT_RATIO,- R.string.renderer_aspect_ratio,- 0,- R.array.rendererAspectRatioNames,- R.array.rendererAspectRatioValues+ titleId = R.string.renderer_aspect_ratio,+ choicesId = R.array.rendererAspectRatioNames,+ valuesId = R.array.rendererAspectRatioValues))put(SingleChoiceSetting(IntSetting.VERTICAL_ALIGNMENT,- R.string.vertical_alignment,- 0,- R.array.verticalAlignmentEntries,- R.array.verticalAlignmentValues+ titleId = R.string.vertical_alignment,+ descriptionId = 0,+ choicesId = R.array.verticalAlignmentEntries,+ valuesId = R.array.verticalAlignmentValues))put(SwitchSetting(BooleanSetting.RENDERER_USE_DISK_SHADER_CACHE,- R.string.use_disk_shader_cache,- R.string.use_disk_shader_cache_description+ titleId = R.string.use_disk_shader_cache,+ descriptionId = R.string.use_disk_shader_cache_description))put(SwitchSetting(BooleanSetting.RENDERER_FORCE_MAX_CLOCK,- R.string.renderer_force_max_clock,- R.string.renderer_force_max_clock_description+ titleId = R.string.renderer_force_max_clock,+ descriptionId = R.string.renderer_force_max_clock_description))put(SwitchSetting(BooleanSetting.RENDERER_ASYNCHRONOUS_SHADERS,- R.string.renderer_asynchronous_shaders,- R.string.renderer_asynchronous_shaders_description+ titleId = R.string.renderer_asynchronous_shaders,+ descriptionId = R.string.renderer_asynchronous_shaders_description))put(SwitchSetting(BooleanSetting.RENDERER_REACTIVE_FLUSHING,- R.string.renderer_reactive_flushing,- R.string.renderer_reactive_flushing_description+ titleId = R.string.renderer_reactive_flushing,+ descriptionId = R.string.renderer_reactive_flushing_description))put(SingleChoiceSetting(IntSetting.MAX_ANISOTROPY,- R.string.anisotropic_filtering,- R.string.anisotropic_filtering_description,- R.array.anisoEntries,- R.array.anisoValues+ titleId = R.string.anisotropic_filtering,+ descriptionId = R.string.anisotropic_filtering_description,+ choicesId = R.array.anisoEntries,+ valuesId = R.array.anisoValues))put(SingleChoiceSetting(IntSetting.AUDIO_OUTPUT_ENGINE,- R.string.audio_output_engine,- 0,- R.array.outputEngineEntries,- R.array.outputEngineValues+ titleId = R.string.audio_output_engine,+ choicesId = R.array.outputEngineEntries,+ valuesId = R.array.outputEngineValues))put(SliderSetting(ByteSetting.AUDIO_VOLUME,- R.string.audio_volume,- R.string.audio_volume_description,- 0,- 100,- "%"+ titleId = R.string.audio_volume,+ descriptionId = R.string.audio_volume_description,+ units = "%"))put(SingleChoiceSetting(IntSetting.RENDERER_BACKEND,- R.string.renderer_api,- 0,- R.array.rendererApiNames,- R.array.rendererApiValues+ titleId = R.string.renderer_api,+ choicesId = R.array.rendererApiNames,+ valuesId = R.array.rendererApiValues))put(SwitchSetting(BooleanSetting.RENDERER_DEBUG,- R.string.renderer_debug,- R.string.renderer_debug_description+ titleId = R.string.renderer_debug,+ descriptionId = R.string.renderer_debug_description))put(SwitchSetting(BooleanSetting.CPU_DEBUG_MODE,- R.string.cpu_debug_mode,- R.string.cpu_debug_mode_description+ titleId = R.string.cpu_debug_mode,+ descriptionId = R.string.cpu_debug_mode_description))@@ -346,7 +379,7 @@ abstract class SettingsItem(override fun reset() = setBoolean(defaultValue)}- put(SwitchSetting(fastmem, R.string.fastmem, 0))+ put(SwitchSetting(fastmem, R.string.fastmem))}}}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SingleChoiceSetting.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SingleChoiceSetting.ktindex 97a5a9e596..ea5e099ede 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SingleChoiceSetting.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SingleChoiceSetting.kt@@ -3,16 +3,20 @@package org.yuzu.yuzu_emu.features.settings.model.view+import androidx.annotation.ArrayRes+import androidx.annotation.StringResimport org.yuzu.yuzu_emu.features.settings.model.AbstractIntSettingimport org.yuzu.yuzu_emu.features.settings.model.AbstractSettingclass SingleChoiceSetting(setting: AbstractSetting,- titleId: Int,- descriptionId: Int,- val choicesId: Int,- val valuesId: Int-) : SettingsItem(setting, titleId, descriptionId) {+ @StringRes titleId: Int = 0,+ titleString: String = "",+ @StringRes descriptionId: Int = 0,+ descriptionString: String = "",+ @ArrayRes val choicesId: Int,+ @ArrayRes val valuesId: Int+) : SettingsItem(setting, titleId, titleString, descriptionId, descriptionString) {override val type = TYPE_SINGLE_CHOICEfun getSelectedValue(needsGlobal: Boolean = false) =diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SliderSetting.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SliderSetting.ktindex b9b709bf7b..6a5cdf48b3 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SliderSetting.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SliderSetting.kt@@ -3,6 +3,7 @@package org.yuzu.yuzu_emu.features.settings.model.view+import androidx.annotation.StringResimport org.yuzu.yuzu_emu.features.settings.model.AbstractByteSettingimport org.yuzu.yuzu_emu.features.settings.model.AbstractFloatSettingimport org.yuzu.yuzu_emu.features.settings.model.AbstractIntSetting@@ -12,12 +13,14 @@ import kotlin.math.roundToIntclass SliderSetting(setting: AbstractSetting,- titleId: Int,- descriptionId: Int,- val min: Int,- val max: Int,- val units: String-) : SettingsItem(setting, titleId, descriptionId) {+ @StringRes titleId: Int = 0,+ titleString: String = "",+ @StringRes descriptionId: Int = 0,+ descriptionString: String = "",+ val min: Int = 0,+ val max: Int = 100,+ val units: String = ""+) : SettingsItem(setting, titleId, titleString, descriptionId, descriptionString) {override val type = TYPE_SLIDERfun getSelectedValue(needsGlobal: Boolean = false) =diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/StringSingleChoiceSetting.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/StringSingleChoiceSetting.ktindex ba7920f50b..5260ff4dc3 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/StringSingleChoiceSetting.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/StringSingleChoiceSetting.kt@@ -3,15 +3,18 @@package org.yuzu.yuzu_emu.features.settings.model.view+import androidx.annotation.StringResimport org.yuzu.yuzu_emu.features.settings.model.AbstractStringSettingclass StringSingleChoiceSetting(private val stringSetting: AbstractStringSetting,- titleId: Int,- descriptionId: Int,+ @StringRes titleId: Int = 0,+ titleString: String = "",+ @StringRes descriptionId: Int = 0,+ descriptionString: String = "",val choices: Array<String>,val values: Array<String>-) : SettingsItem(stringSetting, titleId, descriptionId) {+) : SettingsItem(stringSetting, titleId, titleString, descriptionId, descriptionString) {override val type = TYPE_STRING_SINGLE_CHOICEfun getValueAt(index: Int): String =@@ -20,7 +23,7 @@ class StringSingleChoiceSetting(fun getSelectedValue(needsGlobal: Boolean = false) = stringSetting.getString(needsGlobal)fun setSelectedValue(value: String) = stringSetting.setString(value)- val selectValueIndex: Int+ val selectedValueIndex: Intget() {for (i in values.indices) {if (values[i] == getSelectedValue()) {diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SubmenuSetting.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SubmenuSetting.ktindex 94953b18aa..c722393ddb 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SubmenuSetting.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SubmenuSetting.kt@@ -8,10 +8,12 @@ import androidx.annotation.StringResimport org.yuzu.yuzu_emu.features.settings.model.Settingsclass SubmenuSetting(- @StringRes titleId: Int,- @StringRes descriptionId: Int,- @DrawableRes val iconId: Int,+ @StringRes titleId: Int = 0,+ titleString: String = "",+ @StringRes descriptionId: Int = 0,+ descriptionString: String = "",+ @DrawableRes val iconId: Int = 0,val menuKey: Settings.MenuTag-) : SettingsItem(emptySetting, titleId, descriptionId) {+) : SettingsItem(emptySetting, titleId, titleString, descriptionId, descriptionString) {override val type = TYPE_SUBMENU}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SwitchSetting.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SwitchSetting.ktindex 44d47dd69d..4984bf52e1 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SwitchSetting.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SwitchSetting.kt@@ -3,15 +3,18 @@package org.yuzu.yuzu_emu.features.settings.model.view+import androidx.annotation.StringResimport org.yuzu.yuzu_emu.features.settings.model.AbstractBooleanSettingimport org.yuzu.yuzu_emu.features.settings.model.AbstractIntSettingimport org.yuzu.yuzu_emu.features.settings.model.AbstractSettingclass SwitchSetting(setting: AbstractSetting,- titleId: Int,- descriptionId: Int-) : SettingsItem(setting, titleId, descriptionId) {+ @StringRes titleId: Int = 0,+ titleString: String = "",+ @StringRes descriptionId: Int = 0,+ descriptionString: String = ""+) : SettingsItem(setting, titleId, titleString, descriptionId, descriptionString) {override val type = TYPE_SWITCHfun getIsChecked(needsGlobal: Boolean = false): Boolean {diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.ktindex db1a581472..5d495a7cab 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt@@ -84,42 +84,41 @@ class SettingsFragmentPresenter(sl.apply {add(SubmenuSetting(- R.string.preferences_system,- R.string.preferences_system_description,- R.drawable.ic_system_settings,- Settings.MenuTag.SECTION_SYSTEM+ titleId = R.string.preferences_system,+ descriptionId = R.string.preferences_system_description,+ iconId = R.drawable.ic_system_settings,+ menuKey = MenuTag.SECTION_SYSTEM))add(SubmenuSetting(- R.string.preferences_graphics,- R.string.preferences_graphics_description,- R.drawable.ic_graphics,- Settings.MenuTag.SECTION_RENDERER+ titleId = R.string.preferences_graphics,+ descriptionId = R.string.preferences_graphics_description,+ iconId = R.drawable.ic_graphics,+ menuKey = MenuTag.SECTION_RENDERER))add(SubmenuSetting(- R.string.preferences_audio,- R.string.preferences_audio_description,- R.drawable.ic_audio,- Settings.MenuTag.SECTION_AUDIO+ titleId = R.string.preferences_audio,+ descriptionId = R.string.preferences_audio_description,+ iconId = R.drawable.ic_audio,+ menuKey = MenuTag.SECTION_AUDIO))add(SubmenuSetting(- R.string.preferences_debug,- R.string.preferences_debug_description,- R.drawable.ic_code,- Settings.MenuTag.SECTION_DEBUG+ titleId = R.string.preferences_debug,+ descriptionId = R.string.preferences_debug_description,+ iconId = R.drawable.ic_code,+ menuKey = MenuTag.SECTION_DEBUG))add(RunnableSetting(- R.string.reset_to_default,- R.string.reset_to_default_description,- false,- R.drawable.ic_restore+ titleId = R.string.reset_to_default,+ descriptionId = R.string.reset_to_default_description,+ iconId = R.drawable.ic_restore) { settingsViewModel.setShouldShowResetSettingsDialog(true) })}@@ -186,20 +185,18 @@ class SettingsFragmentPresenter(add(SingleChoiceSetting(theme,- R.string.change_app_theme,- 0,- R.array.themeEntriesA12,- R.array.themeValuesA12+ titleId = R.string.change_app_theme,+ choicesId = R.array.themeEntriesA12,+ valuesId = R.array.themeValuesA12))} else {add(SingleChoiceSetting(theme,- R.string.change_app_theme,- 0,- R.array.themeEntries,- R.array.themeValues+ titleId = R.string.change_app_theme,+ choicesId = R.array.themeEntries,+ valuesId = R.array.themeValues))}@@ -228,10 +225,9 @@ class SettingsFragmentPresenter(add(SingleChoiceSetting(themeMode,- R.string.change_theme_mode,- 0,- R.array.themeModeEntries,- R.array.themeModeValues+ titleId = R.string.change_theme_mode,+ choicesId = R.array.themeModeEntries,+ valuesId = R.array.themeModeValues))@@ -262,8 +258,8 @@ class SettingsFragmentPresenter(add(SwitchSetting(blackBackgrounds,- R.string.use_black_backgrounds,- R.string.use_black_backgrounds_description+ titleId = R.string.use_black_backgrounds,+ descriptionId = R.string.use_black_backgrounds_description))}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/DateTimeViewHolder.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/DateTimeViewHolder.ktindex 5ad0899ddf..a43f7b1fe6 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/DateTimeViewHolder.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/DateTimeViewHolder.kt@@ -21,9 +21,9 @@ class DateTimeViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAoverride fun bind(item: SettingsItem) {setting = item as DateTimeSetting- binding.textSettingName.setText(item.nameId)- if (item.descriptionId != 0) {- binding.textSettingDescription.setText(item.descriptionId)+ binding.textSettingName.text = item.title+ if (setting.description.isNotEmpty()) {+ binding.textSettingDescription.text = item.descriptionbinding.textSettingDescription.visibility = View.VISIBLE} else {binding.textSettingDescription.visibility = View.GONEdiff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/HeaderViewHolder.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/HeaderViewHolder.ktindex f5bcf705c7..0815c36e2e 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/HeaderViewHolder.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/HeaderViewHolder.kt@@ -16,7 +16,7 @@ class HeaderViewHolder(val binding: ListItemSettingsHeaderBinding, adapter: Sett}override fun bind(item: SettingsItem) {- binding.textHeaderName.setText(item.nameId)+ binding.textHeaderName.text = item.title}override fun onClick(clicked: View) {diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/RunnableViewHolder.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/RunnableViewHolder.ktindex 5071842389..2841520a53 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/RunnableViewHolder.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/RunnableViewHolder.kt@@ -5,7 +5,6 @@ package org.yuzu.yuzu_emu.features.settings.ui.viewholderimport android.view.Viewimport androidx.core.content.res.ResourcesCompat-import org.yuzu.yuzu_emu.NativeLibraryimport org.yuzu.yuzu_emu.databinding.ListItemSettingBindingimport org.yuzu.yuzu_emu.features.settings.model.view.RunnableSettingimport org.yuzu.yuzu_emu.features.settings.model.view.SettingsItem@@ -17,12 +16,12 @@ class RunnableViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAoverride fun bind(item: SettingsItem) {setting = item as RunnableSetting- if (item.iconId != 0) {+ if (setting.iconId != 0) {binding.icon.visibility = View.VISIBLEbinding.icon.setImageDrawable(ResourcesCompat.getDrawable(binding.icon.resources,- item.iconId,+ setting.iconId,binding.icon.context.theme))@@ -30,8 +29,8 @@ class RunnableViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAbinding.icon.visibility = View.GONE}- binding.textSettingName.setText(item.nameId)- if (item.descriptionId != 0) {+ binding.textSettingName.text = setting.title+ if (setting.description.isNotEmpty()) {binding.textSettingDescription.setText(item.descriptionId)binding.textSettingDescription.visibility = View.VISIBLE} else {@@ -44,7 +43,7 @@ class RunnableViewHolder(val binding: ListItemSettingBinding, adapter: SettingsA}override fun onClick(clicked: View) {- if (!setting.isRuntimeRunnable && !NativeLibrary.isRunning()) {+ if (setting.isRunnable) {setting.runnable.invoke()}}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SingleChoiceViewHolder.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SingleChoiceViewHolder.ktindex 02dab37859..2cecede48c 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SingleChoiceViewHolder.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SingleChoiceViewHolder.kt@@ -5,6 +5,7 @@ package org.yuzu.yuzu_emu.features.settings.ui.viewholderimport android.view.Viewimport org.yuzu.yuzu_emu.databinding.ListItemSettingBinding+import org.yuzu.yuzu_emu.features.settings.model.view.IntSingleChoiceSettingimport org.yuzu.yuzu_emu.features.settings.model.view.SettingsItemimport org.yuzu.yuzu_emu.features.settings.model.view.SingleChoiceSettingimport org.yuzu.yuzu_emu.features.settings.model.view.StringSingleChoiceSetting@@ -17,30 +18,33 @@ class SingleChoiceViewHolder(val binding: ListItemSettingBinding, adapter: Settioverride fun bind(item: SettingsItem) {setting = item- binding.textSettingName.setText(item.nameId)- if (item.descriptionId != 0) {- binding.textSettingDescription.setText(item.descriptionId)+ binding.textSettingName.text = setting.title+ if (item.description.isNotEmpty()) {+ binding.textSettingDescription.text = item.descriptionbinding.textSettingDescription.visibility = View.VISIBLE} else {binding.textSettingDescription.visibility = View.GONE}binding.textSettingValue.visibility = View.VISIBLE- if (item is SingleChoiceSetting) {- val resMgr = binding.textSettingValue.context.resources- val values = resMgr.getIntArray(item.valuesId)- for (i in values.indices) {- if (values[i] == item.getSelectedValue()) {- binding.textSettingValue.text = resMgr.getStringArray(item.choicesId)[i]- break+ when (item) {+ is SingleChoiceSetting -> {+ val resMgr = binding.textSettingValue.context.resources+ val values = resMgr.getIntArray(item.valuesId)+ for (i in values.indices) {+ if (values[i] == item.getSelectedValue()) {+ binding.textSettingValue.text = resMgr.getStringArray(item.choicesId)[i]+ break+ }}}- } else if (item is StringSingleChoiceSetting) {- for (i in item.values.indices) {- if (item.values[i] == item.getSelectedValue()) {- binding.textSettingValue.text = item.choices[i]- break- }++ is StringSingleChoiceSetting -> {+ binding.textSettingValue.text = item.getSelectedValue()+ }++ is IntSingleChoiceSetting -> {+ binding.textSettingValue.text = item.getChoiceAt(item.getSelectedValue())}}@@ -63,16 +67,25 @@ class SingleChoiceViewHolder(val binding: ListItemSettingBinding, adapter: Settireturn}- if (setting is SingleChoiceSetting) {- adapter.onSingleChoiceClick(- (setting as SingleChoiceSetting),- bindingAdapterPosition- )- } else if (setting is StringSingleChoiceSetting) {- adapter.onStringSingleChoiceClick(- (setting as StringSingleChoiceSetting),+ when (setting) {+ is SingleChoiceSetting -> adapter.onSingleChoiceClick(+ setting as SingleChoiceSetting,bindingAdapterPosition)++ is StringSingleChoiceSetting -> {+ adapter.onStringSingleChoiceClick(+ setting as StringSingleChoiceSetting,+ bindingAdapterPosition+ )+ }++ is IntSingleChoiceSetting -> {+ adapter.onIntSingleChoiceClick(+ setting as IntSingleChoiceSetting,+ bindingAdapterPosition+ )+ }}}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SliderViewHolder.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SliderViewHolder.ktindex 596c18012a..fcfac040ed 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SliderViewHolder.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SliderViewHolder.kt@@ -17,9 +17,9 @@ class SliderViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAdaoverride fun bind(item: SettingsItem) {setting = item as SliderSetting- binding.textSettingName.setText(item.nameId)- if (item.descriptionId != 0) {- binding.textSettingDescription.setText(item.descriptionId)+ binding.textSettingName.text = setting.title+ if (item.description.isNotEmpty()) {+ binding.textSettingDescription.text = setting.descriptionbinding.textSettingDescription.visibility = View.VISIBLE} else {binding.textSettingDescription.visibility = View.GONEdiff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SubmenuViewHolder.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SubmenuViewHolder.ktindex 20d35a17da..165c765b37 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SubmenuViewHolder.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SubmenuViewHolder.kt@@ -12,16 +12,16 @@ import org.yuzu.yuzu_emu.features.settings.ui.SettingsAdapterclass SubmenuViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAdapter) :SettingViewHolder(binding.root, adapter) {- private lateinit var item: SubmenuSetting+ private lateinit var setting: SubmenuSettingoverride fun bind(item: SettingsItem) {- this.item = item as SubmenuSetting- if (item.iconId != 0) {+ setting = item as SubmenuSetting+ if (setting.iconId != 0) {binding.icon.visibility = View.VISIBLEbinding.icon.setImageDrawable(ResourcesCompat.getDrawable(binding.icon.resources,- item.iconId,+ setting.iconId,binding.icon.context.theme))@@ -29,9 +29,9 @@ class SubmenuViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAdbinding.icon.visibility = View.GONE}- binding.textSettingName.setText(item.nameId)- if (item.descriptionId != 0) {- binding.textSettingDescription.setText(item.descriptionId)+ binding.textSettingName.text = setting.title+ if (setting.description.isNotEmpty()) {+ binding.textSettingDescription.text = setting.descriptionbinding.textSettingDescription.visibility = View.VISIBLE} else {binding.textSettingDescription.visibility = View.GONE@@ -41,7 +41,7 @@ class SubmenuViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAd}override fun onClick(clicked: View) {- adapter.onSubmenuClick(item)+ adapter.onSubmenuClick(setting)}override fun onLongClick(clicked: View): Boolean {diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SwitchSettingViewHolder.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SwitchSettingViewHolder.ktindex d26bf9374e..f779a7b60b 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SwitchSettingViewHolder.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SwitchSettingViewHolder.kt@@ -18,19 +18,18 @@ class SwitchSettingViewHolder(val binding: ListItemSettingSwitchBinding, adapteroverride fun bind(item: SettingsItem) {setting = item as SwitchSetting- binding.textSettingName.setText(item.nameId)- if (item.descriptionId != 0) {- binding.textSettingDescription.setText(item.descriptionId)+ binding.textSettingName.text = setting.title+ if (setting.description.isNotEmpty()) {+ binding.textSettingDescription.text = setting.descriptionbinding.textSettingDescription.visibility = View.VISIBLE} else {- binding.textSettingDescription.text = ""binding.textSettingDescription.visibility = View.GONE}binding.switchWidget.setOnCheckedChangeListener(null)binding.switchWidget.isChecked = setting.getIsChecked(setting.needsRuntimeGlobal)binding.switchWidget.setOnCheckedChangeListener { _: CompoundButton, _: Boolean ->- adapter.onBooleanClick(item, binding.switchWidget.isChecked, bindingAdapterPosition)+ adapter.onBooleanClick(setting, binding.switchWidget.isChecked, bindingAdapterPosition)}binding.buttonClear.visibility = if (setting.setting.global ||