diff --git a/.idea/libraries/library_2_4_0.xml b/.idea/libraries/library_2_4_0.xml index eedfc0d..700e0a1 100644 --- a/.idea/libraries/library_2_4_0.xml +++ b/.idea/libraries/library_2_4_0.xml @@ -4,8 +4,6 @@ - - - + \ No newline at end of file diff --git a/HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/AlarmAlertActivity.java b/HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/AlarmAlertActivity.java index dfb3e80..df30cb3 100644 --- a/HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/AlarmAlertActivity.java +++ b/HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/AlarmAlertActivity.java @@ -18,7 +18,7 @@ import android.widget.Button; // TODO sound audible alarm -- see AlarmKlaxon.java // TODO Lower alarm volume if in phone call (and detect phone call!) -// TODO set another alarm for the next half-hour (or grace_period / 2)? +// TODO Snooze? set another alarm for the next half-hour (or grace_period / 2)? public class AlarmAlertActivity extends Activity { // TODO correct alert lifetime diff --git a/HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/AlarmNotify.java b/HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/AlarmNotify.java index 2e407cf..1e86488 100644 --- a/HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/AlarmNotify.java +++ b/HypoAlarm/src/main/java/za/org/treehouse/hypoalarm/AlarmNotify.java @@ -42,7 +42,7 @@ public class AlarmNotify extends Service { final long endTime = System.currentTimeMillis() + (gracePeriod * 60 * 1000); //Bitmap bm = BitmapFactory.decodeResource(getResources(), R.drawable.alarm_notification); - Bitmap bm = BitmapFactory.decodeResource(getResources(), R.drawable.ic_grayscale); + Bitmap bm = BitmapFactory.decodeResource(getResources(), R.drawable.ic_launcher_grey); final NotificationManager nm = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); final Notification.Builder notification = new Notification.Builder(this) .setContentTitle(getString(R.string.app_name)) diff --git a/HypoAlarm/src/main/res/drawable-hdpi/ic_grayscale.png b/HypoAlarm/src/main/res/drawable-hdpi/ic_grayscale.png deleted file mode 100644 index 3770d92..0000000 Binary files a/HypoAlarm/src/main/res/drawable-hdpi/ic_grayscale.png and /dev/null differ diff --git a/HypoAlarm/src/main/res/drawable-hdpi/ic_launcher.png b/HypoAlarm/src/main/res/drawable-hdpi/ic_launcher.png deleted file mode 100644 index 0e85f7a..0000000 Binary files a/HypoAlarm/src/main/res/drawable-hdpi/ic_launcher.png and /dev/null differ diff --git a/HypoAlarm/src/main/res/drawable-mdpi/ic_grayscale.png b/HypoAlarm/src/main/res/drawable-mdpi/ic_grayscale.png deleted file mode 100644 index 36695f2..0000000 Binary files a/HypoAlarm/src/main/res/drawable-mdpi/ic_grayscale.png and /dev/null differ diff --git a/HypoAlarm/src/main/res/drawable-mdpi/ic_launcher.png b/HypoAlarm/src/main/res/drawable-mdpi/ic_launcher.png deleted file mode 100644 index 5b7658a..0000000 Binary files a/HypoAlarm/src/main/res/drawable-mdpi/ic_launcher.png and /dev/null differ diff --git a/HypoAlarm/src/main/res/drawable-xhdpi/ic_grayscale.png b/HypoAlarm/src/main/res/drawable-xhdpi/ic_grayscale.png deleted file mode 100644 index 9f90a90..0000000 Binary files a/HypoAlarm/src/main/res/drawable-xhdpi/ic_grayscale.png and /dev/null differ diff --git a/HypoAlarm/src/main/res/drawable-xhdpi/ic_launcher.png b/HypoAlarm/src/main/res/drawable-xhdpi/ic_launcher.png deleted file mode 100644 index 64d1cce..0000000 Binary files a/HypoAlarm/src/main/res/drawable-xhdpi/ic_launcher.png and /dev/null differ diff --git a/HypoAlarm/src/main/res/drawable-xxhdpi/ic_grayscale.png b/HypoAlarm/src/main/res/drawable-xxhdpi/ic_grayscale.png deleted file mode 100644 index 507ba5c..0000000 Binary files a/HypoAlarm/src/main/res/drawable-xxhdpi/ic_grayscale.png and /dev/null differ diff --git a/HypoAlarm/src/main/res/drawable-xxhdpi/ic_launcher.png b/HypoAlarm/src/main/res/drawable-xxhdpi/ic_launcher.png deleted file mode 100644 index 179918d..0000000 Binary files a/HypoAlarm/src/main/res/drawable-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/HypoAlarm/src/main/res/drawable/hypoalarm.png b/HypoAlarm/src/main/res/drawable/hypoalarm.png deleted file mode 100644 index b778628..0000000 Binary files a/HypoAlarm/src/main/res/drawable/hypoalarm.png and /dev/null differ diff --git a/HypoAlarm/src/main/res/drawable/ic_launcher.svg b/HypoAlarm/src/main/res/drawable/ic_launcher.svg new file mode 100644 index 0000000..168d360 --- /dev/null +++ b/HypoAlarm/src/main/res/drawable/ic_launcher.svg @@ -0,0 +1,504 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HypoAlarm/src/main/res/drawable/ic_launcher_grey.svg b/HypoAlarm/src/main/res/drawable/ic_launcher_grey.svg new file mode 100644 index 0000000..7240d02 --- /dev/null +++ b/HypoAlarm/src/main/res/drawable/ic_launcher_grey.svg @@ -0,0 +1,491 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +