VERY experimental Nintendo Switch 2 emulator
C++
android: Button to reset all settings
Charles Lombardo54bf98ef0bc6
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/BooleanSetting.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/BooleanSetting.ktindex 7c0ca08c74..3dfd66779d 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/BooleanSetting.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/BooleanSetting.kt@@ -32,5 +32,7 @@ enum class BooleanSetting(fun from(key: String): BooleanSetting? =BooleanSetting.values().firstOrNull { it.key == key }++ fun clear() = BooleanSetting.values().forEach { it.boolean = it.defaultValue }}}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/FloatSetting.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/FloatSetting.ktindex 96537782ab..e5545a916a 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/FloatSetting.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/FloatSetting.kt@@ -30,5 +30,7 @@ enum class FloatSetting(private val NOT_RUNTIME_EDITABLE = emptyList<FloatSetting>()fun from(key: String): FloatSetting? = FloatSetting.values().firstOrNull { it.key == key }++ fun clear() = FloatSetting.values().forEach { it.float = it.defaultValue }}}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/IntSetting.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/IntSetting.ktindex 39f62cab7c..c07e566fe8 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/IntSetting.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/IntSetting.kt@@ -119,5 +119,7 @@ enum class IntSetting()fun from(key: String): IntSetting? = IntSetting.values().firstOrNull { it.key == key }++ fun clear() = IntSetting.values().forEach { it.int = it.defaultValue }}}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/SettingsViewModel.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/SettingsViewModel.ktindex 7141604d55..bd9233d625 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/SettingsViewModel.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/SettingsViewModel.kt@@ -1,3 +1,6 @@+// SPDX-FileCopyrightText: 2023 yuzu Emulator Project+// SPDX-License-Identifier: GPL-2.0-or-later+package org.yuzu.yuzu_emu.features.settings.modelimport androidx.lifecycle.ViewModeldiff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/StringSetting.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/StringSetting.ktindex d16ff17dfc..63f95690c7 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/StringSetting.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/StringSetting.kt@@ -31,5 +31,7 @@ enum class StringSetting()fun from(key: String): StringSetting? = StringSetting.values().firstOrNull { it.key == key }++ fun clear() = StringSetting.values().forEach { it.string = it.defaultValue }}}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/HeaderSetting.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/HeaderSetting.ktindex abba64e93e..0f8edbfb01 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/HeaderSetting.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/HeaderSetting.kt@@ -8,7 +8,7 @@ import org.yuzu.yuzu_emu.features.settings.model.AbstractSettingclass HeaderSetting(setting: AbstractSetting?,titleId: Int,- descriptionId: Int?+ descriptionId: Int) : SettingsItem(setting, titleId, descriptionId) {override val type = TYPE_HEADER}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/RunnableSetting.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/RunnableSetting.ktnew file mode 100644index 0000000000..dc89b57748--- /dev/null+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/RunnableSetting.kt@@ -0,0 +1,12 @@+// SPDX-FileCopyrightText: 2023 yuzu Emulator Project+// SPDX-License-Identifier: GPL-2.0-or-later++package org.yuzu.yuzu_emu.features.settings.model.view++class RunnableSetting(+ titleId: Int,+ descriptionId: Int,+ val runnable: () -> Unit+) : SettingsItem(null, titleId, descriptionId) {+ override val type = TYPE_RUNNABLE+}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.ktindex c02848403f..07520849ec 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt@@ -16,7 +16,7 @@ import org.yuzu.yuzu_emu.features.settings.model.AbstractSettingabstract class SettingsItem(var setting: AbstractSetting?,val nameId: Int,- val descriptionId: Int?+ val descriptionId: Int) {abstract val type: Int@@ -34,5 +34,6 @@ abstract class SettingsItem(const val TYPE_SUBMENU = 4const val TYPE_STRING_SINGLE_CHOICE = 5const val TYPE_DATETIME_SETTING = 6+ const val TYPE_RUNNABLE = 7}}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SwitchSetting.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SwitchSetting.ktindex 9f3c7e9d58..90b198718a 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SwitchSetting.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SwitchSetting.kt@@ -6,9 +6,6 @@ package org.yuzu.yuzu_emu.features.settings.model.viewimport org.yuzu.yuzu_emu.features.settings.model.AbstractBooleanSettingimport org.yuzu.yuzu_emu.features.settings.model.AbstractIntSettingimport org.yuzu.yuzu_emu.features.settings.model.AbstractSetting-import org.yuzu.yuzu_emu.features.settings.model.BooleanSetting-import org.yuzu.yuzu_emu.features.settings.model.IntSetting-import org.yuzu.yuzu_emu.utils.Logclass SwitchSetting(setting: AbstractSetting,diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.ktindex b28750eee2..691fad44e5 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt@@ -8,7 +8,6 @@ import android.content.Intentimport android.os.Bundleimport android.view.Menuimport android.view.View-import android.view.ViewGroupimport android.widget.Toastimport androidx.activity.viewModelsimport androidx.appcompat.app.AppCompatActivity@@ -21,9 +20,15 @@ import com.google.android.material.color.MaterialColorsimport org.yuzu.yuzu_emu.NativeLibraryimport org.yuzu.yuzu_emu.Rimport org.yuzu.yuzu_emu.databinding.ActivitySettingsBinding+import org.yuzu.yuzu_emu.features.settings.model.BooleanSetting+import org.yuzu.yuzu_emu.features.settings.model.FloatSetting+import org.yuzu.yuzu_emu.features.settings.model.IntSettingimport org.yuzu.yuzu_emu.features.settings.model.Settingsimport org.yuzu.yuzu_emu.features.settings.model.SettingsViewModel+import org.yuzu.yuzu_emu.features.settings.model.StringSetting+import org.yuzu.yuzu_emu.features.settings.utils.SettingsFileimport org.yuzu.yuzu_emu.utils.*+import java.io.IOExceptionclass SettingsActivity : AppCompatActivity(), SettingsActivityView {private val presenter = SettingsActivityPresenter(this)@@ -165,6 +170,26 @@ class SettingsActivity : AppCompatActivity(), SettingsActivityView {presenter.onSettingChanged()}+ fun onSettingsReset() {+ // Prevents saving to a non-existent settings file+ presenter.onSettingsReset()++ // Reset the static memory representation of each setting+ BooleanSetting.clear()+ FloatSetting.clear()+ IntSetting.clear()+ StringSetting.clear()++ // Delete settings file because the user may have changed values that do not exist in the UI+ val settingsFile = SettingsFile.getSettingsFile(SettingsFile.FILE_NAME_CONFIG)+ if (!settingsFile.delete()) {+ throw IOException("Failed to delete $settingsFile")+ }++ showToastMessage(getString(R.string.settings_reset), true)+ finish()+ }+private val settingsFragment: SettingsFragment?get() = supportFragmentManager.findFragmentByTag(FRAGMENT_TAG) as SettingsFragment?diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivityPresenter.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivityPresenter.ktindex e435c6d58e..4361d95fbb 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivityPresenter.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivityPresenter.kt@@ -70,6 +70,10 @@ class SettingsActivityPresenter(private val activityView: SettingsActivityView)shouldSave = true}+ fun onSettingsReset() {+ shouldSave = false+ }+fun saveState(outState: Bundle) {outState.putBoolean(KEY_SHOULD_SAVE, shouldSave)}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsAdapter.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsAdapter.ktindex 9439054827..1eb4899fcb 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsAdapter.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsAdapter.kt@@ -79,6 +79,10 @@ class SettingsAdapter(DateTimeViewHolder(ListItemSettingBinding.inflate(inflater), this)}+ SettingsItem.TYPE_RUNNABLE -> {+ RunnableViewHolder(ListItemSettingBinding.inflate(inflater), this)+ }+else -> {// TODO: Create an error view since we can't return null nowHeaderViewHolder(ListItemSettingsHeaderBinding.inflate(inflater), this)diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.ktindex d36afa9323..dda44376c3 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt@@ -6,8 +6,8 @@ package org.yuzu.yuzu_emu.features.settings.uiimport android.content.SharedPreferencesimport android.os.Buildimport android.text.TextUtils-import androidx.appcompat.app.AppCompatActivityimport androidx.preference.PreferenceManager+import com.google.android.material.dialog.MaterialAlertDialogBuilderimport org.yuzu.yuzu_emu.Rimport org.yuzu.yuzu_emu.YuzuApplicationimport org.yuzu.yuzu_emu.features.settings.model.AbstractBooleanSetting@@ -26,7 +26,7 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)private lateinit var gameId: Stringprivate var settingsList: ArrayList<SettingsItem>? = null- private val settingsActivity get() = fragmentView.activityView as AppCompatActivity+ private val settingsActivity get() = fragmentView.activityView as SettingsActivityprivate val settings get() = fragmentView.activityView!!.settingsprivate lateinit var preferences: SharedPreferences@@ -111,6 +111,12 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)Settings.SECTION_AUDIO))+ add(+ RunnableSetting(+ R.string.reset_to_default,+ 0+ ) { resetSettings() }+ )}}@@ -338,7 +344,9 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)override var int: Intget() = preferences.getInt(Settings.PREF_THEME, 0)set(value) {- preferences.edit().putInt(Settings.PREF_THEME, value).apply()+ preferences.edit()+ .putInt(Settings.PREF_THEME, value)+ .apply()settingsActivity.recreate()}override val key: String? = null@@ -375,7 +383,9 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)override var int: Intget() = preferences.getInt(Settings.PREF_THEME_MODE, -1)set(value) {- preferences.edit().putInt(Settings.PREF_THEME_MODE, value).apply()+ preferences.edit()+ .putInt(Settings.PREF_THEME_MODE, value)+ .apply()ThemeHelper.setThemeMode(settingsActivity)}override val key: String? = null@@ -400,14 +410,17 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)override var boolean: Booleanget() = preferences.getBoolean(Settings.PREF_BLACK_BACKGROUNDS, false)set(value) {- preferences.edit().putBoolean(Settings.PREF_BLACK_BACKGROUNDS, value).apply()+ preferences.edit()+ .putBoolean(Settings.PREF_BLACK_BACKGROUNDS, value)+ .apply()settingsActivity.recreate()}override val key: String? = nulloverride val section: String? = nulloverride val isRuntimeEditable: Boolean = falseoverride val valueAsString: String- get() = preferences.getBoolean(Settings.PREF_BLACK_BACKGROUNDS, false).toString()+ get() = preferences.getBoolean(Settings.PREF_BLACK_BACKGROUNDS, false)+ .toString()override val defaultValue: Any = false}@@ -420,4 +433,15 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView))}}++ private fun resetSettings() {+ MaterialAlertDialogBuilder(settingsActivity)+ .setTitle(R.string.reset_all_settings)+ .setMessage(R.string.reset_all_settings_description)+ .setPositiveButton(android.R.string.ok) { _, _ ->+ settingsActivity.onSettingsReset()+ }+ .setNegativeButton(android.R.string.cancel, null)+ .show()+ }}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/DateTimeViewHolder.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/DateTimeViewHolder.ktindex b101a790d9..04c045e774 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/DateTimeViewHolder.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/DateTimeViewHolder.kt@@ -21,7 +21,7 @@ class DateTimeViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAoverride fun bind(item: SettingsItem) {setting = item as DateTimeSettingbinding.textSettingName.setText(item.nameId)- if (item.descriptionId!! > 0) {+ if (item.descriptionId != 0) {binding.textSettingDescription.setText(item.descriptionId)binding.textSettingDescription.visibility = View.VISIBLE} else {diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/RunnableViewHolder.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/RunnableViewHolder.ktnew file mode 100644index 0000000000..0c0bb93fc1--- /dev/null+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/RunnableViewHolder.kt@@ -0,0 +1,35 @@+// SPDX-FileCopyrightText: 2023 yuzu Emulator Project+// SPDX-License-Identifier: GPL-2.0-or-later++package org.yuzu.yuzu_emu.features.settings.ui.viewholder++import android.view.View+import org.yuzu.yuzu_emu.databinding.ListItemSettingBinding+import org.yuzu.yuzu_emu.features.settings.model.view.RunnableSetting+import org.yuzu.yuzu_emu.features.settings.model.view.SettingsItem+import org.yuzu.yuzu_emu.features.settings.ui.SettingsAdapter++class RunnableViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAdapter) :+ SettingViewHolder(binding.root, adapter) {+ private lateinit var setting: RunnableSetting++ override fun bind(item: SettingsItem) {+ setting = item as RunnableSetting+ binding.textSettingName.setText(item.nameId)+ if (item.descriptionId != 0) {+ binding.textSettingDescription.setText(item.descriptionId)+ binding.textSettingDescription.visibility = View.VISIBLE+ } else {+ binding.textSettingDescription.visibility = View.GONE+ }+ }++ override fun onClick(clicked: View) {+ setting.runnable.invoke()+ }++ override fun onLongClick(clicked: View): Boolean {+ // no-op+ return true+ }+}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SingleChoiceViewHolder.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SingleChoiceViewHolder.ktindex 487e2e141b..de764a27f4 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SingleChoiceViewHolder.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SingleChoiceViewHolder.kt@@ -18,7 +18,7 @@ class SingleChoiceViewHolder(val binding: ListItemSettingBinding, adapter: Settisetting = itembinding.textSettingName.setText(item.nameId)binding.textSettingDescription.visibility = View.VISIBLE- if (item.descriptionId!! > 0) {+ if (item.descriptionId != 0) {binding.textSettingDescription.setText(item.descriptionId)} else if (item is SingleChoiceSetting) {val resMgr = binding.textSettingDescription.context.resourcesdiff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SliderViewHolder.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SliderViewHolder.ktindex 930bdd152e..cc3f39aa54 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SliderViewHolder.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SliderViewHolder.kt@@ -16,7 +16,7 @@ class SliderViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAdaoverride fun bind(item: SettingsItem) {setting = item as SliderSettingbinding.textSettingName.setText(item.nameId)- if (item.descriptionId!! > 0) {+ if (item.descriptionId != 0) {binding.textSettingDescription.setText(item.descriptionId)binding.textSettingDescription.visibility = View.VISIBLE} else {diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SubmenuViewHolder.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SubmenuViewHolder.ktindex 8bd36e9d54..c545b41743 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SubmenuViewHolder.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SubmenuViewHolder.kt@@ -16,7 +16,7 @@ class SubmenuViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAdoverride fun bind(item: SettingsItem) {this.item = item as SubmenuSettingbinding.textSettingName.setText(item.nameId)- if (item.descriptionId!! > 0) {+ if (item.descriptionId != 0) {binding.textSettingDescription.setText(item.descriptionId)binding.textSettingDescription.visibility = View.VISIBLE} else {diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SwitchSettingViewHolder.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SwitchSettingViewHolder.ktindex c24992e214..b163bd6ca3 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SwitchSettingViewHolder.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SwitchSettingViewHolder.kt@@ -18,7 +18,7 @@ class SwitchSettingViewHolder(val binding: ListItemSettingSwitchBinding, adapteroverride fun bind(item: SettingsItem) {setting = item as SwitchSettingbinding.textSettingName.setText(item.nameId)- if (item.descriptionId!! > 0) {+ if (item.descriptionId != 0) {binding.textSettingDescription.setText(item.descriptionId)binding.textSettingDescription.visibility = View.VISIBLE} else {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 4027df8380..c502fdca0f 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@@ -22,7 +22,7 @@ import java.util.*object SettingsFile {const val FILE_NAME_CONFIG = "config"- private val sectionsMap = BiMap<String?, String?>()+ private var sectionsMap = BiMap<String?, String?>()/*** Reads a given .ini file from disk and returns it as a HashMap of Settings, themselves@@ -154,7 +154,7 @@ object SettingsFile {} else generalSectionName}- private fun getSettingsFile(fileName: String): File {+ fun getSettingsFile(fileName: String): File {return File(DirectoryInitialization.userDirectory + "/config/" + fileName + ".ini")@@ -182,13 +182,11 @@ object SettingsFile {private fun settingFromLine(line: String): AbstractSetting? {val splitLine = line.split("=".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()if (splitLine.size != 2) {- Log.warning("Skipping invalid config line \"$line\"")return null}val key = splitLine[0].trim { it <= ' ' }val value = splitLine[1].trim { it <= ' ' }if (value.isEmpty()) {- Log.warning("Skipping null value in config line \"$line\"")return null}@@ -216,7 +214,7 @@ object SettingsFile {return stringSetting}- return StringSetting.from(key)+ return null}/**diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xmlindex cd93bfc389..ed72e571bf 100644--- a/src/android/app/src/main/res/values/strings.xml+++ b/src/android/app/src/main/res/values/strings.xml@@ -143,8 +143,12 @@<string name="ini_saved">Saved settings</string><string name="gameid_saved">Saved settings for %1$s</string><string name="error_saving">Error saving %1$s.ini: %2$s</string>- <string name="loading">Loading...</string>+ <string name="loading">Loading…</string><string name="reset_setting_confirmation">Do you want to reset this setting back to its default value?</string>+ <string name="reset_to_default">Reset to default</string>+ <string name="reset_all_settings">Reset all settings?</string>+ <string name="reset_all_settings_description">All Advanced Settings will be reset to their default configuration. This can not be undone.</string>+ <string name="settings_reset">Settings reset</string><!-- GPU driver installation --><string name="select_gpu_driver">Select GPU driver</string>