Merge pull request #22 from lucassales2/feature/hilt

Migrate dagger.android to hilt beta

Author: johsoe

app/build.gradle

@@ -2,8 +2,9 @@ plugins {
     id 'com.android.application'
     id 'kotlin-android'
     id 'kotlin-kapt'
-    id 'org.jetbrains.kotlin.plugin.serialization' version '1.4.21'
+    id 'org.jetbrains.kotlin.plugin.serialization' version '1.4.30'
     id 'dk.nstack.translation.plugin'
+    id 'dagger.hilt.android.plugin'
 }
 
 translation {
@@ -97,10 +98,10 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 
-    implementation "com.google.dagger:dagger-android:${versions.dagger}"
-    implementation "com.google.dagger:dagger-android-support:${versions.dagger}"
-    kapt "com.google.dagger:dagger-compiler:${versions.dagger}"
-    kapt "com.google.dagger:dagger-android-processor:${versions.dagger}"
+
+    implementation "com.google.dagger:hilt-android:${versions.hilt}"
+    kapt "com.google.dagger:hilt-compiler:${versions.hilt}"
+
 
     implementation("com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:0.8.0")
     implementation("com.squareup.retrofit2:retrofit:2.9.0")

app/src/main/java/com/monstarlab/App.kt

@@ -1,13 +1,13 @@
 package com.monstarlab
 
+import android.app.Application
 import com.monstarlab.features.nstack.Translation
-import com.monstarlab.injection.components.DaggerAppComponent
-import dagger.android.AndroidInjector
-import dagger.android.DaggerApplication
+import dagger.hilt.android.HiltAndroidApp
 import dk.nodes.nstack.kotlin.NStack
 import timber.log.Timber
 
-class App : DaggerApplication() {
+@HiltAndroidApp
+class App : Application() {
 
     override fun onCreate() {
         super.onCreate()
@@ -17,8 +17,4 @@ class App : DaggerApplication() {
             Timber.plant(Timber.DebugTree())
         }
     }
-
-    override fun applicationInjector(): AndroidInjector<out DaggerApplication> {
-        return DaggerAppComponent.factory().create(this)
-    }
 }

app/src/main/java/com/monstarlab/arch/base/BaseActivity.kt

@@ -3,22 +3,25 @@ package com.monstarlab.features.login
 import android.os.Bundle
 import android.view.View
 import androidx.core.view.isVisible
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
 import androidx.lifecycle.loadingFlow
 import androidx.lifecycle.viewErrorFlow
 import androidx.navigation.fragment.findNavController
 import androidx.transition.TransitionManager
 import com.monstarlab.R
-import com.monstarlab.arch.base.BaseFragment
 import com.monstarlab.arch.extensions.collectFlow
 import com.monstarlab.arch.extensions.onClick
 import com.monstarlab.arch.extensions.snackErrorFlow
 import com.monstarlab.arch.extensions.viewBinding
 import com.monstarlab.arch.extensions.visibilityFlow
 import com.monstarlab.databinding.FragmentLoginBinding
+import dagger.hilt.android.AndroidEntryPoint
 
-class LoginFragment : BaseFragment(R.layout.fragment_login) {
+@AndroidEntryPoint
+class LoginFragment : Fragment(R.layout.fragment_login) {
 
-    private val viewModel by viewModel<LoginViewModel>()
+    private val viewModel by viewModels<LoginViewModel>()
     private val binding by viewBinding(FragmentLoginBinding::bind)
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {

app/src/main/java/com/monstarlab/arch/base/BaseFragment.kt

@@ -8,10 +8,12 @@ import com.monstarlab.arch.extensions.LoadingAware
 import com.monstarlab.arch.extensions.ViewErrorAware
 import com.monstarlab.arch.extensions.onSuccess
 import com.monstarlab.core.usecases.user.LoginUseCase
+import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.launchIn
 import javax.inject.Inject
 
+@HiltViewModel
 class LoginViewModel @Inject constructor(
     private val loginUseCase: LoginUseCase
 ) : ViewModel(), ViewErrorAware, LoadingAware {

app/src/main/java/com/monstarlab/features/login/LoginFragment.kt

@@ -1,10 +1,12 @@
 package com.monstarlab.features.main
 
 import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import com.monstarlab.R
-import com.monstarlab.arch.base.BaseActivity
+import dagger.hilt.android.AndroidEntryPoint
 
-class MainActivity : BaseActivity(R.layout.activity_main) {
+@AndroidEntryPoint
+class MainActivity : AppCompatActivity(R.layout.activity_main) {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setupNStack()

app/src/main/java/com/monstarlab/features/login/LoginViewModel.kt

@@ -2,17 +2,20 @@ package com.monstarlab.features.resources
 
 import android.os.Bundle
 import android.view.View
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
 import androidx.transition.TransitionManager
 import com.google.android.material.snackbar.Snackbar
 import com.monstarlab.R
-import com.monstarlab.arch.base.BaseFragment
 import com.monstarlab.arch.extensions.collectFlow
 import com.monstarlab.arch.extensions.viewBinding
 import com.monstarlab.databinding.FragmentResourceBinding
+import dagger.hilt.android.AndroidEntryPoint
 
-class ResourceFragment : BaseFragment(R.layout.fragment_resource) {
+@AndroidEntryPoint
+class ResourceFragment : Fragment(R.layout.fragment_resource) {
 
-    private val viewModel by viewModel<ResourceViewModel>()
+    private val viewModel by viewModels<ResourceViewModel>()
     private val binding by viewBinding(FragmentResourceBinding::bind)
     private val resourceAdapter = ResourceAdapter()
 

app/src/main/java/com/monstarlab/features/main/MainActivity.kt

@@ -8,13 +8,15 @@ import com.monstarlab.core.domain.model.Resource
 import com.monstarlab.core.sharedui.errorhandling.ViewError
 import com.monstarlab.core.sharedui.errorhandling.mapToViewError
 import com.monstarlab.core.usecases.resources.GetResourcesUseCase
+import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onCompletion
 import kotlinx.coroutines.flow.onStart
 import javax.inject.Inject
 
+@HiltViewModel
 class ResourceViewModel @Inject constructor(
     private val getResourcesUseCase: GetResourcesUseCase
 ) : ViewModel() {