diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt | 35 | ||||
| -rw-r--r-- | src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/Settings.kt | 2 |
2 files changed, 24 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 2c671fea3..7461fb093 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.WindowCompat | |||
| 34 | import androidx.core.view.WindowInsetsCompat | 34 | import androidx.core.view.WindowInsetsCompat |
| 35 | import androidx.core.view.WindowInsetsControllerCompat | 35 | import androidx.core.view.WindowInsetsControllerCompat |
| 36 | import androidx.navigation.fragment.NavHostFragment | 36 | import androidx.navigation.fragment.NavHostFragment |
| 37 | import androidx.preference.PreferenceManager | ||
| 37 | import org.yuzu.yuzu_emu.NativeLibrary | 38 | import org.yuzu.yuzu_emu.NativeLibrary |
| 38 | import org.yuzu.yuzu_emu.R | 39 | import org.yuzu.yuzu_emu.R |
| 40 | import org.yuzu.yuzu_emu.YuzuApplication | ||
| 39 | import org.yuzu.yuzu_emu.databinding.ActivityEmulationBinding | 41 | import org.yuzu.yuzu_emu.databinding.ActivityEmulationBinding |
| 40 | import org.yuzu.yuzu_emu.features.settings.model.BooleanSetting | 42 | import org.yuzu.yuzu_emu.features.settings.model.BooleanSetting |
| 41 | import org.yuzu.yuzu_emu.features.settings.model.IntSetting | 43 | import org.yuzu.yuzu_emu.features.settings.model.IntSetting |
| 44 | import org.yuzu.yuzu_emu.features.settings.model.Settings | ||
| 42 | import org.yuzu.yuzu_emu.features.settings.model.SettingsViewModel | 45 | import org.yuzu.yuzu_emu.features.settings.model.SettingsViewModel |
| 43 | import org.yuzu.yuzu_emu.model.Game | 46 | import org.yuzu.yuzu_emu.model.Game |
| 44 | import org.yuzu.yuzu_emu.utils.ControllerMappingHelper | 47 | import org.yuzu.yuzu_emu.utils.ControllerMappingHelper |
| @@ -107,20 +110,26 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener { | |||
| 107 | inputHandler = InputHandler() | 110 | inputHandler = InputHandler() |
| 108 | inputHandler.initialize() | 111 | inputHandler.initialize() |
| 109 | 112 | ||
| 110 | if (MemoryUtil.isLessThan(MemoryUtil.REQUIRED_MEMORY, MemoryUtil.Gb)) { | 113 | val preferences = PreferenceManager.getDefaultSharedPreferences(YuzuApplication.appContext) |
| 111 | Toast.makeText( | 114 | if (!preferences.getBoolean(Settings.PREF_MEMORY_WARNING_SHOWN, false)) { |
| 112 | this, | 115 | if (MemoryUtil.isLessThan(MemoryUtil.REQUIRED_MEMORY, MemoryUtil.Gb)) { |
| 113 | getString( | 116 | Toast.makeText( |
| 114 | R.string.device_memory_inadequate, | 117 | this, |
| 115 | MemoryUtil.getDeviceRAM(), | ||
| 116 | getString( | 118 | getString( |
| 117 | R.string.memory_formatted, | 119 | R.string.device_memory_inadequate, |
| 118 | NumberFormat.getInstance().format(MemoryUtil.REQUIRED_MEMORY), | 120 | MemoryUtil.getDeviceRAM(), |
| 119 | getString(R.string.memory_gigabyte) | 121 | getString( |
| 120 | ) | 122 | R.string.memory_formatted, |
| 121 | ), | 123 | NumberFormat.getInstance().format(MemoryUtil.REQUIRED_MEMORY), |
| 122 | Toast.LENGTH_LONG | 124 | getString(R.string.memory_gigabyte) |
| 123 | ).show() | 125 | ) |
| 126 | ), | ||
| 127 | Toast.LENGTH_LONG | ||
| 128 | ).show() | ||
| 129 | preferences.edit() | ||
| 130 | .putBoolean(Settings.PREF_MEMORY_WARNING_SHOWN, true) | ||
| 131 | .apply() | ||
| 132 | } | ||
| 124 | } | 133 | } |
| 125 | 134 | ||
| 126 | // Start a foreground service to prevent the app from getting killed in the background | 135 | // Start a foreground service to prevent the app from getting killed in the background |
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 88afb2223..be6e17e65 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 { | |||
| 110 | const val SECTION_THEME = "Theme" | 110 | const val SECTION_THEME = "Theme" |
| 111 | const val SECTION_DEBUG = "Debug" | 111 | const val SECTION_DEBUG = "Debug" |
| 112 | 112 | ||
| 113 | const val PREF_MEMORY_WARNING_SHOWN = "MemoryWarningShown" | ||
| 114 | |||
| 113 | const val PREF_OVERLAY_INIT = "OverlayInit" | 115 | const val PREF_OVERLAY_INIT = "OverlayInit" |
| 114 | const val PREF_CONTROL_SCALE = "controlScale" | 116 | const val PREF_CONTROL_SCALE = "controlScale" |
| 115 | const val PREF_CONTROL_OPACITY = "controlOpacity" | 117 | const val PREF_CONTROL_OPACITY = "controlOpacity" |