From 15454ec4c70079140f976842ef7a51b9187c7b31 Mon Sep 17 00:00:00 2001 From: Bandal Date: Sat, 31 Aug 2024 15:50:10 +0900 Subject: [PATCH] =?UTF-8?q?feat:=2010=EB=B6=84=20=EB=82=A8=EC=95=98?= =?UTF-8?q?=EC=9D=84=20=EB=95=8C=20=EB=A1=9C=EC=BB=AC=20=ED=91=B8=EC=8B=9C?= =?UTF-8?q?=EC=95=8C=EB=9E=8C=20=EC=9A=94=EC=B2=AD=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/teamhy2/feature/main/MainScreen.kt | 4 +--- .../java/com/teamhy2/hongikyeolgong2/timer/model/Timer.kt | 4 ++-- .../java/com/hongikyeolgong2/timer/model/TimerTest.kt | 8 ++++---- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/main-presentation/src/main/java/com/teamhy2/feature/main/MainScreen.kt b/main-presentation/src/main/java/com/teamhy2/feature/main/MainScreen.kt index 416e6a4f..ef6c3225 100644 --- a/main-presentation/src/main/java/com/teamhy2/feature/main/MainScreen.kt +++ b/main-presentation/src/main/java/com/teamhy2/feature/main/MainScreen.kt @@ -150,11 +150,9 @@ private fun startTimer( Duration.ofMinutes(31), mapOf( Timer.THIRTY_MINUTES_SECONDS to { - // TODO: 30분 로컬 푸시 알람 요청 onSendNotification(PushText.THIRTY_MINUTES) }, - Timer.FIVE_MINUTES_SECONDS to { - // TODO: 5분 로컬 푸시 알람 요청 + Timer.TEN_MINUTES_SECONDS to { onSendNotification(PushText.TEN_MINUTES) }, Timer.TIME_OVER_SECONDS to { diff --git a/timer-domain/src/main/java/com/teamhy2/hongikyeolgong2/timer/model/Timer.kt b/timer-domain/src/main/java/com/teamhy2/hongikyeolgong2/timer/model/Timer.kt index bf526150..75fc0a35 100644 --- a/timer-domain/src/main/java/com/teamhy2/hongikyeolgong2/timer/model/Timer.kt +++ b/timer-domain/src/main/java/com/teamhy2/hongikyeolgong2/timer/model/Timer.kt @@ -63,10 +63,10 @@ class Timer( companion object { private const val LEFT_TIME_FORMAT: String = "%02d:%02d:%02d" const val THIRTY_MINUTES_SECONDS: Long = 30 * 60L - const val FIVE_MINUTES_SECONDS: Long = 5 * 60L + const val TEN_MINUTES_SECONDS: Long = 10 * 60L const val TIME_OVER_SECONDS: Long = 0L private const val DELAY_MILLIS: Long = 1000L - private val EVENT_TIMES: List = listOf(THIRTY_MINUTES_SECONDS, FIVE_MINUTES_SECONDS, TIME_OVER_SECONDS) + private val EVENT_TIMES: List = listOf(THIRTY_MINUTES_SECONDS, TEN_MINUTES_SECONDS, TIME_OVER_SECONDS) } } diff --git a/timer-domain/src/test/java/com/hongikyeolgong2/timer/model/TimerTest.kt b/timer-domain/src/test/java/com/hongikyeolgong2/timer/model/TimerTest.kt index 48e2121d..77418900 100644 --- a/timer-domain/src/test/java/com/hongikyeolgong2/timer/model/TimerTest.kt +++ b/timer-domain/src/test/java/com/hongikyeolgong2/timer/model/TimerTest.kt @@ -26,7 +26,7 @@ class TimerTest : BehaviorSpec({ duration, mapOf( Timer.THIRTY_MINUTES_SECONDS to {}, - Timer.FIVE_MINUTES_SECONDS to {}, + Timer.TEN_MINUTES_SECONDS to {}, Timer.TIME_OVER_SECONDS to {}, ), ) @@ -52,7 +52,7 @@ class TimerTest : BehaviorSpec({ duration, mapOf( Timer.THIRTY_MINUTES_SECONDS to {}, - Timer.FIVE_MINUTES_SECONDS to {}, + Timer.TEN_MINUTES_SECONDS to {}, Timer.TIME_OVER_SECONDS to {}, ), ) @@ -77,7 +77,7 @@ class TimerTest : BehaviorSpec({ duration, mapOf( Timer.THIRTY_MINUTES_SECONDS to {}, - Timer.FIVE_MINUTES_SECONDS to {}, + Timer.TEN_MINUTES_SECONDS to {}, Timer.TIME_OVER_SECONDS to {}, ), ) @@ -105,7 +105,7 @@ class TimerTest : BehaviorSpec({ duration, mapOf( Timer.THIRTY_MINUTES_SECONDS to {}, - Timer.FIVE_MINUTES_SECONDS to {}, + Timer.TEN_MINUTES_SECONDS to {}, Timer.TIME_OVER_SECONDS to {}, ), )