From 34930fa2b3712166a551c2543619a053578abf16 Mon Sep 17 00:00:00 2001
From: Phillip Hsu <philliphsu@outlook.com>
Date: Mon, 5 Sep 2016 19:17:54 -0700
Subject: [PATCH] Change timer notification icons

---
 .../timers/TimerNotificationService.java      | 19 +++++++++++--------
 .../clock2/timers/TimerRingtoneService.java   |  6 +++---
 app/src/main/res/values/strings.xml           |  3 +++
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/philliphsu/clock2/timers/TimerNotificationService.java b/app/src/main/java/com/philliphsu/clock2/timers/TimerNotificationService.java
index f792c29..922ace0 100644
--- a/app/src/main/java/com/philliphsu/clock2/timers/TimerNotificationService.java
+++ b/app/src/main/java/com/philliphsu/clock2/timers/TimerNotificationService.java
@@ -74,6 +74,7 @@ public class TimerNotificationService extends Service {
                 // TODO: Verify the notification countdown is extended by one minute.
             } else if (ACTION_START_PAUSE.equals(action)) {
                 mController.startPause();
+                showNotification(); // Update the notification
             } else if (ACTION_STOP.equals(action)) {
                 mController.stop();
                 stopSelf();
@@ -93,7 +94,7 @@ public class TimerNotificationService extends Service {
     private void showNotification() {
         // Base note
         NotificationCompat.Builder builder = new NotificationCompat.Builder(this)
-                .setSmallIcon(R.drawable.ic_half_day_1_24dp) // TODO: correct icon
+                .setSmallIcon(R.drawable.ic_timer_24dp)
                 .setShowWhen(false)
                 .setOngoing(true);
         // TODO: Set content intent so that when clicked, we launch
@@ -118,12 +119,13 @@ public class TimerNotificationService extends Service {
         }
         builder.setContentTitle(title);
 
-        addAction(builder, ACTION_ADD_ONE_MINUTE,
-                R.drawable.ic_add_circle_24dp/*TODO: correct icon*/);
+        addAction(builder, ACTION_ADD_ONE_MINUTE, R.drawable.ic_add_24dp, getString(R.string.minute));
+
+        boolean running = mTimer.isRunning();
         addAction(builder, ACTION_START_PAUSE,
-                R.drawable.ic_add_circle_24dp/*TODO: correct icon*/);
-        addAction(builder, ACTION_STOP,
-                R.drawable.ic_add_circle_24dp/*TODO: correct icon*/);
+                running ? R.drawable.ic_pause_24dp : R.drawable.ic_start_24dp,
+                getString(running ? R.string.pause : R.string.resume));
+        addAction(builder, ACTION_STOP, R.drawable.ic_stop_24dp, getString(R.string.stop));
 
         NotificationManager nm = (NotificationManager)
                 getSystemService(Context.NOTIFICATION_SERVICE);
@@ -133,12 +135,13 @@ public class TimerNotificationService extends Service {
     /**
      * Builds and adds the specified action to the notification's builder.
      */
-    private void addAction(NotificationCompat.Builder noteBuilder, String action, @DrawableRes int icon) {
+    private void addAction(NotificationCompat.Builder noteBuilder, String action,
+                           @DrawableRes int icon, String actionTitle) {
         Intent intent = new Intent(this, TimerNotificationService.class)
                 .setAction(action);
 //                .putExtra(EXTRA_TIMER, mTimer);
         PendingIntent pi = PendingIntent.getService(this,
                 mTimer.getIntId(), intent, 0/*no flags*/);
-        noteBuilder.addAction(icon, ""/*no action title*/, pi);
+        noteBuilder.addAction(icon, actionTitle, pi);
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/philliphsu/clock2/timers/TimerRingtoneService.java b/app/src/main/java/com/philliphsu/clock2/timers/TimerRingtoneService.java
index 6fcf9b4..b80d542 100644
--- a/app/src/main/java/com/philliphsu/clock2/timers/TimerRingtoneService.java
+++ b/app/src/main/java/com/philliphsu/clock2/timers/TimerRingtoneService.java
@@ -69,13 +69,13 @@ public class TimerRingtoneService extends RingtoneService<Timer> {
         return new NotificationCompat.Builder(this)
                 .setContentTitle(title)
                 .setContentText(getString(R.string.times_up))
-                .setSmallIcon(R.drawable.ic_half_day_1_24dp) // TODO: correct icon
+                .setSmallIcon(R.drawable.ic_timer_24dp)
                 .setShowWhen(false) // TODO: Should we show this?
 //                .setOngoing(true) // foreground notes are ongoing by default
-                .addAction(R.drawable.ic_add_circle_24dp, // TODO: correct icon
+                .addAction(R.drawable.ic_add_24dp,
                         getString(R.string.add_one_minute),
                         getPendingIntent(ACTION_ADD_ONE_MINUTE, getRingingObject().getIntId()))
-                .addAction(R.drawable.ic_add_circle_24dp, // TODO: correct icon
+                .addAction(R.drawable.ic_stop_24dp,
                         getString(R.string.stop),
                         getPendingIntent(ACTION_STOP, getRingingObject().getIntId()))
                 .build();
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e563869..0df09f3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -197,4 +197,7 @@
 
     <string name="label">Label</string>
     <string name="ringtones">Ringtones</string>
+
+    <string name="pause">Pause</string>
+    <string name="resume">Resume</string>
 </resources>