Merge pull request #149 from TimerTiTi/147-daily-automation

close #147 daily automation
TimerTiTi · Jun 27, 2024 · bc4b3ef · bc4b3ef
2 parents b302df3 + 6a1d415
commit bc4b3ef
Show file tree

Hide file tree

Showing 53 changed files with 1,281 additions and 347 deletions.
diff --git a/build-logic/src/main/kotlin/titi.android.feature.gradle.kts b/build-logic/src/main/kotlin/titi.android.feature.gradle.kts
@@ -11,6 +11,7 @@ dependencies {
     implementation(project(":core:ui"))
     implementation(project(":core:util"))
     implementation(project(":core:designsystem"))
+    implementation(project(":tds"))
 
     implementation(libs.findLibrary("androidx.compose.navigation").get())
     implementation(libs.findLibrary("androidx.hilt.navigation.compose").get())

diff --git a/core/designsystem/src/main/kotlin/com/titi/app/core/designsystem/theme/Theme.kt b/core/designsystem/src/main/kotlin/com/titi/app/core/designsystem/theme/Theme.kt
@@ -7,15 +7,13 @@ import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.Density
 
-val LocalTiTiColors =
-    staticCompositionLocalOf {
-        TdsColorsPalette()
-    }
+val LocalTiTiColors = staticCompositionLocalOf {
+    TdsColorsPalette()
+}
 
-val LocalTiTiTypography =
-    staticCompositionLocalOf {
-        TdsTypography()
-    }
+val LocalTiTiTypography = staticCompositionLocalOf {
+    TdsTypography()
+}
 
 object TiTiTheme {
     val colors: TdsColorsPalette
@@ -33,12 +31,11 @@ fun TiTiTheme(
     tdsTypography: TdsTypography = TiTiTheme.textStyle,
     content: @Composable () -> Unit,
 ) {
-    val tdsColorsPalette =
-        if (darkTheme) {
-            TdsDarkColorsPalette
-        } else {
-            TdsLightColorsPalette
-        }
+    val tdsColorsPalette = if (darkTheme) {
+        TdsDarkColorsPalette
+    } else {
+        TdsLightColorsPalette
+    }
 
     CompositionLocalProvider(
         LocalTiTiColors provides tdsColorsPalette,

diff --git a/core/ui/src/main/kotlin/com/titi/app/core/ui/ScreenUtil.kt b/core/ui/src/main/kotlin/com/titi/app/core/ui/ScreenUtil.kt
@@ -0,0 +1,9 @@
+package com.titi.app.core.ui
+
+import android.content.res.Configuration
+
+fun Configuration.isTablet(): Boolean {
+    val screenLayout = this.screenLayout and Configuration.SCREENLAYOUT_SIZE_MASK
+    return screenLayout == Configuration.SCREENLAYOUT_SIZE_LARGE ||
+        screenLayout == Configuration.SCREENLAYOUT_SIZE_XLARGE
+}
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
@@ -1,7 +1,6 @@
 package com.titi.app.core.util
 
 import java.time.DayOfWeek
-import java.time.Duration
 import java.time.LocalDate
 import java.time.LocalDateTime
 import java.time.ZoneId
@@ -47,25 +46,48 @@ fun LocalDateTime.toOnlyTime(): String {
     return this.format(formatter)
 }
 
-fun addTimeLine(
-    startTime: ZonedDateTime,
-    endTime: ZonedDateTime,
-    timeLine: List<Long>,
-): List<Long> {
-    var current = startTime
-    val updateTimeLine = timeLine.toMutableList()
+fun getDailyDayWithHour(hour: Int): Pair<String, String> {
+    val currentDateTime = LocalDateTime.now()
 
-    while (current.isBefore(endTime)) {
-        val diffSeconds = if (current.hour == endTime.hour) {
-            Duration.between(current, endTime).seconds
-        } else {
-            val nextTime = current.plusHours(1).withMinute(0).withSecond(0)
-            Duration.between(current, nextTime).seconds
-        }
+    return if (currentDateTime.hour < hour) {
+        val startDateTime = currentDateTime
+            .minusDays(1)
+            .withHour(hour)
+            .withMinute(0)
+            .withSecond(0)
+            .withNano(0)
+            .atZone(ZoneId.systemDefault())
+            .withZoneSameInstant(ZoneOffset.UTC)
+            .toString()
+        val endDateTime = currentDateTime
+            .withHour(hour)
+            .withMinute(0)
+            .withSecond(0)
+            .withNano(0)
+            .atZone(ZoneId.systemDefault())
+            .withZoneSameInstant(ZoneOffset.UTC)
+            .toString()
 
-        updateTimeLine[current.hour] += diffSeconds
-        current = current.plusHours(1).withMinute(0).withSecond(0)
-    }
+        startDateTime to endDateTime
+    } else {
+        val startDateTime = currentDateTime
+            .withHour(hour)
+            .withMinute(0)
+            .withSecond(0)
+            .withNano(0)
+            .atZone(ZoneId.systemDefault())
+            .withZoneSameInstant(ZoneOffset.UTC)
+            .toString()
+        val endDateTime = currentDateTime
+            .plusDays(1)
+            .withHour(hour)
+            .withMinute(0)
+            .withSecond(0)
+            .withNano(0)
+            .atZone(ZoneId.systemDefault())
+            .withZoneSameInstant(ZoneOffset.UTC)
+            .toString()
 
-    return updateTimeLine.toList()
+        startDateTime to endDateTime
+    }
 }
diff --git a/core/util/src/main/kotlin/com/titi/app/core/util/StringExtensions.kt b/core/util/src/main/kotlin/com/titi/app/core/util/StringExtensions.kt
@@ -0,0 +1,11 @@
+package com.titi.app.core.util
+
+import java.time.ZoneId
+import java.time.ZonedDateTime
+
+fun String.isAfterH(hour: Int): Boolean {
+    val inputDateTime = ZonedDateTime.parse(this).withZoneSameInstant(ZoneId.systemDefault())
+    val currentDateTime = ZonedDateTime.now()
+
+    return inputDateTime.dayOfMonth != currentDateTime.dayOfMonth && currentDateTime.hour >= hour
+}
diff --git a/core/util/src/main/kotlin/com/titi/app/core/util/TimeUtil.kt b/core/util/src/main/kotlin/com/titi/app/core/util/TimeUtil.kt
@@ -13,11 +13,6 @@ fun String.parseZoneDateTime(): String {
     return inputDateTime.format(DateTimeFormatter.ofPattern("uuuu.MM.dd"))
 }
 
-fun getTodayDate(): String {
-    val now = ZonedDateTime.now()
-    return now.format(DateTimeFormatter.ofPattern("uuuu.MM.dd"))
-}
-
 fun addTimeToNow(time: Long): String {
     val now = ZonedDateTime.now()
     val interval = Duration.ofSeconds(time)
@@ -31,23 +26,6 @@ fun getTimeToLong(hour: String, minutes: String, seconds: String): Long {
     return hourLong * 3600 + minutesLong * 60 + secondsLong
 }
 
-fun isAfterSixAM(dateTime: String?): Boolean {
-    return if (dateTime.isNullOrBlank()) {
-        false
-    } else {
-        val inputDateTime =
-            ZonedDateTime.parse(dateTime).withZoneSameInstant(ZoneId.systemDefault())
-        val currentDateTime = ZonedDateTime.now()
-
-        if (inputDateTime.dayOfMonth == currentDateTime.dayOfMonth) {
-            true
-        } else {
-            val plusDays = inputDateTime.plusDays(1).dayOfMonth
-            currentDateTime.hour <= 6 && plusDays == currentDateTime.dayOfMonth
-        }
-    }
-}
-
 fun getMeasureTime(dateTime: String): Long {
     val inputDateTime = ZonedDateTime.parse(dateTime)
     val currentDateTime = ZonedDateTime.now(ZoneOffset.UTC)

diff --git a/data/daily/api/src/main/kotlin/com/titi/app/data/daily/api/DailyRepository.kt b/data/daily/api/src/main/kotlin/com/titi/app/data/daily/api/DailyRepository.kt
@@ -39,8 +39,6 @@ interface DailyRepository {
 
     suspend fun getDailies(startDateTime: String, endDateTime: String): List<DailyRepositoryModel>?
 
-    fun getLastDailyFlow(): Flow<DailyRepositoryModel?>
-
     suspend fun getAllDailies(): List<DailyRepositoryModel>?
 
     suspend fun upsert(dailyRepositoryModel: DailyRepositoryModel)

diff --git a/data/daily/impl/src/main/kotlin/com/titi/app/data/daily/impl/local/dao/DailyDao.kt b/data/daily/impl/src/main/kotlin/com/titi/app/data/daily/impl/local/dao/DailyDao.kt
@@ -12,14 +12,14 @@ internal interface DailyDao {
     @Query(
         "SELECT * FROM dailies " +
             " WHERE datetime(day) " +
-            "BETWEEN datetime(:startDateTime) AND datetime(:endDateTime)",
+            "BETWEEN datetime(:startDateTime) AND datetime(:endDateTime) LIMIT 1",
     )
     suspend fun getDateDaily(startDateTime: String, endDateTime: String): DailyEntity?
 
     @Query(
         "SELECT * FROM dailies " +
             " WHERE datetime(day) " +
-            "BETWEEN datetime(:startDateTime) AND datetime(:endDateTime)",
+            "BETWEEN datetime(:startDateTime) AND datetime(:endDateTime) LIMIT 1",
     )
     fun getDateDailyFlow(startDateTime: String, endDateTime: String): Flow<DailyEntity?>
 
@@ -28,10 +28,7 @@ internal interface DailyDao {
             " WHERE datetime(day) " +
             "BETWEEN datetime(:startDateTime) AND datetime(:endDateTime)",
     )
-    suspend fun getWeekDaily(startDateTime: String, endDateTime: String): List<DailyEntity>?
-
-    @Query("SELECT * FROM dailies ORDER BY id desc LIMIT 1")
-    fun getLastDailyFlow(): Flow<DailyEntity?>
+    suspend fun getDailies(startDateTime: String, endDateTime: String): List<DailyEntity>?
 
     @Query("SELECT * FROM dailies")
     suspend fun getAllDailies(): List<DailyEntity>?

diff --git a/...daily/impl/src/main/kotlin/com/titi/app/data/daily/impl/repository/DailyRepositoryImpl.kt b/...daily/impl/src/main/kotlin/com/titi/app/data/daily/impl/repository/DailyRepositoryImpl.kt
@@ -36,16 +36,12 @@ internal class DailyRepositoryImpl @Inject constructor(
         startDateTime: String,
         endDateTime: String,
     ): List<DailyRepositoryModel>? {
-        return dailyDao.getWeekDaily(
+        return dailyDao.getDailies(
             startDateTime = startDateTime,
             endDateTime = endDateTime,
         )?.map { it.toRepositoryModel() }
     }
 
-    override fun getLastDailyFlow(): Flow<DailyRepositoryModel?> {
-        return dailyDao.getLastDailyFlow().map { it?.toRepositoryModel() }
-    }
-
     override suspend fun getAllDailies(): List<DailyRepositoryModel>? {
         return dailyDao.getAllDailies()?.map { it.toRepositoryModel() }
     }

diff --git a/domain/daily/src/main/kotlin/com/titi/app/doamin/daily/model/Daily.kt b/domain/daily/src/main/kotlin/com/titi/app/doamin/daily/model/Daily.kt
@@ -2,17 +2,17 @@ package com.titi.app.doamin.daily.model
 
 import android.os.Parcelable
 import com.titi.app.core.util.addTimeLine
+import com.titi.app.core.util.getDailyDayWithHour
 import kotlin.math.max
 import kotlinx.parcelize.Parcelize
 import org.threeten.bp.Duration
-import org.threeten.bp.ZoneOffset
 import org.threeten.bp.ZonedDateTime
 
 @Parcelize
 data class Daily(
     val id: Long = 0,
     val status: String? = null,
-    val day: String = ZonedDateTime.now(ZoneOffset.UTC).toString(),
+    val day: String = getDailyDayWithHour(6).first,
     val timeLine: List<Long> = LongArray(24) { 0 }.toList(),
     val maxTime: Long = 0,
     val tasks: Map<String, Long>? = null,

diff --git a/...n/daily/src/main/kotlin/com/titi/app/doamin/daily/usecase/AddMeasureTimeAtDailyUseCase.kt b/...n/daily/src/main/kotlin/com/titi/app/doamin/daily/usecase/AddMeasureTimeAtDailyUseCase.kt
@@ -1,44 +1,39 @@
 package com.titi.app.doamin.daily.usecase
 
+import com.titi.app.core.util.getDailyDayWithHour
 import com.titi.app.data.daily.api.DailyRepository
 import com.titi.app.doamin.daily.mapper.toDomainModel
 import com.titi.app.doamin.daily.mapper.toRepositoryModel
+import com.titi.app.doamin.daily.model.Daily
 import com.titi.app.doamin.daily.model.TaskHistory
 import com.titi.app.doamin.daily.model.toUpdateDaily
-import java.time.LocalDate
-import java.time.ZoneId
-import java.time.ZoneOffset
 import javax.inject.Inject
 
 class AddMeasureTimeAtDailyUseCase @Inject constructor(
     private val dailyRepository: DailyRepository,
 ) {
     suspend operator fun invoke(taskName: String, startTime: String, endTime: String) {
-        val recentDaily = dailyRepository
-            .getDateDaily(
-                startDateTime = LocalDate.now()
-                    .atStartOfDay(ZoneId.systemDefault())
-                    .withZoneSameInstant(ZoneOffset.UTC)
-                    .toString(),
-            )?.toDomainModel()
+        val timePair = getDailyDayWithHour(6)
+        val recentDaily = dailyRepository.getDateDaily(
+            startDateTime = timePair.first,
+            endDateTime = timePair.second,
+        )?.toDomainModel() ?: Daily()
 
-        recentDaily?.let { daily ->
-            val taskHistory = TaskHistory(
-                startDate = startTime,
-                endDate = endTime,
-            )
+        val taskHistory = TaskHistory(
+            startDate = startTime,
+            endDate = endTime,
+        )
 
-            val updateTaskHistories = daily.taskHistories?.toMutableMap()?.apply {
-                this[taskName] = this[taskName]
-                    ?.toMutableList()
-                    ?.apply { add(taskHistory) }
-                    ?: listOf(taskHistory)
-            }?.toMap()
-                ?: mapOf(taskName to listOf(taskHistory))
+        val updateTaskHistories = recentDaily.taskHistories?.toMutableMap()?.apply {
+            this[taskName] = this[taskName]
+                ?.toMutableList()
+                ?.apply { add(taskHistory) }
+                ?: listOf(taskHistory)
+        }?.toMap()
+            ?: mapOf(taskName to listOf(taskHistory))
 
-            dailyRepository.upsert(
-                daily.toUpdateDaily(updateTaskHistories).toRepositoryModel(),
-            )
-        }
+        dailyRepository.upsert(
+            recentDaily.toUpdateDaily(updateTaskHistories).toRepositoryModel(),
+        )
     }
 }
diff --git a/domain/daily/src/main/kotlin/com/titi/app/doamin/daily/usecase/GetLastDailyFlowUseCase.kt b/domain/daily/src/main/kotlin/com/titi/app/doamin/daily/usecase/GetLastDailyFlowUseCase.kt
diff --git a/domain/daily/src/main/kotlin/com/titi/app/doamin/daily/usecase/GetTodayDailyFlowUseCase.kt b/domain/daily/src/main/kotlin/com/titi/app/doamin/daily/usecase/GetTodayDailyFlowUseCase.kt
@@ -0,0 +1,22 @@
+package com.titi.app.doamin.daily.usecase
+
+import com.titi.app.core.util.getDailyDayWithHour
+import com.titi.app.data.daily.api.DailyRepository
+import com.titi.app.doamin.daily.mapper.toDomainModel
+import com.titi.app.doamin.daily.model.Daily
+import javax.inject.Inject
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+
+class GetTodayDailyFlowUseCase @Inject constructor(
+    private val dailyRepository: DailyRepository,
+) {
+    operator fun invoke(): Flow<Daily> {
+        val timePair = getDailyDayWithHour(6)
+
+        return dailyRepository.getDateDailyFlow(
+            startDateTime = timePair.first,
+            endDateTime = timePair.second,
+        ).map { it?.toDomainModel() ?: Daily() }
+    }
+}
diff --git a/...me/usecase/UpdateMeasuringStateUseCase.kt → .../time/usecase/UpdateRecordTimesUseCase.kt b/...me/usecase/UpdateMeasuringStateUseCase.kt → .../time/usecase/UpdateRecordTimesUseCase.kt
@@ -5,7 +5,7 @@ import com.titi.app.domain.time.mapper.toRepositoryModel
 import com.titi.app.domain.time.model.RecordTimes
 import javax.inject.Inject
 
-class UpdateMeasuringStateUseCase @Inject constructor(
+class UpdateRecordTimesUseCase @Inject constructor(
     private val recordTimesRepository: RecordTimesRepository,
 ) {
     suspend operator fun invoke(recordTimes: RecordTimes) {

diff --git a/feature/main/build.gradle.kts b/feature/main/build.gradle.kts
@@ -21,4 +21,5 @@ dependencies {
 
     implementation(libs.androidx.splashscreen)
     implementation(libs.androidx.material3.window.size)
+    implementation(libs.lottie)
 }
diff --git a/feature/main/src/main/kotlin/com/titi/app/feature/main/model/SplashResultState.kt b/feature/main/src/main/kotlin/com/titi/app/feature/main/model/SplashResultState.kt
@@ -7,7 +7,7 @@ import com.titi.app.domain.time.model.RecordTimes
 data class SplashResultState(
     val recordTimes: RecordTimes = RecordTimes(),
     val timeColor: TimeColor = TimeColor(),
-    val daily: Daily? = null,
+    val daily: Daily = Daily(),
 )
 
 fun SplashResultState.toFeatureTimeModel() = com.titi.app.feature.time.model.SplashResultState(