diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt | 5 | ||||
| -rw-r--r-- | src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/MemoryUtil.kt | 20 |
2 files changed, 12 insertions, 13 deletions
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.kt index ae665ed2e..4052eead5 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 | |||
| @@ -106,13 +106,12 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener { | |||
| 106 | inputHandler = InputHandler() | 106 | inputHandler = InputHandler() |
| 107 | inputHandler.initialize() | 107 | inputHandler.initialize() |
| 108 | 108 | ||
| 109 | val memoryUtil = MemoryUtil(this) | 109 | if (MemoryUtil.isLessThan(8, MemoryUtil.Gb)) { |
| 110 | if (memoryUtil.isLessThan(8, MemoryUtil.Gb)) { | ||
| 111 | Toast.makeText( | 110 | Toast.makeText( |
| 112 | this, | 111 | this, |
| 113 | getString( | 112 | getString( |
| 114 | R.string.device_memory_inadequate, | 113 | R.string.device_memory_inadequate, |
| 115 | memoryUtil.getDeviceRAM(), | 114 | MemoryUtil.getDeviceRAM(), |
| 116 | "8 ${getString(R.string.memory_gigabyte)}" | 115 | "8 ${getString(R.string.memory_gigabyte)}" |
| 117 | ), | 116 | ), |
| 118 | Toast.LENGTH_LONG | 117 | Toast.LENGTH_LONG |
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.kt index 18e5fa0b0..59e9f8f87 100644 --- 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.kt | |||
| @@ -6,13 +6,22 @@ package org.yuzu.yuzu_emu.utils | |||
| 6 | import android.app.ActivityManager | 6 | import android.app.ActivityManager |
| 7 | import android.content.Context | 7 | import android.content.Context |
| 8 | import org.yuzu.yuzu_emu.R | 8 | import org.yuzu.yuzu_emu.R |
| 9 | import org.yuzu.yuzu_emu.YuzuApplication | ||
| 9 | import java.util.Locale | 10 | import java.util.Locale |
| 10 | 11 | ||
| 11 | class MemoryUtil(val context: Context) { | 12 | object MemoryUtil { |
| 13 | private val context get() = YuzuApplication.appContext | ||
| 12 | 14 | ||
| 13 | private val Long.floatForm: String | 15 | private val Long.floatForm: String |
| 14 | get() = String.format(Locale.ROOT, "%.2f", this.toDouble()) | 16 | get() = String.format(Locale.ROOT, "%.2f", this.toDouble()) |
| 15 | 17 | ||
| 18 | const val Kb: Long = 1024 | ||
| 19 | const val Mb = Kb * 1024 | ||
| 20 | const val Gb = Mb * 1024 | ||
| 21 | const val Tb = Gb * 1024 | ||
| 22 | const val Pb = Tb * 1024 | ||
| 23 | const val Eb = Pb * 1024 | ||
| 24 | |||
| 16 | private fun bytesToSizeUnit(size: Long): String { | 25 | private fun bytesToSizeUnit(size: Long): String { |
| 17 | return when { | 26 | return when { |
| 18 | size < Kb -> "${size.floatForm} ${context.getString(R.string.memory_byte)}" | 27 | size < Kb -> "${size.floatForm} ${context.getString(R.string.memory_byte)}" |
| @@ -47,13 +56,4 @@ class MemoryUtil(val context: Context) { | |||
| 47 | fun getDeviceRAM(): String { | 56 | fun getDeviceRAM(): String { |
| 48 | return bytesToSizeUnit(totalMemory) | 57 | return bytesToSizeUnit(totalMemory) |
| 49 | } | 58 | } |
| 50 | |||
| 51 | companion object { | ||
| 52 | const val Kb: Long = 1024 | ||
| 53 | const val Mb = Kb * 1024 | ||
| 54 | const val Gb = Mb * 1024 | ||
| 55 | const val Tb = Gb * 1024 | ||
| 56 | const val Pb = Tb * 1024 | ||
| 57 | const val Eb = Pb * 1024 | ||
| 58 | } | ||
| 59 | } | 59 | } |