VERY experimental Nintendo Switch 2 emulator
C++
android: Show memory warning once
Charles Lombardoa81e654c4de3
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.ktindex 2c671fea38..7461fb093f 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt@@ -34,11 +34,14 @@ import androidx.core.view.WindowCompatimport androidx.core.view.WindowInsetsCompatimport androidx.core.view.WindowInsetsControllerCompatimport androidx.navigation.fragment.NavHostFragment+import androidx.preference.PreferenceManagerimport org.yuzu.yuzu_emu.NativeLibraryimport org.yuzu.yuzu_emu.R+import org.yuzu.yuzu_emu.YuzuApplicationimport org.yuzu.yuzu_emu.databinding.ActivityEmulationBindingimport org.yuzu.yuzu_emu.features.settings.model.BooleanSettingimport org.yuzu.yuzu_emu.features.settings.model.IntSetting+import org.yuzu.yuzu_emu.features.settings.model.Settingsimport org.yuzu.yuzu_emu.features.settings.model.SettingsViewModelimport org.yuzu.yuzu_emu.model.Gameimport org.yuzu.yuzu_emu.utils.ControllerMappingHelper@@ -107,20 +110,26 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {inputHandler = InputHandler()inputHandler.initialize()- if (MemoryUtil.isLessThan(MemoryUtil.REQUIRED_MEMORY, MemoryUtil.Gb)) {- Toast.makeText(- this,- getString(- R.string.device_memory_inadequate,- MemoryUtil.getDeviceRAM(),+ val preferences = PreferenceManager.getDefaultSharedPreferences(YuzuApplication.appContext)+ if (!preferences.getBoolean(Settings.PREF_MEMORY_WARNING_SHOWN, false)) {+ if (MemoryUtil.isLessThan(MemoryUtil.REQUIRED_MEMORY, MemoryUtil.Gb)) {+ Toast.makeText(+ this,getString(- R.string.memory_formatted,- NumberFormat.getInstance().format(MemoryUtil.REQUIRED_MEMORY),- getString(R.string.memory_gigabyte)- )- ),- Toast.LENGTH_LONG- ).show()+ R.string.device_memory_inadequate,+ MemoryUtil.getDeviceRAM(),+ getString(+ R.string.memory_formatted,+ NumberFormat.getInstance().format(MemoryUtil.REQUIRED_MEMORY),+ getString(R.string.memory_gigabyte)+ )+ ),+ Toast.LENGTH_LONG+ ).show()+ preferences.edit()+ .putBoolean(Settings.PREF_MEMORY_WARNING_SHOWN, true)+ .apply()+ }}// Start a foreground service to prevent the app from getting killed in the backgrounddiff --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.ktindex 88afb2223c..be6e17e65c 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@@ -110,6 +110,8 @@ class Settings {const val SECTION_THEME = "Theme"const val SECTION_DEBUG = "Debug"+ const val PREF_MEMORY_WARNING_SHOWN = "MemoryWarningShown"+const val PREF_OVERLAY_INIT = "OverlayInit"const val PREF_CONTROL_SCALE = "controlScale"const val PREF_CONTROL_OPACITY = "controlOpacity"