From a83fe5b4bc608653bd9d9d42388077482af4ff4e Mon Sep 17 00:00:00 2001 From: Jean-Luc Makiola Date: Fri, 13 Nov 2026 17:43:35 +0100 Subject: [PATCH] fix: review round 2 - TonePlayer only behind RingAudioPlayer, floret-kit ring fixes (calendula#171) --- .../jeanlucmakiola/clockula/ArchitectureRulesTest.kt | 12 +++++++++++- floret-kit | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/app/src/test/java/de/jeanlucmakiola/clockula/ArchitectureRulesTest.kt b/app/src/test/java/de/jeanlucmakiola/clockula/ArchitectureRulesTest.kt index b62cbd5..c848ed9 100644 --- a/app/src/test/java/de/jeanlucmakiola/clockula/ArchitectureRulesTest.kt +++ b/app/src/test/java/de/jeanlucmakiola/clockula/ArchitectureRulesTest.kt @@ -221,13 +221,23 @@ class ArchitectureRulesTest { */ @Test fun `MediaPlayer lives only in the ring path and the ringtone catalog`() { - val offenders = kotlinSources.containing("MediaPlayer", "TonePlayer").filterNot { path -> + val offenders = kotlinSources.containing("MediaPlayer").filterNot { path -> path.contains("/ring/") || path.contains("de/jeanlucmakiola/clockula/data/ringtones/") } assertThat(offenders).isEmpty() } + /** floret-kit's `TonePlayer` is that wrapper now, so only `RingAudioPlayer` may hold one. */ + @Test + fun `TonePlayer lives only behind RingAudioPlayer`() { + val offenders = kotlinSources.containing("TonePlayer").filterNot { + it.endsWith("de/jeanlucmakiola/clockula/ring/RingAudioPlayer.kt") + } + + assertThat(offenders).isEmpty() + } + /** * M7 D19: the stopwatch is silent. It never opens audio, never vibrates and * never takes a wake lock — which is the one thing a future "make the lap diff --git a/floret-kit b/floret-kit index 7a5b81e..1c6c96f 160000 --- a/floret-kit +++ b/floret-kit @@ -1 +1 @@ -Subproject commit 7a5b81e88a24910b80dc21c4ef16cc2c94282a5f +Subproject commit 1c6c96fe33ef32692948aa8c603091737e99390f