From 3be14accd7bf89184f5fde7791b85f83b6c723a3 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Tue, 1 Dec 2015 19:41:07 +0100 Subject: [PATCH 1/5] Whitespace for tasks. Fixes #82 --- Habitica/res/layout/daily_item_card.xml | 4 ++-- Habitica/res/layout/habit_item_card.xml | 5 +++-- Habitica/res/layout/todo_item_card.xml | 11 ++++++++--- Habitica/res/values/dimens.xml | 1 + 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/Habitica/res/layout/daily_item_card.xml b/Habitica/res/layout/daily_item_card.xml index 41152c3de..740e592b3 100644 --- a/Habitica/res/layout/daily_item_card.xml +++ b/Habitica/res/layout/daily_item_card.xml @@ -49,8 +49,8 @@ android:paddingLeft="16dp" android:paddingRight="16dp" android:paddingEnd="16dp" - android:paddingBottom="20dp" - android:paddingTop="20dp" + android:paddingBottom="@dimen/task_top_bottom_padding" + android:paddingTop="@dimen/task_top_bottom_padding" android:id="@+id/linearLayout" android:layout_alignParentTop="true" android:layout_alignParentLeft="true" diff --git a/Habitica/res/layout/habit_item_card.xml b/Habitica/res/layout/habit_item_card.xml index 5fc74041a..ba2794a53 100644 --- a/Habitica/res/layout/habit_item_card.xml +++ b/Habitica/res/layout/habit_item_card.xml @@ -16,6 +16,7 @@ android:layout_height="wrap_content" android:orientation="vertical" android:background="@color/white"> + android:minHeight="@dimen/task_min_height"> @@ -56,8 +57,8 @@ android:paddingLeft="16dp" android:paddingRight="16dp" android:paddingEnd="16dp" - android:paddingBottom="20dp" - android:paddingTop="20dp"> + android:paddingBottom="@dimen/task_top_bottom_padding" + android:paddingTop="@dimen/task_top_bottom_padding"> + android:layout_height="wrap_content" + android:orientation="vertical" + android:layout_centerVertical="true" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:paddingEnd="16dp" + android:paddingBottom="@dimen/task_top_bottom_padding" + android:paddingTop="@dimen/task_top_bottom_padding"> 30dp 350dp + 20dp \ No newline at end of file From 03a1bdcafaa3d39d7bc00c623b27bb5ae813f51b Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Tue, 1 Dec 2015 19:51:38 +0100 Subject: [PATCH 2/5] fix crash when saving task without checklist --- .../com/habitrpg/android/habitica/TaskFormActivity.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Habitica/src/com/habitrpg/android/habitica/TaskFormActivity.java b/Habitica/src/com/habitrpg/android/habitica/TaskFormActivity.java index e4ebe6322..51c623b5a 100644 --- a/Habitica/src/com/habitrpg/android/habitica/TaskFormActivity.java +++ b/Habitica/src/com/habitrpg/android/habitica/TaskFormActivity.java @@ -302,7 +302,12 @@ public class TaskFormActivity extends AppCompatActivity implements AdapterView.O private boolean saveTask(Task task) { task.text = taskText.getText().toString(); - task.setChecklist(checklistAdapter.getCheckListItems()); + if (checklistAdapter != null) { + if (checklistAdapter.getCheckListItems() != null) { + task.setChecklist(checklistAdapter.getCheckListItems()); + } + } + if (task.text.isEmpty()) return false; From b7ad6c086e07d524e6d2fa3e9fb2f6cb37767ba9 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Tue, 1 Dec 2015 19:54:13 +0100 Subject: [PATCH 3/5] update user on launch. Fixes #83 --- .../src/com/habitrpg/android/habitica/MainActivity.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Habitica/src/com/habitrpg/android/habitica/MainActivity.java b/Habitica/src/com/habitrpg/android/habitica/MainActivity.java index 0a7aac68e..5ded2df4d 100644 --- a/Habitica/src/com/habitrpg/android/habitica/MainActivity.java +++ b/Habitica/src/com/habitrpg/android/habitica/MainActivity.java @@ -158,6 +158,12 @@ public class MainActivity extends InstabugAppCompatActivity implements HabitRPGU drawer.setSelection(MainDrawerBuilder.SIDEBAR_PURCHASE); } + @Override + public void onStart() { + super.onStart(); + mAPIHelper.retrieveUser(new HabitRPGUserCallback(this)); + } + @Override public boolean onCreateOptionsMenu(Menu menu) { return true; From f11826b1745a4a5705bdfc4d97a18067c5324ec4 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Tue, 1 Dec 2015 20:12:57 +0100 Subject: [PATCH 4/5] only lock right drawer. Fixes #77 --- .../android/habitica/ui/fragments/TasksFragment.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/TasksFragment.java b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/TasksFragment.java index d960a6ad7..88bf25571 100644 --- a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/TasksFragment.java +++ b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/TasksFragment.java @@ -149,7 +149,7 @@ public class TasksFragment extends BaseFragment implements TaskScoringCallback.O .withCloseOnClick(false) .append(activity.drawer); - filterDrawer.getDrawerLayout().setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED); + filterDrawer.getDrawerLayout().setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED, Gravity.RIGHT); viewPager.setCurrentItem(0); this.tagsHelper = new TagsHelper(); @@ -682,8 +682,8 @@ public class TasksFragment extends BaseFragment implements TaskScoringCallback.O @Override public void onDestroyView() { - filterDrawer.getDrawerLayout().setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED); - + DrawerLayout layout = filterDrawer.getDrawerLayout(); + layout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED, Gravity.RIGHT); super.onDestroyView(); } } From 81e5ed41a952681be6ba16aa425abedbb8f82dba Mon Sep 17 00:00:00 2001 From: Franze Jr Date: Tue, 1 Dec 2015 18:17:35 -0300 Subject: [PATCH 5/5] Check validation for task - it was crashing the daily creation --- .../src/com/habitrpg/android/habitica/TaskFormActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Habitica/src/com/habitrpg/android/habitica/TaskFormActivity.java b/Habitica/src/com/habitrpg/android/habitica/TaskFormActivity.java index 51c623b5a..9d392e8c4 100644 --- a/Habitica/src/com/habitrpg/android/habitica/TaskFormActivity.java +++ b/Habitica/src/com/habitrpg/android/habitica/TaskFormActivity.java @@ -129,7 +129,7 @@ public class TaskFormActivity extends AppCompatActivity implements AdapterView.O private void createCheckListRecyclerView() { List checklistItems = new ArrayList<>(); - if (task.getChecklist() != null) { + if (task != null && task.getChecklist() != null) { checklistItems = task.getChecklist(); } checklistAdapter = new CheckListAdapter(checklistItems);