From 6ae9c3511cdc8ecce19a5d64fa6b6246886a5789 Mon Sep 17 00:00:00 2001
From: Phillip Hsu <philliphsu@outlook.com>
Date: Fri, 5 Aug 2016 01:58:43 -0700
Subject: [PATCH] Expired timer notification

---
 .../clock2/alarms/AlarmRingtoneService.java         |  2 +-
 .../clock2/timers/TimerRingtoneService.java         | 13 +++++++++++--
 app/src/main/res/layout/item_expanded_alarm.xml     |  2 ++
 app/src/main/res/values/strings.xml                 |  1 +
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/philliphsu/clock2/alarms/AlarmRingtoneService.java b/app/src/main/java/com/philliphsu/clock2/alarms/AlarmRingtoneService.java
index 964d74e..1b4b767 100644
--- a/app/src/main/java/com/philliphsu/clock2/alarms/AlarmRingtoneService.java
+++ b/app/src/main/java/com/philliphsu/clock2/alarms/AlarmRingtoneService.java
@@ -59,7 +59,7 @@ public class AlarmRingtoneService extends RingtoneService<Alarm> {
                 .setContentText(mNormalRingTime)
                 .setSmallIcon(R.mipmap.ic_launcher)
                 .build();
-        nm.notify(TAG, getRingingObject().intId(), note);
+        nm.notify(TAG, getRingingObject().getIntId(), note);
     }
 
     @Override
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 c6eddd6..9fbdb2a 100644
--- a/app/src/main/java/com/philliphsu/clock2/timers/TimerRingtoneService.java
+++ b/app/src/main/java/com/philliphsu/clock2/timers/TimerRingtoneService.java
@@ -1,6 +1,7 @@
 package com.philliphsu.clock2.timers;
 
 import android.app.Notification;
+import android.app.NotificationManager;
 import android.content.Intent;
 import android.net.Uri;
 import android.provider.Settings;
@@ -12,6 +13,7 @@ import com.philliphsu.clock2.Timer;
 import com.philliphsu.clock2.ringtone.RingtoneService;
 
 public class TimerRingtoneService extends RingtoneService<Timer> {
+    private static final String TAG = "TimerRingtoneService";
 
     // private because they refer to our foreground notification's actions.
     // we reuse these from TimerNotificationService because they're just constants, the values
@@ -48,8 +50,15 @@ public class TimerRingtoneService extends RingtoneService<Timer> {
 
     @Override
     protected void onAutoSilenced() {
-        // TODO: We probably have relevant code to copy over from the old project.
-        // TODO: Stop the Timer and update the table
+        mController.stop();
+        // Post notification that alarm was missed
+        NotificationManager nm = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
+        Notification note = new NotificationCompat.Builder(this)
+                .setContentTitle(getString(R.string.timer_expired))
+                .setContentText(getRingingObject().label())
+                .setSmallIcon(R.mipmap.ic_launcher) // TODO: correct icon
+                .build();
+        nm.notify(TAG, getRingingObject().getIntId(), note);
     }
 
     @Override
diff --git a/app/src/main/res/layout/item_expanded_alarm.xml b/app/src/main/res/layout/item_expanded_alarm.xml
index 8fa3d3b..23d07dc 100644
--- a/app/src/main/res/layout/item_expanded_alarm.xml
+++ b/app/src/main/res/layout/item_expanded_alarm.xml
@@ -18,6 +18,8 @@
                                     android:layout_height="wrap_content"
                                     app:cardElevation="2dp"
                                     app:cardCornerRadius="0dp"
+                                    android:foreground="?selectableItemBackground"
+                                    android:clickable="true"
     android:layout_marginTop="8dp"
     android:layout_marginBottom="8dp">
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3fa9c8f..f59fd3a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -196,4 +196,5 @@
     <string name="times_up">Time\'s up</string>
     <string name="add_one_minute">Add 1 minute</string>
     <string name="stop">Stop</string>
+    <string name="timer_expired">Timer expired</string>
 </resources>