From 7b3e26acc95d6ea96ad216e80c2fd7c95f0403d3 Mon Sep 17 00:00:00 2001
From: t895 <clombardo169@gmail.com>
Date: Sat, 20 Jan 2024 03:42:01 -0500
Subject: [PATCH] android: Change "Clear" to "Use global setting" for per-game
settings
---
.../org/yuzu/yuzu_emu/fragments/DriverManagerFragment.kt | 4 ++--
.../app/src/main/res/layout/list_item_setting.xml | 2 +-
.../app/src/main/res/layout/list_item_setting_switch.xml | 2 +-
.../app/src/main/res/menu/menu_driver_manager.xml | 9 +++------
src/android/app/src/main/res/values/strings.xml | 1 +
5 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/DriverManagerFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/DriverManagerFragment.kt
index 6c758d80b..bf017cd7c 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/DriverManagerFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/DriverManagerFragment.kt
@@ -75,7 +75,7 @@ class DriverManagerFragment : Fragment() {
driverViewModel.showClearButton(!StringSetting.DRIVER_PATH.global)
binding.toolbarDrivers.setOnMenuItemClickListener {
when (it.itemId) {
- R.id.menu_driver_clear -> {
+ R.id.menu_driver_use_global -> {
StringSetting.DRIVER_PATH.global = true
driverViewModel.updateDriverList()
(binding.listDrivers.adapter as DriverAdapter)
@@ -93,7 +93,7 @@ class DriverManagerFragment : Fragment() {
repeatOnLifecycle(Lifecycle.State.STARTED) {
driverViewModel.showClearButton.collect {
binding.toolbarDrivers.menu
- .findItem(R.id.menu_driver_clear).isVisible = it
+ .findItem(R.id.menu_driver_use_global).isVisible = it
}
}
}
diff --git a/src/android/app/src/main/res/layout/list_item_setting.xml b/src/android/app/src/main/res/layout/list_item_setting.xml
index 1f80682f1..e13431497 100644
--- a/src/android/app/src/main/res/layout/list_item_setting.xml
+++ b/src/android/app/src/main/res/layout/list_item_setting.xml
@@ -69,7 +69,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:visibility="gone"
- android:text="@string/clear"
+ android:text="@string/use_global_setting"
tools:visibility="visible" />
</LinearLayout>
diff --git a/src/android/app/src/main/res/layout/list_item_setting_switch.xml b/src/android/app/src/main/res/layout/list_item_setting_switch.xml
index 1c08e2e1b..e23337058 100644
--- a/src/android/app/src/main/res/layout/list_item_setting_switch.xml
+++ b/src/android/app/src/main/res/layout/list_item_setting_switch.xml
@@ -63,7 +63,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
- android:text="@string/clear"
+ android:text="@string/use_global_setting"
android:visibility="gone"
tools:visibility="visible" />
diff --git a/src/android/app/src/main/res/menu/menu_driver_manager.xml b/src/android/app/src/main/res/menu/menu_driver_manager.xml
index dee5d57b6..0876c2194 100644
--- a/src/android/app/src/main/res/menu/menu_driver_manager.xml
+++ b/src/android/app/src/main/res/menu/menu_driver_manager.xml
@@ -1,11 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto">
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
- android:id="@+id/menu_driver_clear"
- android:icon="@drawable/ic_clear"
- android:title="@string/clear"
- app:showAsAction="always" />
+ android:id="@+id/menu_driver_use_global"
+ android:title="@string/use_global_setting" />
</menu>
diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml
index db5b27d38..bfcbb5812 100644
--- a/src/android/app/src/main/res/values/strings.xml
+++ b/src/android/app/src/main/res/values/strings.xml
@@ -287,6 +287,7 @@
<string name="notice">Notice</string>
<string name="import_complete">Import complete</string>
<string name="more_options">More options</string>
+ <string name="use_global_setting">Use global setting</string>
<!-- GPU driver installation -->
<string name="select_gpu_driver">Select GPU driver</string>