summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorCharles Lombardo <clombardo169@gmail.com>2024-01-22 10:34:08 +0100
committerGitHub <noreply@github.com>2024-01-22 10:34:08 +0100
commit17b0aac80945d28c88097789fe732cd0b053bec1 (patch)
tree168f7c2eceee0e492ee7cf519abee0a990040809 /src
parentMerge pull request #12736 from t895/verify-contents (diff)
parentandroid: Port "Lock drawer" feature from Citra (diff)
downloadyuzu-17b0aac80945d28c88097789fe732cd0b053bec1.tar
yuzu-17b0aac80945d28c88097789fe732cd0b053bec1.tar.gz
yuzu-17b0aac80945d28c88097789fe732cd0b053bec1.tar.bz2
yuzu-17b0aac80945d28c88097789fe732cd0b053bec1.tar.lz
yuzu-17b0aac80945d28c88097789fe732cd0b053bec1.tar.xz
yuzu-17b0aac80945d28c88097789fe732cd0b053bec1.tar.zst
yuzu-17b0aac80945d28c88097789fe732cd0b053bec1.zip
Diffstat (limited to 'src')
-rw-r--r--src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/IntSetting.kt3
-rw-r--r--src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt54
-rw-r--r--src/android/app/src/main/jni/android_settings.h1
-rw-r--r--src/android/app/src/main/res/drawable/ic_lock.xml9
-rw-r--r--src/android/app/src/main/res/menu/menu_in_game.xml5
-rw-r--r--src/android/app/src/main/res/values/strings.xml2
6 files changed, 70 insertions, 4 deletions
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<TextView>(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<bool> show_input_overlay{linkage, true, "show_input_overlay",
Settings::Category::Overlay};
Settings::Setting<bool> touchscreen{linkage, true, "touchscreen", Settings::Category::Overlay};
+ Settings::Setting<s32> 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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:height="24dp"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
+ android:width="24dp">
+ <path
+ android:fillColor="?attr/colorControlNormal"
+ android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z" />
+</vector>
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
@@ -22,6 +22,11 @@
android:title="@string/emulation_input_overlay" />
<item
+ android:id="@+id/menu_lock_drawer"
+ android:icon="@drawable/ic_unlock"
+ android:title="@string/emulation_input_overlay" />
+
+ <item
android:id="@+id/menu_exit"
android:icon="@drawable/ic_exit"
android:title="@string/emulation_exit" />
diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml
index eefcc3ff4..779eb36a8 100644
--- a/src/android/app/src/main/res/values/strings.xml
+++ b/src/android/app/src/main/res/values/strings.xml
@@ -392,6 +392,8 @@
<string name="emulation_unpause">Unpause emulation</string>
<string name="emulation_input_overlay">Overlay options</string>
<string name="touchscreen">Touchscreen</string>
+ <string name="lock_drawer">Lock drawer</string>
+ <string name="unlock_drawer">Unlock drawer</string>
<string name="load_settings">Loading settings…</string>