VERY experimental Nintendo Switch 2 emulator
C++
android: Refactor CheckBoxSetting to SwitchSetting
Charles Lombardo7e48948d542e
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 91cd1a5587..c7ad600460 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@@ -23,7 +23,7 @@ abstract class SettingsItem(companion object {const val TYPE_HEADER = 0- const val TYPE_CHECKBOX = 1+ const val TYPE_SWITCH = 1const val TYPE_SINGLE_CHOICE = 2const val TYPE_SLIDER = 3const val TYPE_SUBMENU = 4diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/CheckBoxSetting.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SwitchSetting.ktsimilarity index 97%rename from src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/CheckBoxSetting.ktrename to src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SwitchSetting.ktindex c6c6f6f89c..b793012ccc 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/CheckBoxSetting.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SwitchSetting.kt@@ -10,8 +10,8 @@ import org.yuzu.yuzu_emu.features.settings.model.IntSettingimport org.yuzu.yuzu_emu.features.settings.model.Settingimport org.yuzu.yuzu_emu.features.settings.ui.SettingsFragmentView-class CheckBoxSetting : SettingsItem {- override val type = TYPE_CHECKBOX+class SwitchSetting : SettingsItem {+ override val type = TYPE_SWITCHprivate var defaultValue: Booleanprivate var showPerformanceWarning: Booleandiff --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 4eac386cca..1b8a0a5ea7 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@@ -52,7 +52,7 @@ class SettingsAdapter(}SettingsItem.TYPE_CHECKBOX -> {view = inflater.inflate(R.layout.list_item_setting_switch, parent, false)- CheckBoxSettingViewHolder(view, this)+ SwitchSettingViewHolder(view, this)}SettingsItem.TYPE_SINGLE_CHOICE, SettingsItem.TYPE_STRING_SINGLE_CHOICE -> {view = inflater.inflate(R.layout.list_item_setting, parent, false)@@ -103,7 +103,7 @@ class SettingsAdapter(notifyDataSetChanged()}- fun onBooleanClick(item: CheckBoxSetting, position: Int, checked: Boolean) {+ fun onBooleanClick(item: SwitchSetting, position: Int, checked: Boolean) {val setting = item.setChecked(checked)if (setting != null) {fragmentView.putSetting(setting)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 f475b26c40..ef825ec58b 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@@ -139,7 +139,7 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)val cpuAccuracy = cpuSection!!.getSetting(SettingsFile.KEY_CPU_ACCURACY)sl.apply {add(- CheckBoxSetting(+ SwitchSetting(SettingsFile.KEY_RENDERER_USE_SPEED_LIMIT,Settings.SECTION_RENDERER,frameLimitEnable,@@ -184,7 +184,7 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)val language = systemSection.getSetting(SettingsFile.KEY_LANGUAGE_INDEX)sl.apply {add(- CheckBoxSetting(+ SwitchSetting(SettingsFile.KEY_USE_DOCKED_MODE,Settings.SECTION_SYSTEM,dockedMode,@@ -283,7 +283,7 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)))add(- CheckBoxSetting(+ SwitchSetting(SettingsFile.KEY_RENDERER_FORCE_MAX_CLOCK,Settings.SECTION_RENDERER,rendererForceMaxClocks,@@ -293,7 +293,7 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)))add(- CheckBoxSetting(+ SwitchSetting(SettingsFile.KEY_RENDERER_ASYNCHRONOUS_SHADERS,Settings.SECTION_RENDERER,rendererAsynchronousShaders,@@ -303,7 +303,7 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)))add(- CheckBoxSetting(+ SwitchSetting(SettingsFile.KEY_RENDERER_DEBUG,Settings.SECTION_RENDERER,rendererDebug,diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/CheckBoxSettingViewHolder.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SwitchSettingViewHolder.ktsimilarity index 87%rename from src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/CheckBoxSettingViewHolder.ktrename to src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SwitchSettingViewHolder.ktindex 3296aed68f..f8b229830f 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/CheckBoxSettingViewHolder.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SwitchSettingViewHolder.kt@@ -8,13 +8,13 @@ import android.widget.CompoundButtonimport android.widget.TextViewimport com.google.android.material.materialswitch.MaterialSwitchimport org.yuzu.yuzu_emu.R-import org.yuzu.yuzu_emu.features.settings.model.view.CheckBoxSetting+import org.yuzu.yuzu_emu.features.settings.model.view.SwitchSettingimport org.yuzu.yuzu_emu.features.settings.model.view.SettingsItemimport org.yuzu.yuzu_emu.features.settings.ui.SettingsAdapter-class CheckBoxSettingViewHolder(itemView: View, adapter: SettingsAdapter) :+class SwitchSettingViewHolder(itemView: View, adapter: SettingsAdapter) :SettingViewHolder(itemView, adapter) {- private lateinit var item: CheckBoxSetting+ private lateinit var item: SwitchSettingprivate lateinit var textSettingName: TextViewprivate lateinit var textSettingDescription: TextViewprivate lateinit var switch: MaterialSwitch@@ -26,7 +26,7 @@ class CheckBoxSettingViewHolder(itemView: View, adapter: SettingsAdapter) :}override fun bind(item: SettingsItem) {- this.item = item as CheckBoxSetting+ this.item = item as SwitchSettingtextSettingName.setText(item.nameId)if (item.descriptionId!! > 0) {textSettingDescription.setText(item.descriptionId)