From bff173ab92fc40576463ee00080aff75952ab8b8 Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Fri, 28 Feb 2020 11:01:48 -0600
Subject: [PATCH] Make notification dialogs consistent

---
 .../main/java/org/tasks/reminders/NotificationActivity.java   | 4 ++++
 app/src/main/java/org/tasks/reminders/NotificationDialog.java | 1 +
 app/src/main/java/org/tasks/reminders/SnoozeActivity.java     | 4 ++++
 app/src/main/java/org/tasks/reminders/SnoozeDialog.java       | 1 +
 app/src/main/res/values/styles.xml                            | 4 ++++
 5 files changed, 14 insertions(+)

diff --git a/app/src/main/java/org/tasks/reminders/NotificationActivity.java b/app/src/main/java/org/tasks/reminders/NotificationActivity.java
index 5be090292..184f2968a 100644
--- a/app/src/main/java/org/tasks/reminders/NotificationActivity.java
+++ b/app/src/main/java/org/tasks/reminders/NotificationActivity.java
@@ -16,6 +16,7 @@ import org.tasks.injection.InjectingAppCompatActivity;
 import org.tasks.intents.TaskIntents;
 import org.tasks.notifications.NotificationManager;
 import org.tasks.receivers.CompleteTaskReceiver;
+import org.tasks.themes.ThemeAccent;
 import timber.log.Timber;
 
 public class NotificationActivity extends InjectingAppCompatActivity
@@ -26,6 +27,7 @@ public class NotificationActivity extends InjectingAppCompatActivity
   private static final String FRAG_TAG_NOTIFICATION_FRAGMENT = "frag_tag_notification_fragment";
   @Inject NotificationManager notificationManager;
   @Inject TaskDao taskDao;
+  @Inject ThemeAccent themeAccent;
 
   private long taskId;
   private CompositeDisposable disposables;
@@ -34,6 +36,8 @@ public class NotificationActivity extends InjectingAppCompatActivity
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
 
+    themeAccent.applyStyle(getTheme());
+
     setup(getIntent());
   }
 
diff --git a/app/src/main/java/org/tasks/reminders/NotificationDialog.java b/app/src/main/java/org/tasks/reminders/NotificationDialog.java
index 797cade04..cbc182bcd 100644
--- a/app/src/main/java/org/tasks/reminders/NotificationDialog.java
+++ b/app/src/main/java/org/tasks/reminders/NotificationDialog.java
@@ -52,6 +52,7 @@ public class NotificationDialog extends InjectingDialogFragment {
                   break;
               }
             })
+        .setNegativeButton(android.R.string.cancel, null)
         .show();
   }
 
diff --git a/app/src/main/java/org/tasks/reminders/SnoozeActivity.java b/app/src/main/java/org/tasks/reminders/SnoozeActivity.java
index b5b46a784..e1e7c0a63 100644
--- a/app/src/main/java/org/tasks/reminders/SnoozeActivity.java
+++ b/app/src/main/java/org/tasks/reminders/SnoozeActivity.java
@@ -14,6 +14,7 @@ import org.tasks.dialogs.MyTimePickerDialog;
 import org.tasks.injection.ActivityComponent;
 import org.tasks.injection.InjectingAppCompatActivity;
 import org.tasks.notifications.NotificationManager;
+import org.tasks.themes.ThemeAccent;
 import org.tasks.time.DateTime;
 
 public class SnoozeActivity extends InjectingAppCompatActivity
@@ -29,12 +30,15 @@ public class SnoozeActivity extends InjectingAppCompatActivity
   @Inject NotificationManager notificationManager;
   @Inject TaskDao taskDao;
   @Inject ReminderService reminderService;
+  @Inject ThemeAccent themeAccent;
   private boolean pickingDateTime;
 
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
 
+    themeAccent.applyStyle(getTheme());
+
     setup(getIntent(), savedInstanceState);
   }
 
diff --git a/app/src/main/java/org/tasks/reminders/SnoozeDialog.java b/app/src/main/java/org/tasks/reminders/SnoozeDialog.java
index 9fc0ce5c6..d092330f8 100644
--- a/app/src/main/java/org/tasks/reminders/SnoozeDialog.java
+++ b/app/src/main/java/org/tasks/reminders/SnoozeDialog.java
@@ -96,6 +96,7 @@ public class SnoozeDialog extends InjectingDialogFragment {
                   break;
               }
             })
+        .setNegativeButton(android.R.string.cancel, null)
         .show();
   }
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index cd6884a75..c3e0a6142 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -14,6 +14,10 @@
     <item name="android:colorBackgroundCacheHint">@null</item>
     <item name="android:windowIsTranslucent">true</item>
     <item name="android:windowCloseOnTouchOutside">false</item>
+    <item name="dialogTheme">@style/TasksDialog</item>
+    <item name="android:dialogTheme">@style/TasksDialog</item>
+    <item name="alertDialogTheme">@style/TasksDialogAlert</item>
+    <item name="materialAlertDialogTheme">@style/TasksDialogAlert</item>
   </style>
 
   <style name="TaskEditTextPrimary">