Fix default tag, caldav, and filter colors

pull/935/head
Alex Baker 6 years ago
parent c386c4fca3
commit 1375b652db

@ -40,7 +40,7 @@ public final class CaldavCalendar implements Parcelable {
private String name = ""; private String name = "";
@ColumnInfo(name = "cdl_color") @ColumnInfo(name = "cdl_color")
private int color = -1; private int color;
@ColumnInfo(name = "cdl_ctag") @ColumnInfo(name = "cdl_ctag")
private String ctag; private String ctag;

@ -28,7 +28,7 @@ public class Filter {
private String criterion; private String criterion;
@ColumnInfo(name = "f_color") @ColumnInfo(name = "f_color")
private Integer color = -1; private Integer color = 0;
@ColumnInfo(name = "f_icon") @ColumnInfo(name = "f_icon")
private Integer icon = -1; private Integer icon = -1;
@ -79,7 +79,7 @@ public class Filter {
} }
public Integer getColor() { public Integer getColor() {
return color == null ? -1 : color; return color == null ? 0 : color;
} }
public void setColor(Integer color) { public void setColor(Integer color) {

@ -38,7 +38,7 @@ public final class TagData implements Parcelable {
private String name = ""; private String name = "";
@ColumnInfo(name = "color") @ColumnInfo(name = "color")
private Integer color = -1; private Integer color = 0;
@ColumnInfo(name = "tagOrdering") @ColumnInfo(name = "tagOrdering")
private String tagOrdering = "[]"; private String tagOrdering = "[]";
@ -105,7 +105,7 @@ public final class TagData implements Parcelable {
} }
public Integer getColor() { public Integer getColor() {
return color; return color == null ? 0 : color;
} }
public void setColor(Integer color) { public void setColor(Integer color) {

Loading…
Cancel
Save