Merge pull request #69 from TimerTiTi/release-0.2.3

Release 0.2.3
TimerTiTi · Feb 24, 2024 · 84fc134 · 84fc134
2 parents 4f5cdba + dc1596b
commit 84fc134
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/build-logic/src/main/kotlin/com/titi/common/BuildInfo.kt b/build-logic/src/main/kotlin/com/titi/common/BuildInfo.kt
@@ -8,7 +8,7 @@ object BuildType {
 
 object AppConfig {
     const val APP_ID = "com.titi.app"
-    const val APP_VERSION_NAME = "0.2.2"
-    const val APP_VERSION_CODE = 8
+    const val APP_VERSION_NAME = "0.2.3"
+    const val APP_VERSION_CODE = 9
     const val APP_NAME = "TiTi"
 }
diff --git a/feature/log/src/main/kotlin/com/titi/app/feature/log/model/LogUiState.kt b/feature/log/src/main/kotlin/com/titi/app/feature/log/model/LogUiState.kt
@@ -1,6 +1,7 @@
 package com.titi.app.feature.log.model
 
 import com.airbnb.mvrx.MavericksState
+import com.titi.app.core.designsystem.extension.getTimeString
 import com.titi.app.core.designsystem.extension.getWeekInformation
 import com.titi.app.core.designsystem.extension.makeDefaultWeekLineChardData
 import com.titi.app.core.designsystem.model.TdsTaskData
@@ -70,8 +71,8 @@ data class HomeUiState(
 
     data class HomeWeekGraphData(
         val weekInformation: Triple<String, String, String> = LocalDate.now().getWeekInformation(),
-        val totalWeekTime: String = "",
-        val averageWeekTime: String = "",
+        val totalWeekTime: String = 0L.getTimeString(),
+        val averageWeekTime: String = 0L.getTimeString(),
         val weekLineChartData: List<TdsWeekLineChartData> =
             LocalDate.now().makeDefaultWeekLineChardData(),
     )
@@ -92,8 +93,8 @@ data class DailyUiState(
 )
 
 data class DailyGraphData(
-    val totalTime: String = "",
-    val maxTime: String = "",
+    val totalTime: String = 0L.getTimeString(),
+    val maxTime: String = 0L.getTimeString(),
     val timeLine: List<Long> = LongArray(24) { 0L }.toList(),
     val taskData: List<TdsTaskData> = emptyList(),
     val tdsTimeTableData: List<TdsTimeTableData> = emptyList(),
@@ -107,10 +108,10 @@ data class WeekUiState(
 
 data class WeekGraphData(
     val weekInformation: Triple<String, String, String> = LocalDate.now().getWeekInformation(),
-    val totalWeekTime: String = "",
-    val averageWeekTime: String = "",
+    val totalWeekTime: String = 0L.getTimeString(),
+    val averageWeekTime: String = 0L.getTimeString(),
     val weekLineChartData: List<TdsWeekLineChartData> =
         LocalDate.now().makeDefaultWeekLineChardData(),
-    val topLevelTaskTotal: String = "",
+    val topLevelTaskTotal: String = 0L.getTimeString(),
     val topLevelTdsTaskData: List<TdsTaskData> = emptyList(),
 )
diff --git a/feature/log/src/main/kotlin/com/titi/app/feature/log/ui/DailyScreen.kt b/feature/log/src/main/kotlin/com/titi/app/feature/log/ui/DailyScreen.kt
@@ -282,13 +282,18 @@ fun Day(
                     } else {
                         Color.Transparent
                     },
-                ).align(Alignment.Center),
+                )
+                .align(Alignment.Center),
             contentAlignment = Alignment.Center,
         ) {
             Text(
                 text = day.date.dayOfMonth.toString(),
                 color = if (day.position == DayPosition.MonthDate) {
-                    TdsColor.TEXT.getColor()
+                    if (isSelected) {
+                        TdsColor.BACKGROUND.getColor()
+                    } else {
+                        TdsColor.TEXT.getColor()
+                    }
                 } else {
                     Color.Gray
                 },