Skip to content

VERY experimental Nintendo Switch 2 emulator

C++

fix Eden's Veil warning dialog (#138)

swurled47533be802
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/BooleanSetting.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/BooleanSetting.kt
index 7598d77f46..554b693313 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/BooleanSetting.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/BooleanSetting.kt
@@ -41,7 +41,6 @@ enum class BooleanSetting(override val key: String) : AbstractBooleanSetting {
SHOW_BAT_TEMPERATURE("show_bat_temperature"),
SHOW_SHADERS_BUILDING("show_shaders_building"),
OVERLAY_BACKGROUND("overlay_background"),
- DONT_SHOW_EDEN_VEIL_WARNING("dont_show_eden_veil_warning"),
DEBUG_FLUSH_BY_LINE("flush_lines"),
USE_LRU_CACHE("use_lru_cache"),;
// external fun isFrameSkippingEnabled(): Boolean
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/Settings.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/Settings.kt
index 320436fb5f..6c8bb65d6e 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/Settings.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/Settings.kt
@@ -35,6 +35,7 @@ object Settings {
const val PREF_FIRST_APP_LAUNCH = "FirstApplicationLaunch"
const val PREF_SHOULD_SHOW_PRE_ALPHA_WARNING = "ShouldShowPreAlphaWarning"
const val PREF_SHOULD_SHOW_PRE_ALPHA_BANNER = "ShouldShowPreAlphaBanner"
+ const val PREF_SHOULD_SHOW_EDENS_VEIL_DIALOG = "ShouldShowEdensVeilDialog"
const val PREF_MEMORY_WARNING_SHOWN = "MemoryWarningShown"
const val SECTION_STATS_OVERLAY = "Stats Overlay"
diff --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.kt
index 69517ebd5a..1a67dd7ebe 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
@@ -1092,7 +1092,10 @@ class SettingsFragmentPresenter(
}
fun showEdenVeilWarningDialog() {
- val shouldDisplayVeilWarning = !BooleanSetting.DONT_SHOW_EDEN_VEIL_WARNING.getBoolean()
+ val shouldDisplayVeilWarning =
+ PreferenceManager.getDefaultSharedPreferences(activity!!.applicationContext)
+ .getBoolean(Settings.PREF_SHOULD_SHOW_EDENS_VEIL_DIALOG, true)
+
if (shouldDisplayVeilWarning) {
activity?.let {
MessageDialogFragment.newInstance(
@@ -1103,7 +1106,10 @@ class SettingsFragmentPresenter(
negativeButtonTitleId = R.string.close,
showNegativeButton = true,
positiveAction = {
- BooleanSetting.DONT_SHOW_EDEN_VEIL_WARNING.setBoolean(true)
+ PreferenceManager.getDefaultSharedPreferences(activity!!.applicationContext)
+ .edit() {
+ putBoolean(Settings.PREF_SHOULD_SHOW_EDENS_VEIL_DIALOG, false)
+ }
}
).show(it.supportFragmentManager, MessageDialogFragment.TAG)
}