diff --git a/Habitica/Habitica.iml b/Habitica/Habitica.iml index d02415d8c..c9d944a1a 100644 --- a/Habitica/Habitica.iml +++ b/Habitica/Habitica.iml @@ -145,13 +145,13 @@ - + - + diff --git a/Habitica/res/drawable-hdpi/ic_check.png b/Habitica/res/drawable-hdpi/ic_check.png new file mode 100644 index 000000000..9b35f7877 Binary files /dev/null and b/Habitica/res/drawable-hdpi/ic_check.png differ diff --git a/Habitica/res/drawable-mdpi/ic_check.png b/Habitica/res/drawable-mdpi/ic_check.png new file mode 100644 index 000000000..de60e901d Binary files /dev/null and b/Habitica/res/drawable-mdpi/ic_check.png differ diff --git a/Habitica/res/drawable-xhdpi/ic_check.png b/Habitica/res/drawable-xhdpi/ic_check.png new file mode 100644 index 000000000..a23a68ed3 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/ic_check.png differ diff --git a/Habitica/res/drawable-xxhdpi/ic_check.png b/Habitica/res/drawable-xxhdpi/ic_check.png new file mode 100644 index 000000000..40de60c36 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/ic_check.png differ diff --git a/Habitica/res/drawable/daily_checkbox.xml b/Habitica/res/drawable/daily_checkbox.xml new file mode 100644 index 000000000..1d2d0b595 --- /dev/null +++ b/Habitica/res/drawable/daily_checkbox.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/Habitica/res/drawable/daily_checked.xml b/Habitica/res/drawable/daily_checked.xml new file mode 100644 index 000000000..4d383c294 --- /dev/null +++ b/Habitica/res/drawable/daily_checked.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/Habitica/res/drawable/daily_unchecked.xml b/Habitica/res/drawable/daily_unchecked.xml new file mode 100644 index 000000000..dfb158862 --- /dev/null +++ b/Habitica/res/drawable/daily_unchecked.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/Habitica/res/drawable/todo_checkbox.xml b/Habitica/res/drawable/todo_checkbox.xml new file mode 100644 index 000000000..c00dbb67b --- /dev/null +++ b/Habitica/res/drawable/todo_checkbox.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/Habitica/res/drawable/todo_checked.xml b/Habitica/res/drawable/todo_checked.xml new file mode 100644 index 000000000..2365d3922 --- /dev/null +++ b/Habitica/res/drawable/todo_checked.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/Habitica/res/drawable/todo_unchecked.xml b/Habitica/res/drawable/todo_unchecked.xml new file mode 100644 index 000000000..d285dec04 --- /dev/null +++ b/Habitica/res/drawable/todo_unchecked.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/Habitica/res/layout/checklist_item_row.xml b/Habitica/res/layout/checklist_item_row.xml index 700640f7b..6b0f1873f 100644 --- a/Habitica/res/layout/checklist_item_row.xml +++ b/Habitica/res/layout/checklist_item_row.xml @@ -6,12 +6,18 @@ android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="fill_parent" android:minHeight="@dimen/checklist_item_min_height"> + + android:layout_width="@dimen/checkbox_size" + android:layout_height="@dimen/checkbox_size" + android:layout_centerInParent="true" + android:gravity="center" + android:button="@drawable/daily_checkbox" + android:layout_gravity="center_horizontal" /> + - + + app:backgroundColor="@{daily.isDisplayedActive ? daily.getLightTaskColor : @color/task_gray}"> + + @@ -36,7 +43,11 @@ android:orientation="vertical" android:layout_width="wrap_content" android:layout_height="match_parent" - android:padding="5dp" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:paddingEnd="16dp" + android:paddingBottom="20dp" + android:paddingTop="20dp" android:id="@+id/linearLayout" android:layout_alignParentTop="true" android:layout_alignParentLeft="true" @@ -53,7 +64,7 @@ android:id="@+id/textView6" style="@style/CardText" android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_height="wrap_content" android:text="@{daily.notes}" android:visibility="@{daily.notes != null ? View.VISIBLE : View.GONE}"/> @@ -93,7 +104,7 @@ android:id="@+id/rightBorderView" android:layout_width="5dp" android:layout_height="match_parent" - app:backgroundColor="@{daily.isDue ? daily.getLightTaskColor : @color/task_gray}" + app:backgroundColor="@{daily.isDisplayedActive ? daily.getLightTaskColor : @color/task_gray}" android:visibility="@{daily.checklist.size == 0 ? View.VISIBLE : View.GONE}" android:gravity="center" android:layout_alignParentTop="true" diff --git a/Habitica/res/layout/todo_item_card.xml b/Habitica/res/layout/todo_item_card.xml index b4bb70ac4..cd29ee7cc 100644 --- a/Habitica/res/layout/todo_item_card.xml +++ b/Habitica/res/layout/todo_item_card.xml @@ -21,14 +21,22 @@ + android:layout_height="match_parent" + android:orientation="horizontal"> + + android:layout_width="@dimen/checkbox_size" + android:layout_height="@dimen/checkbox_size" + android:layout_centerInParent="true" + android:checked="@{todo.completed}" + android:gravity="center" + android:button="@drawable/todo_checkbox" + android:layout_gravity="center_horizontal" /> + #c3c2c6 #ededed - #b5b5b5 + #b7b7b7 + #50ffffff + #c8ffffff + #32000000 \ No newline at end of file diff --git a/Habitica/res/values/dimens.xml b/Habitica/res/values/dimens.xml index c28118827..d9475259c 100644 --- a/Habitica/res/values/dimens.xml +++ b/Habitica/res/values/dimens.xml @@ -39,4 +39,7 @@ 14dp 36dp 50dp + + 2dp + 30dp \ No newline at end of file diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml index 682b10a76..57fca5b64 100644 --- a/Habitica/res/values/styles.xml +++ b/Habitica/res/values/styles.xml @@ -124,4 +124,11 @@ + + \ No newline at end of file diff --git a/Habitica/src/com/habitrpg/android/habitica/MainActivity.java b/Habitica/src/com/habitrpg/android/habitica/MainActivity.java index 4ce30115b..51afbc5b3 100644 --- a/Habitica/src/com/habitrpg/android/habitica/MainActivity.java +++ b/Habitica/src/com/habitrpg/android/habitica/MainActivity.java @@ -239,11 +239,9 @@ public class MainActivity extends AvatarActivityBase implements HabitRPGUserCall } public void onEvent(TaskLongPressedEvent event) { - showSnackbar("LongPress: " + event.Task.text); } public void onEvent(TaskCheckedEvent event) { - showSnackbar("ToDo Checked= " + event.Task.getText(), true); mAPIHelper.updateTaskDirection(event.Task.getId(), event.Task.getCompleted() ? TaskDirection.down : TaskDirection.up, new TaskScoringCallback(this, event.Task.getId())); } diff --git a/Habitica/src/com/habitrpg/android/habitica/callbacks/TaskScoringCallback.java b/Habitica/src/com/habitrpg/android/habitica/callbacks/TaskScoringCallback.java index 3127cf8a9..b65c17145 100644 --- a/Habitica/src/com/habitrpg/android/habitica/callbacks/TaskScoringCallback.java +++ b/Habitica/src/com/habitrpg/android/habitica/callbacks/TaskScoringCallback.java @@ -27,6 +27,7 @@ public class TaskScoringCallback implements Callback { public void success(TaskDirectionData taskDirectionData, Response response) { Task task = new Select().from(Task.class).where(Condition.column("id").eq(taskId)).querySingle(); task.value = task.value + taskDirectionData.getDelta(); + task.save(); this.mCallback.onTaskDataReceived(taskDirectionData); } 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 8add8c7e3..76655375c 100644 --- a/Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java +++ b/Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java @@ -392,6 +392,9 @@ public class HabitItemRecyclerViewAdapter TaskCheckedEvent event = new TaskCheckedEvent(); event.Task = Item; EventBus.getDefault().post(event); + Item.completed = !Item.getCompleted(); + Item.save(); + bindHolder(Item, getAdapterPosition()); } } else { Integer position = (Integer) ((ViewGroup) checkbox.getParent().getParent()).indexOfChild((View) checkbox.getParent()); diff --git a/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/tasks/Task.java b/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/tasks/Task.java index 224b2ddb5..c31ba0370 100644 --- a/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/tasks/Task.java +++ b/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/tasks/Task.java @@ -409,4 +409,8 @@ public class Task extends BaseModel { //TODO: check if daily is due return !this.getCompleted(); } + + public Boolean isDisplayedActive() { + return this.isDue() && !this.completed; + } }