Make notification dialogs consistent

pull/935/head
Alex Baker 6 years ago
parent 32b3f15901
commit bff173ab92

@ -16,6 +16,7 @@ import org.tasks.injection.InjectingAppCompatActivity;
import org.tasks.intents.TaskIntents; import org.tasks.intents.TaskIntents;
import org.tasks.notifications.NotificationManager; import org.tasks.notifications.NotificationManager;
import org.tasks.receivers.CompleteTaskReceiver; import org.tasks.receivers.CompleteTaskReceiver;
import org.tasks.themes.ThemeAccent;
import timber.log.Timber; import timber.log.Timber;
public class NotificationActivity extends InjectingAppCompatActivity 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"; private static final String FRAG_TAG_NOTIFICATION_FRAGMENT = "frag_tag_notification_fragment";
@Inject NotificationManager notificationManager; @Inject NotificationManager notificationManager;
@Inject TaskDao taskDao; @Inject TaskDao taskDao;
@Inject ThemeAccent themeAccent;
private long taskId; private long taskId;
private CompositeDisposable disposables; private CompositeDisposable disposables;
@ -34,6 +36,8 @@ public class NotificationActivity extends InjectingAppCompatActivity
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
themeAccent.applyStyle(getTheme());
setup(getIntent()); setup(getIntent());
} }

@ -52,6 +52,7 @@ public class NotificationDialog extends InjectingDialogFragment {
break; break;
} }
}) })
.setNegativeButton(android.R.string.cancel, null)
.show(); .show();
} }

@ -14,6 +14,7 @@ import org.tasks.dialogs.MyTimePickerDialog;
import org.tasks.injection.ActivityComponent; import org.tasks.injection.ActivityComponent;
import org.tasks.injection.InjectingAppCompatActivity; import org.tasks.injection.InjectingAppCompatActivity;
import org.tasks.notifications.NotificationManager; import org.tasks.notifications.NotificationManager;
import org.tasks.themes.ThemeAccent;
import org.tasks.time.DateTime; import org.tasks.time.DateTime;
public class SnoozeActivity extends InjectingAppCompatActivity public class SnoozeActivity extends InjectingAppCompatActivity
@ -29,12 +30,15 @@ public class SnoozeActivity extends InjectingAppCompatActivity
@Inject NotificationManager notificationManager; @Inject NotificationManager notificationManager;
@Inject TaskDao taskDao; @Inject TaskDao taskDao;
@Inject ReminderService reminderService; @Inject ReminderService reminderService;
@Inject ThemeAccent themeAccent;
private boolean pickingDateTime; private boolean pickingDateTime;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
themeAccent.applyStyle(getTheme());
setup(getIntent(), savedInstanceState); setup(getIntent(), savedInstanceState);
} }

@ -96,6 +96,7 @@ public class SnoozeDialog extends InjectingDialogFragment {
break; break;
} }
}) })
.setNegativeButton(android.R.string.cancel, null)
.show(); .show();
} }

@ -14,6 +14,10 @@
<item name="android:colorBackgroundCacheHint">@null</item> <item name="android:colorBackgroundCacheHint">@null</item>
<item name="android:windowIsTranslucent">true</item> <item name="android:windowIsTranslucent">true</item>
<item name="android:windowCloseOnTouchOutside">false</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>
<style name="TaskEditTextPrimary"> <style name="TaskEditTextPrimary">

Loading…
Cancel
Save