diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt | 2 | ||||
| -rw-r--r-- | src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SwitchSetting.kt (renamed from src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/CheckBoxSetting.kt) | 4 | ||||
| -rw-r--r-- | src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsAdapter.kt | 4 | ||||
| -rw-r--r-- | src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt | 10 | ||||
| -rw-r--r-- | src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SwitchSettingViewHolder.kt (renamed from src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/CheckBoxSettingViewHolder.kt) | 8 |
5 files changed, 14 insertions, 14 deletions
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.kt index 91cd1a558..c7ad60046 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( | |||
| 23 | 23 | ||
| 24 | companion object { | 24 | companion object { |
| 25 | const val TYPE_HEADER = 0 | 25 | const val TYPE_HEADER = 0 |
| 26 | const val TYPE_CHECKBOX = 1 | 26 | const val TYPE_SWITCH = 1 |
| 27 | const val TYPE_SINGLE_CHOICE = 2 | 27 | const val TYPE_SINGLE_CHOICE = 2 |
| 28 | const val TYPE_SLIDER = 3 | 28 | const val TYPE_SLIDER = 3 |
| 29 | const val TYPE_SUBMENU = 4 | 29 | const val TYPE_SUBMENU = 4 |
diff --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.kt index c6c6f6f89..b793012cc 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.IntSetting | |||
| 10 | import org.yuzu.yuzu_emu.features.settings.model.Setting | 10 | import org.yuzu.yuzu_emu.features.settings.model.Setting |
| 11 | import org.yuzu.yuzu_emu.features.settings.ui.SettingsFragmentView | 11 | import org.yuzu.yuzu_emu.features.settings.ui.SettingsFragmentView |
| 12 | 12 | ||
| 13 | class CheckBoxSetting : SettingsItem { | 13 | class SwitchSetting : SettingsItem { |
| 14 | override val type = TYPE_CHECKBOX | 14 | override val type = TYPE_SWITCH |
| 15 | 15 | ||
| 16 | private var defaultValue: Boolean | 16 | private var defaultValue: Boolean |
| 17 | private var showPerformanceWarning: Boolean | 17 | private var showPerformanceWarning: Boolean |
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.kt index 4eac386cc..1b8a0a5ea 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( | |||
| 52 | } | 52 | } |
| 53 | SettingsItem.TYPE_CHECKBOX -> { | 53 | SettingsItem.TYPE_CHECKBOX -> { |
| 54 | view = inflater.inflate(R.layout.list_item_setting_switch, parent, false) | 54 | view = inflater.inflate(R.layout.list_item_setting_switch, parent, false) |
| 55 | CheckBoxSettingViewHolder(view, this) | 55 | SwitchSettingViewHolder(view, this) |
| 56 | } | 56 | } |
| 57 | SettingsItem.TYPE_SINGLE_CHOICE, SettingsItem.TYPE_STRING_SINGLE_CHOICE -> { | 57 | SettingsItem.TYPE_SINGLE_CHOICE, SettingsItem.TYPE_STRING_SINGLE_CHOICE -> { |
| 58 | view = inflater.inflate(R.layout.list_item_setting, parent, false) | 58 | view = inflater.inflate(R.layout.list_item_setting, parent, false) |
| @@ -103,7 +103,7 @@ class SettingsAdapter( | |||
| 103 | notifyDataSetChanged() | 103 | notifyDataSetChanged() |
| 104 | } | 104 | } |
| 105 | 105 | ||
| 106 | fun onBooleanClick(item: CheckBoxSetting, position: Int, checked: Boolean) { | 106 | fun onBooleanClick(item: SwitchSetting, position: Int, checked: Boolean) { |
| 107 | val setting = item.setChecked(checked) | 107 | val setting = item.setChecked(checked) |
| 108 | if (setting != null) { | 108 | if (setting != null) { |
| 109 | fragmentView.putSetting(setting) | 109 | 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.kt index f475b26c4..ef825ec58 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) | |||
| 139 | val cpuAccuracy = cpuSection!!.getSetting(SettingsFile.KEY_CPU_ACCURACY) | 139 | val cpuAccuracy = cpuSection!!.getSetting(SettingsFile.KEY_CPU_ACCURACY) |
| 140 | sl.apply { | 140 | sl.apply { |
| 141 | add( | 141 | add( |
| 142 | CheckBoxSetting( | 142 | SwitchSetting( |
| 143 | SettingsFile.KEY_RENDERER_USE_SPEED_LIMIT, | 143 | SettingsFile.KEY_RENDERER_USE_SPEED_LIMIT, |
| 144 | Settings.SECTION_RENDERER, | 144 | Settings.SECTION_RENDERER, |
| 145 | frameLimitEnable, | 145 | frameLimitEnable, |
| @@ -184,7 +184,7 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView) | |||
| 184 | val language = systemSection.getSetting(SettingsFile.KEY_LANGUAGE_INDEX) | 184 | val language = systemSection.getSetting(SettingsFile.KEY_LANGUAGE_INDEX) |
| 185 | sl.apply { | 185 | sl.apply { |
| 186 | add( | 186 | add( |
| 187 | CheckBoxSetting( | 187 | SwitchSetting( |
| 188 | SettingsFile.KEY_USE_DOCKED_MODE, | 188 | SettingsFile.KEY_USE_DOCKED_MODE, |
| 189 | Settings.SECTION_SYSTEM, | 189 | Settings.SECTION_SYSTEM, |
| 190 | dockedMode, | 190 | dockedMode, |
| @@ -283,7 +283,7 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView) | |||
| 283 | ) | 283 | ) |
| 284 | ) | 284 | ) |
| 285 | add( | 285 | add( |
| 286 | CheckBoxSetting( | 286 | SwitchSetting( |
| 287 | SettingsFile.KEY_RENDERER_FORCE_MAX_CLOCK, | 287 | SettingsFile.KEY_RENDERER_FORCE_MAX_CLOCK, |
| 288 | Settings.SECTION_RENDERER, | 288 | Settings.SECTION_RENDERER, |
| 289 | rendererForceMaxClocks, | 289 | rendererForceMaxClocks, |
| @@ -293,7 +293,7 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView) | |||
| 293 | ) | 293 | ) |
| 294 | ) | 294 | ) |
| 295 | add( | 295 | add( |
| 296 | CheckBoxSetting( | 296 | SwitchSetting( |
| 297 | SettingsFile.KEY_RENDERER_ASYNCHRONOUS_SHADERS, | 297 | SettingsFile.KEY_RENDERER_ASYNCHRONOUS_SHADERS, |
| 298 | Settings.SECTION_RENDERER, | 298 | Settings.SECTION_RENDERER, |
| 299 | rendererAsynchronousShaders, | 299 | rendererAsynchronousShaders, |
| @@ -303,7 +303,7 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView) | |||
| 303 | ) | 303 | ) |
| 304 | ) | 304 | ) |
| 305 | add( | 305 | add( |
| 306 | CheckBoxSetting( | 306 | SwitchSetting( |
| 307 | SettingsFile.KEY_RENDERER_DEBUG, | 307 | SettingsFile.KEY_RENDERER_DEBUG, |
| 308 | Settings.SECTION_RENDERER, | 308 | Settings.SECTION_RENDERER, |
| 309 | rendererDebug, | 309 | 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.kt index 3296aed68..f8b229830 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.CompoundButton | |||
| 8 | import android.widget.TextView | 8 | import android.widget.TextView |
| 9 | import com.google.android.material.materialswitch.MaterialSwitch | 9 | import com.google.android.material.materialswitch.MaterialSwitch |
| 10 | import org.yuzu.yuzu_emu.R | 10 | import org.yuzu.yuzu_emu.R |
| 11 | import org.yuzu.yuzu_emu.features.settings.model.view.CheckBoxSetting | 11 | import org.yuzu.yuzu_emu.features.settings.model.view.SwitchSetting |
| 12 | import org.yuzu.yuzu_emu.features.settings.model.view.SettingsItem | 12 | import org.yuzu.yuzu_emu.features.settings.model.view.SettingsItem |
| 13 | import org.yuzu.yuzu_emu.features.settings.ui.SettingsAdapter | 13 | import org.yuzu.yuzu_emu.features.settings.ui.SettingsAdapter |
| 14 | 14 | ||
| 15 | class CheckBoxSettingViewHolder(itemView: View, adapter: SettingsAdapter) : | 15 | class SwitchSettingViewHolder(itemView: View, adapter: SettingsAdapter) : |
| 16 | SettingViewHolder(itemView, adapter) { | 16 | SettingViewHolder(itemView, adapter) { |
| 17 | private lateinit var item: CheckBoxSetting | 17 | private lateinit var item: SwitchSetting |
| 18 | private lateinit var textSettingName: TextView | 18 | private lateinit var textSettingName: TextView |
| 19 | private lateinit var textSettingDescription: TextView | 19 | private lateinit var textSettingDescription: TextView |
| 20 | private lateinit var switch: MaterialSwitch | 20 | private lateinit var switch: MaterialSwitch |
| @@ -26,7 +26,7 @@ class CheckBoxSettingViewHolder(itemView: View, adapter: SettingsAdapter) : | |||
| 26 | } | 26 | } |
| 27 | 27 | ||
| 28 | override fun bind(item: SettingsItem) { | 28 | override fun bind(item: SettingsItem) { |
| 29 | this.item = item as CheckBoxSetting | 29 | this.item = item as SwitchSetting |
| 30 | textSettingName.setText(item.nameId) | 30 | textSettingName.setText(item.nameId) |
| 31 | if (item.descriptionId!! > 0) { | 31 | if (item.descriptionId!! > 0) { |
| 32 | textSettingDescription.setText(item.descriptionId) | 32 | textSettingDescription.setText(item.descriptionId) |