Conversion from Dagger to Hilt

Author: murat.cakir

app/build.gradle

@@ -1,6 +1,7 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
+apply plugin: 'dagger.hilt.android.plugin'
 apply plugin: 'androidx.navigation.safeargs'
 apply from: "$rootDir/config/git-hooks.gradle.kts"
 apply from: "$rootDir/config/detekt.gradle"
@@ -108,7 +109,7 @@ dependencies {
     implementation androidx
     implementation common
     implementation network
-    implementation dagger
+    implementation hiltt
 
     kapt commonKapt
     debugImplementation commonDebug

app/src/main/kotlin/com/adesso/movee/application/MainApplication.kt

@@ -1,11 +1,13 @@
 package com.adesso.movee.application
 
+import android.app.Application
 import com.adesso.movee.BuildConfig
-import com.adesso.movee.internal.injection.DaggerApplication
 import com.adesso.movee.internal.util.TimberTree
+import dagger.hilt.android.HiltAndroidApp
 import timber.log.Timber
 
-class MainApplication : DaggerApplication() {
+@HiltAndroidApp
+class MainApplication : Application() {
 
     override fun onCreate() {
         super.onCreate()

app/src/main/kotlin/com/adesso/movee/base/BaseActivity.kt

@@ -1,21 +1,22 @@
 package com.adesso.movee.base
 
+import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.ViewModelProvider
 import com.adesso.movee.internal.util.functional.lazyThreadSafetyNone
-import dagger.android.support.DaggerAppCompatActivity
 import java.lang.reflect.ParameterizedType
 import javax.inject.Inject
 
-abstract class BaseActivity<VM : BaseAndroidViewModel> : DaggerAppCompatActivity() {
+abstract class BaseActivity<VM : BaseAndroidViewModel> : AppCompatActivity() {
 
     @Inject
     lateinit var viewModelFactory: ViewModelProvider.Factory
 
     @Suppress("UNCHECKED_CAST")
     protected val viewModel by lazyThreadSafetyNone {
-        val persistentViewModelClass = (javaClass.genericSuperclass as ParameterizedType)
-            .actualTypeArguments[0] as Class<VM>
-        return@lazyThreadSafetyNone ViewModelProvider(this, viewModelFactory)
-            .get(persistentViewModelClass)
+        val persistentViewModelClass =
+            (javaClass.genericSuperclass as ParameterizedType).actualTypeArguments[0] as Class<VM>
+        return@lazyThreadSafetyNone ViewModelProvider(this, viewModelFactory).get(
+            persistentViewModelClass
+        )
     }
 }

app/src/main/kotlin/com/adesso/movee/base/BaseBottomSheetDialogFragment.kt

@@ -1,6 +1,5 @@
 package com.adesso.movee.base
 
-import android.content.Context
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -26,18 +25,11 @@ import com.adesso.movee.navigation.NavigationCommand
 import com.adesso.movee.scene.main.MainActivity
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import com.google.android.material.snackbar.Snackbar
-import dagger.android.AndroidInjector
-import dagger.android.DispatchingAndroidInjector
-import dagger.android.HasAndroidInjector
-import dagger.android.support.AndroidSupportInjection
 import java.lang.reflect.ParameterizedType
 import javax.inject.Inject
 
 abstract class BaseBottomSheetDialogFragment<VM : BaseAndroidViewModel, B : ViewDataBinding> :
-    BottomSheetDialogFragment(), HasAndroidInjector {
-
-    @Inject
-    lateinit var androidInjector: DispatchingAndroidInjector<Any>
+    BottomSheetDialogFragment() {
 
     @Inject
     lateinit var viewModelFactory: ViewModelProvider.Factory
@@ -74,13 +66,6 @@ abstract class BaseBottomSheetDialogFragment<VM : BaseAndroidViewModel, B : View
             return navGraphViewModels(navGraphId) { viewModelFactory }
         }
 
-    override fun onAttach(context: Context) {
-        AndroidSupportInjection.inject(this)
-        super.onAttach(context)
-    }
-
-    override fun androidInjector(): AndroidInjector<Any> = androidInjector
-
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 

app/src/main/kotlin/com/adesso/movee/base/BaseFragment.kt

@@ -9,6 +9,7 @@ import androidx.annotation.LayoutRes
 import androidx.core.net.toUri
 import androidx.databinding.DataBindingUtil
 import androidx.databinding.ViewDataBinding
+import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.ViewModel
@@ -24,12 +25,10 @@ import com.adesso.movee.internal.util.functional.lazyThreadSafetyNone
 import com.adesso.movee.navigation.NavigationCommand
 import com.adesso.movee.scene.main.MainActivity
 import com.google.android.material.snackbar.Snackbar
-import dagger.android.support.DaggerFragment
 import java.lang.reflect.ParameterizedType
 import javax.inject.Inject
 
-abstract class BaseFragment<VM : BaseAndroidViewModel, B : ViewDataBinding> :
-    DaggerFragment() {
+abstract class BaseFragment<VM : BaseAndroidViewModel, B : ViewDataBinding> : Fragment() {
 
     @Inject
     lateinit var viewModelFactory: ViewModelProvider.Factory
@@ -43,10 +42,11 @@ abstract class BaseFragment<VM : BaseAndroidViewModel, B : ViewDataBinding> :
 
     @Suppress("UNCHECKED_CAST")
     protected open val viewModel by lazyThreadSafetyNone {
-        val persistentViewModelClass = (javaClass.genericSuperclass as ParameterizedType)
-            .actualTypeArguments[0] as Class<VM>
-        return@lazyThreadSafetyNone ViewModelProvider(this, viewModelFactory)
-            .get(persistentViewModelClass)
+        val persistentViewModelClass =
+            (javaClass.genericSuperclass as ParameterizedType).actualTypeArguments[0] as Class<VM>
+        return@lazyThreadSafetyNone ViewModelProvider(this, viewModelFactory).get(
+            persistentViewModelClass
+        )
     }
 
     protected inline fun <reified VM : ViewModel> activityViewModels(): Lazy<VM> {
@@ -100,16 +100,19 @@ abstract class BaseFragment<VM : BaseAndroidViewModel, B : ViewDataBinding> :
             is NavigationCommand.ToDirection -> {
                 findNavController().navigate(command.directions, getExtras())
             }
+
             is NavigationCommand.ToDeepLink -> {
-                (activity as? MainActivity)
-                    ?.navController
-                    ?.navigate(command.deepLink.toUri(), null, getExtras())
+                (activity as? MainActivity)?.navController?.navigate(
+                    command.deepLink.toUri(), null, getExtras()
+                )
             }
+
             is NavigationCommand.Popup -> {
                 with(command) {
                     context?.showPopup(model, callback)
                 }
             }
+
             is NavigationCommand.Back -> findNavController().navigateUp()
         }
     }

app/src/main/kotlin/com/adesso/movee/internal/injection/DaggerApplication.kt

@@ -2,23 +2,19 @@ package com.adesso.movee.internal.injection.module
 
 import android.app.Application
 import android.content.Context
-import com.adesso.movee.internal.injection.DaggerApplication
 import dagger.Module
 import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
 import javax.inject.Singleton
 
 @Module(includes = [MoshiModule::class])
-internal class AppModule {
+@InstallIn(SingletonComponent::class)
+object AppModule {
 
     @Provides
     @Singleton
-    internal fun provideApplicationContext(application: DaggerApplication): Context {
+    fun provideApplicationContext(application: Application): Context {
         return application.applicationContext
     }
-
-    @Provides
-    @Singleton
-    internal fun provideApplication(application: DaggerApplication): Application {
-        return application
-    }
 }

app/src/main/kotlin/com/adesso/movee/internal/injection/component/AppComponent.kt

@@ -5,12 +5,14 @@ import android.content.SharedPreferences
 import androidx.preference.PreferenceManager
 import dagger.Module
 import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
 
 @Module
+@InstallIn(SingletonComponent::class)
 object CacheModule {
 
     @Provides
-    @JvmStatic
     fun provideSharedPreferences(application: Application): SharedPreferences {
         return PreferenceManager.getDefaultSharedPreferences(
             application.applicationContext