From 23b9aa44d4f48f4a453ae65e26b956278dfd6229 Mon Sep 17 00:00:00 2001 From: lizzie Date: Mon, 20 Oct 2025 07:55:24 +0000 Subject: [PATCH] no need for 5 separate "learn more" Signed-off-by: lizzie --- .../yuzu/yuzu_emu/fragments/SetupFragment.kt | 25 ++++++++----------- .../fragments/SetupWarningDialogFragment.kt | 8 ------ .../org/yuzu/yuzu_emu/ui/main/MainActivity.kt | 1 - 3 files changed, 10 insertions(+), 24 deletions(-) diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SetupFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SetupFragment.kt index cf90c49047..4cf9cedd03 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SetupFragment.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SetupFragment.kt @@ -114,9 +114,7 @@ class SetupFragment : Fragment() { R.string.notification_warning_description, 0, { - if (NotificationManagerCompat.from(requireContext()) - .areNotificationsEnabled() - ) { + if (NotificationManagerCompat.from(requireContext()).areNotificationsEnabled()) { StepState.COMPLETE } else { StepState.INCOMPLETE @@ -141,7 +139,7 @@ class SetupFragment : Fragment() { true, R.string.install_prod_keys_warning, R.string.install_prod_keys_warning_description, - R.string.install_prod_keys_warning_help, + 0, { val file = File(DirectoryInitialization.userDirectory + "/keys/prod.keys") if (file.exists() && NativeLibrary.areKeysPresent()) { @@ -167,7 +165,7 @@ class SetupFragment : Fragment() { true, R.string.install_firmware_warning, R.string.install_firmware_warning_description, - R.string.install_firmware_warning_help, + 0, { if (NativeLibrary.isFirmwareAvailable()) { StepState.COMPLETE @@ -193,7 +191,7 @@ class SetupFragment : Fragment() { true, R.string.add_games_warning, R.string.add_games_warning_description, - R.string.add_games_warning_help, + 0, { if (NativeConfig.getGameDirs().isNotEmpty()) { StepState.COMPLETE @@ -239,19 +237,16 @@ class SetupFragment : Fragment() { override fun onPageSelected(position: Int) { super.onPageSelected(position) - - if (position == 1 && previousPosition == 0) { - ViewUtils.showView(binding.buttonNext) - ViewUtils.showView(binding.buttonBack) - } else if (position == 0 && previousPosition == 1) { + if (position == 0) { ViewUtils.hideView(binding.buttonBack) + } else { + ViewUtils.showView(binding.buttonBack) + } + if (position == pages.size - 1) { ViewUtils.hideView(binding.buttonNext) - } else if (position == pages.size - 1 && previousPosition == pages.size - 2) { - ViewUtils.hideView(binding.buttonNext) - } else if (position == pages.size - 2 && previousPosition == pages.size - 1) { + } else { ViewUtils.showView(binding.buttonNext) } - previousPosition = position } }) diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SetupWarningDialogFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SetupWarningDialogFragment.kt index b2c1d54af3..d085288b2c 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SetupWarningDialogFragment.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SetupWarningDialogFragment.kt @@ -46,14 +46,6 @@ class SetupWarningDialogFragment : DialogFragment() { if (descriptionId != 0) { builder.setMessage(descriptionId) } - if (helpLinkId != 0) { - builder.setNeutralButton(R.string.warning_help) { _: DialogInterface?, _: Int -> - val helpLink = resources.getString(R.string.install_prod_keys_warning_help) - val intent = Intent(Intent.ACTION_VIEW, Uri.parse(helpLink)) - startActivity(intent) - } - } - return builder.show() } diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt index e52709a0b5..42aaf1d890 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt @@ -210,7 +210,6 @@ class MainActivity : AppCompatActivity(), ThemeProvider { this, titleId = R.string.keys_missing, descriptionId = R.string.keys_missing_description, - helpLinkId = R.string.keys_missing_help, positiveButtonTitleId = R.string.dont_show_again, negativeButtonTitleId = R.string.close, showNegativeButton = true,