VERY experimental Nintendo Switch 2 emulator
C++
android: Combine LongMessageDialogFragment with MessageDialogFragment
Charles Lombardob737fe66aa30
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/HomeSettingAdapter.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/HomeSettingAdapter.ktindex 9f859b4422..8d87d3bd72 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/HomeSettingAdapter.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/HomeSettingAdapter.kt@@ -45,8 +45,8 @@ class HomeSettingAdapter(holder.option.onClick.invoke()} else {MessageDialogFragment.newInstance(- holder.option.disabledTitleId,- holder.option.disabledMessageId+ titleId = holder.option.disabledTitleId,+ descriptionId = holder.option.disabledMessageId).show(activity.supportFragmentManager, MessageDialogFragment.TAG)}}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/ImportExportSavesFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/ImportExportSavesFragment.ktindex e1495ee8c4..f38aeea531 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/ImportExportSavesFragment.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/ImportExportSavesFragment.kt@@ -187,8 +187,8 @@ class ImportExportSavesFragment : DialogFragment() {withContext(Dispatchers.Main) {if (!validZip) {MessageDialogFragment.newInstance(- R.string.save_file_invalid_zip_structure,- R.string.save_file_invalid_zip_structure_description+ titleId = R.string.save_file_invalid_zip_structure,+ descriptionId = R.string.save_file_invalid_zip_structure_description).show(activity.supportFragmentManager, MessageDialogFragment.TAG)return@withContext}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/LongMessageDialogFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/LongMessageDialogFragment.ktdeleted file mode 100644index b29b627e9e..0000000000--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/LongMessageDialogFragment.kt+++ /dev/null@@ -1,62 +0,0 @@-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project-// SPDX-License-Identifier: GPL-2.0-or-later--package org.yuzu.yuzu_emu.fragments--import android.app.Dialog-import android.content.Intent-import android.net.Uri-import android.os.Bundle-import androidx.fragment.app.DialogFragment-import com.google.android.material.dialog.MaterialAlertDialogBuilder-import org.yuzu.yuzu_emu.R--class LongMessageDialogFragment : DialogFragment() {- override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {- val titleId = requireArguments().getInt(TITLE)- val description = requireArguments().getString(DESCRIPTION)- val helpLinkId = requireArguments().getInt(HELP_LINK)-- val dialog = MaterialAlertDialogBuilder(requireContext())- .setPositiveButton(R.string.close, null)- .setTitle(titleId)- .setMessage(description)-- if (helpLinkId != 0) {- dialog.setNeutralButton(R.string.learn_more) { _, _ ->- openLink(getString(helpLinkId))- }- }-- return dialog.show()- }-- private fun openLink(link: String) {- val intent = Intent(Intent.ACTION_VIEW, Uri.parse(link))- startActivity(intent)- }-- companion object {- const val TAG = "LongMessageDialogFragment"-- private const val TITLE = "Title"- private const val DESCRIPTION = "Description"- private const val HELP_LINK = "Link"-- fun newInstance(- titleId: Int,- description: String,- helpLinkId: Int = 0- ): LongMessageDialogFragment {- val dialog = LongMessageDialogFragment()- val bundle = Bundle()- bundle.apply {- putInt(TITLE, titleId)- putString(DESCRIPTION, description)- putInt(HELP_LINK, helpLinkId)- }- dialog.arguments = bundle- return dialog- }- }-}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/MessageDialogFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/MessageDialogFragment.ktindex 2db38fdc2e..7d1c2c8dd9 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/MessageDialogFragment.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/MessageDialogFragment.kt@@ -13,14 +13,20 @@ import org.yuzu.yuzu_emu.Rclass MessageDialogFragment : DialogFragment() {override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {- val titleId = requireArguments().getInt(TITLE)- val descriptionId = requireArguments().getInt(DESCRIPTION)+ val titleId = requireArguments().getInt(TITLE_ID)+ val titleString = requireArguments().getString(TITLE_STRING)!!+ val descriptionId = requireArguments().getInt(DESCRIPTION_ID)+ val descriptionString = requireArguments().getString(DESCRIPTION_STRING)!!val helpLinkId = requireArguments().getInt(HELP_LINK)val dialog = MaterialAlertDialogBuilder(requireContext()).setPositiveButton(R.string.close, null)- .setTitle(titleId)- .setMessage(descriptionId)++ if (titleId != 0) dialog.setTitle(titleId)+ if (titleString.isNotEmpty()) dialog.setTitle(titleString)++ if (descriptionId != 0) dialog.setMessage(descriptionId)+ if (descriptionString.isNotEmpty()) dialog.setMessage(descriptionString)if (helpLinkId != 0) {dialog.setNeutralButton(R.string.learn_more) { _, _ ->@@ -39,20 +45,26 @@ class MessageDialogFragment : DialogFragment() {companion object {const val TAG = "MessageDialogFragment"- private const val TITLE = "Title"- private const val DESCRIPTION = "Description"+ private const val TITLE_ID = "Title"+ private const val TITLE_STRING = "TitleString"+ private const val DESCRIPTION_ID = "DescriptionId"+ private const val DESCRIPTION_STRING = "DescriptionString"private const val HELP_LINK = "Link"fun newInstance(- titleId: Int,- descriptionId: Int,+ titleId: Int = 0,+ titleString: String = "",+ descriptionId: Int = 0,+ descriptionString: String = "",helpLinkId: Int = 0): MessageDialogFragment {val dialog = MessageDialogFragment()val bundle = Bundle()bundle.apply {- putInt(TITLE, titleId)- putInt(DESCRIPTION, descriptionId)+ putInt(TITLE_ID, titleId)+ putString(TITLE_STRING, titleString)+ putInt(DESCRIPTION_ID, descriptionId)+ putString(DESCRIPTION_STRING, descriptionString)putInt(HELP_LINK, helpLinkId)}dialog.arguments = bundlediff --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.ktindex 7735452e51..0721a59358 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@@ -42,7 +42,6 @@ import org.yuzu.yuzu_emu.databinding.DialogProgressBarBindingimport org.yuzu.yuzu_emu.features.settings.model.Settingsimport org.yuzu.yuzu_emu.features.settings.utils.SettingsFileimport org.yuzu.yuzu_emu.fragments.IndeterminateProgressDialogFragment-import org.yuzu.yuzu_emu.fragments.LongMessageDialogFragmentimport org.yuzu.yuzu_emu.fragments.MessageDialogFragmentimport org.yuzu.yuzu_emu.model.GamesViewModelimport org.yuzu.yuzu_emu.model.HomeViewModel@@ -301,8 +300,8 @@ class MainActivity : AppCompatActivity(), ThemeProvider {fun processKey(result: Uri): Boolean {if (FileUtil.getExtension(result) != "keys") {MessageDialogFragment.newInstance(- R.string.reading_keys_failure,- R.string.install_prod_keys_failure_extension_description+ titleId = R.string.reading_keys_failure,+ descriptionId = R.string.install_prod_keys_failure_extension_description).show(supportFragmentManager, MessageDialogFragment.TAG)return false}@@ -330,9 +329,9 @@ class MainActivity : AppCompatActivity(), ThemeProvider {return true} else {MessageDialogFragment.newInstance(- R.string.invalid_keys_error,- R.string.install_keys_failure_description,- R.string.dumping_keys_quickstart_link+ titleId = R.string.invalid_keys_error,+ descriptionId = R.string.install_keys_failure_description,+ helpLinkId = R.string.dumping_keys_quickstart_link).show(supportFragmentManager, MessageDialogFragment.TAG)return false}@@ -370,8 +369,8 @@ class MainActivity : AppCompatActivity(), ThemeProvider {val filteredNumOfFiles = cacheFirmwareDir.list(filterNCA)?.size ?: -2messageToShow = if (unfilteredNumOfFiles != filteredNumOfFiles) {MessageDialogFragment.newInstance(- R.string.firmware_installed_failure,- R.string.firmware_installed_failure_description+ titleId = R.string.firmware_installed_failure,+ descriptionId = R.string.firmware_installed_failure_description)} else {firmwarePath.deleteRecursively()@@ -401,8 +400,8 @@ class MainActivity : AppCompatActivity(), ThemeProvider {if (FileUtil.getExtension(result) != "bin") {MessageDialogFragment.newInstance(- R.string.reading_keys_failure,- R.string.install_amiibo_keys_failure_extension_description+ titleId = R.string.reading_keys_failure,+ descriptionId = R.string.install_amiibo_keys_failure_extension_description).show(supportFragmentManager, MessageDialogFragment.TAG)return@registerForActivityResult}@@ -428,9 +427,9 @@ class MainActivity : AppCompatActivity(), ThemeProvider {).show()} else {MessageDialogFragment.newInstance(- R.string.invalid_keys_error,- R.string.install_keys_failure_description,- R.string.dumping_keys_quickstart_link+ titleId = R.string.invalid_keys_error,+ descriptionId = R.string.install_keys_failure_description,+ helpLinkId = R.string.dumping_keys_quickstart_link).show(supportFragmentManager, MessageDialogFragment.TAG)}}@@ -578,16 +577,16 @@ class MainActivity : AppCompatActivity(), ThemeProvider {)installResult.append(separator)}- LongMessageDialogFragment.newInstance(- R.string.install_game_content_failure,- installResult.toString().trim(),- R.string.install_game_content_help_link- ).show(supportFragmentManager, LongMessageDialogFragment.TAG)+ MessageDialogFragment.newInstance(+ titleId = R.string.install_game_content_failure,+ descriptionString = installResult.toString().trim(),+ helpLinkId = R.string.install_game_content_help_link+ ).show(supportFragmentManager, MessageDialogFragment.TAG)} else {- LongMessageDialogFragment.newInstance(- R.string.install_game_content_success,- installResult.toString().trim()- ).show(supportFragmentManager, LongMessageDialogFragment.TAG)+ MessageDialogFragment.newInstance(+ titleId = R.string.install_game_content_success,+ descriptionString = installResult.toString().trim()+ ).show(supportFragmentManager, MessageDialogFragment.TAG)}}}