VERY experimental Nintendo Switch 2 emulator
C++
android: Fix broken clear button check
t895fbec2ba35d5b
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 8f724835e1..03d81ceb37 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@@ -75,6 +75,9 @@ abstract class SettingsItem(get() = NativeLibrary.isRunning() && !setting.global &&!NativeConfig.isPerGameConfigLoaded()+ val clearable: Boolean+ get() = !setting.global && NativeConfig.isPerGameConfigLoaded()+companion object {const val TYPE_HEADER = 0const val TYPE_SWITCH = 1diff --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 367db7fd20..0309fad591 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@@ -13,7 +13,6 @@ import org.yuzu.yuzu_emu.databinding.ListItemSettingBindingimport org.yuzu.yuzu_emu.features.settings.model.view.DateTimeSettingimport org.yuzu.yuzu_emu.features.settings.model.view.SettingsItemimport org.yuzu.yuzu_emu.features.settings.ui.SettingsAdapter-import org.yuzu.yuzu_emu.utils.NativeConfigimport org.yuzu.yuzu_emu.utils.ViewUtils.setVisibleclass DateTimeViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAdapter) :@@ -32,9 +31,7 @@ class DateTimeViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAval dateFormatter = DateTimeFormatter.ofLocalizedDateTime(FormatStyle.MEDIUM)binding.textSettingValue.text = dateFormatter.format(zonedTime)- binding.buttonClear.setVisible(- !setting.setting.global || NativeConfig.isPerGameConfigLoaded()- )+ binding.buttonClear.setVisible(setting.clearable)binding.buttonClear.setOnClickListener {adapter.onClearClick(setting, bindingAdapterPosition)}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 e2fe0b072b..489f55455d 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@@ -10,7 +10,6 @@ import org.yuzu.yuzu_emu.features.settings.model.view.SettingsItemimport org.yuzu.yuzu_emu.features.settings.model.view.SingleChoiceSettingimport org.yuzu.yuzu_emu.features.settings.model.view.StringSingleChoiceSettingimport org.yuzu.yuzu_emu.features.settings.ui.SettingsAdapter-import org.yuzu.yuzu_emu.utils.NativeConfigimport org.yuzu.yuzu_emu.utils.ViewUtils.setVisibleclass SingleChoiceViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAdapter) :@@ -48,9 +47,7 @@ class SingleChoiceViewHolder(val binding: ListItemSettingBinding, adapter: Settibinding.textSettingValue.setVisible(false)}- binding.buttonClear.setVisible(- !setting.setting.global || NativeConfig.isPerGameConfigLoaded()- )+ binding.buttonClear.setVisible(setting.clearable)binding.buttonClear.setOnClickListener {adapter.onClearClick(setting, bindingAdapterPosition)}diff --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 a37b59b449..90a7138cb7 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@@ -9,7 +9,6 @@ import org.yuzu.yuzu_emu.databinding.ListItemSettingBindingimport org.yuzu.yuzu_emu.features.settings.model.view.SettingsItemimport org.yuzu.yuzu_emu.features.settings.model.view.SliderSettingimport org.yuzu.yuzu_emu.features.settings.ui.SettingsAdapter-import org.yuzu.yuzu_emu.utils.NativeConfigimport org.yuzu.yuzu_emu.utils.ViewUtils.setVisibleclass SliderViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAdapter) :@@ -28,9 +27,7 @@ class SliderViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAdasetting.units)- binding.buttonClear.setVisible(- !setting.setting.global || NativeConfig.isPerGameConfigLoaded()- )+ binding.buttonClear.setVisible(setting.clearable)binding.buttonClear.setOnClickListener {adapter.onClearClick(setting, bindingAdapterPosition)}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 53f7b301f0..e5763264a4 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@@ -9,7 +9,6 @@ import org.yuzu.yuzu_emu.databinding.ListItemSettingSwitchBindingimport org.yuzu.yuzu_emu.features.settings.model.view.SettingsItemimport org.yuzu.yuzu_emu.features.settings.model.view.SwitchSettingimport org.yuzu.yuzu_emu.features.settings.ui.SettingsAdapter-import org.yuzu.yuzu_emu.utils.NativeConfigimport org.yuzu.yuzu_emu.utils.ViewUtils.setVisibleclass SwitchSettingViewHolder(val binding: ListItemSettingSwitchBinding, adapter: SettingsAdapter) :@@ -29,9 +28,7 @@ class SwitchSettingViewHolder(val binding: ListItemSettingSwitchBinding, adapteradapter.onBooleanClick(setting, binding.switchWidget.isChecked, bindingAdapterPosition)}- binding.buttonClear.setVisible(- !setting.setting.global || NativeConfig.isPerGameConfigLoaded()- )+ binding.buttonClear.setVisible(setting.clearable)binding.buttonClear.setOnClickListener {adapter.onClearClick(setting, bindingAdapterPosition)}