From 71d94c8fcce1098aa181b964a943c782fdfb6ef2 Mon Sep 17 00:00:00 2001 From: Ethan Dalool Date: Mon, 13 Mar 2023 18:41:25 -0700 Subject: [PATCH] checkpoint --- app/src/main/java/org/y20k/trackbook/Keys.kt | 3 --- .../org/y20k/trackbook/helpers/NotificationHelper.kt | 12 +++++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/org/y20k/trackbook/Keys.kt b/app/src/main/java/org/y20k/trackbook/Keys.kt index b3e4215..4e905f5 100644 --- a/app/src/main/java/org/y20k/trackbook/Keys.kt +++ b/app/src/main/java/org/y20k/trackbook/Keys.kt @@ -33,7 +33,6 @@ object Keys { // intent actions const val ACTION_START: String = "org.y20k.trackbook.action.START" const val ACTION_STOP: String = "org.y20k.trackbook.action.STOP" - const val ACTION_RESUME: String = "org.y20k.trackbook.action.RESUME" // args const val ARG_TRACK_TITLE: String = "ArgTrackTitle" @@ -68,10 +67,8 @@ object Keys { const val STATE_THEME_DARK_MODE: String = "stateDarkMode" // dialog types - const val DIALOG_RESUME_EMPTY_RECORDING: Int = 0 const val DIALOG_DELETE_TRACK: Int = 1 const val DIALOG_DELETE_NON_STARRED: Int = 2 - const val DIALOG_DELETE_CURRENT_RECORDING: Int = 3 // dialog results const val DIALOG_EMPTY_PAYLOAD_STRING: String = "" diff --git a/app/src/main/java/org/y20k/trackbook/helpers/NotificationHelper.kt b/app/src/main/java/org/y20k/trackbook/helpers/NotificationHelper.kt index f05b227..10f82b0 100644 --- a/app/src/main/java/org/y20k/trackbook/helpers/NotificationHelper.kt +++ b/app/src/main/java/org/y20k/trackbook/helpers/NotificationHelper.kt @@ -100,7 +100,7 @@ class NotificationHelper(private val trackerService: TrackerService) { private val resumeActionPendingIntent = PendingIntent.getService( trackerService, 16, - Intent(trackerService, TrackerService::class.java).setAction(Keys.ACTION_RESUME), + Intent(trackerService, TrackerService::class.java).setAction(Keys.ACTION_START), PendingIntent.FLAG_IMMUTABLE ) private val showActionPendingIntent: PendingIntent? = TaskStackBuilder.create(trackerService).run { @@ -112,14 +112,16 @@ class NotificationHelper(private val trackerService: TrackerService) { private val stopAction = NotificationCompat.Action( R.drawable.ic_notification_action_stop_24dp, trackerService.getString(R.string.notification_pause), - stopActionPendingIntent) + stopActionPendingIntent + ) private val resumeAction = NotificationCompat.Action( R.drawable.ic_notification_action_resume_36dp, trackerService.getString(R.string.notification_resume), - resumeActionPendingIntent) + resumeActionPendingIntent + ) private val showAction = NotificationCompat.Action( R.drawable.ic_notification_action_show_36dp, trackerService.getString(R.string.notification_show), - showActionPendingIntent) - + showActionPendingIntent + ) } \ No newline at end of file