Fix injections

pull/384/head
Alex Baker 9 years ago
parent bce22ca4a0
commit 9de42461e9

@ -170,9 +170,4 @@ public class NotificationTests extends DatabaseTestCase {
.plus(new NotificationTestsModule()) .plus(new NotificationTestsModule())
.inject(this); .inject(this);
} }
@Override
protected Object getModule() {
return new NotificationTestsModule();
}
} }

@ -13,16 +13,8 @@ public abstract class InjectingTestCase extends AndroidTestCase {
TestComponent component = DaggerTestComponent.builder() TestComponent component = DaggerTestComponent.builder()
.testModule(new TestModule(getContext())) .testModule(new TestModule(getContext()))
.build(); .build();
Object extension = getModule();
if (extension != null) {
// objectGraph = objectGraph.plus(extension);
}
inject(component); inject(component);
} }
protected abstract void inject(TestComponent component); protected abstract void inject(TestComponent component);
protected Object getModule() {
return null;
}
} }

@ -126,9 +126,4 @@ public class GtasksMetadataServiceTest extends DatabaseTestCase {
taskService.save(task); taskService.save(task);
return task; return task;
} }
@Override
protected Object getModule() {
return new GtasksMetadataServiceTestModule(getContext());
}
} }

@ -22,6 +22,7 @@ import com.todoroo.astrid.sync.SyncResultCallback;
import org.tasks.Broadcaster; import org.tasks.Broadcaster;
import org.tasks.R; import org.tasks.R;
import org.tasks.dialogs.DialogBuilder; import org.tasks.dialogs.DialogBuilder;
import org.tasks.injection.FragmentComponent;
import org.tasks.preferences.ActivityPreferences; import org.tasks.preferences.ActivityPreferences;
import org.tasks.sync.IndeterminateProgressBarSyncResultCallback; import org.tasks.sync.IndeterminateProgressBarSyncResultCallback;
import org.tasks.sync.RecordSyncStatusCallback; import org.tasks.sync.RecordSyncStatusCallback;
@ -108,4 +109,11 @@ public class GtasksListFragment extends SubtasksListFragment {
public Property<?>[] taskProperties() { public Property<?>[] taskProperties() {
return helper.taskProperties(); return helper.taskProperties();
} }
@Override
public void inject(FragmentComponent component) {
super.inject(component);
component.inject(this);
}
} }

@ -13,6 +13,8 @@ import com.todoroo.astrid.dao.TagDataDao;
import com.todoroo.astrid.data.RemoteModel; import com.todoroo.astrid.data.RemoteModel;
import com.todoroo.astrid.data.TagData; import com.todoroo.astrid.data.TagData;
import org.tasks.injection.FragmentComponent;
import javax.inject.Inject; import javax.inject.Inject;
public class TagViewFragment extends TaskListFragment { public class TagViewFragment extends TaskListFragment {
@ -93,4 +95,11 @@ public class TagViewFragment extends TaskListFragment {
protected boolean hasDraggableOption() { protected boolean hasDraggableOption() {
return tagData != null; return tagData != null;
} }
@Override
public void inject(FragmentComponent component) {
super.inject(component);
component.inject(this);
}
} }

@ -24,6 +24,7 @@ import com.todoroo.astrid.service.TaskService;
import org.tasks.R; import org.tasks.R;
import org.tasks.dialogs.DialogBuilder; import org.tasks.dialogs.DialogBuilder;
import org.tasks.injection.ForApplication; import org.tasks.injection.ForApplication;
import org.tasks.injection.FragmentComponent;
import org.tasks.preferences.ActivityPreferences; import org.tasks.preferences.ActivityPreferences;
import javax.inject.Inject; import javax.inject.Inject;
@ -140,4 +141,11 @@ public class SubtasksListFragment extends TaskListFragment {
protected TaskAdapter createTaskAdapter(TodorooCursor<Task> cursor) { protected TaskAdapter createTaskAdapter(TodorooCursor<Task> cursor) {
return helper.createTaskAdapter(context, cursor, sqlQueryTemplate); return helper.createTaskAdapter(context, cursor, sqlQueryTemplate);
} }
@Override
public void inject(FragmentComponent component) {
super.inject(component);
component.inject(this);
}
} }

@ -23,6 +23,7 @@ import com.todoroo.astrid.service.TaskService;
import org.tasks.R; import org.tasks.R;
import org.tasks.dialogs.DialogBuilder; import org.tasks.dialogs.DialogBuilder;
import org.tasks.injection.ForApplication; import org.tasks.injection.ForApplication;
import org.tasks.injection.FragmentComponent;
import org.tasks.preferences.ActivityPreferences; import org.tasks.preferences.ActivityPreferences;
import javax.inject.Inject; import javax.inject.Inject;
@ -110,4 +111,11 @@ public class SubtasksTagListFragment extends TagViewFragment {
protected TaskAdapter createTaskAdapter(TodorooCursor<Task> cursor) { protected TaskAdapter createTaskAdapter(TodorooCursor<Task> cursor) {
return helper.createTaskAdapter(context, cursor, sqlQueryTemplate); return helper.createTaskAdapter(context, cursor, sqlQueryTemplate);
} }
@Override
public void inject(FragmentComponent component) {
super.inject(component);
component.inject(this);
}
} }

@ -1,9 +1,13 @@
package org.tasks.injection; package org.tasks.injection;
import com.todoroo.astrid.actfm.TagViewFragment;
import com.todoroo.astrid.activity.TaskEditFragment; import com.todoroo.astrid.activity.TaskEditFragment;
import com.todoroo.astrid.activity.TaskListFragment; import com.todoroo.astrid.activity.TaskListFragment;
import com.todoroo.astrid.files.FilesControlSet; import com.todoroo.astrid.files.FilesControlSet;
import com.todoroo.astrid.gtasks.GtasksListFragment;
import com.todoroo.astrid.repeats.RepeatControlSet; import com.todoroo.astrid.repeats.RepeatControlSet;
import com.todoroo.astrid.subtasks.SubtasksListFragment;
import com.todoroo.astrid.subtasks.SubtasksTagListFragment;
import com.todoroo.astrid.tags.TagsControlSet; import com.todoroo.astrid.tags.TagsControlSet;
import com.todoroo.astrid.timers.TimerControlSet; import com.todoroo.astrid.timers.TimerControlSet;
import com.todoroo.astrid.ui.EditTitleControlSet; import com.todoroo.astrid.ui.EditTitleControlSet;
@ -54,4 +58,12 @@ public interface FragmentComponent {
void inject(CalendarControlSet calendarControlSet); void inject(CalendarControlSet calendarControlSet);
void inject(TaskListFragment taskListFragment); void inject(TaskListFragment taskListFragment);
void inject(TagViewFragment tagViewFragment);
void inject(GtasksListFragment gtasksListFragment);
void inject(SubtasksListFragment subtasksListFragment);
void inject(SubtasksTagListFragment subtasksTagListFragment);
} }

Loading…
Cancel
Save