diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/SettingsItem.kt b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/SettingsItem.kt index 544131b5b..a7b315790 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/SettingsItem.kt +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/SettingsItem.kt @@ -30,6 +30,11 @@ abstract class SettingsItem( open var isEnabled: Boolean = true + val isActive: Boolean + get() { + return this.isEditable && this.isEnabled + } + companion object { const val TYPE_HEADER = 0 const val TYPE_SWITCH = 1 diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/DateTimeViewHolder.kt b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/DateTimeViewHolder.kt index 45f875cd8..25a661d23 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/DateTimeViewHolder.kt +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/DateTimeViewHolder.kt @@ -47,7 +47,7 @@ class DateTimeViewHolder(val binding: ListItemSettingBinding, adapter: SettingsA val dateFormatter = DateTimeFormatter.ofLocalizedDateTime(FormatStyle.MEDIUM) binding.textSettingValue.text = dateFormatter.format(zonedTime) - if (setting.isEditable && setting.isEnabled) { + if (setting.isActive) { binding.textSettingName.alpha = 1f binding.textSettingDescription.alpha = 1f binding.textSettingValue.alpha = 1f @@ -59,7 +59,7 @@ class DateTimeViewHolder(val binding: ListItemSettingBinding, adapter: SettingsA } override fun onClick(clicked: View) { - if (setting.isEditable && setting.isEnabled) { + if (setting.isActive) { adapter.onDateTimeClick(setting, bindingAdapterPosition) } else { adapter.onClickDisabledSetting(!setting.isEditable) @@ -67,7 +67,7 @@ class DateTimeViewHolder(val binding: ListItemSettingBinding, adapter: SettingsA } override fun onLongClick(clicked: View): Boolean { - if (setting.isEditable && setting.isEnabled) { + if (setting.isActive) { return adapter.onLongClick(setting.setting!!, bindingAdapterPosition) } else { adapter.onClickDisabledSetting(!setting.isEditable) diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/SingleChoiceViewHolder.kt b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/SingleChoiceViewHolder.kt index 85b5886ae..97022fcfd 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/SingleChoiceViewHolder.kt +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/SingleChoiceViewHolder.kt @@ -27,7 +27,7 @@ class SingleChoiceViewHolder(val binding: ListItemSettingBinding, adapter: Setti binding.textSettingValue.visibility = View.VISIBLE binding.textSettingValue.text = getTextSetting() - if (setting.isEditable && setting.isEnabled) { + if (setting.isActive) { binding.textSettingName.alpha = 1f binding.textSettingDescription.alpha = 1f binding.textSettingValue.alpha = 1f @@ -84,7 +84,7 @@ class SingleChoiceViewHolder(val binding: ListItemSettingBinding, adapter: Setti } override fun onLongClick(clicked: View): Boolean { - if (setting.isEditable && setting.isEnabled) { + if (setting.isActive) { return adapter.onLongClick(setting.setting!!, bindingAdapterPosition) } else { adapter.onClickDisabledSetting(!setting.isEditable) diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/SliderViewHolder.kt b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/SliderViewHolder.kt index 3604fd437..01c7e62df 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/SliderViewHolder.kt +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/SliderViewHolder.kt @@ -35,7 +35,7 @@ class SliderViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAda else -> "${(setting.setting as AbstractIntSetting).int}${setting.units}" } - if (setting.isEditable && setting.isEnabled) { + if (setting.isActive) { binding.textSettingName.alpha = 1f binding.textSettingDescription.alpha = 1f binding.textSettingValue.alpha = 1f @@ -47,7 +47,7 @@ class SliderViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAda } override fun onClick(clicked: View) { - if (setting.isEditable && setting.isEnabled) { + if (setting.isActive) { adapter.onSliderClick(setting, bindingAdapterPosition) } else { adapter.onClickDisabledSetting(!setting.isEditable) @@ -55,7 +55,7 @@ class SliderViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAda } override fun onLongClick(clicked: View): Boolean { - if (setting.isEditable && setting.isEnabled) { + if (setting.isActive) { return adapter.onLongClick(setting.setting!!, bindingAdapterPosition) } else { adapter.onClickDisabledSetting(!setting.isEditable) diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/StringInputViewHolder.kt b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/StringInputViewHolder.kt index 899d25438..ef02f2b60 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/StringInputViewHolder.kt +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/StringInputViewHolder.kt @@ -26,7 +26,7 @@ class StringInputViewHolder(val binding: ListItemSettingBinding, adapter: Settin binding.textSettingValue.visibility = View.VISIBLE binding.textSettingValue.text = setting.setting?.valueAsString - if (setting.isEditable && setting.isEnabled) { + if (setting.isActive) { binding.textSettingName.alpha = 1f binding.textSettingDescription.alpha = 1f binding.textSettingValue.alpha = 1f @@ -46,7 +46,7 @@ class StringInputViewHolder(val binding: ListItemSettingBinding, adapter: Settin } override fun onLongClick(clicked: View): Boolean { - if (setting.isEditable && setting.isEnabled) { + if (setting.isActive) { return adapter.onLongClick(setting.setting!!, bindingAdapterPosition) } else { adapter.onClickDisabledSetting(!setting.isEditable) diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/SwitchSettingViewHolder.kt b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/SwitchSettingViewHolder.kt index d63e05b86..aed9bf44e 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/SwitchSettingViewHolder.kt +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/SwitchSettingViewHolder.kt @@ -33,15 +33,15 @@ class SwitchSettingViewHolder(val binding: ListItemSettingSwitchBinding, adapter adapter.onBooleanClick(item, bindingAdapterPosition, binding.switchWidget.isChecked) } - binding.switchWidget.isEnabled = setting.isEditable && setting.isEnabled + binding.switchWidget.isEnabled = setting.isActive - val textAlpha = if (setting.isEditable && setting.isEnabled) 1f else 0.5f + val textAlpha = if (setting.isActive) 1f else 0.5f binding.textSettingName.alpha = textAlpha binding.textSettingDescription.alpha = textAlpha } override fun onClick(clicked: View) { - if (setting.isEditable && setting.isEnabled) { + if (setting.isActive) { binding.switchWidget.toggle() } else { adapter.onClickDisabledSetting(!setting.isEditable) @@ -49,7 +49,7 @@ class SwitchSettingViewHolder(val binding: ListItemSettingSwitchBinding, adapter } override fun onLongClick(clicked: View): Boolean { - if (setting.isEditable && setting.isEnabled) { + if (setting.isActive) { return adapter.onLongClick(setting.setting!!, bindingAdapterPosition) } else { adapter.onClickDisabledSetting(!setting.isEditable)