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

feat: Show current interval focus count when tapping the clock

Browse Source 
#21
This commit is contained in:
Nishant Mishra
2025-09-08 10:23:53 +05:30
parent 8bcf246d1f
commit ad8929217b
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/nsh07/pomodoro/ui/timerScreen/TimerScreen.kt
View File

@@ -258,9 +258,10 @@ fun TimerScreen(
shrinkVertically(motionScheme.defaultSpatialSpec()) shrinkVertically(motionScheme.defaultSpatialSpec())
) { ) {
Text( Text(
"1 of 4", "${timerState.currentFocusCount} of ${timerState.totalFocusCount}",
fontFamily = openRundeClock, fontFamily = openRundeClock,
style = typography.titleLarge style = typography.titleLarge,
color = colorScheme.outline
) )
} }
} }

4
app/src/main/java/org/nsh07/pomodoro/ui/timerScreen/viewModel/TimerState.kt
View File

@@ -14,7 +14,9 @@ data class TimerState(
val timerRunning: Boolean = false, val timerRunning: Boolean = false,
val nextTimerMode: TimerMode = TimerMode.SHORT_BREAK, val nextTimerMode: TimerMode = TimerMode.SHORT_BREAK,
val nextTimeStr: String = "5:00", val nextTimeStr: String = "5:00",
val showBrandTitle: Boolean = true val showBrandTitle: Boolean = true,
val currentFocusCount: Int = 1,
val totalFocusCount: Int = 4
) )
enum class TimerMode { enum class TimerMode {

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

@@ -145,7 +145,9 @@ class TimerViewModel(
timeStr = millisecondsToStr(time.value), timeStr = millisecondsToStr(time.value),
totalTime = time.value, totalTime = time.value,
nextTimerMode = if (timerRepository.sessionLength > 1) TimerMode.SHORT_BREAK else TimerMode.LONG_BREAK, nextTimerMode = if (timerRepository.sessionLength > 1) TimerMode.SHORT_BREAK else TimerMode.LONG_BREAK,
nextTimeStr = millisecondsToStr(if (timerRepository.sessionLength > 1) timerRepository.shortBreakTime else timerRepository.longBreakTime) nextTimeStr = millisecondsToStr(if (timerRepository.sessionLength > 1) timerRepository.shortBreakTime else timerRepository.longBreakTime),
currentFocusCount = 1,
totalFocusCount = timerRepository.sessionLength
) )
} }
} }
@@ -173,7 +175,9 @@ class TimerViewModel(
timerRepository.longBreakTime timerRepository.longBreakTime
) else millisecondsToStr( ) else millisecondsToStr(
timerRepository.shortBreakTime timerRepository.shortBreakTime
) ),
currentFocusCount = cycles / 2 + 1,
totalFocusCount = timerRepository.sessionLength
) )
} }
} else { } else {