Inject control sets

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

@@ -48,6 +48,7 @@ import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.actfm.ActFmCameraModule;
 import com.todoroo.astrid.actfm.ActFmCameraModule.CameraResultCallback;
 import com.todoroo.astrid.dao.TaskAttachmentDao;
+import com.todoroo.astrid.dao.UserActivityDao;
 import com.todoroo.astrid.data.RemoteModel;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.data.TaskAttachment;
@@ -60,6 +61,7 @@ import com.todoroo.astrid.helper.TaskEditControlSet;
 import com.todoroo.astrid.notes.EditNoteActivity;
 import com.todoroo.astrid.reminders.Notifications;
 import com.todoroo.astrid.repeats.RepeatControlSet;
+import com.todoroo.astrid.service.MetadataService;
 import com.todoroo.astrid.service.TaskService;
 import com.todoroo.astrid.service.ThemeService;
 import com.todoroo.astrid.tags.TagService;
@@ -171,6 +173,8 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
     @Inject TaskService taskService;
     @Inject TaskAttachmentDao taskAttachmentDao;
     @Inject TagService tagService;
+    @Inject MetadataService metadataService;
+    @Inject UserActivityDao userActivityDao;
 
     // --- UI components
 
@@ -272,7 +276,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
     private void instantiateEditNotes() {
         if (showEditComments) {
             long idParam = getActivity().getIntent().getLongExtra(TOKEN_ID, -1L);
-            editNotes = new EditNoteActivity(this, getView(),
+            editNotes = new EditNoteActivity(metadataService, userActivityDao, taskService, this, getView(),
                     idParam);
             editNotes.setLayoutParams(new FrameLayout.LayoutParams(LayoutParams.FILL_PARENT,
                     LayoutParams.WRAP_CONTENT));

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

@@ -23,11 +23,7 @@ import android.widget.LinearLayout.LayoutParams;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.todoroo.astrid.voice.RecognizerApi;
-import com.todoroo.astrid.voice.RecognizerApi.PlaybackExceptionHandler;
 import com.todoroo.andlib.data.TodorooCursor;
-import com.todoroo.andlib.service.Autowired;
-import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.sql.Criterion;
 import com.todoroo.andlib.sql.Query;
 import com.todoroo.andlib.utility.AndroidUtilities;
@@ -41,15 +37,20 @@ import com.todoroo.astrid.data.TaskAttachment;
 import com.todoroo.astrid.service.ThemeService;
 import com.todoroo.astrid.ui.PopupControlSet;
 import com.todoroo.astrid.utility.Constants;
+import com.todoroo.astrid.voice.RecognizerApi;
+import com.todoroo.astrid.voice.RecognizerApi.PlaybackExceptionHandler;
 
 import org.tasks.R;
+import org.tasks.injection.Injector;
 
 import java.io.File;
 import java.util.ArrayList;
 
+import javax.inject.Inject;
+
 public class FilesControlSet extends PopupControlSet {
 
-    @Autowired private TaskAttachmentDao taskAttachmentDao;
+    @Inject TaskAttachmentDao taskAttachmentDao;
 
     private final ArrayList<TaskAttachment> files = new ArrayList<>();
     private final LinearLayout fileDisplayList;
@@ -58,7 +59,7 @@ public class FilesControlSet extends PopupControlSet {
 
     public FilesControlSet(Activity activity, int viewLayout, int displayViewLayout, int title) {
         super(activity, viewLayout, displayViewLayout, title);
-        DependencyInjectionService.getInstance().inject(this);
+        ((Injector) activity.getApplication()).inject(this);
 
         fileDisplayList = (LinearLayout) getDisplayView().findViewById(R.id.files_list);
         image = (ImageView) getDisplayView().findViewById(R.id.display_row_icon);

astrid/src/main/java/com/todoroo/astrid/notes/EditNoteActivity.java

@@ -32,9 +32,7 @@ import android.widget.TextView;
 import android.widget.TextView.OnEditorActionListener;
 
 import com.todoroo.andlib.data.TodorooCursor;
-import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.ContextManager;
-import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.sql.Query;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.Preferences;
@@ -72,10 +70,9 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
 
     private Task task;
 
-    @Autowired MetadataService metadataService;
+    private final MetadataService metadataService;
-    @Autowired UserActivityDao userActivityDao;
+    private final UserActivityDao userActivityDao;
-    @Autowired TaskService taskService;
+    private final TaskService taskService;
-
     private final ArrayList<NoteOrUpdate> items = new ArrayList<>();
     private EditText commentField;
     private final View commentsBar;
@@ -101,9 +98,18 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
         public void commentAdded();
     }
 
-    public EditNoteActivity(Fragment fragment, View parent, long t) {
+    public EditNoteActivity(
+            MetadataService metadataService,
+            UserActivityDao userActivityDao,
+            TaskService taskService,
+            Fragment fragment,
+            View parent,
+            long t) {
         super(fragment.getActivity());
-        DependencyInjectionService.getInstance().inject(this);
+
+        this.metadataService = metadataService;
+        this.userActivityDao = userActivityDao;
+        this.taskService = taskService;
 
         this.fragment = fragment;
 

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

@@ -25,8 +25,6 @@ import android.widget.TextView.OnEditorActionListener;
 
 import com.todoroo.andlib.data.AbstractModel;
 import com.todoroo.andlib.data.TodorooCursor;
-import com.todoroo.andlib.service.Autowired;
-import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.astrid.data.Metadata;
 import com.todoroo.astrid.data.Task;
@@ -36,11 +34,14 @@ import com.todoroo.astrid.ui.PopupControlSet;
 import com.todoroo.astrid.utility.Flags;
 
 import org.tasks.R;
+import org.tasks.injection.Injector;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedHashSet;
 
+import javax.inject.Inject;
+
 /**
  * Control set to manage adding and removing tags
  *
@@ -64,11 +65,11 @@ public final class TagsControlSet extends PopupControlSet {
     //private final LinearLayout tagsContainer;
     private final TextView tagsDisplay;
 
-    @Autowired TagService tagService;
+    @Inject TagService tagService;
 
     public TagsControlSet(Activity activity, int viewLayout, int displayViewLayout, int title) {
         super(activity, viewLayout, displayViewLayout, title);
-        DependencyInjectionService.getInstance().inject(this);
+        ((Injector) activity.getApplication()).inject(this);
         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/ui/EditTitleControlSet.java

@@ -16,8 +16,6 @@ import android.view.animation.Animation;
 import android.view.animation.ScaleAnimation;
 import android.widget.EditText;
 
-import com.todoroo.andlib.service.Autowired;
-import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.astrid.adapter.TaskAdapter;
 import com.todoroo.astrid.data.Task;
@@ -27,6 +25,9 @@ import com.todoroo.astrid.service.TaskService;
 import com.todoroo.astrid.ui.ImportanceControlSet.ImportanceChangedListener;
 
 import org.tasks.R;
+import org.tasks.injection.Injector;
+
+import javax.inject.Inject;
 
 /**
  * Control set for mapping a Property to an EditText
@@ -41,12 +42,12 @@ public class EditTitleControlSet extends TaskEditControlSet implements Importanc
     private boolean isRepeating;
     private int importanceValue;
 
-    @Autowired private TaskService taskService;
+    @Inject TaskService taskService;
 
     public EditTitleControlSet(Activity activity, int layout, int editText) {
         super(activity, layout);
+        ((Injector) activity.getApplication()).inject(this);
         this.editTextId = editText;
-        DependencyInjectionService.getInstance().inject(this);
     }
 
     @Override

astrid/src/main/java/org/tasks/TasksModule.java

@@ -1,7 +1,10 @@
 package org.tasks;
 
 import com.todoroo.astrid.adapter.FilterAdapter;
+import com.todoroo.astrid.files.FilesControlSet;
 import com.todoroo.astrid.service.AstridDependencyInjector;
+import com.todoroo.astrid.tags.TagsControlSet;
+import com.todoroo.astrid.ui.EditTitleControlSet;
 import com.todoroo.astrid.ui.QuickAddBar;
 
 import org.tasks.widget.ScrollableViewsFactory;
@@ -13,6 +16,9 @@ import dagger.Module;
                 AstridDependencyInjector.class,
                 ScrollableViewsFactory.class,
                 QuickAddBar.class,
+                EditTitleControlSet.class,
+                FilesControlSet.class,
+                TagsControlSet.class,
                 FilterAdapter.class
         }
 )