- For dagger2.27 no need HasActivityInjector, extending DaggerApplication

- AndroidInjector interface is given for injection to AppComponent
-

Author: WaheedNazir

app/src/main/java/com/kotlin/mvvm/app/App.kt

@@ -1,29 +1,17 @@
 package com.kotlin.mvvm.app
 
-import android.app.Activity
-import android.app.Application
-import com.kotlin.mvvm.di.base.AppInjector
+import com.kotlin.mvvm.di.components.DaggerAppComponent
 import dagger.android.AndroidInjector
-import dagger.android.DispatchingAndroidInjector
-import dagger.android.HasActivityInjector
-import javax.inject.Inject
+import dagger.android.support.DaggerApplication
 
 /**
  * Created by Waheed on 04,November,2019
  */
 
-class App : Application(), HasActivityInjector {
+class App : DaggerApplication() {
 
-    @Inject
-    lateinit var dispatchingAndroidInjector: DispatchingAndroidInjector<Activity>
+    private val applicationInjector = DaggerAppComponent.builder().application(this).build()
 
-    override fun onCreate() {
-        super.onCreate()
+    override fun applicationInjector(): AndroidInjector<out DaggerApplication> = applicationInjector
 
-        AppInjector.init(this)
-    }
-
-    override fun activityInjector(): AndroidInjector<Activity> {
-        return dispatchingAndroidInjector
-    }
 }

app/src/main/java/com/kotlin/mvvm/di/base/ViewModelFactory.kt

@@ -12,27 +12,13 @@ import javax.inject.Singleton
 
 @Singleton
 class ViewModelFactory @Inject constructor(
-    private val creators: @JvmSuppressWildcards Map<Class<out ViewModel>, Provider<ViewModel>>
+    private val creators: Map<Class<out ViewModel>, @JvmSuppressWildcards Provider<ViewModel>>
 ) : ViewModelProvider.Factory {
-
     override fun <T : ViewModel> create(modelClass: Class<T>): T {
-        var creator: Provider<out ViewModel>? = creators[modelClass]
-        if (creator == null) {
-            for ((key, value) in creators) {
-                if (modelClass.isAssignableFrom(key)) {
-                    creator = value
-                    break
-                }
-            }
-        }
-        if (creator == null) {
-            throw IllegalArgumentException("unknown model class $modelClass")
-        }
-        try {
-            @Suppress("UNCHECKED_CAST")
-            return creator.get() as T
-        } catch (e: Exception) {
-            throw RuntimeException(e)
-        }
+        val creator = creators[modelClass] ?: creators.entries.firstOrNull {
+            modelClass.isAssignableFrom(it.key)
+        }?.value ?: throw IllegalArgumentException("unknown model class $modelClass")
+        @Suppress("UNCHECKED_CAST")
+        return creator.get() as T
     }
 }

app/src/main/java/com/kotlin/mvvm/di/components/AppComponent.kt

@@ -5,6 +5,7 @@ import com.kotlin.mvvm.di.modules.AppModule
 import dagger.BindsInstance
 import dagger.Component
 import dagger.android.AndroidInjectionModule
+import dagger.android.AndroidInjector
 import javax.inject.Singleton
 
 /**
@@ -17,7 +18,7 @@ import javax.inject.Singleton
  */
 @Singleton
 @Component(modules = [AndroidInjectionModule::class, AppModule::class])
-interface AppComponent {
+interface AppComponent : AndroidInjector<App> {
 
     @Component.Builder
     interface Builder {
@@ -28,6 +29,6 @@ interface AppComponent {
         fun build(): AppComponent
     }
 
-    fun inject(app: App)
+    override fun inject(app: App)
 
 }

app/src/main/java/com/kotlin/mvvm/di/modules/ViewModelModule.kt

@@ -3,20 +3,20 @@ package com.kotlin.mvvm.di.modules
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import com.kotlin.mvvm.di.base.ViewModelFactory
-import com.kotlin.mvvm.di.base.ViewModelKey
 import com.kotlin.mvvm.ui.countries.CountriesViewModel
 import com.kotlin.mvvm.ui.news.NewsViewModel
 import dagger.Binds
+import dagger.MapKey
 import dagger.Module
 import dagger.multibindings.IntoMap
+import kotlin.reflect.KClass
 
 /**
  * Created by Waheed on 04,November,2019
  */
 
 @Module
 abstract class ViewModelModule {
-
     /**
      * Binding NewsArticleViewModel using this key "NewsArticleViewModel::class"
      * So you can get NewsArticleViewModel using "NewsArticleViewModel::class" key from factory
@@ -40,3 +40,13 @@ abstract class ViewModelModule {
     @Binds
     abstract fun bindViewModelFactory(factory: ViewModelFactory): ViewModelProvider.Factory
 }
+
+@MustBeDocumented
+@Target(
+    AnnotationTarget.FUNCTION,
+    AnnotationTarget.PROPERTY_GETTER,
+    AnnotationTarget.PROPERTY_SETTER
+)
+@Retention(AnnotationRetention.RUNTIME)
+@MapKey
+annotation class ViewModelKey(val value: KClass<out ViewModel>)

app/src/main/java/com/kotlin/mvvm/ui/DaggerActivity.kt

@@ -1,14 +1,12 @@
 package com.kotlin.mvvm.ui
 
-import androidx.appcompat.app.AppCompatActivity
-import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
-import dagger.android.DispatchingAndroidInjector
-import dagger.android.support.HasSupportFragmentInjector
+import dagger.android.support.DaggerAppCompatActivity
 import javax.inject.Inject
 
 /**
  * Created by Waheed on 04,November,2019
+ * Updated to dagger 2.27, 29, September 2020
  */
 
 // Referring this class as BaseActivity
@@ -18,14 +16,8 @@ typealias BaseActivity = DaggerActivity
 /**
  * Activity providing Dagger support and [ViewModel] support
  */
-abstract class DaggerActivity : AppCompatActivity(), HasSupportFragmentInjector {
-
-    @Inject
-    lateinit var dispatchingAndroidInjector: DispatchingAndroidInjector<Fragment>
+abstract class DaggerActivity : DaggerAppCompatActivity() {
 
     @Inject
     lateinit var viewModelFactory: ViewModelProvider.Factory
-
-    override fun supportFragmentInjector() = dispatchingAndroidInjector
-
 }