artemist/yuzu
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

android: Make MemoryUtil an object

Browse source
This commit is contained in:
Charles Lombardo 2023-06-28 15:05:32 -04:00
parent 217e958a95
commit a1dd5dfba5
2 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt
View file

@ -106,13 +106,12 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
inputHandler = InputHandler() inputHandler = InputHandler()
inputHandler.initialize() inputHandler.initialize()
val memoryUtil = MemoryUtil(this) if (MemoryUtil.isLessThan(8, MemoryUtil.Gb)) {
if (memoryUtil.isLessThan(8, MemoryUtil.Gb)) {
Toast.makeText( Toast.makeText(
this, this,
getString( getString(
R.string.device_memory_inadequate, R.string.device_memory_inadequate,
memoryUtil.getDeviceRAM(), MemoryUtil.getDeviceRAM(),
"8 ${getString(R.string.memory_gigabyte)}" "8 ${getString(R.string.memory_gigabyte)}"
), ),
Toast.LENGTH_LONG Toast.LENGTH_LONG

20
src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/MemoryUtil.kt
View file

@ -6,13 +6,22 @@ package org.yuzu.yuzu_emu.utils
import android.app.ActivityManager import android.app.ActivityManager
import android.content.Context import android.content.Context
import org.yuzu.yuzu_emu.R import org.yuzu.yuzu_emu.R
import org.yuzu.yuzu_emu.YuzuApplication
import java.util.Locale import java.util.Locale
class MemoryUtil(val context: Context) { object MemoryUtil {
private val context get() = YuzuApplication.appContext
private val Long.floatForm: String private val Long.floatForm: String
get() = String.format(Locale.ROOT, "%.2f", this.toDouble()) get() = String.format(Locale.ROOT, "%.2f", this.toDouble())
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
private fun bytesToSizeUnit(size: Long): String { private fun bytesToSizeUnit(size: Long): String {
return when { return when {
size < Kb -> "${size.floatForm} ${context.getString(R.string.memory_byte)}" size < Kb -> "${size.floatForm} ${context.getString(R.string.memory_byte)}"
@ -47,13 +56,4 @@ class MemoryUtil(val context: Context) {
fun getDeviceRAM(): String { fun getDeviceRAM(): String {
return bytesToSizeUnit(totalMemory) 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
}
} }