Migration from Dagger to Hilt

app/build.gradle.kts

@@ -4,6 +4,7 @@ plugins {
   id(BuildPlugins.kotlinAndroid)
   id(BuildPlugins.kotlinKapt)
   id(BuildPlugins.kotlinAndroidExtensions)
+  id(BuildPlugins.androidHilt)
 
   // Internal Script plugins
   id(ScriptPlugins.variants)
@@ -35,9 +36,7 @@ android {
 dependencies {
   //Compile time dependencies
   kapt(Libraries.lifecycleCompiler)
-  kapt(Libraries.daggerCompiler)
-  compileOnly(Libraries.javaxAnnotation)
-  compileOnly(Libraries.javaxInject)
+  kapt(Libraries.hiltCompiler)
 
   // Application dependencies
   implementation(Libraries.kotlinStdLib)
@@ -54,10 +53,13 @@ dependencies {
   implementation(Libraries.material)
   implementation(Libraries.androidAnnotations)
   implementation(Libraries.glide)
-  implementation(Libraries.dagger)
+  implementation(Libraries.hilt)
   implementation(Libraries.retrofit)
   implementation(Libraries.okHttpLoggingInterceptor)
 
+  //TODO: change this
+  implementation ("androidx.fragment:fragment-ktx:1.2.5")
+
   // Unit/Android tests dependencies
   testImplementation(TestLibraries.junit4)
   testImplementation(TestLibraries.mockk)
@@ -70,7 +72,8 @@ dependencies {
   androidTestImplementation(TestLibraries.testExtJunit)
   androidTestImplementation(TestLibraries.testRules)
   androidTestImplementation(TestLibraries.espressoIntents)
+  androidTestImplementation(TestLibraries.hiltTesting)
 
   // Development dependencies
   debugImplementation(DevLibraries.leakCanary)
-}
+}

app/src/main/kotlin/com/fernandocejas/sample/AndroidApplication.kt

@@ -16,23 +16,7 @@
 package com.fernandocejas.sample
 
 import android.app.Application
-import com.fernandocejas.sample.core.di.ApplicationComponent
-import com.fernandocejas.sample.core.di.ApplicationModule
-import com.fernandocejas.sample.core.di.DaggerApplicationComponent
+import dagger.hilt.android.HiltAndroidApp
 
-class AndroidApplication : Application() {
-
-    val appComponent: ApplicationComponent by lazy(mode = LazyThreadSafetyMode.NONE) {
-        DaggerApplicationComponent
-                .builder()
-                .applicationModule(ApplicationModule(this))
-                .build()
-    }
-
-    override fun onCreate() {
-        super.onCreate()
-        this.injectMembers()
-    }
-
-    private fun injectMembers() = appComponent.inject(this)
-}
+@HiltAndroidApp
+class AndroidApplication : Application()

app/src/main/kotlin/com/fernandocejas/sample/core/di/ApplicationModule.kt

@@ -15,22 +15,21 @@
  */
 package com.fernandocejas.sample.core.di
 
-import android.content.Context
-import com.fernandocejas.sample.AndroidApplication
 import com.fernandocejas.sample.BuildConfig
 import com.fernandocejas.sample.features.movies.MoviesRepository
 import dagger.Module
 import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 import javax.inject.Singleton
 
 @Module
-class ApplicationModule(private val application: AndroidApplication) {
-
-    @Provides @Singleton fun provideApplicationContext(): Context = application
+@InstallIn(SingletonComponent::class)
+class ApplicationModule {
 
     @Provides @Singleton fun provideRetrofit(): Retrofit {
         return Retrofit.Builder()

app/src/main/kotlin/com/fernandocejas/sample/core/extension/Fragment.kt

@@ -17,27 +17,17 @@ package com.fernandocejas.sample.core.extension
 
 import android.content.Context
 import android.view.View
-import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentTransaction
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import com.fernandocejas.sample.core.platform.BaseActivity
 import com.fernandocejas.sample.core.platform.BaseFragment
-import kotlinx.android.synthetic.main.activity_layout.fragmentContainer
+import kotlinx.android.synthetic.main.activity_layout.*
 
 inline fun FragmentManager.inTransaction(func: FragmentTransaction.() -> FragmentTransaction) =
         beginTransaction().func().commit()
 
-inline fun <reified T : ViewModel> Fragment.viewModel(factory: ViewModelProvider.Factory, body: T.() -> Unit): T {
-    val vm = ViewModelProviders.of(this, factory)[T::class.java]
-    vm.body()
-    return vm
-}
-
 fun BaseFragment.close() = fragmentManager?.popBackStack()
 
 val BaseFragment.viewContainer: View get() = (activity as BaseActivity).fragmentContainer
 
-val BaseFragment.appContext: Context get() = activity?.applicationContext!!
+val BaseFragment.appContext: Context get() = activity?.applicationContext!!

app/src/main/kotlin/com/fernandocejas/sample/core/navigation/RouteActivity.kt

@@ -17,21 +17,16 @@ package com.fernandocejas.sample.core.navigation
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.fernandocejas.sample.AndroidApplication
-import com.fernandocejas.sample.core.di.ApplicationComponent
+import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 
+@AndroidEntryPoint
 class RouteActivity : AppCompatActivity() {
 
-    private val appComponent: ApplicationComponent by lazy(mode = LazyThreadSafetyMode.NONE) {
-        (application as AndroidApplication).appComponent
-    }
-
     @Inject internal lateinit var navigator: Navigator
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        appComponent.inject(this)
         navigator.showMain(this)
     }
 }

app/src/main/kotlin/com/fernandocejas/sample/core/platform/BaseActivity.kt

@@ -19,6 +19,7 @@ import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import com.fernandocejas.sample.R
 import com.fernandocejas.sample.core.extension.inTransaction
+import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.android.synthetic.main.toolbar.*
 
 /**
@@ -27,6 +28,7 @@ import kotlinx.android.synthetic.main.toolbar.*
  *
  * @see AppCompatActivity
  */
+@AndroidEntryPoint
 abstract class BaseActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {

app/src/main/kotlin/com/fernandocejas/sample/core/platform/BaseFragment.kt

@@ -22,31 +22,23 @@ import android.view.ViewGroup
 import androidx.annotation.StringRes
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.ViewModelProvider
-import com.fernandocejas.sample.AndroidApplication
 import com.fernandocejas.sample.R.color
-import com.fernandocejas.sample.core.di.ApplicationComponent
 import com.fernandocejas.sample.core.extension.appContext
 import com.fernandocejas.sample.core.extension.viewContainer
 import com.google.android.material.snackbar.Snackbar
-import kotlinx.android.synthetic.main.toolbar.progress
-import javax.inject.Inject
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.android.synthetic.main.toolbar.*
 
 /**
  * Base Fragment class with helper methods for handling views and back button events.
  *
  * @see Fragment
  */
+@AndroidEntryPoint
 abstract class BaseFragment : Fragment() {
 
     abstract fun layoutId(): Int
 
-    val appComponent: ApplicationComponent by lazy(mode = LazyThreadSafetyMode.NONE) {
-        (activity?.application as AndroidApplication).appComponent
-    }
-
-    @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
-
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View =
             inflater.inflate(layoutId(), container, false)
 

app/src/main/kotlin/com/fernandocejas/sample/core/platform/NetworkHandler.kt

@@ -19,6 +19,7 @@ import android.content.Context
 import android.net.NetworkCapabilities
 import android.os.Build
 import com.fernandocejas.sample.core.extension.connectivityManager
+import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -27,7 +28,7 @@ import javax.inject.Singleton
  */
 @Singleton
 class NetworkHandler
-@Inject constructor(private val context: Context) {
+@Inject constructor(@ApplicationContext private val context: Context) {
     fun isNetworkAvailable(): Boolean {
         val connectivityManager = context.connectivityManager
 
@@ -50,4 +51,4 @@ class NetworkHandler
             return networkInfo.isConnected
         }
     }
-}
+}

app/src/main/kotlin/com/fernandocejas/sample/features/movies/MovieDetailsActivity.kt

@@ -18,6 +18,7 @@ package com.fernandocejas.sample.features.movies
 import android.content.Context
 import android.content.Intent
 import com.fernandocejas.sample.core.platform.BaseActivity
+import dagger.hilt.android.AndroidEntryPoint
 
 class MovieDetailsActivity : BaseActivity() {