VERY experimental Nintendo Switch 2 emulator
C++
android: Load settings at the start of each activity
Charles Lombardo73440cbb01ca
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 901a3978d8..94d5156cfe 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@@ -21,6 +21,7 @@ import android.view.MotionEventimport android.view.Surfaceimport android.view.Viewimport android.view.inputmethod.InputMethodManager+import androidx.activity.viewModelsimport androidx.appcompat.app.AppCompatActivityimport androidx.core.content.getSystemServiceimport androidx.core.view.WindowCompat@@ -34,6 +35,7 @@ import kotlinx.coroutines.Dispatchersimport kotlinx.coroutines.launchimport org.yuzu.yuzu_emu.NativeLibraryimport org.yuzu.yuzu_emu.R+import org.yuzu.yuzu_emu.features.settings.model.SettingsViewModelimport org.yuzu.yuzu_emu.fragments.EmulationFragmentimport org.yuzu.yuzu_emu.model.Gameimport org.yuzu.yuzu_emu.utils.ControllerMappingHelper@@ -60,6 +62,8 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {private lateinit var game: Game+ private val settingsViewModel: SettingsViewModel by viewModels()+override fun onDestroy() {stopForegroundService(this)super.onDestroy()@@ -68,6 +72,8 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {override fun onCreate(savedInstanceState: Bundle?) {ThemeHelper.setTheme(this)+ settingsViewModel.settings.loadSettings()+super.onCreate(savedInstanceState)if (savedInstanceState == null) {// Get params we were passeddiff --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 23c31e13ab..6d3db53c0a 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@@ -39,7 +39,7 @@ class Settings {val isEmpty: Booleanget() = sections.isEmpty()- fun loadSettings(view: SettingsActivityView) {+ fun loadSettings(view: SettingsActivityView? = null) {sections = SettingsSectionMap()loadYuzuSettings(view)if (!TextUtils.isEmpty(gameId)) {@@ -48,13 +48,13 @@ class Settings {isLoaded = true}- private fun loadYuzuSettings(view: SettingsActivityView) {+ private fun loadYuzuSettings(view: SettingsActivityView?) {for ((fileName) in configFileSectionsMap) {sections.putAll(SettingsFile.readFile(fileName, view))}}- private fun loadCustomGameSettings(gameId: String, view: SettingsActivityView) {+ private fun loadCustomGameSettings(gameId: String, view: SettingsActivityView?) {// Custom game settingsmergeSections(SettingsFile.readCustomGameSettings(gameId, view))}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/utils/SettingsFile.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/utils/SettingsFile.ktindex c502fdca0f..e29bca11df 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/utils/SettingsFile.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/utils/SettingsFile.kt@@ -37,7 +37,7 @@ object SettingsFile {private fun readFile(ini: File?,isCustomGame: Boolean,- view: SettingsActivityView?+ view: SettingsActivityView? = null): HashMap<String, SettingSection?> {val sections: HashMap<String, SettingSection?> = SettingsSectionMap()var reader: BufferedReader? = null@@ -74,10 +74,13 @@ object SettingsFile {return sections}- fun readFile(fileName: String, view: SettingsActivityView): HashMap<String, SettingSection?> {+ fun readFile(fileName: String, view: SettingsActivityView?): HashMap<String, SettingSection?> {return readFile(getSettingsFile(fileName), false, view)}+ fun readFile(fileName: String): HashMap<String, SettingSection?> =+ readFile(getSettingsFile(fileName), false)+/*** Reads a given .ini file from disk and returns it as a HashMap of SettingSections, themselves* effectively a HashMap of key/value settings. If unsuccessful, outputs an error telling why it@@ -88,7 +91,7 @@ object SettingsFile {*/fun readCustomGameSettings(gameId: String,- view: SettingsActivityView+ view: SettingsActivityView?): HashMap<String, SettingSection?> {return readFile(getCustomGameSettingsFile(gameId), true, view)}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.ktindex f8bca11bb6..1340852104 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt@@ -35,6 +35,7 @@ import org.yuzu.yuzu_emu.activities.EmulationActivityimport org.yuzu.yuzu_emu.databinding.ActivityMainBindingimport org.yuzu.yuzu_emu.databinding.DialogProgressBarBindingimport org.yuzu.yuzu_emu.features.settings.model.Settings+import org.yuzu.yuzu_emu.features.settings.model.SettingsViewModelimport org.yuzu.yuzu_emu.features.settings.ui.SettingsActivityimport org.yuzu.yuzu_emu.features.settings.utils.SettingsFileimport org.yuzu.yuzu_emu.fragments.MessageDialogFragment@@ -48,6 +49,7 @@ class MainActivity : AppCompatActivity(), ThemeProvider {private val homeViewModel: HomeViewModel by viewModels()private val gamesViewModel: GamesViewModel by viewModels()+ private val settingsViewModel: SettingsViewModel by viewModels()override var themeId: Int = 0@@ -55,6 +57,8 @@ class MainActivity : AppCompatActivity(), ThemeProvider {val splashScreen = installSplashScreen()splashScreen.setKeepOnScreenCondition { !DirectoryInitialization.areDirectoriesReady }+ settingsViewModel.settings.loadSettings()+ThemeHelper.setTheme(this)super.onCreate(savedInstanceState)