diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3f3f018..62a7ee8 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -18,6 +18,7 @@ + diff --git a/app/src/main/java/org/nsh07/pomodoro/data/AppContainer.kt b/app/src/main/java/org/nsh07/pomodoro/data/AppContainer.kt index f36a179..4ca23c9 100644 --- a/app/src/main/java/org/nsh07/pomodoro/data/AppContainer.kt +++ b/app/src/main/java/org/nsh07/pomodoro/data/AppContainer.kt @@ -17,6 +17,7 @@ package org.nsh07.pomodoro.data +import android.app.NotificationManager import android.app.PendingIntent import android.content.Context import androidx.compose.ui.graphics.Color @@ -34,6 +35,7 @@ interface AppContainer { val appStatRepository: AppStatRepository val appTimerRepository: AppTimerRepository val notificationManager: NotificationManagerCompat + val notificationManagerService: NotificationManager val notificationBuilder: NotificationCompat.Builder val timerState: MutableStateFlow val time: MutableStateFlow @@ -56,6 +58,9 @@ class DefaultAppContainer(context: Context) : AppContainer { NotificationManagerCompat.from(context) } + override val notificationManagerService: NotificationManager = + context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager + override val notificationBuilder: NotificationCompat.Builder by lazy { NotificationCompat.Builder(context, "timer") .setSmallIcon(R.drawable.tomato_logo_notification) diff --git a/app/src/main/java/org/nsh07/pomodoro/service/TimerService.kt b/app/src/main/java/org/nsh07/pomodoro/service/TimerService.kt index b2423d1..d1ff85f 100644 --- a/app/src/main/java/org/nsh07/pomodoro/service/TimerService.kt +++ b/app/src/main/java/org/nsh07/pomodoro/service/TimerService.kt @@ -30,7 +30,6 @@ import android.os.Vibrator import android.os.VibratorManager import androidx.compose.ui.graphics.toArgb import androidx.core.app.NotificationCompat -import androidx.core.app.NotificationManagerCompat import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job @@ -53,7 +52,8 @@ class TimerService : Service() { private val timerRepository by lazy { appContainer.appTimerRepository } private val statRepository by lazy { appContainer.appStatRepository } - private val notificationManager by lazy { NotificationManagerCompat.from(this) } + private val notificationManager by lazy { appContainer.notificationManager } + private val notificationManagerService by lazy { appContainer.notificationManagerService } private val notificationBuilder by lazy { appContainer.notificationBuilder } private val _timerState by lazy { appContainer.timerState } private val _time by lazy { appContainer.time }