Browse Source
Merge pull request #13086 from t895/clear-button-fix
android: Fix broken clear button check
pull/15/merge
liamwhite
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with
7 additions and
16 deletions
-
src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt
-
src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/DateTimeViewHolder.kt
-
src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SingleChoiceViewHolder.kt
-
src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SliderViewHolder.kt
-
src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SwitchSettingViewHolder.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 = 0 |
|
|
|
const val TYPE_SWITCH = 1 |
|
|
|
|
|
|
|
@ -13,7 +13,6 @@ import org.yuzu.yuzu_emu.databinding.ListItemSettingBinding |
|
|
|
import org.yuzu.yuzu_emu.features.settings.model.view.DateTimeSetting |
|
|
|
import org.yuzu.yuzu_emu.features.settings.model.view.SettingsItem |
|
|
|
import org.yuzu.yuzu_emu.features.settings.ui.SettingsAdapter |
|
|
|
import org.yuzu.yuzu_emu.utils.NativeConfig |
|
|
|
import org.yuzu.yuzu_emu.utils.ViewUtils.setVisible |
|
|
|
|
|
|
|
class DateTimeViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAdapter) : |
|
|
|
@ -32,9 +31,7 @@ class DateTimeViewHolder(val binding: ListItemSettingBinding, adapter: SettingsA |
|
|
|
val 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) |
|
|
|
} |
|
|
|
|
|
|
|
@ -10,7 +10,6 @@ import org.yuzu.yuzu_emu.features.settings.model.view.SettingsItem |
|
|
|
import org.yuzu.yuzu_emu.features.settings.model.view.SingleChoiceSetting |
|
|
|
import org.yuzu.yuzu_emu.features.settings.model.view.StringSingleChoiceSetting |
|
|
|
import org.yuzu.yuzu_emu.features.settings.ui.SettingsAdapter |
|
|
|
import org.yuzu.yuzu_emu.utils.NativeConfig |
|
|
|
import org.yuzu.yuzu_emu.utils.ViewUtils.setVisible |
|
|
|
|
|
|
|
class SingleChoiceViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAdapter) : |
|
|
|
@ -48,9 +47,7 @@ class SingleChoiceViewHolder(val binding: ListItemSettingBinding, adapter: Setti |
|
|
|
binding.textSettingValue.setVisible(false) |
|
|
|
} |
|
|
|
|
|
|
|
binding.buttonClear.setVisible( |
|
|
|
!setting.setting.global || NativeConfig.isPerGameConfigLoaded() |
|
|
|
) |
|
|
|
binding.buttonClear.setVisible(setting.clearable) |
|
|
|
binding.buttonClear.setOnClickListener { |
|
|
|
adapter.onClearClick(setting, bindingAdapterPosition) |
|
|
|
} |
|
|
|
|
|
|
|
@ -9,7 +9,6 @@ import org.yuzu.yuzu_emu.databinding.ListItemSettingBinding |
|
|
|
import org.yuzu.yuzu_emu.features.settings.model.view.SettingsItem |
|
|
|
import org.yuzu.yuzu_emu.features.settings.model.view.SliderSetting |
|
|
|
import org.yuzu.yuzu_emu.features.settings.ui.SettingsAdapter |
|
|
|
import org.yuzu.yuzu_emu.utils.NativeConfig |
|
|
|
import org.yuzu.yuzu_emu.utils.ViewUtils.setVisible |
|
|
|
|
|
|
|
class SliderViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAdapter) : |
|
|
|
@ -28,9 +27,7 @@ class SliderViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAda |
|
|
|
setting.units |
|
|
|
) |
|
|
|
|
|
|
|
binding.buttonClear.setVisible( |
|
|
|
!setting.setting.global || NativeConfig.isPerGameConfigLoaded() |
|
|
|
) |
|
|
|
binding.buttonClear.setVisible(setting.clearable) |
|
|
|
binding.buttonClear.setOnClickListener { |
|
|
|
adapter.onClearClick(setting, bindingAdapterPosition) |
|
|
|
} |
|
|
|
|
|
|
|
@ -9,7 +9,6 @@ import org.yuzu.yuzu_emu.databinding.ListItemSettingSwitchBinding |
|
|
|
import org.yuzu.yuzu_emu.features.settings.model.view.SettingsItem |
|
|
|
import org.yuzu.yuzu_emu.features.settings.model.view.SwitchSetting |
|
|
|
import org.yuzu.yuzu_emu.features.settings.ui.SettingsAdapter |
|
|
|
import org.yuzu.yuzu_emu.utils.NativeConfig |
|
|
|
import org.yuzu.yuzu_emu.utils.ViewUtils.setVisible |
|
|
|
|
|
|
|
class SwitchSettingViewHolder(val binding: ListItemSettingSwitchBinding, adapter: SettingsAdapter) : |
|
|
|
@ -29,9 +28,7 @@ class SwitchSettingViewHolder(val binding: ListItemSettingSwitchBinding, adapter |
|
|
|
adapter.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) |
|
|
|
} |
|
|
|
|
