Implement Hilt

app/build.gradle

@@ -4,6 +4,7 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'androidx.navigation.safeargs.kotlin'
 apply plugin: "kotlin-allopen"
+apply plugin: 'dagger.hilt.android.plugin'
 
 def getProperty(String filename, String propName) {
     def propsFile = rootProject.file(filename)
@@ -105,7 +106,8 @@ dependencies {
     def archComponentVersion = '2.1.0'
     def roomVersion = '2.2.5'
     def lifecycleVersion = '2.2.0'
-    def daggerVersion = '2.28.1'
+    def hiltVersion = '2.28.3-alpha'
+    def hiltViewModelVersion = '1.0.0-alpha02'
     def retrofitVersion = '2.9.0'
     def googleJsonVersion = '2.8.6'
     def okhttpVersion = '4.7.2'
@@ -153,11 +155,10 @@ dependencies {
     implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
 
     // dependency injection
-    implementation "com.google.dagger:dagger:$daggerVersion"
-    implementation "com.google.dagger:dagger-android:$daggerVersion"
-    implementation "com.google.dagger:dagger-android-support:$daggerVersion"
-    kapt "com.google.dagger:dagger-compiler:$daggerVersion"
-    kapt "com.google.dagger:dagger-android-processor:$daggerVersion"
+    implementation "com.google.dagger:hilt-android:$hiltVersion"
+    kapt "com.google.dagger:hilt-android-compiler:$hiltVersion"
+    implementation "androidx.hilt:hilt-lifecycle-viewmodel:$hiltViewModelVersion"
+    kapt "androidx.hilt:hilt-compiler:$hiltViewModelVersion"
 
     debugImplementation "androidx.fragment:fragment-testing:$androidFragment"
 

app/src/androidTest/java/com/mustafa/movieguideapp/fragment/movie/MovieDetailFragmentTest.kt

@@ -81,9 +81,7 @@ class MovieDetailFragmentTest {
         val scenario = launchFragmentInContainer(
             bundle, themeResId = R.style.AppTheme
         ) {
-            MovieDetailFragment().apply {
-                viewModelFactory = ViewModelUtil.createFor(viewModel)
-            }
+            MovieDetailFragment()
         }
 
         dataBindingIdlingResourceRule.monitorFragment(scenario)

app/src/androidTest/java/com/mustafa/movieguideapp/fragment/movie/MovieListFragmentTest.kt

@@ -68,7 +68,6 @@ class MovieListFragmentTest {
         val scenario = launchFragmentInContainer(themeResId = R.style.AppTheme) {
             MovieListFragment().apply {
                 appExecutors = countingAppExecutors.appExecutors
-                viewModelFactory = ViewModelUtil.createFor(viewModel)
                 dataBindingComponent = object : DataBindingComponent {
                     override fun getFragmentBindingAdapters(): FragmentBindingAdapters {
                         return mockBindingAdapter

app/src/androidTest/java/com/mustafa/movieguideapp/fragment/movie/MovieSearchFragmentTest.kt

@@ -69,7 +69,6 @@ class MovieSearchFragmentTest {
         val scenario = launchFragmentInContainer(themeResId = R.style.AppTheme) {
             MovieSearchFragment().apply {
                 appExecutors = countingAppExecutors.appExecutors
-                viewModelFactory = ViewModelUtil.createFor(viewModel)
                 dataBindingComponent = object : DataBindingComponent {
                     override fun getFragmentBindingAdapters(): FragmentBindingAdapters {
                         return mockBindingAdapter

app/src/androidTest/java/com/mustafa/movieguideapp/fragment/movie/MovieSearchResultFilterFragmentTest.kt

@@ -81,7 +81,6 @@ class MovieSearchResultFilterFragmentTest {
         ) {
             MovieSearchResultFilterFragment().apply {
                 appExecutors = countingAppExecutors.appExecutors
-                viewModelFactory = ViewModelUtil.createFor(viewModel)
                 dataBindingComponent = object : DataBindingComponent {
                     override fun getFragmentBindingAdapters(): FragmentBindingAdapters {
                         return mockBindingAdapter

app/src/androidTest/java/com/mustafa/movieguideapp/fragment/movie/MovieSearchResultFragmentTest.kt

@@ -76,7 +76,6 @@ class MovieSearchResultFragmentTest {
         ) {
             MovieSearchResultFragment().apply {
                 appExecutors = countingAppExecutors.appExecutors
-                viewModelFactory = ViewModelUtil.createFor(viewModel)
                 dataBindingComponent = object : DataBindingComponent {
                     override fun getFragmentBindingAdapters(): FragmentBindingAdapters {
                         return mockBindingAdapter

app/src/androidTest/java/com/mustafa/movieguideapp/fragment/people/CelebritiesListFragmentTest.kt

@@ -67,7 +67,6 @@ class CelebritiesListFragmentTest {
         ) {
             CelebritiesListFragment().apply {
                 appExecutors = countingAppExecutors.appExecutors
-                viewModelFactory = ViewModelUtil.createFor(viewModel)
                 dataBindingComponent = object : DataBindingComponent {
                     override fun getFragmentBindingAdapters(): FragmentBindingAdapters {
                         return mockBindingAdapter

app/src/androidTest/java/com/mustafa/movieguideapp/fragment/people/CelebrityDetailFragmentTest.kt

@@ -75,7 +75,6 @@ class CelebrityDetailFragmentTest {
             bundle, themeResId = R.style.AppTheme
         ) {
             CelebrityDetailFragment().apply {
-                viewModelFactory = ViewModelUtil.createFor(viewModel)
                 appExecutors = countingAppExecutors.appExecutors
             }
         }

app/src/androidTest/java/com/mustafa/movieguideapp/fragment/people/SearchCelebritiesFragmentTest.kt

@@ -68,7 +68,6 @@ class SearchCelebritiesFragmentTest {
         val scenario = launchFragmentInContainer(themeResId = R.style.AppTheme) {
             SearchCelebritiesFragment().apply {
                 appExecutors = countingAppExecutors.appExecutors
-                viewModelFactory = ViewModelUtil.createFor(viewModel)
                 dataBindingComponent = object : DataBindingComponent {
                     override fun getFragmentBindingAdapters(): FragmentBindingAdapters {
                         return mockBindingAdapter

app/src/androidTest/java/com/mustafa/movieguideapp/fragment/people/SearchCelebritiesResultFragmentTest.kt

@@ -64,7 +64,6 @@ class SearchCelebritiesResultFragmentTest {
         ) {
             SearchCelebritiesResultFragment().apply {
                 appExecutors = countingAppExecutors.appExecutors
-                viewModelFactory = ViewModelUtil.createFor(viewModel)
                 dataBindingComponent = object : DataBindingComponent {
                     override fun getFragmentBindingAdapters(): FragmentBindingAdapters {
                         return mockBindingAdapter

app/src/androidTest/java/com/mustafa/movieguideapp/fragment/tv/TvDetailFragmentTest.kt

@@ -78,9 +78,7 @@ class TvDetailFragmentTest {
         val scenario = launchFragmentInContainer(
             bundle, themeResId = R.style.AppTheme
         ) {
-            TvDetailFragment().apply {
-                viewModelFactory = ViewModelUtil.createFor(viewModel)
-            }
+            TvDetailFragment()
         }
 
         dataBindingIdlingResourceRule.monitorFragment(scenario)

app/src/androidTest/java/com/mustafa/movieguideapp/fragment/tv/TvListFragmentTest.kt

@@ -68,7 +68,6 @@ class TvListFragmentTest {
         val scenario = launchFragmentInContainer(themeResId = R.style.AppTheme) {
             TvListFragment().apply {
                 appExecutors = countingAppExecutors.appExecutors
-                viewModelFactory = ViewModelUtil.createFor(viewModel)
                 dataBindingComponent = object : DataBindingComponent {
                     override fun getFragmentBindingAdapters(): FragmentBindingAdapters {
                         return mockBindingAdapter

app/src/androidTest/java/com/mustafa/movieguideapp/fragment/tv/TvSearchFragmentTest.kt

@@ -69,7 +69,6 @@ class TvSearchFragmentTest {
         val scenario = launchFragmentInContainer(themeResId = R.style.AppTheme) {
             TvSearchFragment().apply {
                 appExecutors = countingAppExecutors.appExecutors
-                viewModelFactory = ViewModelUtil.createFor(viewModel)
                 dataBindingComponent = object : DataBindingComponent {
                     override fun getFragmentBindingAdapters(): FragmentBindingAdapters {
                         return mockBindingAdapter

app/src/androidTest/java/com/mustafa/movieguideapp/fragment/tv/TvSearchResultFilterFragmentTest.kt

@@ -81,7 +81,6 @@ class TvSearchResultFilterFragmentTest {
         ) {
             TvSearchResultFilterFragment().apply {
                 appExecutors = countingAppExecutors.appExecutors
-                viewModelFactory = ViewModelUtil.createFor(viewModel)
                 dataBindingComponent = object : DataBindingComponent {
                     override fun getFragmentBindingAdapters(): FragmentBindingAdapters {
                         return mockBindingAdapter

app/src/androidTest/java/com/mustafa/movieguideapp/fragment/tv/TvSearchResultFragmentTest.kt

@@ -76,7 +76,6 @@ class TvSearchResultFragmentTest {
         ) {
             TvSearchResultFragment().apply {
                 appExecutors = countingAppExecutors.appExecutors
-                viewModelFactory = ViewModelUtil.createFor(viewModel)
                 dataBindingComponent = object : DataBindingComponent {
                     override fun getFragmentBindingAdapters(): FragmentBindingAdapters {
                         return mockBindingAdapter

app/src/debug/java/com/mustafa/movieguideapp/testing/SingleFragmentActivity.kt

@@ -7,10 +7,12 @@ import android.view.ViewGroup
 import android.widget.FrameLayout
 import androidx.fragment.app.FragmentContainerView
 import com.mustafa.movieguideapp.R
+import dagger.hilt.android.AndroidEntryPoint
 
 /**
  * Used for testing fragments inside a fake activity.
  */
+@AndroidEntryPoint
 class SingleFragmentActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)

app/src/main/java/com/mustafa/movieguideapp/MovieGuideApp.kt

@@ -1,31 +1,17 @@
 package com.mustafa.movieguideapp
 
 import android.app.Application
-import com.mustafa.movieguideapp.di.AppInjector
-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
-
-@Suppress("unused")
-class MovieGuideApp : Application(), HasAndroidInjector {
-
-    @Inject
-    lateinit var androidInjector: DispatchingAndroidInjector<Any>
 
+@HiltAndroidApp
+class MovieGuideApp : Application() {
 
     override fun onCreate() {
         super.onCreate()
 
-        AppInjector.init(this)
-
         if (BuildConfig.DEBUG) {
             Timber.plant(Timber.DebugTree())
         }
     }
-
-    override fun androidInjector(): AndroidInjector<Any> {
-        return androidInjector
-    }
 }

app/src/main/java/com/mustafa/movieguideapp/di/AppModule.kt

@@ -1,6 +1,7 @@
 package com.mustafa.movieguideapp.di
 
 import android.app.Application
+import android.content.Context
 import androidx.annotation.NonNull
 import androidx.room.Room
 import com.facebook.stetho.okhttp3.StethoInterceptor
@@ -11,17 +12,21 @@ import com.mustafa.movieguideapp.room.PeopleDao
 import com.mustafa.movieguideapp.room.TvDao
 import dagger.Module
 import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.components.ApplicationComponent
+import dagger.hilt.android.qualifiers.ApplicationContext
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 import javax.inject.Singleton
 
-@Module(includes = [ViewModelModule::class])
+@InstallIn(ApplicationComponent::class)
+@Module
 class AppModule {
     @Provides
     @Singleton
-    fun provideDatabase(@NonNull application: Application): AppDatabase {
+    fun provideDatabase(@ApplicationContext application: Context): AppDatabase {
         return Room
             .databaseBuilder(application, AppDatabase::class.java, "Movie.db")
             .allowMainThreadQueries()