add color to card entity

Author: desperateCoder

app/src/main/java/it/niedermann/nextcloud/deck/database/migration/Migration_34_35.java

@@ -16,6 +16,7 @@ public Migration_34_35() {
     @Override
     public void migrate(@NonNull SupportSQLiteDatabase database) {
         database.execSQL("ALTER TABLE `Card` add column startDate INTEGER");
+        database.execSQL("ALTER TABLE `Card` add column color INTEGER");
         // Reset ETags to refetch Cards
         database.execSQL("UPDATE `Account` SET `boardsEtag` = NULL");
         database.execSQL("UPDATE `Board` SET `etag` = NULL");

app/src/main/java/it/niedermann/nextcloud/deck/model/Card.java

@@ -6,6 +6,7 @@
 import androidx.room.Ignore;
 import androidx.room.Index;
 
+import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 
 import java.time.Instant;
@@ -15,6 +16,7 @@
 
 import it.niedermann.nextcloud.deck.model.enums.DBStatus;
 import it.niedermann.nextcloud.deck.model.interfaces.AbstractRemoteEntity;
+import it.niedermann.nextcloud.deck.remote.api.json.JsonColorSerializer;
 
 @Entity(inheritSuperIndices = true,
         indices = {
@@ -53,6 +55,8 @@ public TaskStatus(int taskCount, int doneCount) {
 
     private String title;
     private String description;
+    @JsonAdapter(JsonColorSerializer.class)
+    private Integer color;
     @NonNull
     private Long stackId;
     private String type;
@@ -96,6 +100,7 @@ public Card(Card card) {
         this.archived = card.isArchived();
         this.dueDate = card.getDueDate();
         this.startDate = card.getStartDate();
+        this.color = card.getColor();
         this.done = card.getDone();
         this.notified = card.isNotified();
         this.overdue = card.getOverdue();
@@ -229,6 +234,14 @@ public void setStartDate(Instant dateTime) {
         this.startDate = dateTime;
     }
 
+    public Integer getColor() {
+        return color;
+    }
+
+    public void setColor(Integer color) {
+        this.color = color;
+    }
+
     public int getOverdue() {
         return overdue;
     }

app/src/main/java/it/niedermann/nextcloud/deck/model/propagation/CardUpdate.java

@@ -22,6 +22,7 @@ public CardUpdate(FullCard card) {
         setArchived(card.getCard().isArchived());
         setDueDate(card.getCard().getDueDate());
         setStartDate(card.getCard().getStartDate());
+        setColor(card.getCard().getColor());
         setNotified(card.getCard().isNotified());
         setOverdue(card.getCard().getOverdue());
         setCommentsUnread(card.getCard().getCommentsUnread());

app/src/main/java/it/niedermann/nextcloud/deck/model/propagation/CardUpdateOwnerString.java

@@ -20,6 +20,7 @@ public CardUpdateOwnerString(CardUpdate card) {
         setArchived(card.isArchived());
         setDueDate(card.getDueDate());
         setStartDate(card.getStartDate());
+        setColor(card.getColor());
         setNotified(card.isNotified());
         setOverdue(card.getOverdue());
         setCommentsUnread(card.getCommentsUnread());

app/src/main/java/it/niedermann/nextcloud/deck/remote/api/JsonToEntityParser.java

@@ -469,6 +469,7 @@ protected static FullCard parseCard(JsonObject e) {
             card.setOverdue(getNullAsZero(e.get("overdue")));
             card.setDueDate(getTimestampFromString(e.get("duedate")));
             card.setStartDate(getTimestampFromString(e.get("startdate")));
+            card.setColor(getColorAsInt(e, "color"));
             card.setCommentsUnread(e.get("commentsUnread").getAsInt());
             JsonElement owner = e.get("owner");
             if (owner != null) {