android: Refactor CheckBoxSetting to SwitchSetting
This commit is contained in:
parent
b5b4e50c32
commit
4de3abdd5a
5 changed files with 14 additions and 14 deletions
|
|
@ -23,7 +23,7 @@ abstract class SettingsItem(
|
|||
|
||||
companion object {
|
||||
const val TYPE_HEADER = 0
|
||||
const val TYPE_CHECKBOX = 1
|
||||
const val TYPE_SWITCH = 1
|
||||
const val TYPE_SINGLE_CHOICE = 2
|
||||
const val TYPE_SLIDER = 3
|
||||
const val TYPE_SUBMENU = 4
|
||||
|
|
|
|||
|
|
@ -0,0 +1,94 @@
|
|||
// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
package org.yuzu.yuzu_emu.features.settings.model.view
|
||||
|
||||
import org.yuzu.yuzu_emu.R
|
||||
import org.yuzu.yuzu_emu.YuzuApplication
|
||||
import org.yuzu.yuzu_emu.features.settings.model.BooleanSetting
|
||||
import org.yuzu.yuzu_emu.features.settings.model.IntSetting
|
||||
import org.yuzu.yuzu_emu.features.settings.model.Setting
|
||||
import org.yuzu.yuzu_emu.features.settings.ui.SettingsFragmentView
|
||||
|
||||
class SwitchSetting : SettingsItem {
|
||||
override val type = TYPE_SWITCH
|
||||
|
||||
private var defaultValue: Boolean
|
||||
private var showPerformanceWarning: Boolean
|
||||
private var fragmentView: SettingsFragmentView? = null
|
||||
|
||||
constructor(
|
||||
key: String,
|
||||
section: String,
|
||||
setting: Setting?,
|
||||
titleId: Int,
|
||||
descriptionId: Int,
|
||||
defaultValue: Boolean
|
||||
) : super(key, section, setting, titleId, descriptionId) {
|
||||
this.defaultValue = defaultValue
|
||||
showPerformanceWarning = false
|
||||
}
|
||||
|
||||
constructor(
|
||||
key: String,
|
||||
section: String,
|
||||
titleId: Int,
|
||||
descriptionId: Int,
|
||||
defaultValue: Boolean,
|
||||
setting: Setting,
|
||||
show_performance_warning: Boolean,
|
||||
view: SettingsFragmentView
|
||||
) : super(key, section, setting, titleId, descriptionId) {
|
||||
this.defaultValue = defaultValue
|
||||
fragmentView = view
|
||||
showPerformanceWarning = show_performance_warning
|
||||
}
|
||||
|
||||
val isChecked: Boolean
|
||||
get() {
|
||||
if (setting == null) {
|
||||
return defaultValue
|
||||
}
|
||||
|
||||
// Try integer setting
|
||||
try {
|
||||
val setting = setting as IntSetting
|
||||
return setting.value == 1
|
||||
} catch (_: ClassCastException) {
|
||||
}
|
||||
|
||||
// Try boolean setting
|
||||
try {
|
||||
val setting = setting as BooleanSetting
|
||||
return setting.value
|
||||
} catch (_: ClassCastException) {
|
||||
}
|
||||
return defaultValue
|
||||
}
|
||||
|
||||
/**
|
||||
* Write a value to the backing boolean. If that boolean was previously null,
|
||||
* initializes a new one and returns it, so it can be added to the Hashmap.
|
||||
*
|
||||
* @param checked Pretty self explanatory.
|
||||
* @return null if overwritten successfully; otherwise, a newly created BooleanSetting.
|
||||
*/
|
||||
fun setChecked(checked: Boolean): IntSetting? {
|
||||
// Show a performance warning if the setting has been disabled
|
||||
if (showPerformanceWarning && !checked) {
|
||||
fragmentView!!.showToastMessage(
|
||||
YuzuApplication.appContext.getString(R.string.performance_warning), true
|
||||
)
|
||||
}
|
||||
|
||||
return if (setting == null) {
|
||||
val newSetting = IntSetting(key!!, section!!, if (checked) 1 else 0)
|
||||
setting = newSetting
|
||||
newSetting
|
||||
} else {
|
||||
val newSetting = setting as IntSetting
|
||||
newSetting.value = if (checked) 1 else 0
|
||||
null
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -0,0 +1,47 @@
|
|||
// 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 android.widget.CompoundButton
|
||||
import android.widget.TextView
|
||||
import com.google.android.material.materialswitch.MaterialSwitch
|
||||
import org.yuzu.yuzu_emu.R
|
||||
import org.yuzu.yuzu_emu.features.settings.model.view.SwitchSetting
|
||||
import org.yuzu.yuzu_emu.features.settings.model.view.SettingsItem
|
||||
import org.yuzu.yuzu_emu.features.settings.ui.SettingsAdapter
|
||||
|
||||
class SwitchSettingViewHolder(itemView: View, adapter: SettingsAdapter) :
|
||||
SettingViewHolder(itemView, adapter) {
|
||||
private lateinit var item: SwitchSetting
|
||||
private lateinit var textSettingName: TextView
|
||||
private lateinit var textSettingDescription: TextView
|
||||
private lateinit var switch: MaterialSwitch
|
||||
|
||||
override fun findViews(root: View) {
|
||||
textSettingName = root.findViewById(R.id.text_setting_name)
|
||||
textSettingDescription = root.findViewById(R.id.text_setting_description)
|
||||
switch = root.findViewById(R.id.switch_widget)
|
||||
}
|
||||
|
||||
override fun bind(item: SettingsItem) {
|
||||
this.item = item as SwitchSetting
|
||||
textSettingName.setText(item.nameId)
|
||||
if (item.descriptionId!! > 0) {
|
||||
textSettingDescription.setText(item.descriptionId)
|
||||
textSettingDescription.visibility = View.VISIBLE
|
||||
} else {
|
||||
textSettingDescription.text = ""
|
||||
textSettingDescription.visibility = View.GONE
|
||||
}
|
||||
switch.isChecked = this.item.isChecked
|
||||
switch.setOnCheckedChangeListener { _: CompoundButton, _: Boolean ->
|
||||
adapter.onBooleanClick(item, bindingAdapterPosition, switch.isChecked)
|
||||
}
|
||||
}
|
||||
|
||||
override fun onClick(clicked: View) {
|
||||
switch.toggle()
|
||||
}
|
||||
}
|
||||
Loading…
Reference in a new issue