Migration from MVP to MVVM with Android Architecture Components

app/build.gradle

@@ -1,7 +1,4 @@
 apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-apply plugin: 'kotlin-kapt'
 apply from: "$project.rootDir/tools/findbugs.gradle"
 apply from: "$project.rootDir/tools/checkstyle.gradle"
 apply from: "$project.rootDir/tools/pmd.gradle"
@@ -49,10 +46,6 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
-
     packagingOptions {
         exclude 'META-INF/ASL2.0'
         exclude 'META-INF/DEPENDENCIES'

app/dependencies.gradle

@@ -12,8 +12,6 @@ dependencies {
     testImplementation deps.junit
     androidTestImplementation deps.findbugs_jsr
 
-    implementation deps.kotlin.stdlib
-
     implementation deps.rxjava.android
     // Because RxAndroid releases are few and far between, it is recommended you also
     // explicitly depend on RxJava's latest version for bug fixes and new features.
@@ -24,7 +22,6 @@ dependencies {
 
     // Glide
     implementation deps.glide.runtime
-    kapt deps.glide.compiler
     implementation deps.glide_okhttp_integration
 
     // Retrofit
@@ -38,11 +35,24 @@ dependencies {
 
     // Dagger2
     implementation deps.dagger.main
-    kapt deps.dagger.compiler
+    annotationProcessor deps.dagger.compiler
     implementation deps.dagger.android
-    kapt deps.dagger.android_processor
+    annotationProcessor deps.dagger.android_processor
     implementation deps.dagger.android_support
 
+    // Viewmodel
+    implementation deps.lifecycle.extensions
+    annotationProcessor deps.lifecycle.compiler
+
+    //Auto value
+    implementation deps.auto_value.annotations
+    annotationProcessor deps.auto_value.compiler
+    implementation deps.auto_value_gson.annotations
+    // included again as annotation processor because of
+    // an issue https://github.com/rharter/auto-value-gson/issues/171
+    annotationProcessor deps.auto_value.annotations
+    annotationProcessor deps.auto_value_gson.compiler
+    annotationProcessor deps.auto_value_parcel
     // Espresso
     androidTestImplementation(deps.espresso, {
         exclude group: 'com.android.support', module: 'support-annotations'

app/src/main/java/com/android/ashwiask/tvmaze/TvMazeApplication.java

@@ -1,40 +1,44 @@
 package com.android.ashwiask.tvmaze;
 
+import android.app.Activity;
 import android.app.Application;
-import android.content.Context;
 
-import com.android.ashwiask.tvmaze.network.NetworkModule;
+import com.android.ashwiask.tvmaze.di.AppComponent;
+import com.android.ashwiask.tvmaze.di.AppInjector;
+import com.android.ashwiask.tvmaze.di.DaggerAppComponent;
 
+import javax.inject.Inject;
+
+import dagger.android.AndroidInjector;
+import dagger.android.DispatchingAndroidInjector;
+import dagger.android.HasActivityInjector;
 
 /**
  * @author Ashwini Kumar.
  */
 public class TvMazeApplication extends Application
-{
-    private AppComponent appComponent;
+        implements HasActivityInjector {
+    @Inject
+    DispatchingAndroidInjector<Activity> dispatchingAndroidInjector;
 
-    public static TvMazeApplication get(Context context)
-    {
-        return (TvMazeApplication) context.getApplicationContext();
-    }
+    private AppComponent appComponent;
 
     @Override
-    public void onCreate()
-    {
+    public void onCreate() {
         super.onCreate();
-        initAppComponent();
-    }
-
-    private void initAppComponent()
-    {
         appComponent = DaggerAppComponent.builder()
-                .appModule(new AppModule(this))
-                .networkModule(new NetworkModule())
+                .application(this)
                 .build();
+        appComponent.inject(this);
+        AppInjector.init(this);
     }
 
-    public AppComponent getAppComponent()
-    {
+    public AppComponent getAppComponent() {
         return appComponent;
     }
+
+    @Override
+    public AndroidInjector<Activity> activityInjector() {
+        return dispatchingAndroidInjector;
+    }
 }

app/src/main/java/com/android/ashwiask/tvmaze/base/TvMazeBaseActivity.java

@@ -0,0 +1,21 @@
+package com.android.ashwiask.tvmaze.base;
+
+import android.support.v4.app.Fragment;
+import android.support.v7.app.AppCompatActivity;
+
+import javax.inject.Inject;
+
+import dagger.android.AndroidInjector;
+import dagger.android.DispatchingAndroidInjector;
+import dagger.android.support.HasSupportFragmentInjector;
+
+public class TvMazeBaseActivity extends AppCompatActivity
+        implements HasSupportFragmentInjector {
+    @Inject
+    DispatchingAndroidInjector<Fragment> fragmentDispatchingAndroidInjector;
+
+    @Override
+    public AndroidInjector<Fragment> supportFragmentInjector() {
+        return fragmentDispatchingAndroidInjector;
+    }
+}

app/src/main/java/com/android/ashwiask/tvmaze/di/ActivityBuildersModule.java

@@ -0,0 +1,12 @@
+package com.android.ashwiask.tvmaze.di;
+
+import com.android.ashwiask.tvmaze.home.HomeActivity;
+
+import dagger.Module;
+import dagger.android.ContributesAndroidInjector;
+
+@Module
+abstract class ActivityBuildersModule {
+    @ContributesAndroidInjector
+    abstract HomeActivity bindHomeActivity();
+}

app/src/main/java/com/android/ashwiask/tvmaze/di/AppComponent.java

@@ -0,0 +1,33 @@
+package com.android.ashwiask.tvmaze.di;
+
+import android.app.Application;
+
+import com.android.ashwiask.tvmaze.TvMazeApplication;
+import com.android.ashwiask.tvmaze.network.NetworkModule;
+
+import javax.inject.Singleton;
+
+import dagger.BindsInstance;
+import dagger.Component;
+import dagger.android.support.AndroidSupportInjectionModule;
+
+/**
+ * @author Ashwini Kumar.
+ */
+@Singleton
+@Component(modules = {
+        AndroidSupportInjectionModule.class,
+        AppModule.class,
+        ActivityBuildersModule.class,
+        NetworkModule.class})
+public interface AppComponent {
+    void inject(TvMazeApplication tvMazeApplication);
+
+    @Component.Builder
+    interface Builder {
+        @BindsInstance
+        Builder application(Application application);
+
+        AppComponent build();
+    }
+}

app/src/main/java/com/android/ashwiask/tvmaze/di/AppInjector.java

@@ -0,0 +1,80 @@
+package com.android.ashwiask.tvmaze.di;
+
+import android.app.Activity;
+import android.app.Application;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentActivity;
+import android.support.v4.app.FragmentManager;
+
+import com.android.ashwiask.tvmaze.TvMazeApplication;
+
+import dagger.android.AndroidInjection;
+import dagger.android.support.AndroidSupportInjection;
+import dagger.android.support.HasSupportFragmentInjector;
+
+/**
+ * Helper class to automatically inject fragments if they implement {@link Injectable}.
+ */
+public class AppInjector {
+    private AppInjector() {
+    }
+
+    public static void init(TvMazeApplication tvMazeApplication) {
+        tvMazeApplication.registerActivityLifecycleCallbacks(new Application.ActivityLifecycleCallbacks() {
+            @Override
+            public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
+                handleActivity(activity);
+            }
+
+            @Override
+            public void onActivityStarted(Activity activity) {
+                //do nothing
+            }
+
+            @Override
+            public void onActivityResumed(Activity activity) {
+                //do nothing
+            }
+
+            @Override
+            public void onActivityPaused(Activity activity) {
+                //do nothing
+            }
+
+            @Override
+            public void onActivityStopped(Activity activity) {
+                //do nothing
+            }
+
+            @Override
+            public void onActivitySaveInstanceState(Activity activity, Bundle outState) {
+                //do nothing
+            }
+
+            @Override
+            public void onActivityDestroyed(Activity activity) {
+                //do nothing
+            }
+        });
+    }
+
+    private static void handleActivity(Activity activity) {
+        if (activity instanceof HasSupportFragmentInjector) {
+            AndroidInjection.inject(activity);
+        }
+        if (activity instanceof FragmentActivity) {
+            ((FragmentActivity) activity).getSupportFragmentManager()
+                    .registerFragmentLifecycleCallbacks(
+                            new FragmentManager.FragmentLifecycleCallbacks() {
+                                @Override
+                                public void onFragmentCreated(FragmentManager fm, Fragment f,
+                                                              Bundle savedInstanceState) {
+                                    if (f instanceof Injectable) {
+                                        AndroidSupportInjection.inject(f);
+                                    }
+                                }
+                            }, true);
+        }
+    }
+}

app/src/main/java/com/android/ashwiask/tvmaze/di/AppModule.java

@@ -0,0 +1,21 @@
+package com.android.ashwiask.tvmaze.di;
+
+import android.app.Application;
+import android.content.Context;
+
+import javax.inject.Singleton;
+
+import dagger.Module;
+import dagger.Provides;
+
+/**
+ * @author Ashwini Kumar.
+ */
+@Module(includes = ViewModelModule.class)
+class AppModule {
+    @Provides
+    @Singleton
+    Context provideContext(Application application) {
+        return application;
+    }
+}

app/src/main/java/com/android/ashwiask/tvmaze/di/Injectable.java

@@ -0,0 +1,7 @@
+package com.android.ashwiask.tvmaze.di;
+
+/**
+ * Marks an activity / fragment injectable.
+ */
+public interface Injectable {
+}