VERY experimental Nintendo Switch 2 emulator
C++
android: Move settings to debug submenu
Charles Lombardo079a3deced4e
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/Settings.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/Settings.ktindex 23c31e13ab..df8dd86344 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/Settings.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/Settings.kt@@ -108,6 +108,7 @@ class Settings {const val SECTION_AUDIO = "Audio"const val SECTION_CPU = "Cpu"const val SECTION_THEME = "Theme"+ const val SECTION_DEBUG = "Debug"const val PREF_OVERLAY_INIT = "OverlayInit"const val PREF_CONTROL_SCALE = "controlScale"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 8c1af63967..a3ef59c2f4 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@@ -6,10 +6,9 @@ package org.yuzu.yuzu_emu.features.settings.model.viewimport org.yuzu.yuzu_emu.features.settings.model.AbstractSettingclass SubmenuSetting(- setting: AbstractSetting?,titleId: Int,descriptionId: Int,val menuKey: String-) : SettingsItem(setting, titleId, descriptionId) {+) : SettingsItem(null, titleId, descriptionId) {override val type = TYPE_SUBMENU}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 1f89a5c707..061046b2e7 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@@ -68,6 +68,7 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)Settings.SECTION_RENDERER -> addGraphicsSettings(sl)Settings.SECTION_AUDIO -> addAudioSettings(sl)Settings.SECTION_THEME -> addThemeSettings(sl)+ Settings.SECTION_DEBUG -> addDebugSettings(sl)else -> {fragmentView.showToastMessage("Unimplemented menu", false)return@@ -82,7 +83,6 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)sl.apply {add(SubmenuSetting(- null,R.string.preferences_general,0,Settings.SECTION_GENERAL@@ -90,7 +90,6 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView))add(SubmenuSetting(- null,R.string.preferences_system,0,Settings.SECTION_SYSTEM@@ -98,7 +97,6 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView))add(SubmenuSetting(- null,R.string.preferences_graphics,0,Settings.SECTION_RENDERER@@ -106,12 +104,18 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView))add(SubmenuSetting(- null,R.string.preferences_audio,0,Settings.SECTION_AUDIO))+ add(+ SubmenuSetting(+ R.string.preferences_debug,+ 0,+ Settings.SECTION_DEBUG+ )+ )add(RunnableSetting(R.string.reset_to_default,@@ -223,17 +227,7 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)private fun addGraphicsSettings(sl: ArrayList<SettingsItem>) {settingsActivity.setToolbarTitle(settingsActivity.getString(R.string.preferences_graphics))sl.apply {- add(- SingleChoiceSetting(- IntSetting.RENDERER_BACKEND,- R.string.renderer_api,- 0,- R.array.rendererApiNames,- R.array.rendererApiValues,- IntSetting.RENDERER_BACKEND.key,- IntSetting.RENDERER_BACKEND.defaultValue- )- )+add(SingleChoiceSetting(IntSetting.RENDERER_ACCURACY,@@ -327,15 +321,6 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)IntSetting.RENDERER_ASYNCHRONOUS_SHADERS.defaultValue))- add(- SwitchSetting(- IntSetting.RENDERER_DEBUG,- R.string.renderer_debug,- R.string.renderer_debug_description,- IntSetting.RENDERER_DEBUG.key,- IntSetting.RENDERER_DEBUG.defaultValue- )- )}}@@ -451,4 +436,30 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView))}}++ private fun addDebugSettings(sl: ArrayList<SettingsItem>) {+ settingsActivity.setToolbarTitle(settingsActivity.getString(R.string.preferences_debug))+ sl.apply {+ add(+ SingleChoiceSetting(+ IntSetting.RENDERER_BACKEND,+ R.string.renderer_api,+ 0,+ R.array.rendererApiNames,+ R.array.rendererApiValues,+ IntSetting.RENDERER_BACKEND.key,+ IntSetting.RENDERER_BACKEND.defaultValue+ )+ )+ add(+ SwitchSetting(+ IntSetting.RENDERER_DEBUG,+ R.string.renderer_debug,+ R.string.renderer_debug_description,+ IntSetting.RENDERER_DEBUG.key,+ IntSetting.RENDERER_DEBUG.defaultValue+ )+ )+ }+ }}diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xmlindex 3239953f9b..f9b759532b 100644--- a/src/android/app/src/main/res/values/strings.xml+++ b/src/android/app/src/main/res/values/strings.xml@@ -196,6 +196,7 @@<string name="preferences_graphics">Graphics</string><string name="preferences_audio">Audio</string><string name="preferences_theme">Theme and color</string>+ <string name="preferences_debug">Debug</string><!-- ROM loading errors --><string name="loader_error_encrypted">Your ROM is encrypted</string>