From 3a25a217e642abcf4aa2101cdb5630250615e201 Mon Sep 17 00:00:00 2001 From: t895 Date: Sun, 21 Jan 2024 20:45:10 -0500 Subject: android: Port "Lock drawer" feature from Citra --- .../yuzu_emu/features/settings/model/IntSetting.kt | 3 +- .../yuzu/yuzu_emu/fragments/EmulationFragment.kt | 54 ++++++++++++++++++++-- src/android/app/src/main/jni/android_settings.h | 1 + src/android/app/src/main/res/drawable/ic_lock.xml | 9 ++++ src/android/app/src/main/res/menu/menu_in_game.xml | 5 ++ src/android/app/src/main/res/values/strings.xml | 2 + 6 files changed, 70 insertions(+), 4 deletions(-) create mode 100644 src/android/app/src/main/res/drawable/ic_lock.xml diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/IntSetting.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/IntSetting.kt index 16fb87614..71be2d0b2 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/IntSetting.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/IntSetting.kt @@ -23,7 +23,8 @@ enum class IntSetting(override val key: String) : AbstractIntSetting { THEME("theme"), THEME_MODE("theme_mode"), OVERLAY_SCALE("control_scale"), - OVERLAY_OPACITY("control_opacity"); + OVERLAY_OPACITY("control_opacity"), + LOCK_DRAWER("lock_drawer"); override fun getInt(needsGlobal: Boolean): Int = NativeConfig.getInt(key, needsGlobal) 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.kt index 47767454a..2a97ae14d 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 @@ -182,11 +182,11 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback { } override fun onDrawerOpened(drawerView: View) { - // No op + binding.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED) } override fun onDrawerClosed(drawerView: View) { - // No op + binding.drawerLayout.setDrawerLockMode(IntSetting.LOCK_DRAWER.getInt()) } override fun onDrawerStateChanged(newState: Int) { @@ -196,6 +196,28 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback { binding.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED) binding.inGameMenu.getHeaderView(0).findViewById(R.id.text_game_title).text = game.title + + 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) { + R.string.unlock_drawer + } else { + R.string.lock_drawer + } + val iconId = if (lockMode == DrawerLayout.LOCK_MODE_UNLOCKED) { + R.drawable.ic_unlock + } else { + R.drawable.ic_lock + } + + title = getString(titleId) + icon = ResourcesCompat.getDrawable( + resources, + iconId, + requireContext().theme + ) + } + binding.inGameMenu.setNavigationItemSelectedListener { when (it.itemId) { R.id.menu_pause_emulation -> { @@ -242,6 +264,32 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback { true } + R.id.menu_lock_drawer -> { + when (IntSetting.LOCK_DRAWER.getInt()) { + DrawerLayout.LOCK_MODE_UNLOCKED -> { + IntSetting.LOCK_DRAWER.setInt(DrawerLayout.LOCK_MODE_LOCKED_CLOSED) + it.title = resources.getString(R.string.unlock_drawer) + it.icon = ResourcesCompat.getDrawable( + resources, + R.drawable.ic_lock, + requireContext().theme + ) + } + + DrawerLayout.LOCK_MODE_LOCKED_CLOSED -> { + IntSetting.LOCK_DRAWER.setInt(DrawerLayout.LOCK_MODE_UNLOCKED) + it.title = resources.getString(R.string.lock_drawer) + it.icon = ResourcesCompat.getDrawable( + resources, + R.drawable.ic_unlock, + requireContext().theme + ) + } + } + NativeConfig.saveGlobalConfig() + true + } + R.id.menu_exit -> { emulationState.stop() emulationViewModel.setIsEmulationStopping(true) @@ -326,7 +374,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback { repeatOnLifecycle(Lifecycle.State.CREATED) { emulationViewModel.emulationStarted.collectLatest { if (it) { - binding.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED) + binding.drawerLayout.setDrawerLockMode(IntSetting.LOCK_DRAWER.getInt()) ViewUtils.showView(binding.surfaceInputOverlay) ViewUtils.hideView(binding.loadingIndicator) diff --git a/src/android/app/src/main/jni/android_settings.h b/src/android/app/src/main/jni/android_settings.h index 559ae83eb..cf93304da 100644 --- a/src/android/app/src/main/jni/android_settings.h +++ b/src/android/app/src/main/jni/android_settings.h @@ -63,6 +63,7 @@ struct Values { Settings::Setting show_input_overlay{linkage, true, "show_input_overlay", Settings::Category::Overlay}; Settings::Setting touchscreen{linkage, true, "touchscreen", Settings::Category::Overlay}; + Settings::Setting lock_drawer{linkage, false, "lock_drawer", Settings::Category::Overlay}; }; extern Values values; diff --git a/src/android/app/src/main/res/drawable/ic_lock.xml b/src/android/app/src/main/res/drawable/ic_lock.xml new file mode 100644 index 000000000..ef97b1936 --- /dev/null +++ b/src/android/app/src/main/res/drawable/ic_lock.xml @@ -0,0 +1,9 @@ + + + diff --git a/src/android/app/src/main/res/menu/menu_in_game.xml b/src/android/app/src/main/res/menu/menu_in_game.xml index ac6ab06ff..eecb0563b 100644 --- a/src/android/app/src/main/res/menu/menu_in_game.xml +++ b/src/android/app/src/main/res/menu/menu_in_game.xml @@ -21,6 +21,11 @@ android:icon="@drawable/ic_controller" android:title="@string/emulation_input_overlay" /> + + Unpause emulation Overlay options Touchscreen + Lock drawer + Unlock drawer Loading settings… -- cgit v1.2.3