Merge pull request #11 from ashwini009/hilt

Migration from dagger-android to Hilt

Author: reactivedroid

README.md

@@ -9,7 +9,7 @@ TvFlix consists of 3 pieces of UI right now:
 2. Favorites
 3. All Shows
 
-This app is under heavy development. :construction_worker: :hammer_and_wrench:
+This app is under development. :construction_worker: :hammer_and_wrench:
 
 *Note: TvFlix is an unofficial app built only for learning and sharing the latest concepts with #AndroidDevs*
 
@@ -18,7 +18,7 @@ This app is under heavy development. :construction_worker: :hammer_and_wrench:
 * The entire codebase is in [Kotlin](https://kotlinlang.org/)
 * Uses Kotlin [Coroutines](https://kotlinlang.org/docs/reference/coroutines/coroutines-guide.html)
 * Uses MVVM Architecture by [Architecture Components](https://developer.android.com/topic/libraries/architecture/). Room, LiveData, ViewModel, Paging
-* Uses [dagger-android](https://google.github.io/dagger/android.html) for dependency injection
+* Uses [Hilt Android](https://developer.android.com/training/dependency-injection/hilt-android) with [Dagger](https://dagger.dev/) for dependency injection
 * Unit Testing by [Mockito](https://github.com/mockito/mockito)
 * Tests Coroutines and architecture components like ViewModel
 * UI Test by [Espresso](https://developer.android.com/training/testing/espresso) based on [Robot Pattern](https://academy.realm.io/posts/kau-jake-wharton-testing-robots/)

app/build.gradle

@@ -4,6 +4,7 @@ apply from: "$project.rootDir/tools/pmd.gradle"
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'kotlin-android-extensions'
+apply plugin: 'dagger.hilt.android.plugin'
 
 android {
     compileSdkVersion versions.compile_sdk

app/dependencies.gradle

@@ -27,13 +27,6 @@ dependencies {
     implementation deps.retrofit.moshi
     implementation deps.okhttp.logging_interceptor
 
-    // Dagger2
-    implementation deps.dagger.main
-    kapt deps.dagger.compiler
-    implementation deps.dagger.android
-    kapt deps.dagger.android_processor
-    implementation deps.dagger.android_support
-
     // Viewmodel
     implementation deps.lifecycle.extensions
     kapt deps.lifecycle.compiler
@@ -84,4 +77,9 @@ dependencies {
 
     debugImplementation deps.chucker.debug
     releaseImplementation deps.chucker.release
+
+    implementation deps.hilt.android
+    kapt deps.hilt.android_compiler
+    implementation deps.hilt.viewmodel
+    kapt deps.hilt.compiler
 }

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

@@ -1,34 +1,15 @@
 package com.android.tvmaze
 
 import androidx.multidex.MultiDexApplication
-import com.android.tvmaze.di.AppComponent
-import com.android.tvmaze.di.AppInjector
-import com.android.tvmaze.di.DaggerAppComponent
-import dagger.android.AndroidInjector
-import dagger.android.DispatchingAndroidInjector
-import dagger.android.HasAndroidInjector
+import dagger.hilt.android.HiltAndroidApp
 import timber.log.Timber
-import javax.inject.Inject
-
-class TvMazeApplication : MultiDexApplication(), HasAndroidInjector {
-    @Inject
-    lateinit var dispatchingAndroidInjector: DispatchingAndroidInjector<Any>
-
-    private lateinit var appComponent: AppComponent
 
+@HiltAndroidApp
+class TvMazeApplication : MultiDexApplication() {
     override fun onCreate() {
         super.onCreate()
         if (BuildConfig.DEBUG) {
             Timber.plant(Timber.DebugTree())
         }
-        appComponent = DaggerAppComponent.builder()
-            .application(this)
-            .build()
-        appComponent.inject(this)
-        AppInjector.init(this)
-    }
-
-    override fun androidInjector(): AndroidInjector<Any> {
-        return dispatchingAndroidInjector
     }
 }

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

@@ -5,15 +5,18 @@ import androidx.room.Room
 import com.android.tvmaze.db.favouriteshow.ShowDao
 import dagger.Module
 import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.components.ApplicationComponent
+import dagger.hilt.android.qualifiers.ApplicationContext
 
 import javax.inject.Singleton
 
+@InstallIn(ApplicationComponent::class)
 @Module
 object TvMazeDbModule {
-    @JvmStatic
     @Singleton
     @Provides
-    fun provideTvMazeDatabase(context: Context): TvMazeDatabase {
+    fun provideTvMazeDatabase(@ApplicationContext context: Context): TvMazeDatabase {
         return Room.databaseBuilder(
             context,
             TvMazeDatabase::class.java, TvMazeDatabase.DATABASE_NAME
@@ -23,7 +26,6 @@ object TvMazeDbModule {
             .build()
     }
 
-    @JvmStatic
     @Singleton
     @Provides
     fun provideShowDao(tvMazeDatabase: TvMazeDatabase): ShowDao {

app/src/main/java/com/android/tvmaze/db/TvMazeDbModule.kt

@@ -4,8 +4,11 @@ import android.app.Application
 import android.content.Context
 import dagger.Module
 import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.components.ApplicationComponent
 import javax.inject.Singleton
 
+@InstallIn(ApplicationComponent::class)
 @Module
 object AppModule {
     @Provides