Merge pull request #203 from TimerTiTi/release-1.4.5

Release 1.4.5
TimerTiTi · Nov 17, 2024 · 2792952 · 2792952
2 parents 7b00292 + 0a06170
commit 2792952
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 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
@@ -9,7 +9,7 @@ object BuildType {
 
 object AppConfig {
     const val APP_ID = "com.titi.app"
-    const val APP_VERSION_NAME = "1.4.4"
-    const val APP_VERSION_CODE = 44
+    const val APP_VERSION_NAME = "1.4.5"
+    const val APP_VERSION_CODE = 46
     const val APP_NAME = "TiTi"
 }
diff --git a/.../src/main/kotlin/com/titi/app/core/designsystem/component/TdsCircularProgressIndicator.kt b/.../src/main/kotlin/com/titi/app/core/designsystem/component/TdsCircularProgressIndicator.kt
@@ -40,13 +40,22 @@ fun TdsCircularProgressIndicator(
         val insideSize = minSize * 0.4
         val fontSize = with(density) { (insideSize / 2).toSp() }
 
+        CircularProgressIndicator(
+            modifier = Modifier.fillMaxSize(),
+            progress = { 1f },
+            color = color.copy(alpha = 0.5f),
+            strokeWidth = strokeWidth,
+            trackColor = Color.Transparent,
+        )
+
         CircularProgressIndicator(
             modifier = Modifier.fillMaxSize(),
             progress = { sumTime / maxTime.toFloat() },
             color = color,
-            trackColor = color.copy(alpha = 0.5f),
+            trackColor = Color.Transparent,
             strokeCap = StrokeCap.Round,
             strokeWidth = strokeWidth,
+            gapSize = 0.dp,
         )
 
         TdsText(

diff --git a/core/util/src/main/kotlin/com/titi/app/core/util/JavaTimeUtil.kt b/core/util/src/main/kotlin/com/titi/app/core/util/JavaTimeUtil.kt
@@ -69,8 +69,8 @@ fun areDatesInSameMonth(localDate: LocalDate, zonedDateTime: ZonedDateTime): Boo
 
 fun areDatesInSameWeek(localDate: LocalDate, zonedDateTime: ZonedDateTime): Boolean {
     val (monday, sunday) = getMondaySunday(localDate)
-
-    return zonedDateTime.isAfter(monday) && zonedDateTime.isBefore(sunday)
+   
+    return  (zonedDateTime.isEqual(monday) || zonedDateTime.isAfter(monday)) && zonedDateTime.isBefore(sunday)
 }
 
 fun areDatesInSameDay(localDate: LocalDate, zonedDateTime: ZonedDateTime): Boolean {

diff --git a/release-note.txt b/release-note.txt
@@ -1,2 +1,3 @@
-TiTi android 1.4.4
-- fix: wrong week total time in week log
+TiTi android 1.4.5
+- fix: missing monday in home page week chart
+- TdsCircularProgressIndicator