From 9728216c28df656b9e767a4b749d38ed9db0113f Mon Sep 17 00:00:00 2001
From: Nishant Mishra <nishant.28@outlook.com>
Date: Mon, 15 Sep 2025 16:05:30 +0530
Subject: [PATCH] fix: Make alarm dialog viewable from any screen

---
 app/src/main/java/org/nsh07/pomodoro/ui/AppScreen.kt     | 9 +++++++++
 .../org/nsh07/pomodoro/ui/timerScreen/AlarmDialog.kt     | 2 +-
 .../org/nsh07/pomodoro/ui/timerScreen/TimerScreen.kt     | 3 ---
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/nsh07/pomodoro/ui/AppScreen.kt b/app/src/main/java/org/nsh07/pomodoro/ui/AppScreen.kt
index 6d36ac8..0a1e0d9 100644
--- a/app/src/main/java/org/nsh07/pomodoro/ui/AppScreen.kt
+++ b/app/src/main/java/org/nsh07/pomodoro/ui/AppScreen.kt
@@ -47,6 +47,7 @@ import org.nsh07.pomodoro.service.TimerService
 import org.nsh07.pomodoro.ui.settingsScreen.SettingsScreenRoot
 import org.nsh07.pomodoro.ui.statsScreen.StatsScreenRoot
 import org.nsh07.pomodoro.ui.statsScreen.viewModel.StatsViewModel
+import org.nsh07.pomodoro.ui.timerScreen.AlarmDialog
 import org.nsh07.pomodoro.ui.timerScreen.TimerScreen
 import org.nsh07.pomodoro.ui.timerScreen.viewModel.TimerAction
 import org.nsh07.pomodoro.ui.timerScreen.viewModel.TimerViewModel
@@ -71,6 +72,14 @@ fun AppScreen(
 
     val backStack = rememberNavBackStack<Screen>(Screen.Timer)
 
+    if (uiState.alarmRinging)
+        AlarmDialog {
+            Intent(context, TimerService::class.java).also {
+                it.action = TimerService.Actions.STOP_ALARM.toString()
+                context.startService(it)
+            }
+        }
+
     Scaffold(
         bottomBar = {
             val wide = remember {
diff --git a/app/src/main/java/org/nsh07/pomodoro/ui/timerScreen/AlarmDialog.kt b/app/src/main/java/org/nsh07/pomodoro/ui/timerScreen/AlarmDialog.kt
index 556e88d..6d67506 100644
--- a/app/src/main/java/org/nsh07/pomodoro/ui/timerScreen/AlarmDialog.kt
+++ b/app/src/main/java/org/nsh07/pomodoro/ui/timerScreen/AlarmDialog.kt
@@ -69,7 +69,7 @@ fun AlarmDialog(
                     onClick = stopAlarm,
                     modifier = Modifier.align(Alignment.End),
                 ) {
-                    Text("Ok")
+                    Text("Dismiss")
                 }
             }
         }
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 df5e554..daed55a 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
@@ -114,9 +114,6 @@ fun TimerScreen(
         onResult = {}
     )
 
-    if (timerState.alarmRinging)
-        AlarmDialog { onAction(TimerAction.StopAlarm) }
-
     Column(modifier = modifier) {
         TopAppBar(
             title = {