Merge branch 'develop' into feature/#160

Author: simeunseok

app/src/main/assets/default.db

@@ -0,0 +1,25 @@
+package com.drunkenboys.calendarun.data.calendartheme.entity
+
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity(tableName = "CalendarTheme")
+data class CalendarTheme(
+    @PrimaryKey val id: Long = 1,
+    val weekDayTextColor: Int,
+    val holidayTextColor: Int,
+    val saturdayTextColor: Int,
+    val sundayTextColor: Int,
+    val selectedFrameColor: Int,
+    val backgroundColor: Int,
+    val textSize: Int,
+    val textAlign: Int,
+    val languageType: LanguageType,
+    val visibleScheduleCount: Int
+) {
+
+    enum class LanguageType(val description: String) {
+        KOREAN("한글"),
+        ENGLISH("영어")
+    }
+}

app/src/main/java/com/drunkenboys/calendarun/data/calendartheme/entity/CalendarTheme.kt

@@ -0,0 +1,17 @@
+package com.drunkenboys.calendarun.data.calendartheme.local
+
+import androidx.room.Dao
+import androidx.room.Query
+import androidx.room.Update
+import com.drunkenboys.calendarun.data.calendartheme.entity.CalendarTheme
+import kotlinx.coroutines.flow.Flow
+
+@Dao
+interface CalendarThemeDao {
+
+    @Query("SELECT * FROM CalendarTheme where id = 1")
+    fun fetchCalendarTheme(): Flow<CalendarTheme>
+
+    @Update
+    suspend fun updateCalendarTheme(theme: CalendarTheme)
+}

app/src/main/java/com/drunkenboys/calendarun/data/calendartheme/local/CalendarThemeDao.kt

@@ -0,0 +1,11 @@
+package com.drunkenboys.calendarun.data.calendartheme.local
+
+import com.drunkenboys.calendarun.data.calendartheme.entity.CalendarTheme
+import kotlinx.coroutines.flow.Flow
+
+interface CalendarThemeLocalDataSource {
+
+    fun fetchCalendarTheme(): Flow<CalendarTheme>
+
+    suspend fun updateCalendarTheme(theme: CalendarTheme)
+}

app/src/main/java/com/drunkenboys/calendarun/data/calendartheme/local/CalendarThemeLocalDataSource.kt

@@ -0,0 +1,19 @@
+package com.drunkenboys.calendarun.data.calendartheme.local
+
+import com.drunkenboys.calendarun.data.calendartheme.entity.CalendarTheme
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.withContext
+import javax.inject.Inject
+
+class CalendarThemeLocalDataSourceImpl @Inject constructor(
+    private val calendarThemeDao: CalendarThemeDao,
+    private val dispatcher: CoroutineDispatcher
+) : CalendarThemeLocalDataSource {
+
+    override fun fetchCalendarTheme(): Flow<CalendarTheme> = calendarThemeDao.fetchCalendarTheme()
+
+    override suspend fun updateCalendarTheme(theme: CalendarTheme) = withContext(dispatcher) {
+        calendarThemeDao.updateCalendarTheme(theme)
+    }
+}

app/src/main/java/com/drunkenboys/calendarun/data/calendartheme/local/CalendarThemeLocalDataSourceImpl.kt

@@ -3,14 +3,18 @@ package com.drunkenboys.calendarun.data.room
 import androidx.room.Database
 import androidx.room.RoomDatabase
 import androidx.room.TypeConverters
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
 import com.drunkenboys.calendarun.data.calendar.entity.Calendar
 import com.drunkenboys.calendarun.data.calendar.local.CalendarDao
+import com.drunkenboys.calendarun.data.calendartheme.entity.CalendarTheme
+import com.drunkenboys.calendarun.data.calendartheme.local.CalendarThemeDao
 import com.drunkenboys.calendarun.data.checkpoint.entity.CheckPoint
 import com.drunkenboys.calendarun.data.checkpoint.local.CheckPointDao
 import com.drunkenboys.calendarun.data.schedule.entity.Schedule
 import com.drunkenboys.calendarun.data.schedule.local.ScheduleDao
 
-@Database(entities = [Calendar::class, CheckPoint::class, Schedule::class], version = 1)
+@Database(entities = [Calendar::class, CheckPoint::class, Schedule::class, CalendarTheme::class], version = 2)
 @TypeConverters(Converters::class)
 abstract class Database : RoomDatabase() {
 
@@ -20,4 +24,28 @@ abstract class Database : RoomDatabase() {
 
     abstract fun scheduleDao(): ScheduleDao
 
+    abstract fun calendarThemeDao(): CalendarThemeDao
+
+    companion object {
+
+        val MIGRATION_1_2 = object : Migration(1, 2) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                database.execSQL(
+                    "CREATE TABLE `CalendarTheme` (" +
+                            "`id` INTEGER NOT NULL, " +
+                            "`weekDayTextColor` INTEGER NOT NULL, " +
+                            "`holidayTextColor` INTEGER NOT NULL, " +
+                            "`saturdayTextColor` INTEGER NOT NULL, " +
+                            "`sundayTextColor` INTEGER NOT NULL, " +
+                            "`selectedFrameColor` INTEGER NOT NULL, " +
+                            "`backgroundColor` INTEGER NOT NULL, " +
+                            "`textSize` INTEGER NOT NULL, " +
+                            "`textAlign` INTEGER NOT NULL, " +
+                            "`languageType` TEXT NOT NULL, " +
+                            "`visibleScheduleCount` INTEGER NOT NULL, " +
+                            "PRIMARY KEY(`id`))"
+                )
+            }
+        }
+    }
 }

