Example2 change to MVVM

Author: Kirito398

app/src/main/java/ru/bis/basearchitectureexample/App.kt

@@ -1,28 +1,22 @@
 package ru.bis.basearchitectureexample
 
-import android.content.Context
 import ru.bis.basearchitectureexample.di.components.AppComponent
 import ru.bis.basearchitectureexample.di.components.DaggerAppComponent
 import ru.bis.example1.di.components.Example1Component
-import ru.bis.example1.di.modules.ViewModelModule
-import ru.bis.example1.di.modules.CacheModule as Example1CacheModule
 import ru.bis.example2.di.components.Example2Component
-import ru.bis.example2.di.provides.Example2ComponentProvider
+import ru.bis.example2.di.modules.CacheModule as Example2CacheModule
+import ru.bis.example1.di.modules.CacheModule as Example1CacheModule
 import ru.sir.presentation.base.BaseApplication
 import ru.sir.presentation.base.BaseDaggerComponent
 import java.lang.IllegalArgumentException
 
-class App : BaseApplication(), Example2ComponentProvider {
+class App : BaseApplication() {
     companion object {
         lateinit var appComponent: AppComponent
-        lateinit var appContext: Context
-        private var example2Component: Example2Component? = null
     }
 
     override fun onCreate() {
         super.onCreate()
-
-        appContext = applicationContext
         initAppComponent()
     }
 
@@ -33,14 +27,8 @@ class App : BaseApplication(), Example2ComponentProvider {
     override fun provideComponent(type: Class<out BaseDaggerComponent>): BaseDaggerComponent {
         return when(type) {
             Example1Component::class.java -> appComponent.createExample1Component().create(Example1CacheModule(this))
-            //Example2Component::class.java -> appComponent.createExample2Component().create()
+            Example2Component::class.java -> appComponent.createExample2Component().create(Example2CacheModule(this))
             else -> throw IllegalArgumentException("Dagger component not provided: $type")
         }
     }
-
-    override fun provideExample2Component(): Example2Component {
-        if (example2Component == null)
-            example2Component = appComponent.createExample2Component().create()
-        return example2Component!!
-    }
 }

app/src/main/java/ru/bis/basearchitectureexample/ui/MainActivity.kt

@@ -3,7 +3,7 @@ package ru.bis.basearchitectureexample.ui
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import ru.bis.basearchitectureexample.R
-import ru.bis.basearchitectureexample.ui.fragments.Example2
+import ru.bis.example2.ui.fragments.Example2
 import ru.bis.example1.ui.fragments.Example1
 
 class MainActivity : AppCompatActivity() {

app/src/main/java/ru/bis/basearchitectureexample/ui/fragments/Example2.kt

@@ -1,5 +1,3 @@
 <resources>
     <string name="app_name">BaseArchitectureExample</string>
-    <string name="data_text">Data</string>
-    <string name="example2_title">Example 2 Fragment</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -23,6 +23,15 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+
+    viewBinding {
+        enabled = true
+    }
+
+    dataBinding {
+        enabled = true
+    }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
@@ -35,13 +44,15 @@ android {
 apply from: "$rootDir/deps/deps_versions.gradle"
 
 dependencies {
+    api project(path: ':entities:presentation')
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'androidx.core:core-ktx:1.3.2'
     implementation 'androidx.appcompat:appcompat:1.2.0'
 
     api project(path: ':features:example2_api')
 
+    implementation constraintLayout
     implementation dagger
     kapt daggerCompiler
 }

features/example2/build.gradle

@@ -1,21 +1,19 @@
 package ru.bis.example2.di.components
 
 import dagger.Subcomponent
-import ru.bis.example2.di.modules.DataModule
-import ru.bis.example2.di.modules.DomainModule
-import ru.bis.example2.di.modules.PresentationModule
-import ru.bis.example2.di.modules.RemoteModule
-import ru.bis.example2.presentation.interfaces.Example2ViewContract
+import ru.bis.example2.di.modules.*
+import ru.bis.example2.ui.fragments.Example2
+import ru.sir.presentation.base.BaseDaggerComponent
 import javax.inject.Singleton
 
 @Singleton
-@Subcomponent(modules = [PresentationModule::class, DomainModule::class, DataModule::class, RemoteModule::class])
-interface Example2Component {
+@Subcomponent(modules = [ViewModelModule::class, DomainModule::class, DataModule::class, RemoteModule::class, CacheModule::class])
+interface Example2Component : BaseDaggerComponent {
 
     @Subcomponent.Factory
     interface Factory {
-        fun create(): Example2Component
+        fun create(cacheModule: CacheModule): Example2Component
     }
 
-    fun getExample2Presenter(): Example2ViewContract.Presenter
+    fun inject(fragment: Example2)
 }

features/example2/src/main/java/ru/bis/example2/di/components/Example2Component.kt

@@ -0,0 +1,16 @@
+package ru.bis.example2.di.modules
+
+import android.app.Application
+import android.content.Context
+import dagger.Module
+import dagger.Provides
+import ru.sir.presentation.base.BaseApplication
+
+@Module
+class CacheModule(private val context: Context) {
+    @Provides
+    fun provideAppContext(): Context = context
+
+    @Provides
+    fun provideApplication(): Application = context as BaseApplication
+}

features/example2/src/main/java/ru/bis/example2/di/modules/CacheModule.kt

@@ -0,0 +1,22 @@
+package ru.bis.example2.di.modules
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import dagger.Binds
+import dagger.Module
+import dagger.multibindings.IntoMap
+import ru.bis.example2.view_models.Example2ViewModel
+import ru.sir.presentation.annotations.ViewModelKey
+import ru.sir.presentation.factories.ViewModelFactory
+
+@Module
+abstract class ViewModelModule {
+
+    @Binds
+    abstract fun bindViewModuleFactory(factory: ViewModelFactory): ViewModelProvider.Factory
+
+    @Binds
+    @IntoMap
+    @ViewModelKey(Example2ViewModel::class)
+    abstract fun bindExample2ViewModule(model: Example2ViewModel): ViewModel
+}