Enable jack and java 8

Jack doesn't like component inheritance? Couldn't figure out a solution
so I copy-and-pasted my way out of it.

build.gradle

@@ -1,6 +1,5 @@
 apply plugin: 'com.android.application'
 apply plugin: 'com.getkeepsafe.dexcount'
-apply plugin: 'com.neenbedankt.android-apt'
 
 task wrapper(type: Wrapper) {
     gradleVersion = '2.14.1'
@@ -12,9 +11,9 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.2'
+        classpath 'com.google.guava:guava:19.0'
+        classpath 'com.android.tools.build:gradle:2.2.0-beta1'
         classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.5.2'
-        classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
     }
 }
 
@@ -38,9 +37,9 @@ android {
         targetSdkVersion 24
         multiDexEnabled true
         testInstrumentationRunner "com.android.test.runner.MultiDexTestRunner"
-//        jackOptions {
-//            enabled true
-//        }
+        jackOptions {
+            enabled true
+        }
     }
 
     signingConfigs {
@@ -48,10 +47,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
-//        sourceCompatibility JavaVersion.VERSION_1_8
-//        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 
     buildTypes {
@@ -105,16 +102,16 @@ configurations {
 }
 
 final DAGGER_VERSION = '2.6'
-final BUTTERKNIFE_VERSION = '8.2.1'
+final BUTTERKNIFE_VERSION = '8.1.0'
 final GPS_VERSION = '9.4.0'
 final SUPPORT_VERSION = '24.1.1'
 final STETHO_VERSION = '1.3.1'
 
 dependencies {
-    apt "com.google.dagger:dagger-compiler:${DAGGER_VERSION}"
+    annotationProcessor "com.google.dagger:dagger-compiler:${DAGGER_VERSION}"
     compile "com.google.dagger:dagger:${DAGGER_VERSION}"
 
-    apt "com.jakewharton:butterknife-compiler:${BUTTERKNIFE_VERSION}"
+    annotationProcessor "com.jakewharton:butterknife-compiler:${BUTTERKNIFE_VERSION}"
     compile "com.jakewharton:butterknife:${BUTTERKNIFE_VERSION}"
 
     debugCompile "com.facebook.stetho:stetho:${STETHO_VERSION}"
@@ -149,8 +146,6 @@ dependencies {
 
     amazonCompile "com.google.android.gms:play-services-analytics:${GPS_VERSION}"
 
-    androidTestApt "com.google.dagger:dagger-compiler:${DAGGER_VERSION}"
-    androidTestApt "com.jakewharton:butterknife-compiler:${BUTTERKNIFE_VERSION}"
     androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.2'
     androidTestCompile 'com.natpryce:make-it-easy:4.0.0'
 }

src/amazon/java/org/tasks/injection/ActivityComponent.java

@@ -1,9 +1,117 @@
 package org.tasks.injection;
 
+import com.todoroo.astrid.actfm.FilterSettingsActivity;
+import com.todoroo.astrid.actfm.TagSettingsActivity;
+import com.todoroo.astrid.activity.BeastModePreferences;
+import com.todoroo.astrid.activity.ShareLinkActivity;
+import com.todoroo.astrid.activity.TaskListActivity;
+import com.todoroo.astrid.core.CustomFilterActivity;
+import com.todoroo.astrid.core.DefaultsPreferences;
+import com.todoroo.astrid.core.OldTaskPreferences;
+import com.todoroo.astrid.files.AACRecordingActivity;
+import com.todoroo.astrid.gcal.CalendarReminderActivity;
+import com.todoroo.astrid.reminders.ReminderPreferences;
+
+import org.tasks.activities.AddAttachmentActivity;
+import org.tasks.activities.CalendarSelectionActivity;
+import org.tasks.activities.CameraActivity;
+import org.tasks.activities.ColorPickerActivity;
+import org.tasks.activities.DateAndTimePickerActivity;
+import org.tasks.activities.DatePickerActivity;
+import org.tasks.activities.FilterSelectionActivity;
+import org.tasks.activities.TimePickerActivity;
+import org.tasks.files.FileExplore;
+import org.tasks.files.MyFilePickerActivity;
+import org.tasks.preferences.AppearancePreferences;
+import org.tasks.preferences.BackupPreferences;
+import org.tasks.preferences.BasicPreferences;
+import org.tasks.preferences.DateShortcutPreferences;
+import org.tasks.preferences.HelpAndFeedbackActivity;
+import org.tasks.preferences.MiscellaneousPreferences;
+import org.tasks.reminders.MissedCallActivity;
+import org.tasks.reminders.NotificationActivity;
+import org.tasks.reminders.SnoozeActivity;
+import org.tasks.themes.Theme;
+import org.tasks.voice.VoiceCommandActivity;
+import org.tasks.widget.ShortcutConfigActivity;
+import org.tasks.widget.WidgetConfigActivity;
+
 import dagger.Subcomponent;
 
 @ActivityScope
 @Subcomponent(modules = ActivityModule.class)
-public interface ActivityComponent extends BaseActivityComponent {
+public interface ActivityComponent {
+    Theme getTheme();
+
+    FragmentComponent plus(FragmentModule module);
+
+    DialogFragmentComponent plus(DialogFragmentModule dialogFragmentModule);
+
+    NativeDialogFragmentComponent plus(NativeDialogFragmentModule nativeDialogFragmentModule);
+
+    void inject(AACRecordingActivity aacRecordingActivity);
+
+    void inject(CustomFilterActivity customFilterActivity);
+
+    void inject(CalendarReminderActivity calendarReminderActivity);
+
+    void inject(FilterSettingsActivity filterSettingsActivity);
+
+    void inject(TagSettingsActivity tagSettingsActivity);
+
+    void inject(ShareLinkActivity shareLinkActivity);
+
+    void inject(TaskListActivity taskListActivity);
+
+    void inject(BeastModePreferences beastModePreferences);
+
+    void inject(NotificationActivity notificationActivity);
+
+    void inject(SnoozeActivity snoozeActivity);
+
+    void inject(MissedCallActivity missedCallActivity);
+
+    void inject(FileExplore fileExplore);
+
+    void inject(CalendarSelectionActivity calendarSelectionActivity);
+
+    void inject(FilterSelectionActivity filterSelectionActivity);
+
+    void inject(DateAndTimePickerActivity dateAndTimePickerActivity);
+
+    void inject(AddAttachmentActivity addAttachmentActivity);
+
+    void inject(DatePickerActivity datePickerActivity);
+
+    void inject(CameraActivity cameraActivity);
+
+    void inject(TimePickerActivity timePickerActivity);
+
+    void inject(VoiceCommandActivity voiceCommandActivity);
+
+    void inject(ReminderPreferences reminderPreferences);
+
+    void inject(WidgetConfigActivity widgetConfigActivity);
+
+    void inject(OldTaskPreferences oldTaskPreferences);
+
+    void inject(DefaultsPreferences defaultsPreferences);
+
+    void inject(ShortcutConfigActivity shortcutConfigActivity);
+
+    void inject(BackupPreferences backupPreferences);
+
+    void inject(MiscellaneousPreferences miscellaneousPreferences);
+
+    void inject(HelpAndFeedbackActivity helpAndFeedbackActivity);
+
+    void inject(DateShortcutPreferences dateShortcutPreferences);
+
+    void inject(AppearancePreferences appearancePreferences);
+
+    void inject(MyFilePickerActivity myFilePickerActivity);
+
+    void inject(ColorPickerActivity colorPickerActivity);
 
+    void inject(BasicPreferences basicPreferences);
 }

src/amazon/java/org/tasks/injection/ApplicationComponent.java

@@ -1,8 +1,20 @@
 package org.tasks.injection;
 
+import org.tasks.Tasks;
+import org.tasks.widget.ScrollableWidgetUpdateService;
+
 import dagger.Component;
 
 @ApplicationScope
 @Component(modules = ApplicationModule.class)
-public interface ApplicationComponent extends BaseApplicationComponent {
+public interface ApplicationComponent {
+    void inject(Tasks tasks);
+
+    void inject(ScrollableWidgetUpdateService scrollableWidgetUpdateService);
+
+    ActivityComponent plus(ActivityModule module);
+
+    BroadcastComponent plus(BroadcastModule module);
+
+    IntentServiceComponent plus(IntentServiceModule module);
 }

src/amazon/java/org/tasks/injection/BroadcastComponent.java

@@ -1,8 +1,53 @@
 package org.tasks.injection;
 
+import com.todoroo.astrid.alarms.AlarmTaskRepeatListener;
+import com.todoroo.astrid.calls.PhoneStateChangedReceiver;
+import com.todoroo.astrid.gcal.CalendarAlarmReceiver;
+import com.todoroo.astrid.gcal.GCalTaskCompleteListener;
+import com.todoroo.astrid.repeats.RepeatTaskCompleteListener;
+import com.todoroo.astrid.timers.TimerTaskCompleteListener;
+
+import org.tasks.receivers.BootCompletedReceiver;
+import org.tasks.receivers.CompleteTaskReceiver;
+import org.tasks.receivers.FirstLaunchReceiver;
+import org.tasks.receivers.ListNotificationReceiver;
+import org.tasks.receivers.MyPackageReplacedReceiver;
+import org.tasks.receivers.RefreshReceiver;
+import org.tasks.receivers.TaskNotificationReceiver;
+import org.tasks.receivers.TeslaUnreadReceiver;
+import org.tasks.widget.TasksWidget;
+
 import dagger.Subcomponent;
 
 @Subcomponent(modules = BroadcastModule.class)
-public interface BroadcastComponent extends BaseBroadcastComponent {
+public interface BroadcastComponent {
+    void inject(TimerTaskCompleteListener timerTaskCompleteListener);
+
+    void inject(PhoneStateChangedReceiver phoneStateChangedReceiver);
+
+    void inject(AlarmTaskRepeatListener alarmTaskRepeatListener);
+
+    void inject(GCalTaskCompleteListener gCalTaskCompleteListener);
+
+    void inject(CalendarAlarmReceiver calendarAlarmReceiver);
+
+    void inject(RepeatTaskCompleteListener repeatTaskCompleteListener);
+
+    void inject(MyPackageReplacedReceiver myPackageReplacedReceiver);
+
+    void inject(RefreshReceiver refreshReceiver);
+
+    void inject(TaskNotificationReceiver taskNotificationReceiver);
+
+    void inject(CompleteTaskReceiver completeTaskReceiver);
+
+    void inject(FirstLaunchReceiver firstLaunchReceiver);
+
+    void inject(ListNotificationReceiver listNotificationReceiver);
+
+    void inject(BootCompletedReceiver bootCompletedReceiver);
+
+    void inject(TasksWidget tasksWidget);
 
+    void inject(TeslaUnreadReceiver teslaUnreadReceiver);
 }

src/amazon/java/org/tasks/injection/DialogFragmentComponent.java

@@ -1,8 +1,31 @@
 package org.tasks.injection;
 
+import org.tasks.activities.CalendarSelectionDialog;
+import org.tasks.dialogs.AccountSelectionDialog;
+import org.tasks.dialogs.AddAttachmentDialog;
+import org.tasks.dialogs.ColorPickerDialog;
+import org.tasks.dialogs.SortDialog;
+import org.tasks.reminders.MissedCallDialog;
+import org.tasks.reminders.NotificationDialog;
+import org.tasks.reminders.SnoozeDialog;
+
 import dagger.Subcomponent;
 
 @Subcomponent(modules = DialogFragmentModule.class)
-public interface DialogFragmentComponent extends BaseDialogFragmentComponent {
+public interface DialogFragmentComponent {
+    void inject(NotificationDialog notificationDialog);
+
+    void inject(MissedCallDialog missedCallDialog);
+
+    void inject(CalendarSelectionDialog calendarSelectionDialog);
+
+    void inject(AddAttachmentDialog addAttachmentDialog);
+
+    void inject(AccountSelectionDialog accountSelectionDialog);
+
+    void inject(SnoozeDialog snoozeDialog);
+
+    void inject(SortDialog sortDialog);
 
+    void inject(ColorPickerDialog colorPickerDialog);
 }

src/amazon/java/org/tasks/injection/NativeDialogFragmentComponent.java

@@ -1,8 +1,28 @@
 package org.tasks.injection;
 
+import org.tasks.dialogs.DonationDialog;
+import org.tasks.dialogs.ExportTasksDialog;
+import org.tasks.dialogs.ImportTasksDialog;
+import org.tasks.dialogs.NativeDatePickerDialog;
+import org.tasks.dialogs.NativeTimePickerDialog;
+import org.tasks.dialogs.SeekBarDialog;
+import org.tasks.locale.LocalePickerDialog;
+
 import dagger.Subcomponent;
 
 @Subcomponent(modules = NativeDialogFragmentModule.class)
-public interface NativeDialogFragmentComponent extends BaseNativeDialogFragmentComponent {
+public interface NativeDialogFragmentComponent {
+    void inject(LocalePickerDialog localePickerDialog);
+
+    void inject(NativeDatePickerDialog nativeDatePickerDialog);
+
+    void inject(NativeTimePickerDialog nativeTimePickerDialog);
+
+    void inject(SeekBarDialog seekBarDialog);
+
+    void inject(ExportTasksDialog exportTasksDialog);
+
+    void inject(ImportTasksDialog importTasksDialog);
 
+    void inject(DonationDialog donationDialog);
 }

src/androidTest/java/org/tasks/injection/BaseTestComponent.java

@@ -1,48 +0,0 @@
-package org.tasks.injection;
-
-import com.todoroo.astrid.dao.Database;
-import com.todoroo.astrid.dao.MetadataDaoTests;
-import com.todoroo.astrid.dao.TaskDaoTests;
-import com.todoroo.astrid.model.TaskTest;
-import com.todoroo.astrid.provider.Astrid3ProviderTests;
-import com.todoroo.astrid.reminders.NotificationTests;
-import com.todoroo.astrid.reminders.ReminderServiceTest;
-import com.todoroo.astrid.repeats.NewRepeatTests;
-import com.todoroo.astrid.service.QuickAddMarkupTest;
-import com.todoroo.astrid.service.TitleParserTest;
-import com.todoroo.astrid.subtasks.SubtasksHelperTest;
-import com.todoroo.astrid.subtasks.SubtasksTestCase;
-import com.todoroo.astrid.sync.NewSyncTestCase;
-
-import org.tasks.scheduling.BackupServiceTests;
-
-public interface BaseTestComponent {
-
-    Database getDatabase();
-
-    void inject(ReminderServiceTest reminderServiceTest);
-
-    void inject(TaskTest taskTest);
-
-    void inject(TaskDaoTests taskDaoTests);
-
-    void inject(MetadataDaoTests metadataDaoTests);
-
-    void inject(Astrid3ProviderTests astrid3ProviderTests);
-
-    void inject(NewSyncTestCase newSyncTestCase);
-
-    void inject(SubtasksTestCase subtasksTestCase);
-
-    void inject(SubtasksHelperTest subtasksHelperTest);
-
-    void inject(QuickAddMarkupTest quickAddMarkupTest);
-
-    void inject(TitleParserTest titleParserTest);
-
-    void inject(NewRepeatTests newRepeatTests);
-
-    void inject(BackupServiceTests backupServiceTests);
-
-    NotificationTests.NotificationTestsComponent plus(NotificationTests.NotificationTestsModule notificationTestsModule);
-}

src/androidTestAmazon/java/org/tasks/injection/TestComponent.java

@@ -1,8 +1,51 @@
 package org.tasks.injection;
 
+import com.todoroo.astrid.dao.Database;
+import com.todoroo.astrid.dao.MetadataDaoTests;
+import com.todoroo.astrid.dao.TaskDaoTests;
+import com.todoroo.astrid.model.TaskTest;
+import com.todoroo.astrid.provider.Astrid3ProviderTests;
+import com.todoroo.astrid.reminders.NotificationTests;
+import com.todoroo.astrid.reminders.ReminderServiceTest;
+import com.todoroo.astrid.repeats.NewRepeatTests;
+import com.todoroo.astrid.service.QuickAddMarkupTest;
+import com.todoroo.astrid.service.TitleParserTest;
+import com.todoroo.astrid.subtasks.SubtasksHelperTest;
+import com.todoroo.astrid.subtasks.SubtasksTestCase;
+import com.todoroo.astrid.sync.NewSyncTestCase;
+
+import org.tasks.scheduling.BackupServiceTests;
+
 import dagger.Component;
 
 @ApplicationScope
 @Component(modules = TestModule.class)
-public interface TestComponent extends BaseTestComponent {
+public interface TestComponent {
+    Database getDatabase();
+
+    void inject(ReminderServiceTest reminderServiceTest);
+
+    void inject(TaskTest taskTest);
+
+    void inject(TaskDaoTests taskDaoTests);
+
+    void inject(MetadataDaoTests metadataDaoTests);
+
+    void inject(Astrid3ProviderTests astrid3ProviderTests);
+
+    void inject(NewSyncTestCase newSyncTestCase);
+
+    void inject(SubtasksTestCase subtasksTestCase);
+
+    void inject(SubtasksHelperTest subtasksHelperTest);
+
+    void inject(QuickAddMarkupTest quickAddMarkupTest);
+
+    void inject(TitleParserTest titleParserTest);
+
+    void inject(NewRepeatTests newRepeatTests);
+
+    void inject(BackupServiceTests backupServiceTests);
+
+    NotificationTests.NotificationTestsComponent plus(NotificationTests.NotificationTestsModule notificationTestsModule);
 }

src/androidTestGeneric/java/org/tasks/injection/TestComponent.java

@@ -1,8 +1,51 @@
 package org.tasks.injection;
 
+import com.todoroo.astrid.dao.Database;
+import com.todoroo.astrid.dao.MetadataDaoTests;
+import com.todoroo.astrid.dao.TaskDaoTests;
+import com.todoroo.astrid.model.TaskTest;
+import com.todoroo.astrid.provider.Astrid3ProviderTests;
+import com.todoroo.astrid.reminders.NotificationTests;
+import com.todoroo.astrid.reminders.ReminderServiceTest;
+import com.todoroo.astrid.repeats.NewRepeatTests;
+import com.todoroo.astrid.service.QuickAddMarkupTest;
+import com.todoroo.astrid.service.TitleParserTest;
+import com.todoroo.astrid.subtasks.SubtasksHelperTest;
+import com.todoroo.astrid.subtasks.SubtasksTestCase;
+import com.todoroo.astrid.sync.NewSyncTestCase;
+
+import org.tasks.scheduling.BackupServiceTests;
+
 import dagger.Component;
 
 @ApplicationScope
 @Component(modules = TestModule.class)
-public interface TestComponent extends BaseTestComponent {
+public interface TestComponent {
+    Database getDatabase();
+
+    void inject(ReminderServiceTest reminderServiceTest);
+
+    void inject(TaskTest taskTest);
+
+    void inject(TaskDaoTests taskDaoTests);
+
+    void inject(MetadataDaoTests metadataDaoTests);
+
+    void inject(Astrid3ProviderTests astrid3ProviderTests);
+
+    void inject(NewSyncTestCase newSyncTestCase);
+
+    void inject(SubtasksTestCase subtasksTestCase);
+
+    void inject(SubtasksHelperTest subtasksHelperTest);
+
+    void inject(QuickAddMarkupTest quickAddMarkupTest);
+
+    void inject(TitleParserTest titleParserTest);
+
+    void inject(NewRepeatTests newRepeatTests);
+
+    void inject(BackupServiceTests backupServiceTests);
+
+    NotificationTests.NotificationTestsComponent plus(NotificationTests.NotificationTestsModule notificationTestsModule);
 }

src/androidTestGoogleplay/java/org/tasks/injection/TestComponent.java

@@ -1,16 +1,31 @@
 package org.tasks.injection;
 
+import com.todoroo.astrid.dao.Database;
+import com.todoroo.astrid.dao.MetadataDaoTests;
+import com.todoroo.astrid.dao.TaskDaoTests;
 import com.todoroo.astrid.gtasks.GtasksIndentActionTest;
 import com.todoroo.astrid.gtasks.GtasksListServiceTest;
 import com.todoroo.astrid.gtasks.GtasksMetadataServiceTest;
 import com.todoroo.astrid.gtasks.GtasksTaskListUpdaterTest;
 import com.todoroo.astrid.gtasks.GtasksTaskMovingTest;
+import com.todoroo.astrid.model.TaskTest;
+import com.todoroo.astrid.provider.Astrid3ProviderTests;
+import com.todoroo.astrid.reminders.NotificationTests;
+import com.todoroo.astrid.reminders.ReminderServiceTest;
+import com.todoroo.astrid.repeats.NewRepeatTests;
+import com.todoroo.astrid.service.QuickAddMarkupTest;
+import com.todoroo.astrid.service.TitleParserTest;
+import com.todoroo.astrid.subtasks.SubtasksHelperTest;
+import com.todoroo.astrid.subtasks.SubtasksTestCase;
+import com.todoroo.astrid.sync.NewSyncTestCase;
+
+import org.tasks.scheduling.BackupServiceTests;
 
 import dagger.Component;
 
 @ApplicationScope
 @Component(modules = TestModule.class)
-public interface TestComponent extends BaseTestComponent {
+public interface TestComponent {
 
     GtasksMetadataServiceTest.GtasksMetadataServiceTestComponent plus(GtasksMetadataServiceTest.GtasksMetadataServiceTestModule gtasksMetadataServiceTestModule);
 
@@ -21,4 +36,32 @@ public interface TestComponent extends BaseTestComponent {
     void inject(GtasksListServiceTest gtasksListServiceTest);
 
     void inject(GtasksTaskListUpdaterTest gtasksTaskListUpdaterTest);
+
+    Database getDatabase();
+
+    void inject(ReminderServiceTest reminderServiceTest);
+
+    void inject(TaskTest taskTest);
+
+    void inject(TaskDaoTests taskDaoTests);
+
+    void inject(MetadataDaoTests metadataDaoTests);
+
+    void inject(Astrid3ProviderTests astrid3ProviderTests);
+
+    void inject(NewSyncTestCase newSyncTestCase);
+
+    void inject(SubtasksTestCase subtasksTestCase);
+
+    void inject(SubtasksHelperTest subtasksHelperTest);
+
+    void inject(QuickAddMarkupTest quickAddMarkupTest);
+
+    void inject(TitleParserTest titleParserTest);
+
+    void inject(NewRepeatTests newRepeatTests);
+
+    void inject(BackupServiceTests backupServiceTests);
+
+    NotificationTests.NotificationTestsComponent plus(NotificationTests.NotificationTestsModule notificationTestsModule);
 }

src/generic/java/org/tasks/injection/ActivityComponent.java

@@ -1,9 +1,117 @@
 package org.tasks.injection;
 
+import com.todoroo.astrid.actfm.FilterSettingsActivity;
+import com.todoroo.astrid.actfm.TagSettingsActivity;
+import com.todoroo.astrid.activity.BeastModePreferences;
+import com.todoroo.astrid.activity.ShareLinkActivity;
+import com.todoroo.astrid.activity.TaskListActivity;
+import com.todoroo.astrid.core.CustomFilterActivity;
+import com.todoroo.astrid.core.DefaultsPreferences;
+import com.todoroo.astrid.core.OldTaskPreferences;
+import com.todoroo.astrid.files.AACRecordingActivity;
+import com.todoroo.astrid.gcal.CalendarReminderActivity;
+import com.todoroo.astrid.reminders.ReminderPreferences;
+
+import org.tasks.activities.AddAttachmentActivity;
+import org.tasks.activities.CalendarSelectionActivity;
+import org.tasks.activities.CameraActivity;
+import org.tasks.activities.ColorPickerActivity;
+import org.tasks.activities.DateAndTimePickerActivity;
+import org.tasks.activities.DatePickerActivity;
+import org.tasks.activities.FilterSelectionActivity;
+import org.tasks.activities.TimePickerActivity;
+import org.tasks.files.FileExplore;
+import org.tasks.files.MyFilePickerActivity;
+import org.tasks.preferences.AppearancePreferences;
+import org.tasks.preferences.BackupPreferences;
+import org.tasks.preferences.BasicPreferences;
+import org.tasks.preferences.DateShortcutPreferences;
+import org.tasks.preferences.HelpAndFeedbackActivity;
+import org.tasks.preferences.MiscellaneousPreferences;
+import org.tasks.reminders.MissedCallActivity;
+import org.tasks.reminders.NotificationActivity;
+import org.tasks.reminders.SnoozeActivity;
+import org.tasks.themes.Theme;
+import org.tasks.voice.VoiceCommandActivity;
+import org.tasks.widget.ShortcutConfigActivity;
+import org.tasks.widget.WidgetConfigActivity;
+
 import dagger.Subcomponent;
 
 @ActivityScope
 @Subcomponent(modules = ActivityModule.class)
-public interface ActivityComponent extends BaseActivityComponent {
+public interface ActivityComponent {
+    Theme getTheme();
+
+    FragmentComponent plus(FragmentModule module);
+
+    DialogFragmentComponent plus(DialogFragmentModule dialogFragmentModule);
+
+    NativeDialogFragmentComponent plus(NativeDialogFragmentModule nativeDialogFragmentModule);
+
+    void inject(AACRecordingActivity aacRecordingActivity);
+
+    void inject(CustomFilterActivity customFilterActivity);
+
+    void inject(CalendarReminderActivity calendarReminderActivity);
+
+    void inject(FilterSettingsActivity filterSettingsActivity);
+
+    void inject(TagSettingsActivity tagSettingsActivity);
+
+    void inject(ShareLinkActivity shareLinkActivity);
+
+    void inject(TaskListActivity taskListActivity);
+
+    void inject(BeastModePreferences beastModePreferences);
+
+    void inject(NotificationActivity notificationActivity);
+
+    void inject(SnoozeActivity snoozeActivity);
+
+    void inject(MissedCallActivity missedCallActivity);
+
+    void inject(FileExplore fileExplore);
+
+    void inject(CalendarSelectionActivity calendarSelectionActivity);
+
+    void inject(FilterSelectionActivity filterSelectionActivity);
+
+    void inject(DateAndTimePickerActivity dateAndTimePickerActivity);
+
+    void inject(AddAttachmentActivity addAttachmentActivity);
+
+    void inject(DatePickerActivity datePickerActivity);
+
+    void inject(CameraActivity cameraActivity);
+
+    void inject(TimePickerActivity timePickerActivity);
+
+    void inject(VoiceCommandActivity voiceCommandActivity);
+
+    void inject(ReminderPreferences reminderPreferences);
+
+    void inject(WidgetConfigActivity widgetConfigActivity);
+
+    void inject(OldTaskPreferences oldTaskPreferences);
+
+    void inject(DefaultsPreferences defaultsPreferences);
+
+    void inject(ShortcutConfigActivity shortcutConfigActivity);
+
+    void inject(BackupPreferences backupPreferences);
+
+    void inject(MiscellaneousPreferences miscellaneousPreferences);
+
+    void inject(HelpAndFeedbackActivity helpAndFeedbackActivity);
+
+    void inject(DateShortcutPreferences dateShortcutPreferences);
+
+    void inject(AppearancePreferences appearancePreferences);
+
+    void inject(MyFilePickerActivity myFilePickerActivity);
+
+    void inject(ColorPickerActivity colorPickerActivity);
 
+    void inject(BasicPreferences basicPreferences);
 }

src/generic/java/org/tasks/injection/ApplicationComponent.java

@@ -1,8 +1,20 @@
 package org.tasks.injection;
 
+import org.tasks.Tasks;
+import org.tasks.widget.ScrollableWidgetUpdateService;
+
 import dagger.Component;
 
 @ApplicationScope
 @Component(modules = ApplicationModule.class)
-public interface ApplicationComponent extends BaseApplicationComponent {
+public interface ApplicationComponent {
+    void inject(Tasks tasks);
+
+    void inject(ScrollableWidgetUpdateService scrollableWidgetUpdateService);
+
+    ActivityComponent plus(ActivityModule module);
+
+    BroadcastComponent plus(BroadcastModule module);
+
+    IntentServiceComponent plus(IntentServiceModule module);
 }

src/generic/java/org/tasks/injection/BroadcastComponent.java

@@ -1,8 +1,53 @@
 package org.tasks.injection;
 
+import com.todoroo.astrid.alarms.AlarmTaskRepeatListener;
+import com.todoroo.astrid.calls.PhoneStateChangedReceiver;
+import com.todoroo.astrid.gcal.CalendarAlarmReceiver;
+import com.todoroo.astrid.gcal.GCalTaskCompleteListener;
+import com.todoroo.astrid.repeats.RepeatTaskCompleteListener;
+import com.todoroo.astrid.timers.TimerTaskCompleteListener;
+
+import org.tasks.receivers.BootCompletedReceiver;
+import org.tasks.receivers.CompleteTaskReceiver;
+import org.tasks.receivers.FirstLaunchReceiver;
+import org.tasks.receivers.ListNotificationReceiver;
+import org.tasks.receivers.MyPackageReplacedReceiver;
+import org.tasks.receivers.RefreshReceiver;
+import org.tasks.receivers.TaskNotificationReceiver;
+import org.tasks.receivers.TeslaUnreadReceiver;
+import org.tasks.widget.TasksWidget;
+
 import dagger.Subcomponent;
 
 @Subcomponent(modules = BroadcastModule.class)
-public interface BroadcastComponent extends BaseBroadcastComponent {
+public interface BroadcastComponent {
+    void inject(TimerTaskCompleteListener timerTaskCompleteListener);
+
+    void inject(PhoneStateChangedReceiver phoneStateChangedReceiver);
+
+    void inject(AlarmTaskRepeatListener alarmTaskRepeatListener);
+
+    void inject(GCalTaskCompleteListener gCalTaskCompleteListener);
+
+    void inject(CalendarAlarmReceiver calendarAlarmReceiver);
+
+    void inject(RepeatTaskCompleteListener repeatTaskCompleteListener);
+
+    void inject(MyPackageReplacedReceiver myPackageReplacedReceiver);
+
+    void inject(RefreshReceiver refreshReceiver);
+
+    void inject(TaskNotificationReceiver taskNotificationReceiver);
+
+    void inject(CompleteTaskReceiver completeTaskReceiver);
+
+    void inject(FirstLaunchReceiver firstLaunchReceiver);
+
+    void inject(ListNotificationReceiver listNotificationReceiver);
+
+    void inject(BootCompletedReceiver bootCompletedReceiver);
+
+    void inject(TasksWidget tasksWidget);
 
+    void inject(TeslaUnreadReceiver teslaUnreadReceiver);
 }

src/generic/java/org/tasks/injection/DialogFragmentComponent.java

@@ -1,8 +1,31 @@
 package org.tasks.injection;
 
+import org.tasks.activities.CalendarSelectionDialog;
+import org.tasks.dialogs.AccountSelectionDialog;
+import org.tasks.dialogs.AddAttachmentDialog;
+import org.tasks.dialogs.ColorPickerDialog;
+import org.tasks.dialogs.SortDialog;
+import org.tasks.reminders.MissedCallDialog;
+import org.tasks.reminders.NotificationDialog;
+import org.tasks.reminders.SnoozeDialog;
+
 import dagger.Subcomponent;
 
 @Subcomponent(modules = DialogFragmentModule.class)
-public interface DialogFragmentComponent extends BaseDialogFragmentComponent {
+public interface DialogFragmentComponent {
+    void inject(NotificationDialog notificationDialog);
+
+    void inject(MissedCallDialog missedCallDialog);
+
+    void inject(CalendarSelectionDialog calendarSelectionDialog);
+
+    void inject(AddAttachmentDialog addAttachmentDialog);
+
+    void inject(AccountSelectionDialog accountSelectionDialog);
+
+    void inject(SnoozeDialog snoozeDialog);
+
+    void inject(SortDialog sortDialog);
 
+    void inject(ColorPickerDialog colorPickerDialog);
 }

src/generic/java/org/tasks/injection/NativeDialogFragmentComponent.java

@@ -1,8 +1,28 @@
 package org.tasks.injection;
 
+import org.tasks.dialogs.DonationDialog;
+import org.tasks.dialogs.ExportTasksDialog;
+import org.tasks.dialogs.ImportTasksDialog;
+import org.tasks.dialogs.NativeDatePickerDialog;
+import org.tasks.dialogs.NativeTimePickerDialog;
+import org.tasks.dialogs.SeekBarDialog;
+import org.tasks.locale.LocalePickerDialog;
+
 import dagger.Subcomponent;
 
 @Subcomponent(modules = NativeDialogFragmentModule.class)
-public interface NativeDialogFragmentComponent extends BaseNativeDialogFragmentComponent {
+public interface NativeDialogFragmentComponent {
+    void inject(LocalePickerDialog localePickerDialog);
+
+    void inject(NativeDatePickerDialog nativeDatePickerDialog);
+
+    void inject(NativeTimePickerDialog nativeTimePickerDialog);
+
+    void inject(SeekBarDialog seekBarDialog);
+
+    void inject(ExportTasksDialog exportTasksDialog);
+
+    void inject(ImportTasksDialog importTasksDialog);
 
+    void inject(DonationDialog donationDialog);
 }

src/googleplay/java/org/tasks/injection/ActivityComponent.java

@@ -1,16 +1,50 @@
 package org.tasks.injection;
 
+import com.todoroo.astrid.actfm.FilterSettingsActivity;
+import com.todoroo.astrid.actfm.TagSettingsActivity;
+import com.todoroo.astrid.activity.BeastModePreferences;
+import com.todoroo.astrid.activity.ShareLinkActivity;
+import com.todoroo.astrid.activity.TaskListActivity;
+import com.todoroo.astrid.core.CustomFilterActivity;
+import com.todoroo.astrid.core.DefaultsPreferences;
+import com.todoroo.astrid.core.OldTaskPreferences;
+import com.todoroo.astrid.files.AACRecordingActivity;
+import com.todoroo.astrid.gcal.CalendarReminderActivity;
 import com.todoroo.astrid.gtasks.GtasksPreferences;
 import com.todoroo.astrid.gtasks.auth.GtasksLoginActivity;
+import com.todoroo.astrid.reminders.ReminderPreferences;
 
+import org.tasks.activities.AddAttachmentActivity;
+import org.tasks.activities.CalendarSelectionActivity;
+import org.tasks.activities.CameraActivity;
+import org.tasks.activities.ColorPickerActivity;
+import org.tasks.activities.DateAndTimePickerActivity;
+import org.tasks.activities.DatePickerActivity;
+import org.tasks.activities.FilterSelectionActivity;
+import org.tasks.activities.TimePickerActivity;
 import org.tasks.dashclock.DashClockSettings;
+import org.tasks.files.FileExplore;
+import org.tasks.files.MyFilePickerActivity;
 import org.tasks.locale.ui.activity.TaskerSettingsActivity;
+import org.tasks.preferences.AppearancePreferences;
+import org.tasks.preferences.BackupPreferences;
+import org.tasks.preferences.BasicPreferences;
+import org.tasks.preferences.DateShortcutPreferences;
+import org.tasks.preferences.HelpAndFeedbackActivity;
+import org.tasks.preferences.MiscellaneousPreferences;
+import org.tasks.reminders.MissedCallActivity;
+import org.tasks.reminders.NotificationActivity;
+import org.tasks.reminders.SnoozeActivity;
+import org.tasks.themes.Theme;
+import org.tasks.voice.VoiceCommandActivity;
+import org.tasks.widget.ShortcutConfigActivity;
+import org.tasks.widget.WidgetConfigActivity;
 
 import dagger.Subcomponent;
 
 @ActivityScope
 @Subcomponent(modules = ActivityModule.class)
-public interface ActivityComponent extends BaseActivityComponent {
+public interface ActivityComponent {
 
     void inject(GtasksPreferences gtasksPreferences);
 
@@ -19,4 +53,78 @@ public interface ActivityComponent extends BaseActivityComponent {
     void inject(GtasksLoginActivity gtasksLoginActivity);
 
     void inject(DashClockSettings dashClockSettings);
+
+    Theme getTheme();
+
+    FragmentComponent plus(FragmentModule module);
+
+    DialogFragmentComponent plus(DialogFragmentModule dialogFragmentModule);
+
+    NativeDialogFragmentComponent plus(NativeDialogFragmentModule nativeDialogFragmentModule);
+
+    void inject(AACRecordingActivity aacRecordingActivity);
+
+    void inject(CustomFilterActivity customFilterActivity);
+
+    void inject(CalendarReminderActivity calendarReminderActivity);
+
+    void inject(FilterSettingsActivity filterSettingsActivity);
+
+    void inject(TagSettingsActivity tagSettingsActivity);
+
+    void inject(ShareLinkActivity shareLinkActivity);
+
+    void inject(TaskListActivity taskListActivity);
+
+    void inject(BeastModePreferences beastModePreferences);
+
+    void inject(NotificationActivity notificationActivity);
+
+    void inject(SnoozeActivity snoozeActivity);
+
+    void inject(MissedCallActivity missedCallActivity);
+
+    void inject(FileExplore fileExplore);
+
+    void inject(CalendarSelectionActivity calendarSelectionActivity);
+
+    void inject(FilterSelectionActivity filterSelectionActivity);
+
+    void inject(DateAndTimePickerActivity dateAndTimePickerActivity);
+
+    void inject(AddAttachmentActivity addAttachmentActivity);
+
+    void inject(DatePickerActivity datePickerActivity);
+
+    void inject(CameraActivity cameraActivity);
+
+    void inject(TimePickerActivity timePickerActivity);
+
+    void inject(VoiceCommandActivity voiceCommandActivity);
+
+    void inject(ReminderPreferences reminderPreferences);
+
+    void inject(WidgetConfigActivity widgetConfigActivity);
+
+    void inject(OldTaskPreferences oldTaskPreferences);
+
+    void inject(DefaultsPreferences defaultsPreferences);
+
+    void inject(ShortcutConfigActivity shortcutConfigActivity);
+
+    void inject(BackupPreferences backupPreferences);
+
+    void inject(MiscellaneousPreferences miscellaneousPreferences);
+
+    void inject(HelpAndFeedbackActivity helpAndFeedbackActivity);
+
+    void inject(DateShortcutPreferences dateShortcutPreferences);
+
+    void inject(AppearancePreferences appearancePreferences);
+
+    void inject(MyFilePickerActivity myFilePickerActivity);
+
+    void inject(ColorPickerActivity colorPickerActivity);
+
+    void inject(BasicPreferences basicPreferences);
 }

src/googleplay/java/org/tasks/injection/ApplicationComponent.java

@@ -1,13 +1,25 @@
 package org.tasks.injection;
 
+import org.tasks.Tasks;
 import org.tasks.dashclock.DashClockExtension;
+import org.tasks.widget.ScrollableWidgetUpdateService;
 
 import dagger.Component;
 
 @ApplicationScope
 @Component(modules = ApplicationModule.class)
-public interface ApplicationComponent extends BaseApplicationComponent {
+public interface ApplicationComponent {
     SyncAdapterComponent plus(SyncAdapterModule syncAdapterModule);
 
     void inject(DashClockExtension dashClockExtension);
+
+    void inject(Tasks tasks);
+
+    void inject(ScrollableWidgetUpdateService scrollableWidgetUpdateService);
+
+    ActivityComponent plus(ActivityModule module);
+
+    BroadcastComponent plus(BroadcastModule module);
+
+    IntentServiceComponent plus(IntentServiceModule module);
 }

src/googleplay/java/org/tasks/injection/BroadcastComponent.java

@@ -1,13 +1,59 @@
 package org.tasks.injection;
 
+import com.todoroo.astrid.alarms.AlarmTaskRepeatListener;
+import com.todoroo.astrid.calls.PhoneStateChangedReceiver;
+import com.todoroo.astrid.gcal.CalendarAlarmReceiver;
+import com.todoroo.astrid.gcal.GCalTaskCompleteListener;
+import com.todoroo.astrid.repeats.RepeatTaskCompleteListener;
+import com.todoroo.astrid.timers.TimerTaskCompleteListener;
+
 import org.tasks.locale.receiver.FireReceiver;
+import org.tasks.receivers.BootCompletedReceiver;
+import org.tasks.receivers.CompleteTaskReceiver;
+import org.tasks.receivers.FirstLaunchReceiver;
 import org.tasks.receivers.GoogleTaskPushReceiver;
+import org.tasks.receivers.ListNotificationReceiver;
+import org.tasks.receivers.MyPackageReplacedReceiver;
+import org.tasks.receivers.RefreshReceiver;
+import org.tasks.receivers.TaskNotificationReceiver;
+import org.tasks.receivers.TeslaUnreadReceiver;
+import org.tasks.widget.TasksWidget;
 
 import dagger.Subcomponent;
 
 @Subcomponent(modules = BroadcastModule.class)
-public interface BroadcastComponent extends BaseBroadcastComponent {
+public interface BroadcastComponent {
     void inject(FireReceiver fireReceiver);
 
     void inject(GoogleTaskPushReceiver forceSyncReceiver);
+
+    void inject(TimerTaskCompleteListener timerTaskCompleteListener);
+
+    void inject(PhoneStateChangedReceiver phoneStateChangedReceiver);
+
+    void inject(AlarmTaskRepeatListener alarmTaskRepeatListener);
+
+    void inject(GCalTaskCompleteListener gCalTaskCompleteListener);
+
+    void inject(CalendarAlarmReceiver calendarAlarmReceiver);
+
+    void inject(RepeatTaskCompleteListener repeatTaskCompleteListener);
+
+    void inject(MyPackageReplacedReceiver myPackageReplacedReceiver);
+
+    void inject(RefreshReceiver refreshReceiver);
+
+    void inject(TaskNotificationReceiver taskNotificationReceiver);
+
+    void inject(CompleteTaskReceiver completeTaskReceiver);
+
+    void inject(FirstLaunchReceiver firstLaunchReceiver);
+
+    void inject(ListNotificationReceiver listNotificationReceiver);
+
+    void inject(BootCompletedReceiver bootCompletedReceiver);
+
+    void inject(TasksWidget tasksWidget);
+
+    void inject(TeslaUnreadReceiver teslaUnreadReceiver);
 }

src/googleplay/java/org/tasks/injection/DialogFragmentComponent.java

@@ -1,12 +1,35 @@
 package org.tasks.injection;
 
+import org.tasks.activities.CalendarSelectionDialog;
 import org.tasks.activities.SupportGoogleTaskListPicker;
+import org.tasks.dialogs.AccountSelectionDialog;
+import org.tasks.dialogs.AddAttachmentDialog;
+import org.tasks.dialogs.ColorPickerDialog;
+import org.tasks.dialogs.SortDialog;
+import org.tasks.reminders.MissedCallDialog;
+import org.tasks.reminders.NotificationDialog;
+import org.tasks.reminders.SnoozeDialog;
 
 import dagger.Subcomponent;
 
 @Subcomponent(modules = DialogFragmentModule.class)
-public interface DialogFragmentComponent extends BaseDialogFragmentComponent {
+public interface DialogFragmentComponent {
 
     void inject(SupportGoogleTaskListPicker supportGoogleTaskListPicker);
 
+    void inject(NotificationDialog notificationDialog);
+
+    void inject(MissedCallDialog missedCallDialog);
+
+    void inject(CalendarSelectionDialog calendarSelectionDialog);
+
+    void inject(AddAttachmentDialog addAttachmentDialog);
+
+    void inject(AccountSelectionDialog accountSelectionDialog);
+
+    void inject(SnoozeDialog snoozeDialog);
+
+    void inject(SortDialog sortDialog);
+
+    void inject(ColorPickerDialog colorPickerDialog);
 }

src/googleplay/java/org/tasks/injection/NativeDialogFragmentComponent.java

@@ -1,10 +1,31 @@
 package org.tasks.injection;
 
 import org.tasks.activities.NativeGoogleTaskListPicker;
+import org.tasks.dialogs.DonationDialog;
+import org.tasks.dialogs.ExportTasksDialog;
+import org.tasks.dialogs.ImportTasksDialog;
+import org.tasks.dialogs.NativeDatePickerDialog;
+import org.tasks.dialogs.NativeTimePickerDialog;
+import org.tasks.dialogs.SeekBarDialog;
+import org.tasks.locale.LocalePickerDialog;
 
 import dagger.Subcomponent;
 
 @Subcomponent(modules = NativeDialogFragmentModule.class)
-public interface NativeDialogFragmentComponent extends BaseNativeDialogFragmentComponent {
+public interface NativeDialogFragmentComponent {
     void inject(NativeGoogleTaskListPicker nativeGoogleTaskListPicker);
+
+    void inject(LocalePickerDialog localePickerDialog);
+
+    void inject(NativeDatePickerDialog nativeDatePickerDialog);
+
+    void inject(NativeTimePickerDialog nativeTimePickerDialog);
+
+    void inject(SeekBarDialog seekBarDialog);
+
+    void inject(ExportTasksDialog exportTasksDialog);
+
+    void inject(ImportTasksDialog importTasksDialog);
+
+    void inject(DonationDialog donationDialog);
 }

src/main/java/org/tasks/injection/BaseActivityComponent.java

@@ -1,114 +0,0 @@
-package org.tasks.injection;
-
-import com.todoroo.astrid.actfm.FilterSettingsActivity;
-import com.todoroo.astrid.actfm.TagSettingsActivity;
-import com.todoroo.astrid.activity.BeastModePreferences;
-import com.todoroo.astrid.activity.ShareLinkActivity;
-import com.todoroo.astrid.activity.TaskListActivity;
-import com.todoroo.astrid.core.CustomFilterActivity;
-import com.todoroo.astrid.core.DefaultsPreferences;
-import com.todoroo.astrid.core.OldTaskPreferences;
-import com.todoroo.astrid.files.AACRecordingActivity;
-import com.todoroo.astrid.gcal.CalendarReminderActivity;
-import com.todoroo.astrid.reminders.ReminderPreferences;
-
-import org.tasks.activities.AddAttachmentActivity;
-import org.tasks.activities.CalendarSelectionActivity;
-import org.tasks.activities.CameraActivity;
-import org.tasks.activities.ColorPickerActivity;
-import org.tasks.activities.DateAndTimePickerActivity;
-import org.tasks.activities.DatePickerActivity;
-import org.tasks.activities.FilterSelectionActivity;
-import org.tasks.activities.TimePickerActivity;
-import org.tasks.files.FileExplore;
-import org.tasks.files.MyFilePickerActivity;
-import org.tasks.preferences.AppearancePreferences;
-import org.tasks.preferences.BackupPreferences;
-import org.tasks.preferences.BasicPreferences;
-import org.tasks.preferences.DateShortcutPreferences;
-import org.tasks.preferences.HelpAndFeedbackActivity;
-import org.tasks.preferences.MiscellaneousPreferences;
-import org.tasks.reminders.MissedCallActivity;
-import org.tasks.reminders.NotificationActivity;
-import org.tasks.reminders.SnoozeActivity;
-import org.tasks.themes.Theme;
-import org.tasks.voice.VoiceCommandActivity;
-import org.tasks.widget.ShortcutConfigActivity;
-import org.tasks.widget.WidgetConfigActivity;
-
-public interface BaseActivityComponent {
-
-    Theme getTheme();
-
-    FragmentComponent plus(FragmentModule module);
-
-    DialogFragmentComponent plus(DialogFragmentModule dialogFragmentModule);
-
-    NativeDialogFragmentComponent plus(NativeDialogFragmentModule nativeDialogFragmentModule);
-
-    void inject(AACRecordingActivity aacRecordingActivity);
-
-    void inject(CustomFilterActivity customFilterActivity);
-
-    void inject(CalendarReminderActivity calendarReminderActivity);
-
-    void inject(FilterSettingsActivity filterSettingsActivity);
-
-    void inject(TagSettingsActivity tagSettingsActivity);
-
-    void inject(ShareLinkActivity shareLinkActivity);
-
-    void inject(TaskListActivity taskListActivity);
-
-    void inject(BeastModePreferences beastModePreferences);
-
-    void inject(NotificationActivity notificationActivity);
-
-    void inject(SnoozeActivity snoozeActivity);
-
-    void inject(MissedCallActivity missedCallActivity);
-
-    void inject(FileExplore fileExplore);
-
-    void inject(CalendarSelectionActivity calendarSelectionActivity);
-
-    void inject(FilterSelectionActivity filterSelectionActivity);
-
-    void inject(DateAndTimePickerActivity dateAndTimePickerActivity);
-
-    void inject(AddAttachmentActivity addAttachmentActivity);
-
-    void inject(DatePickerActivity datePickerActivity);
-
-    void inject(CameraActivity cameraActivity);
-
-    void inject(TimePickerActivity timePickerActivity);
-
-    void inject(VoiceCommandActivity voiceCommandActivity);
-
-    void inject(ReminderPreferences reminderPreferences);
-
-    void inject(WidgetConfigActivity widgetConfigActivity);
-
-    void inject(OldTaskPreferences oldTaskPreferences);
-
-    void inject(DefaultsPreferences defaultsPreferences);
-
-    void inject(ShortcutConfigActivity shortcutConfigActivity);
-
-    void inject(BackupPreferences backupPreferences);
-
-    void inject(MiscellaneousPreferences miscellaneousPreferences);
-
-    void inject(HelpAndFeedbackActivity helpAndFeedbackActivity);
-
-    void inject(DateShortcutPreferences dateShortcutPreferences);
-
-    void inject(AppearancePreferences appearancePreferences);
-
-    void inject(MyFilePickerActivity myFilePickerActivity);
-
-    void inject(ColorPickerActivity colorPickerActivity);
-
-    void inject(BasicPreferences basicPreferences);
-}

src/main/java/org/tasks/injection/BaseApplicationComponent.java

@@ -1,16 +0,0 @@
-package org.tasks.injection;
-
-import org.tasks.Tasks;
-import org.tasks.widget.ScrollableWidgetUpdateService;
-
-public interface BaseApplicationComponent {
-    void inject(Tasks tasks);
-
-    void inject(ScrollableWidgetUpdateService scrollableWidgetUpdateService);
-
-    ActivityComponent plus(ActivityModule module);
-
-    BroadcastComponent plus(BroadcastModule module);
-
-    IntentServiceComponent plus(IntentServiceModule module);
-}

src/main/java/org/tasks/injection/BaseBroadcastComponent.java

@@ -1,51 +0,0 @@
-package org.tasks.injection;
-
-import com.todoroo.astrid.alarms.AlarmTaskRepeatListener;
-import com.todoroo.astrid.calls.PhoneStateChangedReceiver;
-import com.todoroo.astrid.gcal.CalendarAlarmReceiver;
-import com.todoroo.astrid.gcal.GCalTaskCompleteListener;
-import com.todoroo.astrid.repeats.RepeatTaskCompleteListener;
-import com.todoroo.astrid.timers.TimerTaskCompleteListener;
-
-import org.tasks.receivers.BootCompletedReceiver;
-import org.tasks.receivers.CompleteTaskReceiver;
-import org.tasks.receivers.FirstLaunchReceiver;
-import org.tasks.receivers.ListNotificationReceiver;
-import org.tasks.receivers.MyPackageReplacedReceiver;
-import org.tasks.receivers.RefreshReceiver;
-import org.tasks.receivers.TaskNotificationReceiver;
-import org.tasks.receivers.TeslaUnreadReceiver;
-import org.tasks.widget.TasksWidget;
-
-public interface BaseBroadcastComponent {
-
-    void inject(TimerTaskCompleteListener timerTaskCompleteListener);
-
-    void inject(PhoneStateChangedReceiver phoneStateChangedReceiver);
-
-    void inject(AlarmTaskRepeatListener alarmTaskRepeatListener);
-
-    void inject(GCalTaskCompleteListener gCalTaskCompleteListener);
-
-    void inject(CalendarAlarmReceiver calendarAlarmReceiver);
-
-    void inject(RepeatTaskCompleteListener repeatTaskCompleteListener);
-
-    void inject(MyPackageReplacedReceiver myPackageReplacedReceiver);
-
-    void inject(RefreshReceiver refreshReceiver);
-
-    void inject(TaskNotificationReceiver taskNotificationReceiver);
-
-    void inject(CompleteTaskReceiver completeTaskReceiver);
-
-    void inject(FirstLaunchReceiver firstLaunchReceiver);
-
-    void inject(ListNotificationReceiver listNotificationReceiver);
-
-    void inject(BootCompletedReceiver bootCompletedReceiver);
-
-    void inject(TasksWidget tasksWidget);
-
-    void inject(TeslaUnreadReceiver teslaUnreadReceiver);
-}

src/main/java/org/tasks/injection/BaseDialogFragmentComponent.java

@@ -1,28 +0,0 @@
-package org.tasks.injection;
-
-import org.tasks.activities.CalendarSelectionDialog;
-import org.tasks.dialogs.AccountSelectionDialog;
-import org.tasks.dialogs.AddAttachmentDialog;
-import org.tasks.dialogs.ColorPickerDialog;
-import org.tasks.dialogs.SortDialog;
-import org.tasks.reminders.MissedCallDialog;
-import org.tasks.reminders.NotificationDialog;
-import org.tasks.reminders.SnoozeDialog;
-
-public interface BaseDialogFragmentComponent {
-    void inject(NotificationDialog notificationDialog);
-
-    void inject(MissedCallDialog missedCallDialog);
-
-    void inject(CalendarSelectionDialog calendarSelectionDialog);
-
-    void inject(AddAttachmentDialog addAttachmentDialog);
-
-    void inject(AccountSelectionDialog accountSelectionDialog);
-
-    void inject(SnoozeDialog snoozeDialog);
-
-    void inject(SortDialog sortDialog);
-
-    void inject(ColorPickerDialog colorPickerDialog);
-}

src/main/java/org/tasks/injection/BaseNativeDialogFragmentComponent.java

@@ -1,25 +0,0 @@
-package org.tasks.injection;
-
-import org.tasks.dialogs.DonationDialog;
-import org.tasks.dialogs.ExportTasksDialog;
-import org.tasks.dialogs.ImportTasksDialog;
-import org.tasks.dialogs.NativeDatePickerDialog;
-import org.tasks.dialogs.NativeTimePickerDialog;
-import org.tasks.dialogs.SeekBarDialog;
-import org.tasks.locale.LocalePickerDialog;
-
-public interface BaseNativeDialogFragmentComponent {
-    void inject(LocalePickerDialog localePickerDialog);
-
-    void inject(NativeDatePickerDialog nativeDatePickerDialog);
-
-    void inject(NativeTimePickerDialog nativeTimePickerDialog);
-
-    void inject(SeekBarDialog seekBarDialog);
-
-    void inject(ExportTasksDialog exportTasksDialog);
-
-    void inject(ImportTasksDialog importTasksDialog);
-
-    void inject(DonationDialog donationDialog);
-}