app/src/main/java/com/drunkenboys/calendarun/data/room/Database.kt

@@ -2,6 +2,8 @@ package com.drunkenboys.calendarun.di
 
 import com.drunkenboys.calendarun.data.calendar.local.CalendarLocalDataSource
 import com.drunkenboys.calendarun.data.calendar.local.CalendarLocalDataSourceImpl
+import com.drunkenboys.calendarun.data.calendartheme.local.CalendarThemeLocalDataSource
+import com.drunkenboys.calendarun.data.calendartheme.local.CalendarThemeLocalDataSourceImpl
 import com.drunkenboys.calendarun.data.checkpoint.local.CheckPointLocalDataSource
 import com.drunkenboys.calendarun.data.checkpoint.local.CheckPointLocalDataSourceImpl
 import com.drunkenboys.calendarun.data.schedule.local.ScheduleLocalDataSource
@@ -24,4 +26,7 @@ abstract class DataSourceModule {
     @Binds
     abstract fun bindScheduleDataSource(dataSource: ScheduleLocalDataSourceImpl): ScheduleLocalDataSource
 
+    @Binds
+    abstract fun bindCalendarThemeDataSource(dataSource: CalendarThemeLocalDataSourceImpl): CalendarThemeLocalDataSource
+
 }

app/src/main/java/com/drunkenboys/calendarun/di/DataSourceModule.kt

@@ -22,6 +22,7 @@ object LocalDatabaseModule {
         "AppDatabase.db"
     )
         .createFromAsset("default.db")
+        .addMigrations(Database.MIGRATION_1_2)
         .build()
 
     @Provides
@@ -32,4 +33,7 @@ object LocalDatabaseModule {
 
     @Provides
     fun provideScheduleDao(database: Database) = database.scheduleDao()
+
+    @Provides
+    fun provideCalendarThemeDao(database: Database) = database.calendarThemeDao()
 }

app/src/main/java/com/drunkenboys/calendarun/di/LocalDatabaseModule.kt

@@ -44,6 +44,7 @@ class MainCalendarFragment : BaseFragment<FragmentMainCalendarBinding>(R.layout.
         collectFabClickEvent()
         collectDaySecondClickListener()
         mainCalendarViewModel.fetchCalendarList()
+        collectCalendarDesignObject()
     }
 
     private fun setupCalendarView() {
@@ -203,6 +204,18 @@ class MainCalendarFragment : BaseFragment<FragmentMainCalendarBinding>(R.layout.
         }
     }
 
+    private fun collectCalendarDesignObject() {
+        lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.STARTED) {
+                mainCalendarViewModel.fetchCalendarDesignObject()
+                    .collect {
+                        binding.calendarMonth.setDesign(it)
+                        binding.calendarYear.setTheme(it)
+                    }
+            }
+        }
+    }
+
     companion object {
 
         private const val FIRST_HEADER = 0

app/src/main/java/com/drunkenboys/calendarun/ui/maincalendar/MainCalendarFragment.kt

@@ -4,11 +4,13 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.drunkenboys.calendarun.data.calendar.entity.Calendar
 import com.drunkenboys.calendarun.data.calendar.local.CalendarLocalDataSource
+import com.drunkenboys.calendarun.data.calendartheme.local.CalendarThemeLocalDataSource
 import com.drunkenboys.calendarun.data.checkpoint.entity.CheckPoint
 import com.drunkenboys.calendarun.data.checkpoint.local.CheckPointLocalDataSource
 import com.drunkenboys.calendarun.data.schedule.entity.Schedule
 import com.drunkenboys.calendarun.data.schedule.local.ScheduleLocalDataSource
 import com.drunkenboys.calendarun.util.nextDay
+import com.drunkenboys.calendarun.ui.theme.toCalendarDesignObject
 import com.drunkenboys.ckscalendar.data.CalendarScheduleObject
 import com.drunkenboys.ckscalendar.data.CalendarSet
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -17,6 +19,7 @@ import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
 import java.time.LocalDate
 import javax.inject.Inject
@@ -25,7 +28,8 @@ import javax.inject.Inject
 class MainCalendarViewModel @Inject constructor(
     private val calendarLocalDataSource: CalendarLocalDataSource,
     private val checkPointLocalDataSource: CheckPointLocalDataSource,
-    private val scheduleLocalDataSource: ScheduleLocalDataSource
+    private val scheduleLocalDataSource: ScheduleLocalDataSource,
+    private val calendarThemeDataSource: CalendarThemeLocalDataSource
 ) : ViewModel() {
 
     private val _calendar = MutableStateFlow<Calendar?>(null)
@@ -156,4 +160,7 @@ class MainCalendarViewModel @Inject constructor(
 
         return calendarStartDateList to calendarEndDateList
     }
+    
+    fun fetchCalendarDesignObject() = calendarThemeDataSource.fetchCalendarTheme()
+        .map { it.toCalendarDesignObject() }
 }