diff --git a/app/src/main/java/com/physphil/android/remindme/job/ShowNotificationJob.kt b/app/src/main/java/com/physphil/android/remindme/job/ShowNotificationJob.kt index 679d38b..2019902 100644 --- a/app/src/main/java/com/physphil/android/remindme/job/ShowNotificationJob.kt +++ b/app/src/main/java/com/physphil/android/remindme/job/ShowNotificationJob.kt @@ -47,14 +47,14 @@ class ShowNotificationJob(private val repo: ReminderRepo) : Job() { .setSmallIcon(R.drawable.ic_notification) .setContentIntent(pi) .setContentTitle(title) - .setColor(ContextCompat.getColor(context, R.color.colorPrimary)) - .addAction(R.drawable.ic_clock_purple_24dp, + .setColor(ContextCompat.getColor(context, R.color.colorAccent)) + .addAction(R.drawable.ic_clock_silver_blue_24dp, context.getString(R.string.snooze_1_hour), getSnoozePendingIntent(SnoozeDuration.OneHour, notificationId, title, text)) - .addAction(R.drawable.ic_clock_purple_24dp, + .addAction(R.drawable.ic_clock_silver_blue_24dp, context.getString(R.string.snooze_3_hours), getSnoozePendingIntent(SnoozeDuration.ThreeHours, notificationId, title, text)) - .addAction(R.drawable.ic_clock_purple_24dp, + .addAction(R.drawable.ic_clock_silver_blue_24dp, context.getString(R.string.snooze_tomorrow), getSnoozePendingIntent(SnoozeDuration.Tomorrow, notificationId, title, text)) diff --git a/app/src/main/res/drawable-hdpi/ic_shortcut_eod.png b/app/src/main/res/drawable-hdpi/ic_shortcut_eod.png old mode 100755 new mode 100644 index c5815b3..d708a2c Binary files a/app/src/main/res/drawable-hdpi/ic_shortcut_eod.png and b/app/src/main/res/drawable-hdpi/ic_shortcut_eod.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_shortcut_eod_purple.png b/app/src/main/res/drawable-hdpi/ic_shortcut_eod_purple.png new file mode 100755 index 0000000..c5815b3 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_shortcut_eod_purple.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_shortcut_new_reminder.png b/app/src/main/res/drawable-hdpi/ic_shortcut_new_reminder.png old mode 100755 new mode 100644 index d0b0462..21cd9b1 Binary files a/app/src/main/res/drawable-hdpi/ic_shortcut_new_reminder.png and b/app/src/main/res/drawable-hdpi/ic_shortcut_new_reminder.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_shortcut_new_reminder_purple.png b/app/src/main/res/drawable-hdpi/ic_shortcut_new_reminder_purple.png new file mode 100755 index 0000000..d0b0462 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_shortcut_new_reminder_purple.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_shortcut_tomorrow_morning.png b/app/src/main/res/drawable-hdpi/ic_shortcut_tomorrow_morning.png old mode 100755 new mode 100644 index 572662c..00b7392 Binary files a/app/src/main/res/drawable-hdpi/ic_shortcut_tomorrow_morning.png and b/app/src/main/res/drawable-hdpi/ic_shortcut_tomorrow_morning.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_shortcut_tomorrow_morning_purple.png b/app/src/main/res/drawable-hdpi/ic_shortcut_tomorrow_morning_purple.png new file mode 100755 index 0000000..572662c Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_shortcut_tomorrow_morning_purple.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_shortcut_tonight.png b/app/src/main/res/drawable-hdpi/ic_shortcut_tonight.png old mode 100755 new mode 100644 index 0da8ee4..d864c42 Binary files a/app/src/main/res/drawable-hdpi/ic_shortcut_tonight.png and b/app/src/main/res/drawable-hdpi/ic_shortcut_tonight.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_shortcut_tonight_purple.png b/app/src/main/res/drawable-hdpi/ic_shortcut_tonight_purple.png new file mode 100755 index 0000000..0da8ee4 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_shortcut_tonight_purple.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_shortcut_eod.png b/app/src/main/res/drawable-mdpi/ic_shortcut_eod.png old mode 100755 new mode 100644 index 2da7879..95fe685 Binary files a/app/src/main/res/drawable-mdpi/ic_shortcut_eod.png and b/app/src/main/res/drawable-mdpi/ic_shortcut_eod.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_shortcut_eod_purple.png b/app/src/main/res/drawable-mdpi/ic_shortcut_eod_purple.png new file mode 100755 index 0000000..2da7879 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_shortcut_eod_purple.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_shortcut_new_reminder.png b/app/src/main/res/drawable-mdpi/ic_shortcut_new_reminder.png old mode 100755 new mode 100644 index 2e44ac2..ca52196 Binary files a/app/src/main/res/drawable-mdpi/ic_shortcut_new_reminder.png and b/app/src/main/res/drawable-mdpi/ic_shortcut_new_reminder.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_shortcut_new_reminder_purple.png b/app/src/main/res/drawable-mdpi/ic_shortcut_new_reminder_purple.png new file mode 100755 index 0000000..2e44ac2 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_shortcut_new_reminder_purple.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_shortcut_tomorrow_morning.png b/app/src/main/res/drawable-mdpi/ic_shortcut_tomorrow_morning.png old mode 100755 new mode 100644 index a96c68b..e0388b0 Binary files a/app/src/main/res/drawable-mdpi/ic_shortcut_tomorrow_morning.png and b/app/src/main/res/drawable-mdpi/ic_shortcut_tomorrow_morning.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_shortcut_tomorrow_morning_purple.png b/app/src/main/res/drawable-mdpi/ic_shortcut_tomorrow_morning_purple.png new file mode 100755 index 0000000..a96c68b Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_shortcut_tomorrow_morning_purple.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_shortcut_tonight.png b/app/src/main/res/drawable-mdpi/ic_shortcut_tonight.png old mode 100755 new mode 100644 index d40b565..4e5e948 Binary files a/app/src/main/res/drawable-mdpi/ic_shortcut_tonight.png and b/app/src/main/res/drawable-mdpi/ic_shortcut_tonight.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_shortcut_tonight_purple.png b/app/src/main/res/drawable-mdpi/ic_shortcut_tonight_purple.png new file mode 100755 index 0000000..d40b565 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_shortcut_tonight_purple.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_shortcut_eod.png b/app/src/main/res/drawable-xhdpi/ic_shortcut_eod.png old mode 100755 new mode 100644 index 4c78029..03a5876 Binary files a/app/src/main/res/drawable-xhdpi/ic_shortcut_eod.png and b/app/src/main/res/drawable-xhdpi/ic_shortcut_eod.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_shortcut_eod_purple.png b/app/src/main/res/drawable-xhdpi/ic_shortcut_eod_purple.png new file mode 100755 index 0000000..4c78029 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_shortcut_eod_purple.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_shortcut_new_reminder.png b/app/src/main/res/drawable-xhdpi/ic_shortcut_new_reminder.png old mode 100755 new mode 100644 index 9d4a9c2..7a4c17f Binary files a/app/src/main/res/drawable-xhdpi/ic_shortcut_new_reminder.png and b/app/src/main/res/drawable-xhdpi/ic_shortcut_new_reminder.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_shortcut_new_reminder_purple.png b/app/src/main/res/drawable-xhdpi/ic_shortcut_new_reminder_purple.png new file mode 100755 index 0000000..9d4a9c2 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_shortcut_new_reminder_purple.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_shortcut_tomorrow_morning.png b/app/src/main/res/drawable-xhdpi/ic_shortcut_tomorrow_morning.png old mode 100755 new mode 100644 index 6eb06fa..ac741b7 Binary files a/app/src/main/res/drawable-xhdpi/ic_shortcut_tomorrow_morning.png and b/app/src/main/res/drawable-xhdpi/ic_shortcut_tomorrow_morning.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_shortcut_tomorrow_morning_purple.png b/app/src/main/res/drawable-xhdpi/ic_shortcut_tomorrow_morning_purple.png new file mode 100755 index 0000000..6eb06fa Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_shortcut_tomorrow_morning_purple.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_shortcut_tonight.png b/app/src/main/res/drawable-xhdpi/ic_shortcut_tonight.png old mode 100755 new mode 100644 index d738d1b..e95878c Binary files a/app/src/main/res/drawable-xhdpi/ic_shortcut_tonight.png and b/app/src/main/res/drawable-xhdpi/ic_shortcut_tonight.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_shortcut_tonight_purple.png b/app/src/main/res/drawable-xhdpi/ic_shortcut_tonight_purple.png new file mode 100755 index 0000000..d738d1b Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_shortcut_tonight_purple.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_shortcut_eod.png b/app/src/main/res/drawable-xxhdpi/ic_shortcut_eod.png old mode 100755 new mode 100644 index 5093750..98d2c3e Binary files a/app/src/main/res/drawable-xxhdpi/ic_shortcut_eod.png and b/app/src/main/res/drawable-xxhdpi/ic_shortcut_eod.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_shortcut_eod_purple.png b/app/src/main/res/drawable-xxhdpi/ic_shortcut_eod_purple.png new file mode 100755 index 0000000..5093750 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_shortcut_eod_purple.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_shortcut_new_reminder.png b/app/src/main/res/drawable-xxhdpi/ic_shortcut_new_reminder.png old mode 100755 new mode 100644 index f45e9e1..4f83a86 Binary files a/app/src/main/res/drawable-xxhdpi/ic_shortcut_new_reminder.png and b/app/src/main/res/drawable-xxhdpi/ic_shortcut_new_reminder.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_shortcut_new_reminder_purple.png b/app/src/main/res/drawable-xxhdpi/ic_shortcut_new_reminder_purple.png new file mode 100755 index 0000000..f45e9e1 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_shortcut_new_reminder_purple.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_shortcut_tomorrow_morning.png b/app/src/main/res/drawable-xxhdpi/ic_shortcut_tomorrow_morning.png old mode 100755 new mode 100644 index 08c1d0d..3ea6af1 Binary files a/app/src/main/res/drawable-xxhdpi/ic_shortcut_tomorrow_morning.png and b/app/src/main/res/drawable-xxhdpi/ic_shortcut_tomorrow_morning.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_shortcut_tomorrow_morning_purple.png b/app/src/main/res/drawable-xxhdpi/ic_shortcut_tomorrow_morning_purple.png new file mode 100755 index 0000000..08c1d0d Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_shortcut_tomorrow_morning_purple.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_shortcut_tonight.png b/app/src/main/res/drawable-xxhdpi/ic_shortcut_tonight.png old mode 100755 new mode 100644 index 7ebc4f7..870ce53 Binary files a/app/src/main/res/drawable-xxhdpi/ic_shortcut_tonight.png and b/app/src/main/res/drawable-xxhdpi/ic_shortcut_tonight.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_shortcut_tonight_purple.png b/app/src/main/res/drawable-xxhdpi/ic_shortcut_tonight_purple.png new file mode 100755 index 0000000..7ebc4f7 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_shortcut_tonight_purple.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_shortcut_eod.png b/app/src/main/res/drawable-xxxhdpi/ic_shortcut_eod.png old mode 100755 new mode 100644 index 82f77ff..88769b6 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_shortcut_eod.png and b/app/src/main/res/drawable-xxxhdpi/ic_shortcut_eod.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_shortcut_eod_purple.png b/app/src/main/res/drawable-xxxhdpi/ic_shortcut_eod_purple.png new file mode 100755 index 0000000..82f77ff Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_shortcut_eod_purple.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_shortcut_new_reminder.png b/app/src/main/res/drawable-xxxhdpi/ic_shortcut_new_reminder.png old mode 100755 new mode 100644 index c37ba31..2f4cc46 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_shortcut_new_reminder.png and b/app/src/main/res/drawable-xxxhdpi/ic_shortcut_new_reminder.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_shortcut_new_reminder_purple.png b/app/src/main/res/drawable-xxxhdpi/ic_shortcut_new_reminder_purple.png new file mode 100755 index 0000000..c37ba31 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_shortcut_new_reminder_purple.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_shortcut_tomorrow_morning.png b/app/src/main/res/drawable-xxxhdpi/ic_shortcut_tomorrow_morning.png old mode 100755 new mode 100644 index 11d7483..a672a6b Binary files a/app/src/main/res/drawable-xxxhdpi/ic_shortcut_tomorrow_morning.png and b/app/src/main/res/drawable-xxxhdpi/ic_shortcut_tomorrow_morning.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_shortcut_tomorrow_morning_purple.png b/app/src/main/res/drawable-xxxhdpi/ic_shortcut_tomorrow_morning_purple.png new file mode 100755 index 0000000..11d7483 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_shortcut_tomorrow_morning_purple.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_shortcut_tonight.png b/app/src/main/res/drawable-xxxhdpi/ic_shortcut_tonight.png old mode 100755 new mode 100644 index 7788ad6..3eec7dc Binary files a/app/src/main/res/drawable-xxxhdpi/ic_shortcut_tonight.png and b/app/src/main/res/drawable-xxxhdpi/ic_shortcut_tonight.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_shortcut_tonight_purple.png b/app/src/main/res/drawable-xxxhdpi/ic_shortcut_tonight_purple.png new file mode 100755 index 0000000..7788ad6 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_shortcut_tonight_purple.png differ diff --git a/app/src/main/res/drawable/bg_rounded_recurrence.xml b/app/src/main/res/drawable/bg_rounded_recurrence.xml new file mode 100644 index 0000000..7f23f17 --- /dev/null +++ b/app/src/main/res/drawable/bg_rounded_recurrence.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_rounded_time.xml b/app/src/main/res/drawable/bg_rounded_time.xml new file mode 100644 index 0000000..bba80b4 --- /dev/null +++ b/app/src/main/res/drawable/bg_rounded_time.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_clock_purple_24dp.xml b/app/src/main/res/drawable/ic_clock_silver_blue_24dp.xml similarity index 92% rename from app/src/main/res/drawable/ic_clock_purple_24dp.xml rename to app/src/main/res/drawable/ic_clock_silver_blue_24dp.xml index 9924a73..b737d22 100644 --- a/app/src/main/res/drawable/ic_clock_purple_24dp.xml +++ b/app/src/main/res/drawable/ic_clock_silver_blue_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_repeat_16dp.xml b/app/src/main/res/drawable/ic_row_recurrence.xml similarity index 85% rename from app/src/main/res/drawable/ic_repeat_16dp.xml rename to app/src/main/res/drawable/ic_row_recurrence.xml index c106dce..fc5e1ea 100644 --- a/app/src/main/res/drawable/ic_repeat_16dp.xml +++ b/app/src/main/res/drawable/ic_row_recurrence.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_time_16dp.xml b/app/src/main/res/drawable/ic_row_time.xml similarity index 89% rename from app/src/main/res/drawable/ic_time_16dp.xml rename to app/src/main/res/drawable/ic_row_time.xml index fbd2338..abbdd0e 100644 --- a/app/src/main/res/drawable/ic_time_16dp.xml +++ b/app/src/main/res/drawable/ic_row_time.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/layout/view_row_reminder_list.xml b/app/src/main/res/layout/view_row_reminder_list.xml index 0a29057..4869a87 100644 --- a/app/src/main/res/layout/view_row_reminder_list.xml +++ b/app/src/main/res/layout/view_row_reminder_list.xml @@ -18,9 +18,10 @@ android:layout_marginEnd="@dimen/global_margin_xxxlarge" android:drawableStart="@drawable/ic_date_range_16dp" android:textColor="@color/colorHeaderText" + app:layout_constraintBottom_toBottomOf="@id/reminderItemTimeView" app:layout_constraintEnd_toStartOf="@id/reminderItemTimeView" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" + app:layout_constraintTop_toTopOf="@id/reminderItemTimeView" tools:text="Wed. Oct. 28, 2020" /> @@ -37,12 +43,17 @@ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 9197069..1e7c2cd 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -22,12 +22,14 @@ #F44336 #38A5FF + #0E2940 #2E72D2 #2864B8 #202122 #303133 #21AF85 #1D9672 + #013011 #003D2C #003325 #FC766D diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 0dc578b..3b1fa64 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -27,7 +27,7 @@