lostecho/Tomato
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(internal): ensure continuous history on app startup

Browse Source
This commit is contained in:
Nishant Mishra
2025-07-12 10:30:29 +05:30
parent af0c1ee732
commit 2c6c00b24f
3 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/org/nsh07/pomodoro/data/StatDao.kt
View File

@@ -44,4 +44,7 @@ interface StatDao {
@Query("SELECT EXISTS (SELECT * FROM stat WHERE date = :date)") @Query("SELECT EXISTS (SELECT * FROM stat WHERE date = :date)")
suspend fun statExists(date: String): Boolean suspend fun statExists(date: String): Boolean
@Query("SELECT date FROM stat ORDER BY date DESC LIMIT 1")
suspend fun getLastDate(): String?
} }

8
app/src/main/java/org/nsh07/pomodoro/data/StatRepository.kt
View File

@@ -20,6 +20,8 @@ import java.time.LocalTime
* ViewModel * ViewModel
*/ */
interface StatRepository { interface StatRepository {
suspend fun insertStat(stat: Stat)
suspend fun addFocusTime(focusTime: Long) suspend fun addFocusTime(focusTime: Long)
suspend fun addBreakTime(breakTime: Long) suspend fun addBreakTime(breakTime: Long)
@@ -29,6 +31,8 @@ interface StatRepository {
fun getLastWeekStatsSummary(): Flow<List<StatSummary>> fun getLastWeekStatsSummary(): Flow<List<StatSummary>>
fun getAverageFocusTimes(): Flow<StatFocusTime?> fun getAverageFocusTimes(): Flow<StatFocusTime?>
suspend fun getLastDate(): String?
} }
/** /**
@@ -38,6 +42,8 @@ class AppStatRepository(
private val statDao: StatDao, private val statDao: StatDao,
private val ioDispatcher: CoroutineDispatcher = Dispatchers.IO private val ioDispatcher: CoroutineDispatcher = Dispatchers.IO
) : StatRepository { ) : StatRepository {
override suspend fun insertStat(stat: Stat) = statDao.insertStat(stat)
override suspend fun addFocusTime(focusTime: Long) = withContext(ioDispatcher) { override suspend fun addFocusTime(focusTime: Long) = withContext(ioDispatcher) {
val currentDate = LocalDate.now().toString() val currentDate = LocalDate.now().toString()
val currentTime = LocalTime.now().toSecondOfDay() val currentTime = LocalTime.now().toSecondOfDay()
@@ -99,4 +105,6 @@ class AppStatRepository(
statDao.getLastWeekStatsSummary() statDao.getLastWeekStatsSummary()
override fun getAverageFocusTimes(): Flow<StatFocusTime?> = statDao.getAvgFocusTimes() override fun getAverageFocusTimes(): Flow<StatFocusTime?> = statDao.getAvgFocusTimes()
override suspend fun getLastDate(): String? = statDao.getLastDate()
} }

11
app/src/main/java/org/nsh07/pomodoro/ui/timerScreen/viewModel/TimerViewModel.kt
View File

@@ -25,9 +25,11 @@ import kotlinx.coroutines.flow.update
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import org.nsh07.pomodoro.TomatoApplication import org.nsh07.pomodoro.TomatoApplication
import org.nsh07.pomodoro.data.PreferenceRepository import org.nsh07.pomodoro.data.PreferenceRepository
import org.nsh07.pomodoro.data.Stat
import org.nsh07.pomodoro.data.StatRepository import org.nsh07.pomodoro.data.StatRepository
import org.nsh07.pomodoro.data.TimerRepository import org.nsh07.pomodoro.data.TimerRepository
import org.nsh07.pomodoro.utils.millisecondsToStr import org.nsh07.pomodoro.utils.millisecondsToStr
import java.time.LocalDate
@OptIn(FlowPreview::class) @OptIn(FlowPreview::class)
class TimerViewModel( class TimerViewModel(
@@ -83,6 +85,15 @@ class TimerViewModel(
resetTimer() resetTimer()
var lastDate = LocalDate.parse(statRepository.getLastDate())
val today = LocalDate.now()
// Fills dates between today and lastDate with 0s to ensure continuous history
while (lastDate.until(today).days > 0) {
lastDate = lastDate.plusDays(1)
statRepository.insertStat(Stat(lastDate.toString(), 0, 0, 0, 0, 0))
}
delay(1500) delay(1500)
_timerState.update { currentState -> _timerState.update { currentState ->