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

fix: Show only the progress for the current timer in notification when running on Android 15 or lower

Browse Source
This commit is contained in:
Nishant Mishra
2025-09-14 17:07:32 +05:30
parent c1c2f57ddc
commit fdca3cfa2a
1 changed files with 47 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
app/src/main/java/org/nsh07/pomodoro/service/TimerService.kt
View File

@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
import android.app.Service import android.app.Service
import android.content.Intent import android.content.Intent
import android.media.MediaPlayer import android.media.MediaPlayer
import android.os.Build
import android.os.IBinder import android.os.IBinder
import android.os.SystemClock import android.os.SystemClock
import android.provider.Settings import android.provider.Settings
@@ -107,20 +108,27 @@ class TimerService : Service() {
} }
private fun toggleTimer() { private fun toggleTimer() {
notificationBuilder
.clearActions()
.addTimerActions(
this,
if (timerState.value.timerRunning) R.drawable.pause else R.drawable.play,
if (timerState.value.timerRunning) "Stop" else "Start"
)
if (timerState.value.timerRunning) { if (timerState.value.timerRunning) {
notificationBuilder
.clearActions()
.addTimerActions(
this,
R.drawable.play,
"Start"
)
showTimerNotification(time.toInt(), paused = true) showTimerNotification(time.toInt(), paused = true)
_timerState.update { currentState -> _timerState.update { currentState ->
currentState.copy(timerRunning = false) currentState.copy(timerRunning = false)
} }
pauseTime = SystemClock.elapsedRealtime() pauseTime = SystemClock.elapsedRealtime()
} else { } else {
notificationBuilder
.clearActions()
.addTimerActions(
this,
R.drawable.pause,
"Stop"
)
_timerState.update { it.copy(timerRunning = true) } _timerState.update { it.copy(timerRunning = true) }
if (pauseTime != 0L) pauseDuration += SystemClock.elapsedRealtime() - pauseTime if (pauseTime != 0L) pauseDuration += SystemClock.elapsedRealtime() - pauseTime
@@ -202,26 +210,42 @@ class TimerService : Service() {
.setStyle( .setStyle(
NotificationCompat.ProgressStyle().also { NotificationCompat.ProgressStyle().also {
// Add all the Focus, Short break and long break intervals in order // Add all the Focus, Short break and long break intervals in order
for (i in 0..<timerRepository.sessionLength * 2) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.BAKLAVA) {
if (i % 2 == 0) it.addProgressSegment( // Android 16 and later supports live updates
// Set progress bar sections if on Baklava or later
for (i in 0..<timerRepository.sessionLength * 2) {
if (i % 2 == 0) it.addProgressSegment(
NotificationCompat.ProgressStyle.Segment(
timerRepository.focusTime.toInt()
).setColor(cs.primary.toArgb())
)
else if (i != (timerRepository.sessionLength * 2 - 1)) it.addProgressSegment(
NotificationCompat.ProgressStyle.Segment(
timerRepository.shortBreakTime.toInt()
).setColor(cs.tertiary.toArgb())
)
else it.addProgressSegment(
NotificationCompat.ProgressStyle.Segment(
timerRepository.longBreakTime.toInt()
).setColor(cs.tertiary.toArgb())
)
}
} else {
it.addProgressSegment(
NotificationCompat.ProgressStyle.Segment( NotificationCompat.ProgressStyle.Segment(
timerRepository.focusTime.toInt() when (timerState.value.timerMode) {
).setColor(cs.primary.toArgb()) TimerMode.FOCUS -> timerRepository.focusTime.toInt()
) TimerMode.SHORT_BREAK -> timerRepository.shortBreakTime.toInt()
else if (i != (timerRepository.sessionLength * 2 - 1)) it.addProgressSegment( else -> timerRepository.longBreakTime.toInt()
NotificationCompat.ProgressStyle.Segment( }
timerRepository.shortBreakTime.toInt() )
).setColor(cs.tertiary.toArgb())
)
else it.addProgressSegment(
NotificationCompat.ProgressStyle.Segment(
timerRepository.longBreakTime.toInt()
).setColor(cs.tertiary.toArgb())
) )
} }
} }
.setProgress( // Set the current progress by filling the previous intervals and part of the current interval .setProgress( // Set the current progress by filling the previous intervals and part of the current interval
(totalTime - remainingTime) + ((cycles + 1) / 2) * timerRepository.focusTime.toInt() + (cycles / 2) * timerRepository.shortBreakTime.toInt() if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.BAKLAVA) {
(totalTime - remainingTime) + ((cycles + 1) / 2) * timerRepository.focusTime.toInt() + (cycles / 2) * timerRepository.shortBreakTime.toInt()
} else (totalTime - remainingTime)
) )
) )
.setWhen(System.currentTimeMillis() + remainingTime) // Sets the Live Activity/Now Bar chip time .setWhen(System.currentTimeMillis() + remainingTime) // Sets the Live Activity/Now Bar chip time
@@ -310,7 +334,7 @@ class TimerService : Service() {
_timerState.update { currentState -> _timerState.update { currentState ->
currentState.copy(alarmRinging = false) currentState.copy(alarmRinging = false)
} }
notificationBuilder.clearActions().addTimerActions(this, R.drawable.play, "Start") notificationBuilder.clearActions().addTimerActions(this, R.drawable.play, "Start next")
showTimerNotification( showTimerNotification(
when (timerState.value.timerMode) { when (timerState.value.timerMode) {
TimerMode.FOCUS -> timerRepository.focusTime.toInt() TimerMode.FOCUS -> timerRepository.focusTime.toInt()