mirror of
https://github.com/sudoxnym/habitica-android.git
synced 2026-07-13 17:51:57 +00:00
correct daily checklist rendering
This commit is contained in:
parent
1fb1139eaa
commit
259e725602
2 changed files with 2 additions and 2 deletions
|
|
@ -75,7 +75,7 @@
|
||||||
android:id="@+id/checklistIndicatorWrapper"
|
android:id="@+id/checklistIndicatorWrapper"
|
||||||
android:layout_width="@dimen/checklist_wrapper_width"
|
android:layout_width="@dimen/checklist_wrapper_width"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
app:backgroundColor="@{daily.isChecklistDisplayActive(offset) ? @color/task_gray : daily.getLightTaskColor}"
|
app:backgroundColor="@{daily.isChecklistDisplayActive(offset) ? daily.getLightTaskColor : @color/task_gray}"
|
||||||
android:visibility="@{daily.checklist.size > 0 ? View.VISIBLE : View.GONE}"
|
android:visibility="@{daily.checklist.size > 0 ? View.VISIBLE : View.GONE}"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:layout_alignParentTop="true"
|
android:layout_alignParentTop="true"
|
||||||
|
|
|
||||||
|
|
@ -482,6 +482,6 @@ public class Task extends BaseModel {
|
||||||
}
|
}
|
||||||
|
|
||||||
public Boolean isChecklistDisplayActive(int offset) {
|
public Boolean isChecklistDisplayActive(int offset) {
|
||||||
return this.isDisplayedActive(offset) || (this.checklist.size() != this.getCompletedChecklistCount());
|
return this.isDisplayedActive(offset) && (this.checklist.size() != this.getCompletedChecklistCount());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue