Merge pull request #65 from robert-muriithi/devv

Author: robert-muriithi

app/src/main/java/dev/robert/composetodo/navigation/MainApp.kt

@@ -87,7 +87,6 @@ fun MainApp(
     var selectedIndex by remember {
         mutableIntStateOf(0)
     }
-    Timber.d("User Object: $userObject")
 
     // TODO: FIX THIS/ OR FIND BETTER APPROACH.. it's always reseting to 0 when user navigates back
     LaunchedEffect(currentDestination) {

core/database/build.gradle.kts

@@ -43,7 +43,7 @@ android {
 }
 
 dependencies {
-
+    implementation(project(path = ":core:design-system"))
     implementation(libs.androidx.core.ktx)
     // room
     implementation(libs.androidx.room.runtime)

core/database/src/main/java/dev/robert/database/ConstUtils.kt

@@ -17,5 +17,6 @@ package dev.robert.database
 
 object ConstUtils {
     const val TODO_TABLE_NAME = "todos"
+    const val TODO_TASK_CATEGORY_TABLE_NAME = "task_categories"
     const val TODO_DATABASE = "todos_database.db"
 }

…obert/database/data/todo/TodoDatabase.kt …dev/robert/database/data/TodoDatabase.ktcore/database/src/main/java/dev/robert/database/data/todo/TodoDatabase.kt renamed to core/database/src/main/java/dev/robert/database/data/TodoDatabase.kt core/database/src/main/java/dev/robert/database/data/todo/TodoDatabase.kt renamed to core/database/src/main/java/dev/robert/database/data/TodoDatabase.kt

@@ -13,21 +13,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dev.robert.database.data.todo
+package dev.robert.database.data
 
 import androidx.room.Database
 import androidx.room.RoomDatabase
 import androidx.room.TypeConverters
 import dev.robert.database.TasksTypeConverter
+import dev.robert.database.data.categories.CategoriesDao
+import dev.robert.database.data.categories.CategoryEntity
+import dev.robert.database.data.todo.TodoDao
+import dev.robert.database.data.todo.TodoEntity
 
 @Database(
     exportSchema = false,
     entities = [
         TodoEntity::class,
+        CategoryEntity::class
     ],
     version = 4,
 )
 @TypeConverters(TasksTypeConverter::class)
 abstract class TodoDatabase : RoomDatabase() {
-    abstract val dao: TodoDao
+    abstract val tasksDao: TodoDao
+    abstract val categoryDao: CategoriesDao
 }

core/database/src/main/java/dev/robert/database/data/categories/CategoriesDao.kt

@@ -0,0 +1,24 @@
+package dev.robert.database.data.categories
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.Query
+import androidx.room.Upsert
+
+@Dao
+interface CategoriesDao {
+    @Upsert
+    suspend fun saveCategory(entity: CategoryEntity)
+
+    @Query("SELECT * FROM task_categories")
+    fun getCategories(): List<CategoryEntity>
+
+    @Query("DELETE FROM task_categories")
+    suspend fun clear()
+
+    @Query("UPDATE task_categories SET name =:name WHERE id =:id")
+    suspend fun updateCategoryName(name: String, id: Int)
+
+    @Insert
+    suspend fun insertAll(categories: List<CategoryEntity>)
+}

core/database/src/main/java/dev/robert/database/data/categories/CategoryEntity.kt

@@ -0,0 +1,16 @@
+package dev.robert.database.data.categories
+
+import androidx.annotation.DrawableRes
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import dev.robert.database.ConstUtils.TODO_TASK_CATEGORY_TABLE_NAME
+
+@Entity(tableName = TODO_TASK_CATEGORY_TABLE_NAME)
+data class CategoryEntity(
+    @PrimaryKey(autoGenerate = true)
+    val id: Int? = null,
+    val name: String,
+    val color: String,
+    @field:DrawableRes
+    val icon: Int,
+)

core/database/src/main/java/dev/robert/database/data/todo/TodoEntity.kt

@@ -37,4 +37,6 @@ data class TodoEntity(
 
 data class TaskCategoryModelEntity(
     val name: String,
+    val color: String? = null,
+    val icon: Int? = null
 )

core/database/src/main/java/dev/robert/database/domain/DatabaseModule.kt

@@ -17,15 +17,22 @@ package dev.robert.database.domain
 
 import android.content.Context
 import androidx.room.Room
+import androidx.room.RoomDatabase
+import androidx.sqlite.db.SupportSQLiteDatabase
 import com.google.gson.Gson
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
 import dev.robert.database.ConstUtils.TODO_DATABASE
+import dev.robert.design_system.R
 import dev.robert.database.TasksTypeConverter
-import dev.robert.database.data.todo.TodoDatabase
+import dev.robert.database.data.TodoDatabase
+import dev.robert.database.data.categories.CategoryEntity
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import javax.inject.Singleton
 
 @Module
@@ -41,7 +48,13 @@ object DatabaseModule {
     Provides
     Singleton
     ]
-    fun provideTodoDao(db: TodoDatabase) = db.dao
+    fun provideTodoDao(db: TodoDatabase) = db.tasksDao
+
+    @[
+        Provides
+        Singleton
+    ]
+    fun provideCategoryDao(db: TodoDatabase) = db.categoryDao
 
     @[
     Provides
@@ -63,7 +76,29 @@ object DatabaseModule {
             TODO_DATABASE,
         ).addTypeConverter(converter)
             .fallbackToDestructiveMigration()
-            .allowMainThreadQueries()
+            .addCallback(object : RoomDatabase.Callback() {
+                override fun onCreate(db: SupportSQLiteDatabase) {
+                    super.onCreate(db)
+//                    db.execSQL("INSERT INTO task_categories (name, color, icon) VALUES ('Work', '#FF5733', '')")
+//                    db.execSQL("INSERT INTO task_categories (name, color, icon) VALUES ('Personal', '#33FF57', '')")
+//                    db.execSQL("INSERT INTO task_categories (name, color, icon) VALUES ('Shopping', '#3357FF', '')")
+//                    db.execSQL("INSERT INTO task_categories (name, color, icon) VALUES ('Health', '#FF33F6', '')")
+//                    db.execSQL("INSERT INTO task_categories (name, color, icon) VALUES ('Miscellaneous', '#33FFF6', '')")
+                    CoroutineScope(Dispatchers.IO).launch {
+                        provideCategoryDao(provideTodoDatabase(context, converter))
+                            .insertAll(getInitialCategories())
+                    }
+                }
+            })
             .build()
     }
+
+
+    private fun getInitialCategories(): List<CategoryEntity> = listOf(
+        CategoryEntity(name = "Work", color = "#FF5733", icon = R.drawable.ic_work_outline),
+        CategoryEntity(name = "Personal", color = "#33FF57", icon = R.drawable.ic_personal),
+        CategoryEntity(name = "Shopping", color = "#3357FF", icon = R.drawable.ic_shopping),
+        CategoryEntity(name = "Health", color = "#FF33F6", icon = R.drawable.ic_health_safety),
+        CategoryEntity(name = "Miscellaneous", color = "#33FFF6", icon = R.drawable.ic_miscellaneous_services)
+    )
 }

core/design-system/src/main/res/drawable/ic_health_safety.xml

@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M10.5,13H8v-3h2.5V7.5h3V10H16v3h-2.5v2.5h-3V13zM12,2L4,5v6.09c0,5.05 3.41,9.76 8,10.91c4.59,-1.15 8,-5.86 8,-10.91V5L12,2z"/>
+    
+</vector>

core/design-system/src/main/res/drawable/ic_miscellaneous_services.xml

@@ -0,0 +1,7 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M14.17,13.71l1.4,-2.42c0.09,-0.15 0.05,-0.34 -0.08,-0.45l-1.48,-1.16c0.03,-0.22 0.05,-0.45 0.05,-0.68s-0.02,-0.46 -0.05,-0.69l1.48,-1.16c0.13,-0.11 0.17,-0.3 0.08,-0.45l-1.4,-2.42c-0.09,-0.15 -0.27,-0.21 -0.43,-0.15L12,4.83c-0.36,-0.28 -0.75,-0.51 -1.18,-0.69l-0.26,-1.85C10.53,2.13 10.38,2 10.21,2h-2.8C7.24,2 7.09,2.13 7.06,2.3L6.8,4.15C6.38,4.33 5.98,4.56 5.62,4.84l-1.74,-0.7c-0.16,-0.06 -0.34,0 -0.43,0.15l-1.4,2.42C1.96,6.86 2,7.05 2.13,7.16l1.48,1.16C3.58,8.54 3.56,8.77 3.56,9s0.02,0.46 0.05,0.69l-1.48,1.16C2,10.96 1.96,11.15 2.05,11.3l1.4,2.42c0.09,0.15 0.27,0.21 0.43,0.15l1.74,-0.7c0.36,0.28 0.75,0.51 1.18,0.69l0.26,1.85C7.09,15.87 7.24,16 7.41,16h2.8c0.17,0 0.32,-0.13 0.35,-0.3l0.26,-1.85c0.42,-0.18 0.82,-0.41 1.18,-0.69l1.74,0.7C13.9,13.92 14.08,13.86 14.17,13.71zM8.81,11c-1.1,0 -2,-0.9 -2,-2c0,-1.1 0.9,-2 2,-2s2,0.9 2,2C10.81,10.1 9.91,11 8.81,11z"/>
+      
+    <path android:fillColor="@android:color/white" android:pathData="M21.92,18.67l-0.96,-0.74c0.02,-0.14 0.04,-0.29 0.04,-0.44c0,-0.15 -0.01,-0.3 -0.04,-0.44l0.95,-0.74c0.08,-0.07 0.11,-0.19 0.05,-0.29l-0.9,-1.55c-0.05,-0.1 -0.17,-0.13 -0.28,-0.1l-1.11,0.45c-0.23,-0.18 -0.48,-0.33 -0.76,-0.44l-0.17,-1.18C18.73,13.08 18.63,13 18.53,13h-1.79c-0.11,0 -0.21,0.08 -0.22,0.19l-0.17,1.18c-0.27,0.12 -0.53,0.26 -0.76,0.44l-1.11,-0.45c-0.1,-0.04 -0.22,0 -0.28,0.1l-0.9,1.55c-0.05,0.1 -0.04,0.22 0.05,0.29l0.95,0.74c-0.02,0.14 -0.03,0.29 -0.03,0.44c0,0.15 0.01,0.3 0.03,0.44l-0.95,0.74c-0.08,0.07 -0.11,0.19 -0.05,0.29l0.9,1.55c0.05,0.1 0.17,0.13 0.28,0.1l1.11,-0.45c0.23,0.18 0.48,0.33 0.76,0.44l0.17,1.18c0.02,0.11 0.11,0.19 0.22,0.19h1.79c0.11,0 0.21,-0.08 0.22,-0.19l0.17,-1.18c0.27,-0.12 0.53,-0.26 0.75,-0.44l1.12,0.45c0.1,0.04 0.22,0 0.28,-0.1l0.9,-1.55C22.03,18.86 22,18.74 21.92,18.67zM17.63,18.83c-0.74,0 -1.35,-0.6 -1.35,-1.35s0.6,-1.35 1.35,-1.35s1.35,0.6 1.35,1.35S18.37,18.83 17.63,18.83z"/>
+    
+</vector>