diff --git a/Habitica/res/drawable-hdpi/habit_minus.png b/Habitica/res/drawable-hdpi/habit_minus.png
new file mode 100644
index 000000000..11d6fc0e5
Binary files /dev/null and b/Habitica/res/drawable-hdpi/habit_minus.png differ
diff --git a/Habitica/res/drawable-hdpi/habit_minus_disabled.png b/Habitica/res/drawable-hdpi/habit_minus_disabled.png
new file mode 100644
index 000000000..4369601a1
Binary files /dev/null and b/Habitica/res/drawable-hdpi/habit_minus_disabled.png differ
diff --git a/Habitica/res/drawable-hdpi/habit_plus.png b/Habitica/res/drawable-hdpi/habit_plus.png
new file mode 100644
index 000000000..712bddb19
Binary files /dev/null and b/Habitica/res/drawable-hdpi/habit_plus.png differ
diff --git a/Habitica/res/drawable-hdpi/habit_plus_disabled.png b/Habitica/res/drawable-hdpi/habit_plus_disabled.png
new file mode 100644
index 000000000..f0e52a760
Binary files /dev/null and b/Habitica/res/drawable-hdpi/habit_plus_disabled.png differ
diff --git a/Habitica/res/drawable-hdpi/task_icon_calendar.png b/Habitica/res/drawable-hdpi/task_icon_calendar.png
new file mode 100644
index 000000000..527ccd750
Binary files /dev/null and b/Habitica/res/drawable-hdpi/task_icon_calendar.png differ
diff --git a/Habitica/res/drawable-hdpi/task_icon_challenge.png b/Habitica/res/drawable-hdpi/task_icon_challenge.png
new file mode 100644
index 000000000..d7e4298a8
Binary files /dev/null and b/Habitica/res/drawable-hdpi/task_icon_challenge.png differ
diff --git a/Habitica/res/drawable-hdpi/task_icon_reminder.png b/Habitica/res/drawable-hdpi/task_icon_reminder.png
new file mode 100644
index 000000000..5149f77d3
Binary files /dev/null and b/Habitica/res/drawable-hdpi/task_icon_reminder.png differ
diff --git a/Habitica/res/drawable-hdpi/task_icon_streak.png b/Habitica/res/drawable-hdpi/task_icon_streak.png
new file mode 100644
index 000000000..bab34f93a
Binary files /dev/null and b/Habitica/res/drawable-hdpi/task_icon_streak.png differ
diff --git a/Habitica/res/drawable-hdpi/task_icon_tag.png b/Habitica/res/drawable-hdpi/task_icon_tag.png
new file mode 100644
index 000000000..7ef4a63cb
Binary files /dev/null and b/Habitica/res/drawable-hdpi/task_icon_tag.png differ
diff --git a/Habitica/res/drawable-mdpi/habit_minus.png b/Habitica/res/drawable-mdpi/habit_minus.png
new file mode 100644
index 000000000..0e6022394
Binary files /dev/null and b/Habitica/res/drawable-mdpi/habit_minus.png differ
diff --git a/Habitica/res/drawable-mdpi/habit_minus_disabled.png b/Habitica/res/drawable-mdpi/habit_minus_disabled.png
new file mode 100644
index 000000000..8f6707bd5
Binary files /dev/null and b/Habitica/res/drawable-mdpi/habit_minus_disabled.png differ
diff --git a/Habitica/res/drawable-mdpi/habit_plus.png b/Habitica/res/drawable-mdpi/habit_plus.png
new file mode 100644
index 000000000..5fa253416
Binary files /dev/null and b/Habitica/res/drawable-mdpi/habit_plus.png differ
diff --git a/Habitica/res/drawable-mdpi/habit_plus_disabled.png b/Habitica/res/drawable-mdpi/habit_plus_disabled.png
new file mode 100644
index 000000000..3285133a8
Binary files /dev/null and b/Habitica/res/drawable-mdpi/habit_plus_disabled.png differ
diff --git a/Habitica/res/drawable-mdpi/task_icon_calendar.png b/Habitica/res/drawable-mdpi/task_icon_calendar.png
new file mode 100644
index 000000000..b174a1cc7
Binary files /dev/null and b/Habitica/res/drawable-mdpi/task_icon_calendar.png differ
diff --git a/Habitica/res/drawable-mdpi/task_icon_challenge.png b/Habitica/res/drawable-mdpi/task_icon_challenge.png
new file mode 100644
index 000000000..a0524f0f1
Binary files /dev/null and b/Habitica/res/drawable-mdpi/task_icon_challenge.png differ
diff --git a/Habitica/res/drawable-mdpi/task_icon_reminder.png b/Habitica/res/drawable-mdpi/task_icon_reminder.png
new file mode 100644
index 000000000..c5670020c
Binary files /dev/null and b/Habitica/res/drawable-mdpi/task_icon_reminder.png differ
diff --git a/Habitica/res/drawable-mdpi/task_icon_streak.png b/Habitica/res/drawable-mdpi/task_icon_streak.png
new file mode 100644
index 000000000..df27107a1
Binary files /dev/null and b/Habitica/res/drawable-mdpi/task_icon_streak.png differ
diff --git a/Habitica/res/drawable-mdpi/task_icon_tag.png b/Habitica/res/drawable-mdpi/task_icon_tag.png
new file mode 100644
index 000000000..7f4144960
Binary files /dev/null and b/Habitica/res/drawable-mdpi/task_icon_tag.png differ
diff --git a/Habitica/res/drawable-xhdpi/habit_minus.png b/Habitica/res/drawable-xhdpi/habit_minus.png
new file mode 100644
index 000000000..d70bbf57b
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/habit_minus.png differ
diff --git a/Habitica/res/drawable-xhdpi/habit_minus_disabled.png b/Habitica/res/drawable-xhdpi/habit_minus_disabled.png
new file mode 100644
index 000000000..4e5a0f241
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/habit_minus_disabled.png differ
diff --git a/Habitica/res/drawable-xhdpi/habit_plus.png b/Habitica/res/drawable-xhdpi/habit_plus.png
new file mode 100644
index 000000000..0bf661134
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/habit_plus.png differ
diff --git a/Habitica/res/drawable-xhdpi/habit_plus_disabled.png b/Habitica/res/drawable-xhdpi/habit_plus_disabled.png
new file mode 100644
index 000000000..16ab93a96
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/habit_plus_disabled.png differ
diff --git a/Habitica/res/drawable-xhdpi/task_icon_calendar.png b/Habitica/res/drawable-xhdpi/task_icon_calendar.png
new file mode 100644
index 000000000..906391eeb
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/task_icon_calendar.png differ
diff --git a/Habitica/res/drawable-xhdpi/task_icon_challenge.png b/Habitica/res/drawable-xhdpi/task_icon_challenge.png
new file mode 100644
index 000000000..6ca6db65e
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/task_icon_challenge.png differ
diff --git a/Habitica/res/drawable-xhdpi/task_icon_reminder.png b/Habitica/res/drawable-xhdpi/task_icon_reminder.png
new file mode 100644
index 000000000..390c3457b
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/task_icon_reminder.png differ
diff --git a/Habitica/res/drawable-xhdpi/task_icon_streak.png b/Habitica/res/drawable-xhdpi/task_icon_streak.png
new file mode 100644
index 000000000..f0c51f58e
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/task_icon_streak.png differ
diff --git a/Habitica/res/drawable-xhdpi/task_icon_tag.png b/Habitica/res/drawable-xhdpi/task_icon_tag.png
new file mode 100644
index 000000000..9a3b890d1
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/task_icon_tag.png differ
diff --git a/Habitica/res/drawable-xxhdpi/habit_minus.png b/Habitica/res/drawable-xxhdpi/habit_minus.png
new file mode 100644
index 000000000..44e69a47f
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/habit_minus.png differ
diff --git a/Habitica/res/drawable-xxhdpi/habit_minus_disabled.png b/Habitica/res/drawable-xxhdpi/habit_minus_disabled.png
new file mode 100644
index 000000000..3e8dc323b
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/habit_minus_disabled.png differ
diff --git a/Habitica/res/drawable-xxhdpi/habit_plus.png b/Habitica/res/drawable-xxhdpi/habit_plus.png
new file mode 100644
index 000000000..d45b4f15a
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/habit_plus.png differ
diff --git a/Habitica/res/drawable-xxhdpi/habit_plus_disabled.png b/Habitica/res/drawable-xxhdpi/habit_plus_disabled.png
new file mode 100644
index 000000000..06f123f47
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/habit_plus_disabled.png differ
diff --git a/Habitica/res/drawable-xxhdpi/task_icon_calendar.png b/Habitica/res/drawable-xxhdpi/task_icon_calendar.png
new file mode 100644
index 000000000..a978acfc3
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/task_icon_calendar.png differ
diff --git a/Habitica/res/drawable-xxhdpi/task_icon_challenge.png b/Habitica/res/drawable-xxhdpi/task_icon_challenge.png
new file mode 100644
index 000000000..752e15060
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/task_icon_challenge.png differ
diff --git a/Habitica/res/drawable-xxhdpi/task_icon_reminder.png b/Habitica/res/drawable-xxhdpi/task_icon_reminder.png
new file mode 100644
index 000000000..4bb469cb7
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/task_icon_reminder.png differ
diff --git a/Habitica/res/drawable-xxhdpi/task_icon_streak.png b/Habitica/res/drawable-xxhdpi/task_icon_streak.png
new file mode 100644
index 000000000..5e9a985ce
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/task_icon_streak.png differ
diff --git a/Habitica/res/drawable-xxhdpi/task_icon_tag.png b/Habitica/res/drawable-xxhdpi/task_icon_tag.png
new file mode 100644
index 000000000..f79c0f9c2
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/task_icon_tag.png differ
diff --git a/Habitica/res/layout/daily_item_card.xml b/Habitica/res/layout/daily_item_card.xml
index 40e917565..8f44cee90 100644
--- a/Habitica/res/layout/daily_item_card.xml
+++ b/Habitica/res/layout/daily_item_card.xml
@@ -1,11 +1,15 @@
+
+
-
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/task_icon_space">
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
-
+
+
-
-
-
-
-
-
-
-
+ android:background="@drawable/selection_highlight"
+ style="@style/HabitButton" />
+
+
+
-
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+ android:layout_marginBottom="1dp"/>
+
+
+
+
+
+
+
diff --git a/Habitica/res/layout/todo_item_card.xml b/Habitica/res/layout/todo_item_card.xml
index b4a78038d..5274b7b83 100644
--- a/Habitica/res/layout/todo_item_card.xml
+++ b/Habitica/res/layout/todo_item_card.xml
@@ -6,6 +6,9 @@
android:orientation="vertical"
android:background="@color/white"
android:foreground="?selectableItemBackground">
+
+
-
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/task_icon_space">
+
+
+
+
+
+
+
+
-
+
+
#c8ffffff
#32000000
+ #F9F9F9
+
@color/colorAccent
@@ -103,5 +105,6 @@
#c8432874
#10bda8ff
-
+ #1a000000
+ #B2B2B2
diff --git a/Habitica/res/values/dimens.xml b/Habitica/res/values/dimens.xml
index ab1a042a3..d68a368e9 100644
--- a/Habitica/res/values/dimens.xml
+++ b/Habitica/res/values/dimens.xml
@@ -84,4 +84,6 @@
40dp
13dp
5dp
+ 12dp
+ 18dp
\ No newline at end of file
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 3a82bec9e..96f4a196b 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -442,5 +442,8 @@ To start, which parts of your life do you want to improve?
See you tomorrow!
+ Belongs to Challenge
+ Has Reminder
+ Has Tag
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.java
index 8678d4401..267055c6b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.java
@@ -161,7 +161,6 @@ public class TaskRecyclerViewFragment extends BaseFragment implements View.OnCli
if (recyclerView.getAdapter() == null) {
this.setInnerAdapter();
}
- recyclerView.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL_LIST));
}
if (savedInstanceState != null) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.java
index b1e4873b6..a9bfaa2fc 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.java
@@ -11,6 +11,8 @@ import android.content.Context;
import android.support.annotation.Nullable;
import android.support.v7.widget.RecyclerView;
import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
import android.widget.TextView;
import butterknife.BindColor;
@@ -37,6 +39,26 @@ public class BaseTaskViewHolder extends RecyclerView.ViewHolder implements View.
@BindColor(R.color.task_gray)
int taskGray;
+ @Nullable
+ @BindView(R.id.specialTaskText)
+ TextView specialTaskTextView;
+
+ @Nullable
+ @BindView(R.id.iconviewChallenge)
+ ImageView iconViewChallenge;
+
+ @Nullable
+ @BindView(R.id.iconviewReminder)
+ ImageView iconViewReminder;
+
+ @Nullable
+ @BindView(R.id.iconviewTag)
+ ImageView iconViewTag;
+
+ @Nullable
+ @BindView(R.id.taskIconWrapper)
+ LinearLayout taskIconWrapper;
+
public BaseTaskViewHolder(View itemView) {
super(itemView);
@@ -87,6 +109,59 @@ public class BaseTaskViewHolder extends RecyclerView.ViewHolder implements View.
if (this.rightBorderView != null) {
this.rightBorderView.setBackgroundResource(this.task.getLightTaskColor());
}
+ if (this.iconViewReminder != null) {
+ this.iconViewReminder.setVisibility(this.task.getReminders().size() > 0 ? View.VISIBLE : View.GONE);
+ }
+ if (this.iconViewTag != null) {
+ this.iconViewTag.setVisibility(this.task.getTags().size() > 0 ? View.VISIBLE : View.GONE);
+ }
+
+ if (this.iconViewChallenge != null) {
+ this.iconViewChallenge.setVisibility(View.GONE);
+ }
+
+ this.configureSpecialTaskTextView(task);
+
+ if (this.taskIconWrapper != null) {
+ this.taskIconWrapper.setVisibility(getTaskIconWrapperIsVisible() ? View.VISIBLE : View.GONE);
+ }
+ }
+
+ protected void configureSpecialTaskTextView(Task task) {
+ if (this.specialTaskTextView != null) {
+ this.specialTaskTextView.setVisibility(View.INVISIBLE);
+ }
+ }
+
+ protected Boolean getTaskIconWrapperIsVisible() {
+ Boolean isVisible = false;
+
+ if (this.iconViewReminder != null) {
+ if (this.iconViewReminder.getVisibility() == View.VISIBLE) {
+ isVisible = true;
+ }
+ }
+ if (this.iconViewTag != null) {
+ if (this.iconViewTag.getVisibility() == View.VISIBLE) {
+ isVisible = true;
+ }
+ }
+ if (this.iconViewChallenge != null) {
+ if (this.iconViewChallenge.getVisibility() == View.VISIBLE) {
+ isVisible = true;
+ }
+ }
+ if (this.iconViewReminder != null) {
+ if (this.iconViewReminder.getVisibility() == View.VISIBLE) {
+ isVisible = true;
+ }
+ }
+ if (this.specialTaskTextView != null) {
+ if (this.specialTaskTextView.getVisibility() == View.VISIBLE) {
+ isVisible = true;
+ }
+ }
+ return isVisible;
}
@Override
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.java
index 00249d292..0affc3041 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.java
@@ -36,8 +36,6 @@ public abstract class ChecklistedViewHolder extends BaseTaskViewHolder implement
CheckBox checkbox;
@BindView(R.id.checklistView)
LinearLayout checklistView;
- @BindView(R.id.checklistSeparator)
- View checklistSeparator;
@BindView(R.id.checklistBottomSpace)
View checklistBottomSpace;
@BindView(R.id.checklistIndicatorWrapper)
@@ -101,12 +99,10 @@ public abstract class ChecklistedViewHolder extends BaseTaskViewHolder implement
expandCheckboxTouchArea(checkboxHolder, checkbox);
this.checklistView.addView(itemView);
}
- this.checklistSeparator.setVisibility(View.VISIBLE);
this.checklistView.setVisibility(View.VISIBLE);
this.checklistBottomSpace.setVisibility(View.VISIBLE);
} else {
this.checklistView.removeAllViewsInLayout();
- this.checklistSeparator.setVisibility(View.GONE);
this.checklistView.setVisibility(View.GONE);
this.checklistBottomSpace.setVisibility(View.GONE);
}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/DailyViewHolder.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/DailyViewHolder.java
index d543b95d3..a1c6c594a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/DailyViewHolder.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/DailyViewHolder.java
@@ -28,7 +28,7 @@ public class DailyViewHolder extends ChecklistedViewHolder {
this.checklistIndicatorWrapper.setBackgroundColor(this.taskGray);
}
if (task.streak != null && task.streak > 0) {
- this.streakTextView.setText(itemView.getContext().getString(R.string.daily_streak, task.streak));
+ this.streakTextView.setText(String.valueOf(task.streak));
this.streakTextView.setVisibility(View.VISIBLE);
} else {
this.streakTextView.setVisibility(View.GONE);
@@ -39,4 +39,13 @@ public class DailyViewHolder extends ChecklistedViewHolder {
public Boolean shouldDisplayAsActive() {
return this.task.isDisplayedActive(this.dailyResetOffset);
}
+
+ @Override
+ protected Boolean getTaskIconWrapperIsVisible() {
+ Boolean isVisible = super.getTaskIconWrapperIsVisible();
+ if (this.streakTextView.getVisibility() == View.VISIBLE) {
+ isVisible = true;
+ }
+ return isVisible;
+ }
}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/HabitViewHolder.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/HabitViewHolder.java
index a52fe97ca..2cf3c432f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/HabitViewHolder.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/HabitViewHolder.java
@@ -10,6 +10,7 @@ import android.graphics.Color;
import android.view.View;
import android.widget.Button;
import android.widget.FrameLayout;
+import android.widget.ImageView;
import butterknife.BindView;
import butterknife.OnClick;
@@ -19,18 +20,14 @@ public class HabitViewHolder extends BaseTaskViewHolder {
@BindView(R.id.btnPlusWrapper)
FrameLayout btnPlusWrapper;
@BindView(R.id.btnPlusIconView)
- View btnPlusIconView;
- @BindView(R.id.btnPlusBackground)
- View btnPlusBackground;
+ ImageView btnPlusIconView;
@BindView(R.id.btnPlus)
Button btnPlus;
@BindView(R.id.btnMinusWrapper)
FrameLayout btnMinusWrapper;
@BindView(R.id.btnMinusIconView)
- View btnMinusIconView;
- @BindView(R.id.btnMinusBackground)
- View btnMinusBackground;
+ ImageView btnMinusIconView;
@BindView(R.id.btnMinus)
Button btnMinus;
@@ -42,14 +39,20 @@ public class HabitViewHolder extends BaseTaskViewHolder {
public void bindHolder(Task newTask, int position) {
super.bindHolder(newTask, position);
- this.btnPlusWrapper.setVisibility(this.task.getUp() ? View.VISIBLE : View.GONE);
- this.btnPlusBackground.setBackgroundResource(this.task.getLightTaskColor());
-
- this.btnMinusWrapper.setVisibility(this.task.getDown() ? View.VISIBLE : View.GONE);
- if (task.getUp()) {
- this.btnMinusBackground.setBackgroundResource(this.task.getMediumTaskColor());
+ if (this.task.up) {
+ this.btnPlusWrapper.setBackgroundResource(this.task.getLightTaskColor());
+ this.btnPlusIconView.setImageResource(R.drawable.habit_plus);
} else {
- this.btnMinusBackground.setBackgroundResource(this.task.getLightTaskColor());
+ this.btnPlusWrapper.setBackgroundResource(R.color.habit_inactive_gray);
+ this.btnPlusIconView.setImageResource(R.drawable.habit_plus_disabled);
+ }
+
+ if (this.task.down) {
+ this.btnMinusWrapper.setBackgroundResource(this.task.getLightTaskColor());
+ this.btnMinusIconView.setImageResource(R.drawable.habit_minus);
+ } else {
+ this.btnMinusWrapper.setBackgroundResource(R.color.habit_inactive_gray);
+ this.btnMinusIconView.setImageResource(R.drawable.habit_minus_disabled);
}
}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/TodoViewHolder.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/TodoViewHolder.java
index b7361732b..8d00268fb 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/TodoViewHolder.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/TodoViewHolder.java
@@ -1,20 +1,18 @@
package com.habitrpg.android.habitica.ui.viewHolders.tasks;
-import com.habitrpg.android.habitica.R;
import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
import android.view.View;
-import android.widget.TextView;
-import butterknife.BindView;
+import java.text.DateFormat;
public class TodoViewHolder extends ChecklistedViewHolder {
- @BindView(R.id.duedateTextView)
- TextView duedateTextView;
+ private DateFormat dateFormatter;
public TodoViewHolder(View itemView) {
super(itemView);
+ dateFormatter = android.text.format.DateFormat.getDateFormat(context);
}
@Override
@@ -25,11 +23,18 @@ public class TodoViewHolder extends ChecklistedViewHolder {
} else {
this.checklistIndicatorWrapper.setBackgroundResource(this.task.getLightTaskColor());
}
- if (task.duedate != null) {
- this.duedateTextView.setText(itemView.getContext().getString(R.string.todo_due, task.duedate));
- this.duedateTextView.setVisibility(View.VISIBLE);
- } else {
- this.duedateTextView.setVisibility(View.GONE);
+
+ }
+
+ @Override
+ protected void configureSpecialTaskTextView(Task task) {
+ if (this.specialTaskTextView != null) {
+ if (task.duedate != null) {
+ this.specialTaskTextView.setText(dateFormatter.format(task.duedate));
+ this.specialTaskTextView.setVisibility(View.VISIBLE);
+ } else {
+ this.specialTaskTextView.setVisibility(View.INVISIBLE);
+ }
}
}