VERY experimental Nintendo Switch 2 emulator
C++
android: Add icons and descriptions to the first-level advanced settings page
t895260ff2b43f37
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/RunnableSetting.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/RunnableSetting.ktindex 522cc49df1..4251600241 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/RunnableSetting.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/RunnableSetting.kt@@ -3,10 +3,13 @@package org.yuzu.yuzu_emu.features.settings.model.view+import androidx.annotation.DrawableRes+class RunnableSetting(titleId: Int,descriptionId: Int,val isRuntimeRunnable: Boolean,+ @DrawableRes val iconId: Int = 0,val runnable: () -> Unit) : SettingsItem(emptySetting, titleId, descriptionId) {override val type = TYPE_RUNNABLEdiff --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 b343e527ef..94953b18aa 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@@ -3,11 +3,14 @@package org.yuzu.yuzu_emu.features.settings.model.view+import androidx.annotation.DrawableRes+import androidx.annotation.StringResimport org.yuzu.yuzu_emu.features.settings.model.Settingsclass SubmenuSetting(- titleId: Int,- descriptionId: Int,+ @StringRes titleId: Int,+ @StringRes descriptionId: Int,+ @DrawableRes val iconId: Int,val menuKey: Settings.MenuTag) : SettingsItem(emptySetting, titleId, descriptionId) {override val type = TYPE_SUBMENUdiff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragment.ktindex 70d8ec14bb..2b85167a85 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragment.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragment.kt@@ -144,10 +144,9 @@ class SettingsFragment : Fragment() {val leftInsets = barInsets.left + cutoutInsets.leftval rightInsets = barInsets.right + cutoutInsets.right- val sideMargin = resources.getDimensionPixelSize(R.dimen.spacing_medlarge)val mlpSettingsList = binding.listSettings.layoutParams as MarginLayoutParams- mlpSettingsList.leftMargin = sideMargin + leftInsets- mlpSettingsList.rightMargin = sideMargin + rightInsets+ mlpSettingsList.leftMargin = leftInsets+ mlpSettingsList.rightMargin = rightInsetsbinding.listSettings.layoutParams = mlpSettingsListbinding.listSettings.updatePadding(bottom = barInsets.bottomdiff --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 4b8adc7a3a..8b71e32f3d 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@@ -3,7 +3,6 @@package org.yuzu.yuzu_emu.features.settings.ui-import android.content.Contextimport android.content.SharedPreferencesimport android.os.Buildimport android.widget.Toast@@ -32,8 +31,6 @@ class SettingsFragmentPresenter(private val preferences: SharedPreferencesget() = PreferenceManager.getDefaultSharedPreferences(YuzuApplication.appContext)- private val context: Context get() = YuzuApplication.appContext-// Extension for populating settings list based on paired settingsfun ArrayList<SettingsItem>.add(key: String) {val item = SettingsItem.settingsItems[key]!!@@ -74,14 +71,45 @@ class SettingsFragmentPresenter(private fun addConfigSettings(sl: ArrayList<SettingsItem>) {sl.apply {- add(SubmenuSetting(R.string.preferences_system, 0, Settings.MenuTag.SECTION_SYSTEM))- add(SubmenuSetting(R.string.preferences_graphics, 0, Settings.MenuTag.SECTION_RENDERER))- add(SubmenuSetting(R.string.preferences_audio, 0, Settings.MenuTag.SECTION_AUDIO))- add(SubmenuSetting(R.string.preferences_debug, 0, Settings.MenuTag.SECTION_DEBUG))add(- RunnableSetting(R.string.reset_to_default, 0, false) {- settingsViewModel.setShouldShowResetSettingsDialog(true)- }+ SubmenuSetting(+ R.string.preferences_system,+ R.string.preferences_system_description,+ R.drawable.ic_system_settings,+ Settings.MenuTag.SECTION_SYSTEM+ )+ )+ add(+ SubmenuSetting(+ R.string.preferences_graphics,+ R.string.preferences_graphics_description,+ R.drawable.ic_graphics,+ Settings.MenuTag.SECTION_RENDERER+ )+ )+ add(+ SubmenuSetting(+ R.string.preferences_audio,+ R.string.preferences_audio_description,+ R.drawable.ic_audio,+ Settings.MenuTag.SECTION_AUDIO+ )+ )+ add(+ SubmenuSetting(+ R.string.preferences_debug,+ R.string.preferences_debug_description,+ R.drawable.ic_code,+ Settings.MenuTag.SECTION_DEBUG+ )+ )+ add(+ RunnableSetting(+ R.string.reset_to_default,+ R.string.reset_to_default_description,+ false,+ R.drawable.ic_restore+ ) { settingsViewModel.setShouldShowResetSettingsDialog(true) })}}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/RunnableViewHolder.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/RunnableViewHolder.ktindex 83a2e94f13..0361956244 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/RunnableViewHolder.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/RunnableViewHolder.kt@@ -4,6 +4,7 @@package org.yuzu.yuzu_emu.features.settings.ui.viewholderimport android.view.View+import androidx.core.content.res.ResourcesCompatimport org.yuzu.yuzu_emu.NativeLibraryimport org.yuzu.yuzu_emu.databinding.ListItemSettingBindingimport org.yuzu.yuzu_emu.features.settings.model.view.RunnableSetting@@ -16,6 +17,19 @@ class RunnableViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAoverride fun bind(item: SettingsItem) {setting = item as RunnableSetting+ if (item.iconId != 0) {+ binding.icon.visibility = View.VISIBLE+ binding.icon.setImageDrawable(+ ResourcesCompat.getDrawable(+ binding.icon.resources,+ item.iconId,+ binding.icon.context.theme+ )+ )+ } else {+ binding.icon.visibility = View.GONE+ }+binding.textSettingName.setText(item.nameId)if (item.descriptionId != 0) {binding.textSettingDescription.setText(item.descriptionId)diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SubmenuViewHolder.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SubmenuViewHolder.ktindex 1cf581a9d4..8100c65dd5 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SubmenuViewHolder.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SubmenuViewHolder.kt@@ -4,6 +4,7 @@package org.yuzu.yuzu_emu.features.settings.ui.viewholderimport android.view.View+import androidx.core.content.res.ResourcesCompatimport org.yuzu.yuzu_emu.databinding.ListItemSettingBindingimport org.yuzu.yuzu_emu.features.settings.model.view.SettingsItemimport org.yuzu.yuzu_emu.features.settings.model.view.SubmenuSetting@@ -15,6 +16,19 @@ class SubmenuViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAdoverride fun bind(item: SettingsItem) {this.item = item as SubmenuSetting+ if (item.iconId != 0) {+ binding.icon.visibility = View.VISIBLE+ binding.icon.setImageDrawable(+ ResourcesCompat.getDrawable(+ binding.icon.resources,+ item.iconId,+ binding.icon.context.theme+ )+ )+ } else {+ binding.icon.visibility = View.GONE+ }+binding.textSettingName.setText(item.nameId)if (item.descriptionId != 0) {binding.textSettingDescription.setText(item.descriptionId)diff --git a/src/android/app/src/main/res/drawable/ic_audio.xml b/src/android/app/src/main/res/drawable/ic_audio.xmlnew file mode 100644index 0000000000..e306c3b0cb--- /dev/null+++ b/src/android/app/src/main/res/drawable/ic_audio.xml@@ -0,0 +1,9 @@+<vector xmlns:android="http://schemas.android.com/apk/res/android"+ android:width="24dp"+ android:height="24dp"+ android:viewportHeight="24"+ android:viewportWidth="24">+ <path+ android:fillColor="?attr/colorControlNormal"+ android:pathData="M3,9v6h4l5,5L12,4L7,9L3,9zM16.5,12c0,-1.77 -1.02,-3.29 -2.5,-4.03v8.05c1.48,-0.73 2.5,-2.25 2.5,-4.02zM14,3.23v2.06c2.89,0.86 5,3.54 5,6.71s-2.11,5.85 -5,6.71v2.06c4.01,-0.91 7,-4.49 7,-8.77s-2.99,-7.86 -7,-8.77z" />+</vector>diff --git a/src/android/app/src/main/res/drawable/ic_code.xml b/src/android/app/src/main/res/drawable/ic_code.xmlnew file mode 100644index 0000000000..26f83b39bd--- /dev/null+++ b/src/android/app/src/main/res/drawable/ic_code.xml@@ -0,0 +1,9 @@+<vector xmlns:android="http://schemas.android.com/apk/res/android"+ android:width="24dp"+ android:height="24dp"+ android:viewportWidth="960"+ android:viewportHeight="960">+ <path+ android:fillColor="?attr/colorControlNormal"+ android:pathData="M320,720 L80,480l240,-240 57,57 -184,184 183,183 -56,56ZM640,720 L583,663 767,479 584,296 640,240 880,480 640,720Z"/>+</vector>diff --git a/src/android/app/src/main/res/drawable/ic_graphics.xml b/src/android/app/src/main/res/drawable/ic_graphics.xmlnew file mode 100644index 0000000000..2fdb5a4d6c--- /dev/null+++ b/src/android/app/src/main/res/drawable/ic_graphics.xml@@ -0,0 +1,9 @@+<vector xmlns:android="http://schemas.android.com/apk/res/android"+ android:width="24dp"+ android:height="24dp"+ android:viewportWidth="960"+ android:viewportHeight="960">+ <path+ android:fillColor="?attr/colorControlNormal"+ android:pathData="M160,840q-33,0 -56.5,-23.5T80,760v-560q0,-33 23.5,-56.5T160,120h560q33,0 56.5,23.5T800,200v80h80v80h-80v80h80v80h-80v80h80v80h-80v80q0,33 -23.5,56.5T720,840L160,840ZM160,760h560v-560L160,200v560ZM240,680h200v-160L240,520v160ZM480,400h160v-120L480,280v120ZM240,480h200v-200L240,280v200ZM480,680h160v-240L480,440v240ZM160,200v560,-560Z"/>+</vector>diff --git a/src/android/app/src/main/res/drawable/ic_system_settings.xml b/src/android/app/src/main/res/drawable/ic_system_settings.xmlnew file mode 100644index 0000000000..7701a2babd--- /dev/null+++ b/src/android/app/src/main/res/drawable/ic_system_settings.xml@@ -0,0 +1,9 @@+<vector xmlns:android="http://schemas.android.com/apk/res/android"+ android:width="24dp"+ android:height="24dp"+ android:viewportWidth="960"+ android:viewportHeight="960">+ <path+ android:fillColor="?attr/colorControlNormal"+ android:pathData="M320,960q-17,0 -28.5,-11.5T280,920q0,-17 11.5,-28.5T320,880q17,0 28.5,11.5T360,920q0,17 -11.5,28.5T320,960ZM480,960q-17,0 -28.5,-11.5T440,920q0,-17 11.5,-28.5T480,880q17,0 28.5,11.5T520,920q0,17 -11.5,28.5T480,960ZM640,960q-17,0 -28.5,-11.5T600,920q0,-17 11.5,-28.5T640,880q17,0 28.5,11.5T680,920q0,17 -11.5,28.5T640,960ZM320,800q-33,0 -56.5,-23.5T240,720v-640q0,-33 23.5,-56.5T320,0h320q33,0 56.5,23.5T720,80v640q0,33 -23.5,56.5T640,800L320,800ZM320,720h320v-40L320,680v40ZM320,600h320v-400L320,200v400ZM320,120h320v-40L320,80v40ZM320,120v-40,40ZM320,720v-40,40Z"/>+</vector>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.xmlindex f1037a7401..544280e753 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@@ -10,41 +10,59 @@android:focusable="true"android:gravity="center_vertical"android:minHeight="72dp"- android:padding="@dimen/spacing_large">+ android:padding="16dp"><LinearLayoutandroid:layout_width="match_parent"android:layout_height="wrap_content"- android:orientation="vertical">+ android:orientation="horizontal">- <com.google.android.material.textview.MaterialTextView- android:id="@+id/text_setting_name"- style="@style/TextAppearance.Material3.HeadlineMedium"- android:layout_width="match_parent"- android:layout_height="wrap_content"- android:textAlignment="viewStart"- android:textSize="16sp"- app:lineHeight="22dp"- tools:text="Setting Name" />-- <com.google.android.material.textview.MaterialTextView- android:id="@+id/text_setting_description"- style="@style/TextAppearance.Material3.BodySmall"- android:layout_width="match_parent"- android:layout_height="wrap_content"- android:layout_marginTop="@dimen/spacing_small"- android:textAlignment="viewStart"- tools:text="@string/app_disclaimer" />+ <ImageView+ android:id="@+id/icon"+ android:layout_width="24dp"+ android:layout_height="24dp"+ android:layout_marginStart="8dp"+ android:layout_marginEnd="24dp"+ android:layout_gravity="center_vertical"+ android:visibility="gone"+ app:tint="?attr/colorOnSurface" />- <com.google.android.material.textview.MaterialTextView- android:id="@+id/text_setting_value"- style="@style/TextAppearance.Material3.LabelMedium"+ <LinearLayoutandroid:layout_width="match_parent"android:layout_height="wrap_content"- android:layout_marginTop="@dimen/spacing_small"- android:textAlignment="viewStart"- android:textStyle="bold"- tools:text="1x" />+ android:orientation="vertical">++ <com.google.android.material.textview.MaterialTextView+ android:id="@+id/text_setting_name"+ style="@style/TextAppearance.Material3.HeadlineMedium"+ android:layout_width="match_parent"+ android:layout_height="wrap_content"+ android:textAlignment="viewStart"+ android:textSize="17sp"+ app:lineHeight="22dp"+ tools:text="Setting Name" />++ <com.google.android.material.textview.MaterialTextView+ android:id="@+id/text_setting_description"+ style="@style/TextAppearance.Material3.BodySmall"+ android:layout_width="match_parent"+ android:layout_height="wrap_content"+ android:layout_marginTop="@dimen/spacing_small"+ android:textAlignment="viewStart"+ tools:text="@string/app_disclaimer" />++ <com.google.android.material.textview.MaterialTextView+ android:id="@+id/text_setting_value"+ style="@style/TextAppearance.Material3.LabelMedium"+ android:layout_width="match_parent"+ android:layout_height="wrap_content"+ android:layout_marginTop="@dimen/spacing_small"+ android:textAlignment="viewStart"+ android:textStyle="bold"+ android:textSize="13sp"+ tools:text="1x" />++ </LinearLayout></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.xmlindex a5767adee1..a8f5aff78b 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@@ -8,9 +8,7 @@android:clickable="true"android:focusable="true"android:minHeight="72dp"- android:paddingVertical="@dimen/spacing_large"- android:paddingStart="@dimen/spacing_large"- android:paddingEnd="24dp">+ android:padding="16dp"><com.google.android.material.materialswitch.MaterialSwitchandroid:id="@+id/switch_widget"@@ -24,7 +22,7 @@android:layout_height="wrap_content"android:layout_alignParentTop="true"android:layout_centerVertical="true"- android:layout_marginEnd="@dimen/spacing_large"+ android:layout_marginEnd="24dp"android:layout_toStartOf="@+id/switch_widget"android:gravity="center_vertical"android:orientation="vertical">@@ -35,7 +33,7 @@android:layout_width="wrap_content"android:layout_height="wrap_content"android:textAlignment="viewStart"- android:textSize="16sp"+ android:textSize="17sp"app:lineHeight="28dp"tools:text="@string/frame_limit_enable" />diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xmlindex c551a61064..98c3f20f87 100644--- a/src/android/app/src/main/res/values/strings.xml+++ b/src/android/app/src/main/res/values/strings.xml@@ -240,6 +240,7 @@<string name="shutting_down">Shutting down…</string><string name="reset_setting_confirmation">Do you want to reset this setting back to its default value?</string><string name="reset_to_default">Reset to default</string>+ <string name="reset_to_default_description">Resets all advanced settings</string><string name="reset_all_settings">Reset all settings?</string><string name="reset_all_settings_description">All advanced settings will be reset to their default configuration. This can not be undone.</string><string name="settings_reset">Settings reset</string>@@ -271,10 +272,14 @@<string name="preferences_settings">Settings</string><string name="preferences_general">General</string><string name="preferences_system">System</string>+ <string name="preferences_system_description">Docked mode, region, language</string><string name="preferences_graphics">Graphics</string>+ <string name="preferences_graphics_description">Accuracy level, resolution, shader cache</string><string name="preferences_audio">Audio</string>+ <string name="preferences_audio_description">Output engine, volume</string><string name="preferences_theme">Theme and color</string><string name="preferences_debug">Debug</string>+ <string name="preferences_debug_description">CPU/GPU debugging, graphics API, fastmem</string><!-- ROM loading errors --><string name="loader_error_encrypted">Your ROM is encrypted</string>