fix: hold a timer's heads-up while an alarm is ringing

A timer whose ring was held back by a ringing alarm still popped a
heads-up over the alarm's screen, then alerted again once the alarm
ended. The heads-up now waits with the ring.

app/src/main/java/de/jeanlucmakiola/clockula/domain/timer/TimerNotification.kt

@@ -22,10 +22,16 @@ data class TimerNotificationState(
 
 /** One notification for however many timers: the subject, and a count (D17). */
 object TimerNotificationPolicy {
-    /** Null when nothing is active. [active] is [TimerReadings.active]'s output. */
+    /**
+     * Null when nothing is active. [active] is [TimerReadings.active]'s output.
+     * [ringSuppressed] is a ringing alarm holding the timer's ring back: its
+     * heads-up waits too, rather than popping over the alarm's screen and
+     * then, when the alarm ends, a second time.
+     */
     fun stateFor(
         active: List<TimerReading>,
         alreadyAlerted: Boolean,
+        ringSuppressed: Boolean = false,
     ): TimerNotificationState? {
         val subject = TimerReadings.subject(active) ?: return null
         return TimerNotificationState(
@@ -46,7 +52,7 @@ object TimerNotificationPolicy {
             actions = actionsFor(subject.mode),
             // An expiry heads-ups exactly once; a countdown update never does,
             // and there is no second notification and no channel gymnastics.
-            alertOnce = subject.mode != TimerMode.EXPIRED || alreadyAlerted,
+            alertOnce = subject.mode != TimerMode.EXPIRED || alreadyAlerted || ringSuppressed,
         )
     }
 

app/src/main/java/de/jeanlucmakiola/clockula/timer/TimerEngine.kt

@@ -289,7 +289,11 @@ class TimerEngine @Inject constructor(
 
         val sounding = outcome.decision as? TimerRingDecision.Sound
         return TimerServiceState(
-            notification = TimerNotificationPolicy.stateFor(active, alreadyAlerted),
+            notification = TimerNotificationPolicy.stateFor(
+                active,
+                alreadyAlerted,
+                ringSuppressed = outcome.decision is TimerRingDecision.Suppressed,
+            ),
             ring = outcome.decision,
             // Floored, so a rounding error cannot spin the service's loop (D20).
             expiresIn = TimerExpiry.nextDeadline(rows, now, wallNow)

app/src/test/java/de/jeanlucmakiola/clockula/domain/timer/TimerNotificationPolicyTest.kt

@@ -144,6 +144,17 @@ class TimerNotificationPolicyTest {
         assertThat(state.alertOnce).isTrue()
     }
 
+    @Test
+    fun `an expiry held back by a ringing alarm does not heads-up yet`() {
+        val state = TimerNotificationPolicy.stateFor(
+            listOf(expired()),
+            alreadyAlerted = false,
+            ringSuppressed = true,
+        )!!
+
+        assertThat(state.alertOnce).isTrue()
+    }
+
     /** §5.5 #11 */
     @Test
     fun `a countdown never alerts`() {