adds dagger 2

David Weiser · David Weiser · commit ea1750b22186 · 2017-04-26T14:21:04.000+02:00
diff --git a/com.vogella.android.github.issuetracker/app/src/main/java/com/vogella/android/github/issuetracker/ApplicationModule.java b/com.vogella.android.github.issuetracker/app/src/main/java/com/vogella/android/github/issuetracker/ApplicationModule.java
@@ -4,7 +4,7 @@
 import dagger.android.ContributesAndroidInjector;
 
 @Module
-public abstract class ActivityModule {
-    @ContributesAndroidInjector
+public abstract class ApplicationModule {
+    @ContributesAndroidInjector(modules = GithubApiModule.class)
     abstract MainActivity contributeMainActivity();
 }
diff --git a/com.vogella.android.github.issuetracker/app/src/main/java/com/vogella/android/github/issuetracker/CommunicationController.java b/com.vogella.android.github.issuetracker/app/src/main/java/com/vogella/android/github/issuetracker/CommunicationController.java
@@ -8,34 +8,14 @@
 import io.reactivex.observers.DisposableSingleObserver;
 import io.reactivex.schedulers.Schedulers;
 import okhttp3.Credentials;
-import okhttp3.OkHttpClient;
-import okhttp3.logging.HttpLoggingInterceptor;
-import retrofit2.Retrofit;
-import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
-import retrofit2.converter.gson.GsonConverterFactory;
 
 public class CommunicationController {
 
-    private GithubApi githubApi;
-
     @Inject
-    public CommunicationController() {
-        initGithubApi();
-    }
-
-    private void initGithubApi() {
-        HttpLoggingInterceptor interceptor = new HttpLoggingInterceptor();
-        interceptor.setLevel(HttpLoggingInterceptor.Level.BODY);
-        OkHttpClient okHttpClient = new OkHttpClient.Builder().addInterceptor(interceptor).build();
-        Retrofit retrofit = new Retrofit.Builder()
-                .client(okHttpClient)
-                .baseUrl(GithubApi.BASE_URL)
-                .addConverterFactory(GsonConverterFactory.create())
-                .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
-                .build();
+    GithubApi githubApi;
 
-        githubApi = retrofit.create(GithubApi.class);
-    }
+    @Inject
+    public CommunicationController() {}
 
     public void loadIssues(String username, String password, DisposableSingleObserver<List<Issue>> observer, String owner, String repository) {
         githubApi.getIssues(Credentials.basic(username, password), owner, repository)
diff --git a/com.vogella.android.github.issuetracker/app/src/main/java/com/vogella/android/github/issuetracker/GithubApi.java b/com.vogella.android.github.issuetracker/app/src/main/java/com/vogella/android/github/issuetracker/GithubApi.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 
+import dagger.Provides;
 import io.reactivex.Single;
 import retrofit2.http.GET;
 import retrofit2.http.Header;
diff --git a/com.vogella.android.github.issuetracker/app/src/main/java/com/vogella/android/github/issuetracker/GithubApiModule.java b/com.vogella.android.github.issuetracker/app/src/main/java/com/vogella/android/github/issuetracker/GithubApiModule.java
@@ -0,0 +1,29 @@
+package com.vogella.android.github.issuetracker;
+
+
+import dagger.Module;
+import dagger.Provides;
+import okhttp3.OkHttpClient;
+import okhttp3.logging.HttpLoggingInterceptor;
+import retrofit2.Retrofit;
+import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
+import retrofit2.converter.gson.GsonConverterFactory;
+
+@Module
+public class GithubApiModule {
+
+    @Provides
+    static GithubApi provideGithubApi() {
+        HttpLoggingInterceptor interceptor = new HttpLoggingInterceptor();
+        interceptor.setLevel(HttpLoggingInterceptor.Level.BODY);
+        OkHttpClient okHttpClient = new OkHttpClient.Builder().addInterceptor(interceptor).build();
+        Retrofit retrofit = new Retrofit.Builder()
+                .client(okHttpClient)
+                .baseUrl(GithubApi.BASE_URL)
+                .addConverterFactory(GsonConverterFactory.create())
+                .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
+                .build();
+
+        return retrofit.create(GithubApi.class);
+    }
+}
diff --git a/com.vogella.android.github.issuetracker/app/src/main/java/com/vogella/android/github/issuetracker/IApplicationComponent.java b/com.vogella.android.github.issuetracker/app/src/main/java/com/vogella/android/github/issuetracker/IApplicationComponent.java
@@ -4,6 +4,6 @@
 import dagger.android.AndroidInjectionModule;
 import dagger.android.AndroidInjector;
 
-@Component(modules = {AndroidInjectionModule.class,ActivityModule.class })
+@Component(modules = {AndroidInjectionModule.class, ApplicationModule.class})
 public interface IApplicationComponent extends AndroidInjector<MyApplication> {
 }
diff --git a/com.vogella.android.github.issuetracker/app/src/main/java/com/vogella/android/github/issuetracker/MainActivity.java b/com.vogella.android.github.issuetracker/app/src/main/java/com/vogella/android/github/issuetracker/MainActivity.java
@@ -141,4 +141,4 @@ protected void onStop() {
             issuesObserver.dispose();
         }
     }
-}
+}
diff --git a/com.vogella.android.github.issuetracker/app/src/test/java/com/vogella/android/github/issuetracker/ExampleUnitTest.java b/com.vogella.android.github.issuetracker/app/src/test/java/com/vogella/android/github/issuetracker/ExampleUnitTest.java
@@ -2,6 +2,7 @@
 
 import org.junit.Test;
 
+import static junit.framework.Assert.assertEquals;
 import static org.junit.Assert.*;
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`import dagger.android.ContributesAndroidInjector;`
`5`	`5`
`6`	`6`	`@Module`
`7`		`-public abstract class ActivityModule {`
`8`		`- @ContributesAndroidInjector`
	`7`	`+public abstract class ApplicationModule {`
	`8`	`+ @ContributesAndroidInjector(modules = GithubApiModule.class)`
`9`	`9`	`abstract MainActivity contributeMainActivity();`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,6 @@`
`4`	`4`	`import dagger.android.AndroidInjectionModule;`
`5`	`5`	`import dagger.android.AndroidInjector;`
`6`	`6`
`7`		`-@Component(modules = {AndroidInjectionModule.class,ActivityModule.class })`
	`7`	`+@Component(modules = {AndroidInjectionModule.class, ApplicationModule.class})`
`8`	`8`	`public interface IApplicationComponent extends AndroidInjector<MyApplication> {`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -141,4 +141,4 @@ protected void onStop() {`
`141`	`141`	`issuesObserver.dispose();`
`142`	`142`	`}`
`143`	`143`	`}`
`144`		`-}`
	`144`	`+}`