diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/AddonAdapter.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/AddonAdapter.kt index ff254d9b77..55b39d8638 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/AddonAdapter.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/AddonAdapter.kt @@ -20,18 +20,22 @@ class AddonAdapter(val addonViewModel: AddonViewModel) : inner class AddonViewHolder(val binding: ListItemAddonBinding) : AbstractViewHolder(binding) { override fun bind(model: Patch) { - binding.root.setOnClickListener { - binding.addonCheckbox.isChecked = !binding.addonCheckbox.isChecked + binding.addonCard.setOnClickListener { + binding.addonSwitch.performClick() } binding.title.text = model.name binding.version.text = model.version - binding.addonCheckbox.setOnCheckedChangeListener { _, checked -> + binding.addonSwitch.isChecked = model.enabled + + binding.addonSwitch.setOnCheckedChangeListener { _, checked -> model.enabled = checked } - binding.addonCheckbox.isChecked = model.enabled - binding.buttonDelete.setOnClickListener { + + val deleteAction = { addonViewModel.setAddonToDelete(model) } + binding.deleteCard.setOnClickListener { deleteAction() } + binding.buttonDelete.setOnClickListener { deleteAction() } } } } diff --git a/src/android/app/src/main/res/layout/list_item_addon.xml b/src/android/app/src/main/res/layout/list_item_addon.xml index 9b1c0e6fcc..861d98d989 100644 --- a/src/android/app/src/main/res/layout/list_item_addon.xml +++ b/src/android/app/src/main/res/layout/list_item_addon.xml @@ -2,68 +2,109 @@ + android:padding="8dp"> - + app:layout_constraintEnd_toStartOf="@+id/delete_card" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toBottomOf="parent"> - + android:paddingStart="16dp" + android:paddingEnd="12dp" + android:paddingTop="12dp" + android:paddingBottom="12dp"> - + - + - + -