VERY experimental Nintendo Switch 2 emulator
C++
android: Add a notice when RAM inadequate
Abandoned Cart0891b3e77543
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 f0a6753a92..75d994c9c6 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@@ -27,13 +27,13 @@ import android.view.MotionEventimport android.view.Surfaceimport android.view.Viewimport android.view.inputmethod.InputMethodManager+import android.widget.Toastimport androidx.activity.viewModelsimport androidx.appcompat.app.AppCompatActivityimport androidx.core.view.WindowCompatimport androidx.core.view.WindowInsetsCompatimport androidx.core.view.WindowInsetsControllerCompatimport androidx.navigation.fragment.NavHostFragment-import kotlin.math.roundToIntimport org.yuzu.yuzu_emu.NativeLibraryimport org.yuzu.yuzu_emu.Rimport org.yuzu.yuzu_emu.databinding.ActivityEmulationBinding@@ -44,8 +44,10 @@ import org.yuzu.yuzu_emu.model.Gameimport org.yuzu.yuzu_emu.utils.ControllerMappingHelperimport org.yuzu.yuzu_emu.utils.ForegroundServiceimport org.yuzu.yuzu_emu.utils.InputHandler+import org.yuzu.yuzu_emu.utils.MemoryUtilimport org.yuzu.yuzu_emu.utils.NfcReaderimport org.yuzu.yuzu_emu.utils.ThemeHelper+import kotlin.math.roundToIntclass EmulationActivity : AppCompatActivity(), SensorEventListener {private lateinit var binding: ActivityEmulationBinding@@ -102,6 +104,19 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {inputHandler = InputHandler()inputHandler.initialize()+ val memoryUtil = MemoryUtil(this)+ if (memoryUtil.isLessThan(8, MemoryUtil.Gb)) {+ Toast.makeText(+ this,+ getString(+ R.string.device_memory_inadequate_description,+ memoryUtil.getDeviceRAM(),+ "8 GB"+ ),+ Toast.LENGTH_LONG+ ).show()+ }+// Start a foreground service to prevent the app from getting killed in the backgroundval startIntent = Intent(this, ForegroundService::class.java)startForegroundService(startIntent)diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/MemoryUtil.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/MemoryUtil.ktnew file mode 100644index 0000000000..390767e473--- /dev/null+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/MemoryUtil.kt@@ -0,0 +1,58 @@+// SPDX-FileCopyrightText: 2023 yuzu Emulator Project+// SPDX-License-Identifier: GPL-2.0-or-later++package org.yuzu.yuzu_emu.utils++import android.app.ActivityManager+import android.content.Context+import java.util.Locale++class MemoryUtil(context: Context) {++ private val Long.floatForm: String+ get() = String.format(Locale.ROOT, "%.2f", this.toDouble())++ private fun bytesToSizeUnit(size: Long): String {+ return when {+ size < Kb -> size.floatForm + " byte"+ size < Mb -> (size / Kb).floatForm + " KB"+ size < Gb -> (size / Mb).floatForm + " MB"+ size < Tb -> (size / Gb).floatForm + " GB"+ size < Pb -> (size / Tb).floatForm + " TB"+ size < Eb -> (size / Pb).floatForm + " Pb"+ else -> (size / Eb).floatForm + " Eb"+ }+ }++ private val totalMemory =+ with(context.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager) {+ val memInfo = ActivityManager.MemoryInfo()+ getMemoryInfo(memInfo)+ memInfo.totalMem+ }++ fun isLessThan(minimum: Int, size: Long): Boolean {+ return when (size) {+ Kb -> totalMemory < Mb && totalMemory < minimum+ Mb -> totalMemory < Gb && (totalMemory / Mb) < minimum+ Gb -> totalMemory < Tb && (totalMemory / Gb) < minimum+ Tb -> totalMemory < Pb && (totalMemory / Tb) < minimum+ Pb -> totalMemory < Eb && (totalMemory / Pb) < minimum+ Eb -> totalMemory / Eb < minimum+ else -> totalMemory < Kb && totalMemory < minimum+ }+ }++ fun getDeviceRAM(): String {+ return bytesToSizeUnit(totalMemory)+ }++ companion object {+ const val Kb: Long = 1024+ const val Mb = Kb * 1024+ const val Gb = Mb * 1024+ const val Tb = Gb * 1024+ const val Pb = Tb * 1024+ const val Eb = Pb * 1024+ }+}diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xmlindex cc1d8c39d9..7d37d2beee 100644--- a/src/android/app/src/main/res/values/strings.xml+++ b/src/android/app/src/main/res/values/strings.xml@@ -270,6 +270,7 @@<string name="fatal_error">Fatal Error</string><string name="fatal_error_message">A fatal error occurred. Check the log for details.\nContinuing emulation may result in crashes and bugs.</string><string name="performance_warning">Turning off this setting will significantly reduce emulation performance! For the best experience, it is recommended that you leave this setting enabled.</string>+ <string name="device_memory_inadequate_description">Device RAM: %1$s\nRecommended: %2$s</string><!-- Region Names --><string name="region_japan">Japan</string>