VERY experimental Nintendo Switch 2 emulator
C++
[android] add toggle for quick settings to hide it and fix setting names (#3435)
nekled76b2b5d2668
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/dialogs/QuickSettings.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/dialogs/QuickSettings.ktindex 11185f019e..992f8f2a16 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/dialogs/QuickSettings.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/dialogs/QuickSettings.kt@@ -22,14 +22,6 @@ import org.yuzu.yuzu_emu.features.settings.model.AbstractShortSettingimport org.yuzu.yuzu_emu.features.settings.model.AbstractIntSettingclass QuickSettings(val emulationFragment: EmulationFragment) {- // Kinda a crappy workaround to get a title from setting keys- // Idk how to do this witthout hardcoding every single one- private fun getSettingTitle(settingKey: String): String {- return settingKey.replace("_", " ").split(" ")- .joinToString(" ") { it.replaceFirstChar { c -> c.uppercase() } }-- }-private fun saveSettings() {if (emulationFragment.shouldUseCustom) {NativeConfig.savePerGameConfig()@@ -60,6 +52,7 @@ class QuickSettings(val emulationFragment: EmulationFragment) {// settingsfun addIntSetting(+ name: Int,container: ViewGroup,setting: IntSetting,namesArrayId: Int,@@ -73,7 +66,7 @@ class QuickSettings(val emulationFragment: EmulationFragment) {val expandIcon = itemView.findViewById<android.widget.ImageView>(R.id.expand_icon)val radioGroup = itemView.findViewById<RadioGroup>(R.id.radio_group)- titleView.text = getSettingTitle(setting.key)+ titleView.text = YuzuApplication.appContext.getString(name)val names = emulationFragment.resources.getStringArray(namesArrayId)val values = emulationFragment.resources.getIntArray(valuesArrayId)@@ -115,6 +108,8 @@ class QuickSettings(val emulationFragment: EmulationFragment) {}fun addBooleanSetting(+ name: Int,+container: ViewGroup,setting: BooleanSetting) {@@ -125,7 +120,7 @@ class QuickSettings(val emulationFragment: EmulationFragment) {val titleView = itemView.findViewById<TextView>(R.id.switch_title)val switchView = itemView.findViewById<com.google.android.material.materialswitch.MaterialSwitch>(R.id.setting_switch)- titleView.text = getSettingTitle(setting.key)+ titleView.text = YuzuApplication.appContext.getString(name)switchContainer.visibility = View.VISIBLEswitchView.isChecked = setting.getBoolean()@@ -141,6 +136,7 @@ class QuickSettings(val emulationFragment: EmulationFragment) {}fun addSliderSetting(+ name: Int,container: ViewGroup,setting: AbstractSetting,minValue: Int = 0,@@ -156,7 +152,7 @@ class QuickSettings(val emulationFragment: EmulationFragment) {val slider = itemView.findViewById<com.google.android.material.slider.Slider>(R.id.setting_slider)- titleView.text = getSettingTitle(setting.key)+ titleView.text = YuzuApplication.appContext.getString(name)sliderContainer.visibility = View.VISIBLEslider.valueFrom = minValue.toFloat()diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/BooleanSetting.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/BooleanSetting.ktindex 2059177621..ee07e15474 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/BooleanSetting.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/BooleanSetting.kt@@ -82,8 +82,9 @@ enum class BooleanSetting(override val key: String) : AbstractBooleanSetting {GPU_LOG_VULKAN_CALLS("gpu_log_vulkan_calls"),GPU_LOG_SHADER_DUMPS("gpu_log_shader_dumps"),GPU_LOG_MEMORY_TRACKING("gpu_log_memory_tracking"),- GPU_LOG_DRIVER_DEBUG("gpu_log_driver_debug");+ GPU_LOG_DRIVER_DEBUG("gpu_log_driver_debug"),+ ENABLE_QUICK_SETTINGS("enable_quick_settings");// external fun isFrameSkippingEnabled(): Booleanexternal fun isFrameInterpolationEnabled(): Booleandiff --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 870eec1a1b..0785e3fc8b 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@@ -799,6 +799,13 @@ abstract class SettingsItem(descriptionId = R.string.enable_update_checks_description,))+ put(+ SwitchSetting(+ BooleanSetting.ENABLE_QUICK_SETTINGS,+ titleId = R.string.enable_quick_settings,+ descriptionId = R.string.enable_quick_settings_description,+ )+ )put(SwitchSetting(BooleanSetting.ENABLE_FOLDER_BUTTON,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 490f2a97a5..5899382520 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@@ -1074,6 +1074,8 @@ class SettingsFragmentPresenter(add(BooleanSetting.ENABLE_UPDATE_CHECKS.key)}+ add(BooleanSetting.ENABLE_QUICK_SETTINGS.key)+add(HeaderSetting(R.string.theme_and_color))diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.ktindex 97f0dfa86a..0c091fdeb9 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt@@ -690,8 +690,18 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {})binding.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED)+ if (!BooleanSetting.ENABLE_QUICK_SETTINGS.getBoolean()) {+ binding.drawerLayout.setDrawerLockMode(+ DrawerLayout.LOCK_MODE_LOCKED_CLOSED,+ binding.quickSettingsSheet+ )+ }+updateGameTitle()+ binding.inGameMenu.menu.findItem(R.id.menu_quick_settings)?.isVisible =+ BooleanSetting.ENABLE_QUICK_SETTINGS.getBoolean()+binding.inGameMenu.menu.findItem(R.id.menu_lock_drawer).apply {val lockMode = IntSetting.LOCK_DRAWER.getInt()val titleId = if (lockMode == DrawerLayout.LOCK_MODE_LOCKED_CLOSED) {@@ -749,10 +759,11 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {true}- R.id.menu_quick_settings -> {- openQuickSettingsMenu()- true- }+ if (BooleanSetting.ENABLE_QUICK_SETTINGS.getBoolean())+ R.id.menu_quick_settings else 0 -> {+ openQuickSettingsMenu()+ true+ }R.id.menu_settings_per_game -> {val action = HomeNavigationDirections.actionGlobalSettingsActivity(@@ -1045,11 +1056,13 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {}quickSettings.addBooleanSetting(+ R.string.frame_limit_enable,container,BooleanSetting.RENDERER_USE_SPEED_LIMIT,)quickSettings.addSliderSetting(+ R.string.frame_limit_slider,container,ShortSetting.RENDERER_SPEED_LIMIT,minValue = 0,@@ -1058,6 +1071,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {)quickSettings.addBooleanSetting(+ R.string.use_docked_mode,container,BooleanSetting.USE_DOCKED_MODE,)@@ -1065,6 +1079,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {quickSettings.addDivider(container)quickSettings.addIntSetting(+ R.string.renderer_accuracy,container,IntSetting.RENDERER_ACCURACY,R.array.rendererAccuracyNames,@@ -1073,6 +1088,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {quickSettings.addIntSetting(+ R.string.renderer_scaling_filter,container,IntSetting.RENDERER_SCALING_FILTER,R.array.rendererScalingFilterNames,@@ -1080,6 +1096,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {)quickSettings.addSliderSetting(+ R.string.fsr_sharpness,container,IntSetting.FSR_SHARPENING_SLIDER,minValue = 0,@@ -1088,6 +1105,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {)quickSettings.addIntSetting(+ R.string.renderer_anti_aliasing,container,IntSetting.RENDERER_ANTI_ALIASING,R.array.rendererAntiAliasingNames,diff --git a/src/android/app/src/main/jni/android_settings.h b/src/android/app/src/main/jni/android_settings.hindex b6fd37c9dd..7643d49532 100644--- a/src/android/app/src/main/jni/android_settings.h+++ b/src/android/app/src/main/jni/android_settings.h@@ -202,9 +202,14 @@ namespace AndroidSettings {Settings::Specialization::Default, true, true,&show_soc_overlay};+ // MISCSettings::Setting<bool> dont_show_driver_shader_warning{linkage, false,"dont_show_driver_shader_warning",Settings::Category::Android, Settings::Specialization::Default, true, true};+ Settings::Setting<bool> enable_quick_settings{linkage, true,+ "enable_quick_settings",+ Settings::Category::Android, Settings::Specialization::Default, true,+ false};};extern Values values;diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xmlindex 1e49450b95..ff8b1e3c72 100644--- a/src/android/app/src/main/res/values/strings.xml+++ b/src/android/app/src/main/res/values/strings.xml@@ -738,6 +738,8 @@<string name="preferences_graphics">Graphics</string><string name="preferences_graphics_description">Accuracy level, resolution, shader cache</string><string name="quick_settings">Quick Settings</string>+ <string name="enable_quick_settings">Enable Quick Settings</string>+ <string name="enable_quick_settings_description">Allow access to quick settings menu via swipe and menu button</string><string name="preferences_audio">Audio</string><string name="preferences_audio_description">Output engine, volume</string><string name="preferences_controls">Controls</string>