From 1375b652db1501b456f8000dec2b970e6b5fbbd4 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Fri, 28 Feb 2020 13:35:15 -0600 Subject: [PATCH] Fix default tag, caldav, and filter colors --- app/src/main/java/org/tasks/data/CaldavCalendar.java | 2 +- app/src/main/java/org/tasks/data/Filter.java | 4 ++-- app/src/main/java/org/tasks/data/TagData.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/org/tasks/data/CaldavCalendar.java b/app/src/main/java/org/tasks/data/CaldavCalendar.java index 989874b69..d8a0bb72a 100644 --- a/app/src/main/java/org/tasks/data/CaldavCalendar.java +++ b/app/src/main/java/org/tasks/data/CaldavCalendar.java @@ -40,7 +40,7 @@ public final class CaldavCalendar implements Parcelable { private String name = ""; @ColumnInfo(name = "cdl_color") - private int color = -1; + private int color; @ColumnInfo(name = "cdl_ctag") private String ctag; diff --git a/app/src/main/java/org/tasks/data/Filter.java b/app/src/main/java/org/tasks/data/Filter.java index 97389a183..7aa69b609 100644 --- a/app/src/main/java/org/tasks/data/Filter.java +++ b/app/src/main/java/org/tasks/data/Filter.java @@ -28,7 +28,7 @@ public class Filter { private String criterion; @ColumnInfo(name = "f_color") - private Integer color = -1; + private Integer color = 0; @ColumnInfo(name = "f_icon") private Integer icon = -1; @@ -79,7 +79,7 @@ public class Filter { } public Integer getColor() { - return color == null ? -1 : color; + return color == null ? 0 : color; } public void setColor(Integer color) { diff --git a/app/src/main/java/org/tasks/data/TagData.java b/app/src/main/java/org/tasks/data/TagData.java index 5aafcaa19..67d3a3585 100644 --- a/app/src/main/java/org/tasks/data/TagData.java +++ b/app/src/main/java/org/tasks/data/TagData.java @@ -38,7 +38,7 @@ public final class TagData implements Parcelable { private String name = ""; @ColumnInfo(name = "color") - private Integer color = -1; + private Integer color = 0; @ColumnInfo(name = "tagOrdering") private String tagOrdering = "[]"; @@ -105,7 +105,7 @@ public final class TagData implements Parcelable { } public Integer getColor() { - return color; + return color == null ? 0 : color; } public void setColor(Integer color) {