Deleted ViewModelModule.kt and AppModule.kt according the PR Reviews.

.

Author: murat.cakir

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

@@ -1,12 +1,12 @@
 package com.adesso.movee.base
 
 import androidx.annotation.LayoutRes
+import androidx.appcompat.app.AppCompatActivity
 import androidx.databinding.DataBindingUtil
 import androidx.databinding.ViewDataBinding
 import com.adesso.movee.internal.util.functional.lazyThreadSafetyNone
 
-abstract class BaseBindingActivity<VM : BaseAndroidViewModel, B : ViewDataBinding> :
-    BaseActivity<VM>() {
+abstract class BaseBindingActivity<B : ViewDataBinding> : AppCompatActivity() {
 
     protected val binder by lazyThreadSafetyNone<B> {
         DataBindingUtil.setContentView(this, layoutId)

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

@@ -4,35 +4,26 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.annotation.IdRes
 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
-import androidx.lifecycle.ViewModelProvider
+import androidx.fragment.app.createViewModelLazy
+import androidx.lifecycle.HasDefaultViewModelProviderFactory
 import androidx.navigation.fragment.FragmentNavigator
 import androidx.navigation.fragment.FragmentNavigatorExtras
 import androidx.navigation.fragment.findNavController
-import androidx.navigation.navGraphViewModels
 import com.adesso.movee.BR
 import com.adesso.movee.internal.extension.observeNonNull
 import com.adesso.movee.internal.extension.showPopup
-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 java.lang.reflect.ParameterizedType
-import javax.inject.Inject
 
 abstract class BaseFragment<VM : BaseAndroidViewModel, B : ViewDataBinding> : Fragment() {
 
-    @Inject
-    lateinit var viewModelFactory: ViewModelProvider.Factory
-
     protected lateinit var binder: B
 
     @get:LayoutRes
@@ -41,29 +32,20 @@ abstract class BaseFragment<VM : BaseAndroidViewModel, B : ViewDataBinding> : Fr
     open fun initialize() {}
 
     @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
-        )
-    }
-
-    protected inline fun <reified VM : ViewModel> activityViewModels(): Lazy<VM> {
-        return activityViewModels { viewModelFactory }
-    }
-
-    protected inline fun <reified VM : ViewModel> viewModels(): Lazy<VM> {
-        return viewModels { viewModelFactory }
-    }
-
-    protected inline fun <reified VM : ViewModel> parentViewModels(): Lazy<VM> {
-        return requireParentFragment().viewModels { viewModelFactory }
-    }
-
-    protected inline fun <reified VM : ViewModel> navGraphViewModels(@IdRes navGraphId: Int):
-        Lazy<VM> {
-            return navGraphViewModels(navGraphId) { viewModelFactory }
+    protected open val viewModel: VM
+        get() {
+            val persistentViewModelClass =
+                (javaClass.genericSuperclass as ParameterizedType)
+                    .actualTypeArguments[0] as Class<VM>
+            val lazyVM = createViewModelLazy(
+                viewModelClass = persistentViewModelClass.kotlin,
+                storeProducer = { viewModelStore },
+                factoryProducer = {
+                    (this as? HasDefaultViewModelProviderFactory)?.defaultViewModelProviderFactory
+                        ?: defaultViewModelProviderFactory
+                }
+            )
+            return lazyVM.value
         }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {

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

@@ -21,6 +21,7 @@ import dagger.Lazy
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
 import okhttp3.Cache
 import okhttp3.OkHttpClient
@@ -44,7 +45,7 @@ object NetworkModule {
      */
     @Provides
     @Singleton
-    fun providesCache(context: Context): Cache = Cache(
+    fun providesCache(@ApplicationContext context: Context): Cache = Cache(
         File(
             context.cacheDir,
             CLIENT_CACHE_DIRECTORY
@@ -79,7 +80,7 @@ object NetworkModule {
     @Provides
     @Singleton
     fun provideOkHttpClient(
-        context: Context,
+        @ApplicationContext context: Context,
         cache: Cache,
         loggingInterceptor: HttpLoggingInterceptor,
         curlInterceptor: CurlInterceptor,

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

@@ -4,6 +4,7 @@ import android.content.Context
 import com.adesso.movee.R
 import com.adesso.movee.data.local.datasource.LoginLocalDataSource
 import com.adesso.movee.internal.util.Failure
+import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 import okhttp3.Interceptor
 import okhttp3.Response
@@ -12,7 +13,7 @@ const val HEADER_REQUIRE_SESSION_TOKEN =
     "${RequiresSessionTokenInterceptor.HEADER_KEY}: ${RequiresSessionTokenInterceptor.HEADER_VALUE}"
 
 class RequiresSessionTokenInterceptor @Inject constructor(
-    context: Context,
+    @ApplicationContext context: Context,
     private val loginLocalDataSource: LoginLocalDataSource
 ) : Interceptor {
 

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

@@ -10,9 +10,11 @@ import com.adesso.movee.domain.LoginUseCase
 import com.adesso.movee.internal.util.Event
 import com.github.michaelbull.result.onFailure
 import com.github.michaelbull.result.onSuccess
+import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
+@HiltViewModel
 class LoginViewModel @Inject constructor(
     private val loginUseCase: LoginUseCase,
     application: Application

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

@@ -4,6 +4,7 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.view.View
+import androidx.activity.viewModels
 import androidx.core.net.toUri
 import androidx.navigation.NavController
 import androidx.navigation.findNavController
@@ -17,9 +18,10 @@ import com.adesso.movee.navigation.NavigationCommand
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
-class MainActivity : BaseBindingActivity<MainViewModel, ActivityMainBinding>() {
+class MainActivity : BaseBindingActivity<ActivityMainBinding>() {
 
     override val layoutId get() = R.layout.activity_main
+    private val viewModel: MainViewModel by viewModels()
 
     val navController: NavController by lazy { findNavController(R.id.main_host_fragment) }
 

app/src/main/kotlin/com/adesso/movee/internal/util/api/RequiresSessionTokenInterceptor.kt

@@ -2,8 +2,10 @@ package com.adesso.movee.scene.main
 
 import android.app.Application
 import com.adesso.movee.base.BaseAndroidViewModel
+import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
 
+@HiltViewModel
 class MainViewModel @Inject constructor(
     application: Application
 ) : BaseAndroidViewModel(application)