Injecting Preference Activity

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

@@ -37,12 +37,12 @@ import com.todoroo.astrid.service.TaskService;
 import com.todoroo.astrid.sync.SyncProviderPreferences;
 import com.todoroo.astrid.utility.Constants;
 import com.todoroo.astrid.utility.Flags;
+import com.todoroo.astrid.utility.TodorooPreferenceActivity;
 import com.todoroo.astrid.voice.VoiceInputAssistant;
 import com.todoroo.astrid.voice.VoiceOutputService;
 import com.todoroo.astrid.voice.VoiceRecognizer;
 
 import org.tasks.R;
-import org.tasks.injection.InjectingTodorooPreferenceActivity;
 import org.tasks.preferences.Preferences;
 import org.tasks.widget.WidgetHelper;
 
@@ -60,7 +60,7 @@ import javax.inject.Inject;
  * @author Tim Su <tim@todoroo.com>
  *
  */
-public class EditPreferences extends InjectingTodorooPreferenceActivity {
+public class EditPreferences extends TodorooPreferenceActivity {
 
     private static final int REQUEST_CODE_SYNC = 0;
     private static final int REQUEST_CODE_FILES_DIR = 2;

astrid/src/main/java/com/todoroo/astrid/backup/BackupPreferences.java

@@ -16,9 +16,9 @@ import android.view.ViewGroup.OnHierarchyChangeListener;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.DialogUtilities;
 import com.todoroo.astrid.utility.Flags;
+import com.todoroo.astrid.utility.TodorooPreferenceActivity;
 
 import org.tasks.R;
-import org.tasks.injection.InjectingTodorooPreferenceActivity;
 import org.tasks.preferences.Preferences;
 
 import javax.inject.Inject;
@@ -32,7 +32,7 @@ import static org.tasks.date.DateTimeUtils.newDate;
  * @author timsu
  *
  */
-public class BackupPreferences extends InjectingTodorooPreferenceActivity {
+public class BackupPreferences extends TodorooPreferenceActivity {
 
     static final String PREF_BACKUP_LAST_DATE = "backupDate"; //$NON-NLS-1$
 

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

@@ -13,9 +13,9 @@ import android.preference.Preference;
 
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.astrid.gcal.Calendars;
+import com.todoroo.astrid.utility.TodorooPreferenceActivity;
 
 import org.tasks.R;
-import org.tasks.injection.InjectingTodorooPreferenceActivity;
 import org.tasks.preferences.Preferences;
 
 import javax.inject.Inject;
@@ -26,7 +26,7 @@ import javax.inject.Inject;
  * @author Tim Su <tim@todoroo.com>
  *
  */
-public class DefaultsPreferences extends InjectingTodorooPreferenceActivity {
+public class DefaultsPreferences extends TodorooPreferenceActivity {
 
     @Inject Preferences preferences;
 

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

@@ -23,9 +23,9 @@ import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.gcal.GCalHelper;
 import com.todoroo.astrid.service.MetadataService;
 import com.todoroo.astrid.service.TaskService;
+import com.todoroo.astrid.utility.TodorooPreferenceActivity;
 
 import org.tasks.R;
-import org.tasks.injection.InjectingTodorooPreferenceActivity;
 import org.tasks.preferences.Preferences;
 
 import javax.inject.Inject;
@@ -36,7 +36,7 @@ import javax.inject.Inject;
  * @author Tim Su <tim@todoroo.com>
  *
  */
-public class OldTaskPreferences extends InjectingTodorooPreferenceActivity {
+public class OldTaskPreferences extends TodorooPreferenceActivity {
 
     @Inject TaskService taskService;
     @Inject MetadataService metadataService;

astrid/src/main/java/com/todoroo/astrid/reminders/ReminderPreferences.java

@@ -8,7 +8,7 @@ package com.todoroo.astrid.reminders;
 import android.content.res.Resources;
 import android.preference.Preference;
 
-import com.todoroo.andlib.utility.TodorooPreferenceActivity;
+import com.todoroo.astrid.utility.TodorooPreferenceActivity;
 
 import org.joda.time.DateTime;
 import org.tasks.R;

astrid/src/main/java/com/todoroo/astrid/sync/SyncProviderPreferences.java

@@ -21,7 +21,7 @@ import android.view.ViewGroup.OnHierarchyChangeListener;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.DialogUtilities;
-import com.todoroo.andlib.utility.TodorooPreferenceActivity;
+import com.todoroo.astrid.utility.TodorooPreferenceActivity;
 
 import org.tasks.api.R;
 

astrid/src/main/java/com/todoroo/astrid/utility/TodorooPreferenceActivity.java

@@ -3,7 +3,7 @@
  *
  * See the file "LICENSE" for the full license governing this code.
  */
-package com.todoroo.andlib.utility;
+package com.todoroo.astrid.utility;
 /**
  * Copyright (c) 2012 Todoroo Inc
  *
@@ -18,12 +18,14 @@ import android.preference.EditTextPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceChangeListener;
-import android.preference.PreferenceActivity;
 import android.preference.PreferenceGroup;
 import android.preference.PreferenceManager;
 import android.preference.RingtonePreference;
 
 import com.todoroo.andlib.service.ContextManager;
+import com.todoroo.andlib.utility.Preferences;
+
+import org.tasks.injection.InjectingPreferenceActivity;
 import org.tasks.ui.TimePreference;
 
 /**
@@ -33,7 +35,7 @@ import org.tasks.ui.TimePreference;
  * @author Tim Su <tim@todoroo.com>
  *
  */
-abstract public class TodorooPreferenceActivity extends PreferenceActivity {
+abstract public class TodorooPreferenceActivity extends InjectingPreferenceActivity {
 
     // --- abstract methods
 
@@ -103,5 +105,4 @@ abstract public class TodorooPreferenceActivity extends PreferenceActivity {
             initializePreference(getPreferenceScreen());
         }
     }
-
 }

astrid/src/main/java/org/tasks/injection/ActivityModule.java

@@ -23,6 +23,7 @@ import com.todoroo.astrid.gtasks.GtasksFilterExposer;
 import com.todoroo.astrid.gtasks.GtasksListAdder;
 import com.todoroo.astrid.gtasks.GtasksPreferences;
 import com.todoroo.astrid.gtasks.auth.GtasksLoginActivity;
+import com.todoroo.astrid.reminders.ReminderPreferences;
 import com.todoroo.astrid.tags.DeleteTagActivity;
 import com.todoroo.astrid.tags.RenameTagActivity;
 import com.todoroo.astrid.tags.TagFilterExposer;
@@ -63,7 +64,8 @@ import dagger.Provides;
         GtasksFilterExposer.class,
         TagFilterExposer.class,
         BeastModePreferences.class,
-        DefaultsPreferences.class
+        DefaultsPreferences.class,
+        ReminderPreferences.class
 })
 public class ActivityModule {
 

astrid/src/main/java/org/tasks/injection/InjectingPreferenceActivity.java

@@ -1,12 +1,11 @@
 package org.tasks.injection;
 
 import android.os.Bundle;
-
+import android.preference.PreferenceActivity;
-import com.todoroo.andlib.utility.TodorooPreferenceActivity;
 
 import dagger.ObjectGraph;
 
-public abstract class InjectingTodorooPreferenceActivity extends TodorooPreferenceActivity implements Injector {
+public abstract class InjectingPreferenceActivity extends PreferenceActivity implements Injector {
     private ObjectGraph objectGraph;
 
     @Override