diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2023-11-01 14:14:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-01 14:14:27 +0100 |
| commit | 48f913b6e7fdc83874d9ac7e5fb237cde85be5a2 (patch) | |
| tree | 491ce3a90e55d4d92aa70a5631dda4107b02a51b | |
| parent | Merge pull request #11933 from t895/android-ci-agony (diff) | |
| parent | android: Adjust driver manager source string (diff) | |
| download | yuzu-48f913b6e7fdc83874d9ac7e5fb237cde85be5a2.tar yuzu-48f913b6e7fdc83874d9ac7e5fb237cde85be5a2.tar.gz yuzu-48f913b6e7fdc83874d9ac7e5fb237cde85be5a2.tar.bz2 yuzu-48f913b6e7fdc83874d9ac7e5fb237cde85be5a2.tar.lz yuzu-48f913b6e7fdc83874d9ac7e5fb237cde85be5a2.tar.xz yuzu-48f913b6e7fdc83874d9ac7e5fb237cde85be5a2.tar.zst yuzu-48f913b6e7fdc83874d9ac7e5fb237cde85be5a2.zip | |
| -rw-r--r-- | src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.kt | 66 | ||||
| -rw-r--r-- | src/android/app/src/main/res/values/strings.xml | 2 |
2 files changed, 34 insertions, 34 deletions
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.kt index 6e19fc6c0..ed2a5cb55 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.kt @@ -86,28 +86,6 @@ class HomeSettingsFragment : Fragment() { ) add( HomeSetting( - R.string.open_user_folder, - R.string.open_user_folder_description, - R.drawable.ic_folder_open, - { openFileManager() } - ) - ) - add( - HomeSetting( - R.string.preferences_theme, - R.string.theme_and_color_description, - R.drawable.ic_palette, - { - val action = HomeNavigationDirections.actionGlobalSettingsActivity( - null, - Settings.MenuTag.SECTION_THEME - ) - binding.root.findNavController().navigate(action) - } - ) - ) - add( - HomeSetting( R.string.gpu_driver_manager, R.string.install_gpu_driver_description, R.drawable.ic_build, @@ -123,17 +101,6 @@ class HomeSettingsFragment : Fragment() { ) add( HomeSetting( - R.string.manage_yuzu_data, - R.string.manage_yuzu_data_description, - R.drawable.ic_install, - { - binding.root.findNavController() - .navigate(R.id.action_homeSettingsFragment_to_installableFragment) - } - ) - ) - add( - HomeSetting( R.string.applets, R.string.applets_description, R.drawable.ic_applet, @@ -148,6 +115,17 @@ class HomeSettingsFragment : Fragment() { ) add( HomeSetting( + R.string.manage_yuzu_data, + R.string.manage_yuzu_data_description, + R.drawable.ic_install, + { + binding.root.findNavController() + .navigate(R.id.action_homeSettingsFragment_to_installableFragment) + } + ) + ) + add( + HomeSetting( R.string.select_games_folder, R.string.select_games_folder_description, R.drawable.ic_add, @@ -172,6 +150,28 @@ class HomeSettingsFragment : Fragment() { ) add( HomeSetting( + R.string.open_user_folder, + R.string.open_user_folder_description, + R.drawable.ic_folder_open, + { openFileManager() } + ) + ) + add( + HomeSetting( + R.string.preferences_theme, + R.string.theme_and_color_description, + R.drawable.ic_palette, + { + val action = HomeNavigationDirections.actionGlobalSettingsActivity( + null, + Settings.MenuTag.SECTION_THEME + ) + binding.root.findNavController().navigate(action) + } + ) + ) + add( + HomeSetting( R.string.about, R.string.about_description, R.drawable.ic_info_outline, diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml index b92978140..c551a6106 100644 --- a/src/android/app/src/main/res/values/strings.xml +++ b/src/android/app/src/main/res/values/strings.xml @@ -72,7 +72,7 @@ <string name="invalid_keys_error">Invalid encryption keys</string> <string name="dumping_keys_quickstart_link">https://yuzu-emu.org/help/quickstart/#dumping-decryption-keys</string> <string name="install_keys_failure_description">The selected file is incorrect or corrupt. Please redump your keys.</string> - <string name="gpu_driver_manager">GPU Driver Manager</string> + <string name="gpu_driver_manager">GPU driver manager</string> <string name="install_gpu_driver">Install GPU driver</string> <string name="install_gpu_driver_description">Install alternative drivers for potentially better performance or accuracy</string> <string name="advanced_settings">Advanced settings</string> |