From bec64cbdda8fc07950c75946cf743f95970a794e Mon Sep 17 00:00:00 2001
From: Nishant Mishra <nishant.28@outlook.com>
Date: Mon, 8 Sep 2025 19:07:47 +0530
Subject: [PATCH] fix: Don't play alarm sound when skip button is clicked

---
 .../java/org/nsh07/pomodoro/ui/timerScreen/TimerScreen.kt  | 4 ++--
 .../nsh07/pomodoro/ui/timerScreen/viewModel/TimerAction.kt | 3 ++-
 .../pomodoro/ui/timerScreen/viewModel/TimerViewModel.kt    | 7 ++++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/nsh07/pomodoro/ui/timerScreen/TimerScreen.kt b/app/src/main/java/org/nsh07/pomodoro/ui/timerScreen/TimerScreen.kt
index a31724e..dae0e4e 100644
--- a/app/src/main/java/org/nsh07/pomodoro/ui/timerScreen/TimerScreen.kt
+++ b/app/src/main/java/org/nsh07/pomodoro/ui/timerScreen/TimerScreen.kt
@@ -395,7 +395,7 @@ fun TimerScreen(
                     customItem(
                         {
                             FilledTonalIconButton(
-                                onClick = { onAction(TimerAction.SkipTimer) },
+                                onClick = { onAction(TimerAction.SkipTimer(fromButton = true)) },
                                 colors = IconButtonDefaults.filledTonalIconButtonColors(
                                     containerColor = colorContainer
                                 ),
@@ -422,7 +422,7 @@ fun TimerScreen(
                                 },
                                 text = { Text("Skip to next") },
                                 onClick = {
-                                    onAction(TimerAction.SkipTimer)
+                                    onAction(TimerAction.SkipTimer(fromButton = true))
                                     state.dismiss()
                                 }
                             )
diff --git a/app/src/main/java/org/nsh07/pomodoro/ui/timerScreen/viewModel/TimerAction.kt b/app/src/main/java/org/nsh07/pomodoro/ui/timerScreen/viewModel/TimerAction.kt
index 46df0d5..2134c1c 100644
--- a/app/src/main/java/org/nsh07/pomodoro/ui/timerScreen/viewModel/TimerAction.kt
+++ b/app/src/main/java/org/nsh07/pomodoro/ui/timerScreen/viewModel/TimerAction.kt
@@ -8,8 +8,9 @@
 package org.nsh07.pomodoro.ui.timerScreen.viewModel
 
 sealed interface TimerAction {
+    data class SkipTimer(val fromButton: Boolean) : TimerAction
+
     data object ResetTimer : TimerAction
-    data object SkipTimer : TimerAction
     data object StopAlarm : TimerAction
     data object ToggleTimer : TimerAction
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/nsh07/pomodoro/ui/timerScreen/viewModel/TimerViewModel.kt b/app/src/main/java/org/nsh07/pomodoro/ui/timerScreen/viewModel/TimerViewModel.kt
index 80ed086..ebfd45e 100644
--- a/app/src/main/java/org/nsh07/pomodoro/ui/timerScreen/viewModel/TimerViewModel.kt
+++ b/app/src/main/java/org/nsh07/pomodoro/ui/timerScreen/viewModel/TimerViewModel.kt
@@ -134,8 +134,9 @@ class TimerViewModel(
 
     fun onAction(action: TimerAction) {
         when (action) {
+            is TimerAction.SkipTimer -> skipTimer(action.fromButton)
+
             TimerAction.ResetTimer -> resetTimer()
-            TimerAction.SkipTimer -> skipTimer()
             TimerAction.StopAlarm -> stopAlarm()
             TimerAction.ToggleTimer -> toggleTimer()
         }
@@ -164,10 +165,10 @@ class TimerViewModel(
         }
     }
 
-    private fun skipTimer() {
+    private fun skipTimer(fromButton: Boolean = false) {
         viewModelScope.launch {
             saveTimeToDb()
-            showTimerNotification(0, paused = true, complete = true)
+            showTimerNotification(0, paused = true, complete = !fromButton)
             startTime = 0L
             pauseTime = 0L
             pauseDuration = 0L