Merge pull request #71 from physphil/ui-updates

Bunch of UI updates and fixes
physphil · Oct 24, 2020 · 854dbd2 · 854dbd2
2 parents 83c7349 + 03cd26b
commit 854dbd2
Show file tree

Hide file tree

Showing 49 changed files with 39 additions and 14 deletions.
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
@@ -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
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
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
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
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
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
diff --git a/app/src/main/res/drawable-hdpi/ic_shortcut_tonight.png b/app/src/main/res/drawable-hdpi/ic_shortcut_tonight.png
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
diff --git a/app/src/main/res/drawable-mdpi/ic_shortcut_eod.png b/app/src/main/res/drawable-mdpi/ic_shortcut_eod.png
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
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
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
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
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
diff --git a/app/src/main/res/drawable-mdpi/ic_shortcut_tonight.png b/app/src/main/res/drawable-mdpi/ic_shortcut_tonight.png
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
diff --git a/app/src/main/res/drawable-xhdpi/ic_shortcut_eod.png b/app/src/main/res/drawable-xhdpi/ic_shortcut_eod.png
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
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
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
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
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
diff --git a/app/src/main/res/drawable-xhdpi/ic_shortcut_tonight.png b/app/src/main/res/drawable-xhdpi/ic_shortcut_tonight.png
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
diff --git a/app/src/main/res/drawable-xxhdpi/ic_shortcut_eod.png b/app/src/main/res/drawable-xxhdpi/ic_shortcut_eod.png
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
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
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
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
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
diff --git a/app/src/main/res/drawable-xxhdpi/ic_shortcut_tonight.png b/app/src/main/res/drawable-xxhdpi/ic_shortcut_tonight.png
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
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_shortcut_eod.png b/app/src/main/res/drawable-xxxhdpi/ic_shortcut_eod.png
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
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
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
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
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
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_shortcut_tonight.png b/app/src/main/res/drawable-xxxhdpi/ic_shortcut_tonight.png
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
diff --git a/app/src/main/res/drawable/bg_rounded_recurrence.xml b/app/src/main/res/drawable/bg_rounded_recurrence.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/theme_key_lime_green_very_dark" />
+    <corners android:radius="@dimen/radius_button_primary" />
+</shape>
diff --git a/app/src/main/res/drawable/bg_rounded_time.xml b/app/src/main/res/drawable/bg_rounded_time.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/theme_ice_blue_very_dark" />
+    <corners android:radius="@dimen/radius_button_primary" />
+</shape>
diff --git a/...ain/res/drawable/ic_clock_purple_24dp.xml → ...es/drawable/ic_clock_silver_blue_24dp.xml b/...ain/res/drawable/ic_clock_purple_24dp.xml → ...es/drawable/ic_clock_silver_blue_24dp.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF3f51b5"
+        android:fillColor="#2E72D2"
         android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM12.5,7H11v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_repeat_16dp.xml → ...c/main/res/drawable/ic_row_recurrence.xml b/app/src/main/res/drawable/ic_repeat_16dp.xml → ...c/main/res/drawable/ic_row_recurrence.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/colorIconFill"
+        android:fillColor="@color/theme_key_lime_green"
         android:pathData="M7,7h10v3l4,-4 -4,-4v3L5,5v6h2L7,7zM17,17L7,17v-3l-4,4 4,4v-3h12v-6h-2v4z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_time_16dp.xml → app/src/main/res/drawable/ic_row_time.xml b/app/src/main/res/drawable/ic_time_16dp.xml → app/src/main/res/drawable/ic_row_time.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/colorIconFill"
+        android:fillColor="@color/theme_ice_blue"
         android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM12.5,7H11v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z"/>
 </vector>
diff --git a/app/src/main/res/layout/view_row_reminder_list.xml b/app/src/main/res/layout/view_row_reminder_list.xml
@@ -18,31 +18,42 @@
         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" />
 
     <TextView
         android:id="@+id/reminderItemTimeView"
         style="@style/ReminderListTime"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:drawableEnd="@drawable/ic_time_16dp"
-        android:textColor="@color/colorHeaderText"
+        android:background="@drawable/bg_rounded_time"
+        android:drawableEnd="@drawable/ic_row_time"
+        android:paddingStart="@dimen/global_margin_typical"
+        android:paddingTop="@dimen/global_margin_small"
+        android:paddingEnd="@dimen/global_margin_typical"
+        android:paddingBottom="@dimen/global_margin_small"
+        android:textColor="@color/theme_ice_blue"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="9:30 AM" />
 
     <TextView
         android:id="@+id/reminderItemRecurrenceView"
         style="@style/ReminderListTime"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/global_margin_xlarge"
         android:layout_marginTop="@dimen/global_margin_typical"
-        android:drawableEnd="@drawable/ic_repeat_16dp"
-        android:textColor="@color/colorHeaderText"
+        android:background="@drawable/bg_rounded_recurrence"
+        android:drawableEnd="@drawable/ic_row_recurrence"
+        android:paddingStart="@dimen/global_margin_typical"
+        android:paddingTop="@dimen/global_margin_small"
+        android:paddingEnd="@dimen/global_margin_typical"
+        android:paddingBottom="@dimen/global_margin_small"
+        android:textColor="@color/theme_key_lime_green"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@id/reminderItemTimeView"
         tools:text="Yearly" />

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -22,12 +22,14 @@
     <color name="theme_red">#F44336</color>
 
     <color name="theme_ice_blue">#38A5FF</color>
+    <color name="theme_ice_blue_very_dark">#0E2940</color>
     <color name="theme_silver_blue">#2E72D2</color>
     <color name="theme_silver_blue_dark">#2864B8</color>
     <color name="theme_charcoal">#202122</color>
     <color name="theme_charcoal_light">#303133</color>
     <color name="theme_key_lime_green">#21AF85</color>
     <color name="theme_key_lime_green_dark">#1D9672</color>
+    <color name="theme_key_lime_green_very_dark">#013011</color>
     <color name="theme_forest_green">#003D2C</color>
     <color name="theme_forest_green_dark">#003325</color>
     <color name="theme_text_critical">#FC766D</color>

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -27,7 +27,7 @@
     </style>
 
     <style name="Pickers" parent="Theme.AppCompat.Light.Dialog">
-        <item name="colorAccent">@color/colorPrimary</item>
+        <item name="colorAccent">@color/colorAccentDark</item>
     </style>
 
     <style name="Button">