Cleaning up the injection code a bit.

Author: donnfelker

app/src/main/java/com/donnfelker/android/bootstrap/BootstrapApplication.java

@@ -18,7 +18,6 @@
 public class BootstrapApplication extends Application {
 
     private static BootstrapApplication instance;
-    ObjectGraph objectGraph;
 
     /**
      * Create main application
@@ -46,10 +45,9 @@ public void onCreate() {
         super.onCreate();
 
         instance = this;
-        // Perform Injection
-        objectGraph = ObjectGraph.create(getRootModule());
-        objectGraph.inject(this);
-        objectGraph.injectStatics();
+
+        // Perform injection
+        Injector.init(getRootModule(), this);
 
     }
 
@@ -68,13 +66,6 @@ public BootstrapApplication(final Instrumentation instrumentation) {
         attachBaseContext(instrumentation.getTargetContext());
     }
 
-    public void inject(Object object)
-    {
-        objectGraph.inject(object);
-    }
-
-
-
     public static BootstrapApplication getInstance() {
         return instance;
     }

app/src/main/java/com/donnfelker/android/bootstrap/Injector.java

@@ -0,0 +1,41 @@
+package com.donnfelker.android.bootstrap;
+
+import dagger.ObjectGraph;
+
+public final class Injector
+{
+    public static ObjectGraph objectGraph = null;
+
+
+    public static void init(final Object rootModule) {
+
+        if(objectGraph == null)
+        {
+            objectGraph = ObjectGraph.create(rootModule);
+        }
+        else
+        {
+            objectGraph = objectGraph.plus(rootModule);
+        }
+
+        // Inject statics
+        objectGraph.injectStatics();
+
+    }
+
+    public static void init(final Object rootModule, final Object target)
+    {
+        init(rootModule);
+        inject(target);
+    }
+
+    public static final void inject(final Object target)
+    {
+        objectGraph.inject(target);
+    }
+
+    public static <T> T resolve(Class<T> type)
+    {
+        return objectGraph.get(type);
+    }
+}

app/src/main/java/com/donnfelker/android/bootstrap/core/TimerService.java

@@ -12,6 +12,7 @@
 import android.support.v4.app.NotificationCompat;
 
 import com.donnfelker.android.bootstrap.BootstrapApplication;
+import com.donnfelker.android.bootstrap.Injector;
 import com.donnfelker.android.bootstrap.R;
 import com.donnfelker.android.bootstrap.ui.BootstrapTimerActivity;
 import javax.inject.Inject;
@@ -46,7 +47,7 @@ public IBinder onBind(Intent intent) {
     public void onCreate() {
         super.onCreate();
 
-        BootstrapApplication.getInstance().inject(this);
+        Injector.inject(this);
 
         // Register the bus so we can send notifications.
         BUS.register(this);

app/src/main/java/com/donnfelker/android/bootstrap/ui/BootstrapActivity.java

@@ -8,6 +8,7 @@
 import com.actionbarsherlock.app.SherlockActivity;
 import com.actionbarsherlock.view.MenuItem;
 import com.donnfelker.android.bootstrap.BootstrapApplication;
+import com.donnfelker.android.bootstrap.Injector;
 
 import butterknife.Views;
 
@@ -20,7 +21,7 @@ public abstract class BootstrapActivity extends SherlockActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        BootstrapApplication.getInstance().inject(this);
+        Injector.inject(this);
     }
 
     @Override

app/src/main/java/com/donnfelker/android/bootstrap/ui/BootstrapFragmentActivity.java

@@ -4,6 +4,7 @@
 
 import com.actionbarsherlock.app.SherlockFragmentActivity;
 import com.donnfelker.android.bootstrap.BootstrapApplication;
+import com.donnfelker.android.bootstrap.Injector;
 
 import butterknife.Views;
 
@@ -16,7 +17,7 @@ public class BootstrapFragmentActivity extends SherlockFragmentActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        BootstrapApplication.getInstance().inject(this);
+        Injector.inject(this);
     }
 
     @Override

app/src/main/java/com/donnfelker/android/bootstrap/ui/CheckInsListFragment.java

@@ -11,6 +11,7 @@
 
 import com.donnfelker.android.bootstrap.BootstrapApplication;
 import com.donnfelker.android.bootstrap.BootstrapServiceProvider;
+import com.donnfelker.android.bootstrap.Injector;
 import com.donnfelker.android.bootstrap.R;
 import com.donnfelker.android.bootstrap.authenticator.LogoutService;
 import com.donnfelker.android.bootstrap.core.CheckIn;
@@ -29,7 +30,7 @@ public class CheckInsListFragment extends ItemListFragment<CheckIn> {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        BootstrapApplication.getInstance().inject(this);
+        Injector.inject(this);
     }
 
     @Override

app/src/main/java/com/donnfelker/android/bootstrap/ui/NewsListFragment.java

@@ -11,6 +11,7 @@
 
 import com.donnfelker.android.bootstrap.BootstrapApplication;
 import com.donnfelker.android.bootstrap.BootstrapServiceProvider;
+import com.donnfelker.android.bootstrap.Injector;
 import com.donnfelker.android.bootstrap.R;
 import com.donnfelker.android.bootstrap.authenticator.LogoutService;
 import com.donnfelker.android.bootstrap.core.News;
@@ -29,7 +30,7 @@ public class NewsListFragment extends ItemListFragment<News> {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        BootstrapApplication.getInstance().inject(this);
+        Injector.inject(this);
     }
 
     @Override

app/src/main/java/com/donnfelker/android/bootstrap/ui/UserListFragment.java

@@ -12,6 +12,7 @@
 
 import com.donnfelker.android.bootstrap.BootstrapApplication;
 import com.donnfelker.android.bootstrap.BootstrapServiceProvider;
+import com.donnfelker.android.bootstrap.Injector;
 import com.donnfelker.android.bootstrap.R;
 import com.donnfelker.android.bootstrap.authenticator.LogoutService;
 import com.donnfelker.android.bootstrap.core.AvatarLoader;
@@ -33,7 +34,7 @@ public class UserListFragment  extends ItemListFragment<User> {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        BootstrapApplication.getInstance().inject(this);
+        Injector.inject(this);
     }
 
     @Override