From b5165752dfa60dccc5f43ede11461d7e68d549ca Mon Sep 17 00:00:00 2001 From: Darron Lumley Date: Thu, 17 Dec 2015 21:52:05 +1100 Subject: [PATCH] Made the relativelayout holder of the task checkbox react to click events --- Habitica/res/layout/daily_item_card.xml | 1 + Habitica/res/layout/todo_item_card.xml | 1 + .../adapter/HabitItemRecyclerViewAdapter.java | 17 +++++++++++++++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/Habitica/res/layout/daily_item_card.xml b/Habitica/res/layout/daily_item_card.xml index 740e592b3..7c2b04be6 100644 --- a/Habitica/res/layout/daily_item_card.xml +++ b/Habitica/res/layout/daily_item_card.xml @@ -26,6 +26,7 @@ android:layout_height="match_parent" android:orientation="horizontal"> diff --git a/Habitica/res/layout/todo_item_card.xml b/Habitica/res/layout/todo_item_card.xml index 86697f3bd..75f55d111 100644 --- a/Habitica/res/layout/todo_item_card.xml +++ b/Habitica/res/layout/todo_item_card.xml @@ -24,6 +24,7 @@ android:layout_height="match_parent" android:orientation="horizontal"> diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java b/Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java index dbea011f8..fdcf807f9 100644 --- a/Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java +++ b/Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java @@ -344,6 +344,9 @@ public class HabitItemRecyclerViewAdapter public class ChecklistedViewHolder extends ViewHolder implements CompoundButton.OnCheckedChangeListener { + @Bind(R.id.checkBoxHolder) + RelativeLayout checkboxHolder; + @Bind(R.id.checkBox) CheckBox checkbox; @@ -443,6 +446,16 @@ public class HabitItemRecyclerViewAdapter } } } + + @NonNull + protected View.OnClickListener checkboxHolderClickListener() { + return new View.OnClickListener() { + @Override + public void onClick(View v) { + checkbox.setChecked(!checkbox.isChecked()); + } + }; + } } public class DailyViewHolder extends ChecklistedViewHolder { @@ -453,12 +466,11 @@ public class HabitItemRecyclerViewAdapter super(itemView); binding = DataBindingUtil.bind(itemView); - + checkboxHolder.setOnClickListener(checkboxHolderClickListener()); checkbox.setOnCheckedChangeListener(this); binding.setOffset(dailyResetOffset); } - @Override public void bindHolder(Task habitItem, int position) { super.bindHolder(habitItem, position); @@ -481,6 +493,7 @@ public class HabitItemRecyclerViewAdapter public TodoViewHolder(View itemView) { super(itemView); + checkboxHolder.setOnClickListener(checkboxHolderClickListener()); binding = DataBindingUtil.bind(itemView); }