#831 Migrate from SQLiteOpenHelper to Room

Refactor selected navigation category

3 files changed, 48 insertions, 18 deletions

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/model/ENavigationCategoryType.java b/app/src/main/java/it/niedermann/owncloud/notes/shared/model/ENavigationCategoryType.java
new file mode 100644
index 00000000..597ba782
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/model/ENavigationCategoryType.java
@@ -0,0 +1,9 @@
+package it.niedermann.owncloud.notes.shared.model;
+
+public enum ENavigationCategoryType {
+
+    RECENT,
+    FAVORITES,
+    UNCATEGORIZED,
+    DEFAULT_CATEGORY
+}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/model/NavigationCategory.java b/app/src/main/java/it/niedermann/owncloud/notes/shared/model/NavigationCategory.java
new file mode 100644
index 00000000..de71dbc6
--- /dev/null
+++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/model/NavigationCategory.java
@@ -0,0 +1,39 @@
+package it.niedermann.owncloud.notes.shared.model;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import java.io.Serializable;
+
+import it.niedermann.owncloud.notes.persistence.entity.Category;
+
+public class NavigationCategory implements Serializable {
+
+    @NonNull
+    private final ENavigationCategoryType type;
+    @Nullable
+    private final Category category;
+
+    public NavigationCategory(@NonNull ENavigationCategoryType type) {
+        if (type == ENavigationCategoryType.DEFAULT_CATEGORY) {
+            throw new IllegalArgumentException("If you want to provide a " + ENavigationCategoryType.DEFAULT_CATEGORY + ", call the constructor with a " + Category.class.getSimpleName());
+        }
+        this.type = type;
+        this.category = null;
+    }
+
+    public NavigationCategory(@NonNull Category category) {
+        this.type = ENavigationCategoryType.DEFAULT_CATEGORY;
+        this.category = category;
+    }
+
+    @NonNull
+    public ENavigationCategoryType getType() {
+        return type;
+    }
+
+    @Nullable
+    public Category getCategory() {
+        return category;
+    }
+}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/model/OldCategory.java b/app/src/main/java/it/niedermann/owncloud/notes/shared/model/OldCategory.java
deleted file mode 100644
index 58e558b8..00000000
--- a/app/src/main/java/it/niedermann/owncloud/notes/shared/model/OldCategory.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package it.niedermann.owncloud.notes.shared.model;
-
-import androidx.annotation.Nullable;
-
-import java.io.Serializable;
-
-public class OldCategory implements Serializable {
-
-    @Nullable
-    public final String category;
-    @Nullable
-    public final Boolean favorite;
-
-    public OldCategory(@Nullable String category, @Nullable Boolean favorite) {
-        this.category = category;
-        this.favorite = favorite;
-    }
-}