Remove ThemeService

astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java

@@ -64,7 +64,6 @@ import com.todoroo.astrid.repeats.RepeatControlSet;
 import com.todoroo.astrid.service.MetadataService;
 import com.todoroo.astrid.service.TaskDeleter;
 import com.todoroo.astrid.service.TaskService;
-import com.todoroo.astrid.service.ThemeService;
 import com.todoroo.astrid.tags.TagService;
 import com.todoroo.astrid.tags.TagsControlSet;
 import com.todoroo.astrid.timers.TimerActionControlSet;
@@ -371,17 +370,17 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
         timerAction = new TimerActionControlSet(taskService, getActivity(), getView());
         controls.add(timerAction);
 
-        TagsControlSet tagsControlSet = new TagsControlSet(tagService, getActivity(),
+        TagsControlSet tagsControlSet = new TagsControlSet(preferences, tagService, getActivity(),
                 R.layout.control_set_tags, R.layout.control_set_default_display, R.string.TEA_tags_label_long);
         controls.add(tagsControlSet);
         controlSetMap.put(getString(R.string.TEA_ctrl_lists_pref),
                 tagsControlSet);
 
-        RepeatControlSet repeatControls = new RepeatControlSet(getActivity(),
+        RepeatControlSet repeatControls = new RepeatControlSet(preferences, getActivity(),
                 R.layout.control_set_repeat,
                 R.layout.control_set_repeat_display, R.string.repeat_enabled);
 
-        GCalControlSet gcalControl = new GCalControlSet(gcalHelper, getActivity(),
+        GCalControlSet gcalControl = new GCalControlSet(preferences, gcalHelper, getActivity(),
                 R.layout.control_set_gcal, R.layout.control_set_gcal_display,
                 R.string.gcal_TEA_addToCalendar_label);
 
@@ -392,7 +391,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
         // otherwise the correct date may not be written to the calendar event.
         // Order matters!
         DeadlineControlSet deadlineControl = new DeadlineControlSet(
-                getActivity(), R.layout.control_set_deadline,
+                preferences, getActivity(), R.layout.control_set_deadline,
                 R.layout.control_set_deadline_display, repeatControls,
                 repeatControls.getDisplayView(), gcalControl.getDisplayView());
         controlSetMap.put(getString(R.string.TEA_ctrl_when_pref),
@@ -409,7 +408,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
         controlSetMap.put(getString(R.string.TEA_ctrl_importance_pref),
                 importanceControl);
 
-        notesControlSet = new EditNotesControlSet(getActivity(),
+        notesControlSet = new EditNotesControlSet(preferences, getActivity(),
                 R.layout.control_set_notes, R.layout.control_set_notes_display);
         notesEditText = (EditText) notesControlSet.getView().findViewById(
                 R.id.notes);
@@ -417,14 +416,14 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
         controlSetMap.put(getString(R.string.TEA_ctrl_notes_pref),
                 notesControlSet);
 
-        ReminderControlSet reminderControl = new ReminderControlSet(
+        ReminderControlSet reminderControl = new ReminderControlSet(preferences,
                 alarmService, getActivity(), R.layout.control_set_reminders,
                 R.layout.control_set_default_display);
         controls.add(reminderControl);
         controlSetMap.put(getString(R.string.TEA_ctrl_reminders_pref),
                 reminderControl);
 
-        HideUntilControlSet hideUntilControls = new HideUntilControlSet(getActivity(),
+        HideUntilControlSet hideUntilControls = new HideUntilControlSet(preferences, getActivity(),
                 R.layout.control_set_hide,
                 R.layout.control_set_default_display,
                 R.string.hide_until_prompt);
@@ -434,7 +433,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
         // TODO: Fix the fact that hideUntil doesn't update accordingly with date changes when lazy loaded. Until then, don't lazy load.
         hideUntilControls.getView();
 
-        TimerControlSet timerControl = new TimerControlSet(getActivity(),
+        TimerControlSet timerControl = new TimerControlSet(preferences, getActivity(),
                 R.layout.control_set_timers,
                 R.layout.control_set_default_display,
                 R.string.TEA_timer_controls);
@@ -442,7 +441,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
         controls.add(timerControl);
         controlSetMap.put(getString(R.string.TEA_ctrl_timer_pref), timerControl);
 
-        filesControlSet = new FilesControlSet(taskAttachmentDao, getActivity(),
+        filesControlSet = new FilesControlSet(preferences, taskAttachmentDao, getActivity(),
                 R.layout.control_set_files, R.layout.control_set_files_display, R.string.TEA_control_files);
         controls.add(filesControlSet);
         controlSetMap.put(getString(R.string.TEA_ctrl_files_pref), filesControlSet);

astrid/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java

@@ -39,7 +39,6 @@ import com.todoroo.astrid.data.RemoteModel;
 import com.todoroo.astrid.data.TagData;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.gtasks.GtasksListFragment;
-import com.todoroo.astrid.service.ThemeService;
 import com.todoroo.astrid.tags.DeleteTagActivity;
 import com.todoroo.astrid.tags.RenameTagActivity;
 import com.todoroo.astrid.tags.TagFilterExposer;

astrid/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java

@@ -613,7 +613,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
     }
 
     private void showFilesDialog(Task task) {
-        FilesControlSet filesControlSet = new FilesControlSet(taskAttachmentDao,
+        FilesControlSet filesControlSet = new FilesControlSet(preferences, taskAttachmentDao,
                 fragment.getActivity(), R.layout.control_set_files,
                 R.layout.control_set_files_display, R.string.TEA_control_files);
         filesControlSet.readFromTask(task);

astrid/src/main/java/com/todoroo/astrid/alarms/AlarmControlSet.java

@@ -23,6 +23,7 @@ import com.todoroo.astrid.ui.DateAndTimeDialog.DateAndTimeDialogListener;
 import com.todoroo.astrid.ui.DateAndTimePicker;
 
 import org.tasks.R;
+import org.tasks.preferences.ActivityPreferences;
 
 import java.util.Date;
 import java.util.LinkedHashSet;
@@ -37,13 +38,15 @@ import static org.tasks.date.DateTimeUtils.newDate;
  */
 public final class AlarmControlSet extends TaskEditControlSet {
 
+    private final ActivityPreferences preferences;
     private final AlarmService alarmService;
 
     private LinearLayout alertsContainer;
     private DateAndTimeDialog pickerDialog;
 
-    public AlarmControlSet(AlarmService alarmService, Activity activity, int layout) {
+    public AlarmControlSet(ActivityPreferences preferences, AlarmService alarmService, Activity activity, int layout) {
         super(activity, layout);
+        this.preferences = preferences;
         this.alarmService = alarmService;
     }
 
@@ -71,7 +74,7 @@ public final class AlarmControlSet extends TaskEditControlSet {
         };
         getView().findViewById(R.id.alarms_add).setOnClickListener(addAlarmListener);
 
-        pickerDialog = new DateAndTimeDialog(activity, 0);
+        pickerDialog = new DateAndTimeDialog(preferences, activity, 0);
     }
 
     @Override

astrid/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java

@@ -26,7 +26,6 @@ import com.todoroo.astrid.dao.StoreObjectDao;
 import com.todoroo.astrid.dao.TaskDao.TaskCriteria;
 import com.todoroo.astrid.data.StoreObject;
 import com.todoroo.astrid.data.Task;
-import com.todoroo.astrid.service.ThemeService;
 
 import org.tasks.R;
 import org.tasks.injection.ForApplication;

astrid/src/main/java/com/todoroo/astrid/files/FilesControlSet.java

@@ -40,6 +40,7 @@ import com.todoroo.astrid.voice.RecognizerApi;
 import com.todoroo.astrid.voice.RecognizerApi.PlaybackExceptionHandler;
 
 import org.tasks.R;
+import org.tasks.preferences.ActivityPreferences;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -54,8 +55,8 @@ public class FilesControlSet extends PopupControlSet {
     private final ImageView image;
     private final TaskAttachmentDao taskAttachmentDao;
 
-    public FilesControlSet(TaskAttachmentDao taskAttachmentDao, Activity activity, int viewLayout, int displayViewLayout, int title) {
+    public FilesControlSet(ActivityPreferences preferences, TaskAttachmentDao taskAttachmentDao, Activity activity, int viewLayout, int displayViewLayout, int title) {
-        super(activity, viewLayout, displayViewLayout, title);
+        super(preferences, activity, viewLayout, displayViewLayout, title);
         this.taskAttachmentDao = taskAttachmentDao;
         fileDisplayList = (LinearLayout) getDisplayView().findViewById(R.id.files_list);
         image = (ImageView) getDisplayView().findViewById(R.id.display_row_icon);

astrid/src/main/java/com/todoroo/astrid/gcal/CalendarAlarmListCreator.java

@@ -13,7 +13,6 @@ import com.todoroo.astrid.activity.EditPreferences;
 import com.todoroo.astrid.activity.TaskListActivity;
 import com.todoroo.astrid.data.TagData;
 import com.todoroo.astrid.service.TagDataService;
-import com.todoroo.astrid.service.ThemeService;
 
 import org.json.JSONArray;
 import org.json.JSONException;

astrid/src/main/java/com/todoroo/astrid/gcal/GCalControlSet.java

@@ -30,6 +30,7 @@ import com.todoroo.astrid.ui.PopupControlSet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.tasks.R;
+import org.tasks.preferences.ActivityPreferences;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -58,8 +59,8 @@ public class GCalControlSet extends PopupControlSet {
     private final int title;
     private final ImageView image;
 
-    public GCalControlSet(GCalHelper gcal, final Activity activity, int viewLayout, int displayViewLayout, int title) {
+    public GCalControlSet(ActivityPreferences preferences, GCalHelper gcal, final Activity activity, int viewLayout, int displayViewLayout, int title) {
-        super(activity, viewLayout, displayViewLayout, title);
+        super(preferences, activity, viewLayout, displayViewLayout, title);
         this.gcal = gcal;
         this.title = title;
         this.calendars = gcal.getCalendars();

astrid/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java

@@ -38,6 +38,7 @@ import com.todoroo.astrid.ui.PopupControlSet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.tasks.R;
+import org.tasks.preferences.ActivityPreferences;
 
 import java.text.DateFormatSymbols;
 import java.util.ArrayList;
@@ -93,8 +94,8 @@ public class RepeatControlSet extends PopupControlSet {
 
     // --- implementation
 
-    public RepeatControlSet(Activity activity, int viewLayout, int displayViewLayout, int title) {
+    public RepeatControlSet(ActivityPreferences preferences, Activity activity, int viewLayout, int displayViewLayout, int title) {
-        super(activity, viewLayout, displayViewLayout, title);
+        super(preferences, activity, viewLayout, displayViewLayout, title);
     }
 
     /** Set up the repeat value button */
@@ -129,7 +130,7 @@ public class RepeatControlSet extends PopupControlSet {
     }
 
     private void repeatUntilClick() {
-        DateAndTimeDialog d = new DateAndTimeDialog(activity, repeatUntilValue,
+        DateAndTimeDialog d = new DateAndTimeDialog(preferences, activity, repeatUntilValue,
                 R.layout.repeat_until_dialog, R.string.repeat_until_title);
         d.setDateAndTimeDialogListener(new DateAndTimeDialogListener() {
             @Override

astrid/src/main/java/com/todoroo/astrid/service/ThemeService.java

@@ -1,35 +0,0 @@
-/**
- * Copyright (c) 2012 Todoroo Inc
- *
- * See the file "LICENSE" for the full license governing this code.
- */
-package com.todoroo.astrid.service;
-
-import com.todoroo.andlib.utility.AndroidUtilities;
-import com.todoroo.andlib.utility.Preferences;
-
-import org.tasks.R;
-
-public class ThemeService {
-
-    @Deprecated
-    public static int getEditDialogTheme() {
-        boolean ics = AndroidUtilities.getSdkVersion() >= 14;
-        int themeSetting = Preferences.getBoolean(R.string.p_use_dark_theme, false) ? R.style.Tasks : R.style.Tasks_Light;
-        int theme;
-        if (themeSetting == R.style.Tasks) {
-            if (ics) {
-                theme = R.style.TEA_Dialog_ICS;
-            } else {
-                theme = R.style.TEA_Dialog;
-            }
-        } else {
-            if (ics) {
-                theme = R.style.TEA_Dialog_Light_ICS;
-            } else {
-                theme = R.style.TEA_Dialog_Light;
-            }
-        }
-        return theme;
-    }
-}

astrid/src/main/java/com/todoroo/astrid/tags/TagFilterExposer.java

@@ -30,7 +30,6 @@ import com.todoroo.astrid.dao.TaskDao.TaskCriteria;
 import com.todoroo.astrid.data.Metadata;
 import com.todoroo.astrid.data.RemoteModel;
 import com.todoroo.astrid.data.TagData;
-import com.todoroo.astrid.service.ThemeService;
 import com.todoroo.astrid.tags.TagService.Tag;
 
 import org.tasks.R;

astrid/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java

@@ -33,6 +33,7 @@ import com.todoroo.astrid.ui.PopupControlSet;
 import com.todoroo.astrid.utility.Flags;
 
 import org.tasks.R;
+import org.tasks.preferences.ActivityPreferences;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -65,8 +66,8 @@ public final class TagsControlSet extends PopupControlSet {
 
     private final TagService tagService;
 
-    public TagsControlSet(TagService tagService, Activity activity, int viewLayout, int displayViewLayout, int title) {
+    public TagsControlSet(ActivityPreferences preferences, TagService tagService, Activity activity, int viewLayout, int displayViewLayout, int title) {
-        super(activity, viewLayout, displayViewLayout, title);
+        super(preferences, activity, viewLayout, displayViewLayout, title);
         this.tagService = tagService;
         tagsDisplay = (TextView) getDisplayView().findViewById(R.id.display_row_edit);
         image = (ImageView) getDisplayView().findViewById(R.id.display_row_icon);

astrid/src/main/java/com/todoroo/astrid/timers/TimerControlSet.java

@@ -20,6 +20,7 @@ import com.todoroo.astrid.ui.PopupControlSet;
 import com.todoroo.astrid.ui.TimeDurationControlSet;
 
 import org.tasks.R;
+import org.tasks.preferences.ActivityPreferences;
 
 import static org.tasks.preferences.ResourceResolver.getResource;
 
@@ -35,8 +36,8 @@ public class TimerControlSet extends PopupControlSet implements TimerActionListe
     private final TextView displayEdit;
     private final ImageView image;
 
-    public TimerControlSet(final Activity activity, int viewLayout, int displayViewLayout, int title) {
+    public TimerControlSet(ActivityPreferences preferences, final Activity activity, int viewLayout, int displayViewLayout, int title) {
-        super(activity, viewLayout, displayViewLayout, title);
+        super(preferences, activity, viewLayout, displayViewLayout, title);
 
         displayEdit = (TextView) getDisplayView().findViewById(R.id.display_row_edit);
         displayEdit.setText(R.string.TEA_timer_controls);

astrid/src/main/java/com/todoroo/astrid/ui/DateAndTimeDialog.java

@@ -13,9 +13,8 @@ import android.view.Window;
 import android.view.WindowManager.LayoutParams;
 import android.widget.Button;
 
-import com.todoroo.astrid.service.ThemeService;
-
 import org.tasks.R;
+import org.tasks.preferences.ActivityPreferences;
 
 public class DateAndTimeDialog extends Dialog {
 
@@ -29,12 +28,12 @@ public class DateAndTimeDialog extends Dialog {
 
     private DateAndTimeDialogListener listener;
 
-    public DateAndTimeDialog(Context context, long startDate) {
+    public DateAndTimeDialog(ActivityPreferences preferences, Context context, long startDate) {
-        this(context, startDate, R.layout.date_time_dialog, 0);
+        this(preferences, context, startDate, R.layout.date_time_dialog, 0);
     }
 
-    public DateAndTimeDialog(Context context, long startDate, int contentView, int title) {
+    public DateAndTimeDialog(ActivityPreferences preferences, Context context, long startDate, int contentView, int title) {
-        super(context, ThemeService.getEditDialogTheme());
+        super(context, preferences.getEditDialogTheme());
 
         if (title == 0) {
             requestWindowFeature(Window.FEATURE_NO_TITLE);

astrid/src/main/java/com/todoroo/astrid/ui/DateChangedAlerts.java

@@ -35,7 +35,7 @@ import com.todoroo.astrid.ui.DateAndTimeDialog.DateAndTimeDialogListener;
 import com.todoroo.astrid.utility.Flags;
 
 import org.tasks.R;
-import org.tasks.preferences.Preferences;
+import org.tasks.preferences.ActivityPreferences;
 
 import java.text.ParseException;
 
@@ -59,10 +59,10 @@ public class DateChangedAlerts {
     /** Start showing the option to hide future notifs after this many confirmation dialogs */
     private static final int HIDE_CHECKBOX_AFTER_SHOWS = 3;
 
-    private final Preferences preferences;
+    private final ActivityPreferences preferences;
 
     @Inject
-    public DateChangedAlerts(Preferences preferences) {
+    public DateChangedAlerts(ActivityPreferences preferences) {
         this.preferences = preferences;
     }
 
@@ -150,7 +150,7 @@ public class DateChangedAlerts {
                 @Override
                 public void onClick(View v) {
                     long startDate = 0;
-                    DateAndTimeDialog picker = new DateAndTimeDialog(activity, startDate, R.layout.repeat_until_dialog, R.string.repeat_until_title);
+                    DateAndTimeDialog picker = new DateAndTimeDialog(preferences, activity, startDate, R.layout.repeat_until_dialog, R.string.repeat_until_title);
                     picker.setDateAndTimeDialogListener(new DateAndTimeDialogListener() {
                         @Override
                         public void onDateAndTimeSelected(long date) {

astrid/src/main/java/com/todoroo/astrid/ui/DeadlineControlSet.java

@@ -24,6 +24,7 @@ import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.repeats.RepeatControlSet;
 
 import org.tasks.R;
+import org.tasks.preferences.ActivityPreferences;
 
 import static org.tasks.preferences.ResourceResolver.getResource;
 
@@ -35,9 +36,9 @@ public class DeadlineControlSet extends PopupControlSet {
     private final RepeatControlSet repeatControlSet;
     private final ImageView image;
 
-    public DeadlineControlSet(Activity activity, int viewLayout, int displayViewLayout,
+    public DeadlineControlSet(ActivityPreferences preferences, Activity activity, int viewLayout, int displayViewLayout,
             RepeatControlSet repeatControlSet, View...extraViews) {
-        super(activity, viewLayout, displayViewLayout, 0);
+        super(preferences, activity, viewLayout, displayViewLayout, 0);
         this.extraViews = extraViews;
         this.repeatControlSet = repeatControlSet;
         this.image = (ImageView) getDisplayView().findViewById(R.id.display_row_icon);

astrid/src/main/java/com/todoroo/astrid/ui/EditNotesControlSet.java

@@ -19,6 +19,7 @@ import android.widget.TextView;
 import com.todoroo.astrid.data.Task;
 
 import org.tasks.R;
+import org.tasks.preferences.ActivityPreferences;
 
 import static org.tasks.preferences.ResourceResolver.getResource;
 
@@ -28,8 +29,8 @@ public class EditNotesControlSet extends PopupControlSet {
     protected TextView notesPreview;
     protected ImageView image;
 
-    public EditNotesControlSet(Activity activity, int viewLayout, int displayViewLayout) {
+    public EditNotesControlSet(ActivityPreferences preferences, Activity activity, int viewLayout, int displayViewLayout) {
-        super(activity, viewLayout, displayViewLayout, R.string.TEA_note_label);
+        super(preferences, activity, viewLayout, displayViewLayout, R.string.TEA_note_label);
         image = (ImageView) getDisplayView().findViewById(R.id.display_row_icon);
     }
 

astrid/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java

@@ -21,6 +21,7 @@ import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.ui.DateAndTimeDialog.DateAndTimeDialogListener;
 
 import org.tasks.R;
+import org.tasks.preferences.ActivityPreferences;
 
 import java.util.Date;
 
@@ -47,8 +48,8 @@ public class HideUntilControlSet extends PopupControlSet implements OnItemSelect
 
     private long existingDate = EXISTING_TIME_UNSET;
 
-    public HideUntilControlSet(Activity activity, int viewLayout, int displayViewLayout, int title) {
+    public HideUntilControlSet(ActivityPreferences preferences, Activity activity, int viewLayout, int displayViewLayout, int title) {
-        super(activity, viewLayout, displayViewLayout, title);
+        super(preferences, activity, viewLayout, displayViewLayout, title);
         this.title = title;
         image = (ImageView) getDisplayView().findViewById(R.id.display_row_icon);
     }
@@ -123,7 +124,7 @@ public class HideUntilControlSet extends PopupControlSet implements OnItemSelect
             customDate = newDate(existingDate == EXISTING_TIME_UNSET ? DateUtilities.now() : existingDate);
             customDate.setSeconds(0);
 
-            final DateAndTimeDialog dateAndTimeDialog = new DateAndTimeDialog(activity, customDate.getTime());
+            final DateAndTimeDialog dateAndTimeDialog = new DateAndTimeDialog(preferences, activity, customDate.getTime());
             dateAndTimeDialog.show();
             dateAndTimeDialog.setDateAndTimeDialogListener(new DateAndTimeDialogListener() {
                 @Override

astrid/src/main/java/com/todoroo/astrid/ui/ImportanceControlSet.java

@@ -15,7 +15,6 @@ import android.widget.ToggleButton;
 
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.helper.TaskEditControlSet;
-import com.todoroo.astrid.service.ThemeService;
 
 import org.tasks.R;
 

astrid/src/main/java/com/todoroo/astrid/ui/PopupControlSet.java

@@ -19,7 +19,6 @@ import android.widget.Button;
 import com.todoroo.andlib.utility.DialogUtilities;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.helper.TaskEditControlSet;
-import com.todoroo.astrid.service.ThemeService;
 
 import org.tasks.R;
 import org.tasks.preferences.ActivityPreferences;
@@ -27,6 +26,7 @@ import org.tasks.preferences.ActivityPreferences;
 public abstract class PopupControlSet extends TaskEditControlSet {
 
     protected final View displayView;
+    protected final ActivityPreferences preferences;
     protected Dialog dialog;
     private final String titleString;
 
@@ -48,8 +48,9 @@ public abstract class PopupControlSet extends TaskEditControlSet {
         }
     };
 
-    public PopupControlSet(Activity activity, int viewLayout, int displayViewLayout, final int title) {
+    public PopupControlSet(ActivityPreferences preferences, Activity activity, int viewLayout, int displayViewLayout, final int title) {
         super(activity, viewLayout);
+        this.preferences = preferences;
         if (displayViewLayout != -1) {
             this.displayView = LayoutInflater.from(activity).inflate(displayViewLayout, null);
         } else {
@@ -68,8 +69,7 @@ public abstract class PopupControlSet extends TaskEditControlSet {
     }
 
     protected Dialog buildDialog(String title, final PopupDialogClickListener okClickListener, DialogInterface.OnCancelListener cancelClickListener) {
-        int theme = ThemeService.getEditDialogTheme();
+        dialog = new Dialog(activity, preferences.getEditDialogTheme());
-        dialog = new Dialog(activity, theme);
         if (title.length() == 0) {
             dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
         } else {

astrid/src/main/java/com/todoroo/astrid/ui/QuickAddBar.java

@@ -47,7 +47,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.tasks.R;
 import org.tasks.injection.Injector;
-import org.tasks.preferences.Preferences;
+import org.tasks.preferences.ActivityPreferences;
 
 import java.util.HashSet;
 
@@ -77,7 +77,7 @@ public class QuickAddBar extends LinearLayout {
     @Inject MetadataService metadataService;
     @Inject TaskService taskService;
     @Inject GCalHelper gcalHelper;
-    @Inject Preferences preferences;
+    @Inject ActivityPreferences preferences;
     @Inject DateChangedAlerts dateChangedAlerts;
 
     private VoiceRecognizer voiceRecognizer;
@@ -208,15 +208,15 @@ public class QuickAddBar extends LinearLayout {
 
     private void setUpQuickAddControlSets() {
 
-        repeatControl = new RepeatControlSet(activity,
+        repeatControl = new RepeatControlSet(preferences, activity,
                 R.layout.control_set_repeat,
                 R.layout.control_set_repeat_display, R.string.repeat_enabled);
 
-        gcalControl = new GCalControlSet(gcalHelper, activity,
+        gcalControl = new GCalControlSet(preferences, gcalHelper, activity,
                 R.layout.control_set_gcal, R.layout.control_set_gcal_display,
                 R.string.gcal_TEA_addToCalendar_label);
 
-        deadlineControl = new DeadlineControlSet(activity,
+        deadlineControl = new DeadlineControlSet(preferences, activity,
                 R.layout.control_set_deadline,
                 R.layout.control_set_default_display, null,
                 repeatControl.getDisplayView(), gcalControl.getDisplayView());

astrid/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java

@@ -22,6 +22,7 @@ import com.todoroo.astrid.alarms.AlarmService;
 import com.todoroo.astrid.data.Task;
 
 import org.tasks.R;
+import org.tasks.preferences.ActivityPreferences;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -47,8 +48,9 @@ public class ReminderControlSet extends PopupControlSet {
     private AlarmControlSet alarmControl;
     private final AlarmService alarmService;
 
-    public ReminderControlSet(AlarmService alarmService, Activity activity, int viewLayout, int displayViewLayout) {
+    public ReminderControlSet(ActivityPreferences preferences, AlarmService alarmService,
-        super(activity, viewLayout, displayViewLayout, R.string.TEA_reminders_group_label);
+                              Activity activity, int viewLayout, int displayViewLayout) {
+        super(preferences, activity, viewLayout, displayViewLayout, R.string.TEA_reminders_group_label);
         this.alarmService = alarmService;
         extraViews = new ArrayList<>();
         label = (TextView) getDisplayView().findViewById(R.id.display_row_edit);
@@ -113,7 +115,7 @@ public class ReminderControlSet extends PopupControlSet {
         });
 
         randomControlSet = new RandomReminderControlSet(activity, getView(), -1);
-        alarmControl = new AlarmControlSet(alarmService, activity, R.layout.control_set_alarms);
+        alarmControl = new AlarmControlSet(preferences, alarmService, activity, R.layout.control_set_alarms);
         alarmControl.readFromTask(model);
 
         remindersBody = (LinearLayout) getView().findViewById(R.id.reminders_body);