Example1 change to MVVM

Author: Kirito398

app/build.gradle

@@ -9,7 +9,7 @@ android {
 
     defaultConfig {
         applicationId "ru.bis.basearchitectureexample"
-        minSdkVersion 19
+        minSdkVersion 21
         targetSdkVersion 30
         versionCode 1
         versionName "1.0"
@@ -23,6 +23,22 @@ 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
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
 }
 
 apply from: "$rootDir/deps/deps_versions.gradle"

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

@@ -1,20 +1,21 @@
 package ru.bis.basearchitectureexample
 
-import android.app.Application
 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.example1.di.provides.Example1ComponentProvider
 import ru.bis.example2.di.components.Example2Component
 import ru.bis.example2.di.provides.Example2ComponentProvider
+import ru.sir.presentation.base.BaseApplication
+import ru.sir.presentation.base.BaseDaggerComponent
+import java.lang.IllegalArgumentException
 
-class App : Application(), Example1ComponentProvider, Example2ComponentProvider {
+class App : BaseApplication(), Example2ComponentProvider {
     companion object {
         lateinit var appComponent: AppComponent
         lateinit var appContext: Context
-        private var example1Component: Example1Component? = null
         private var example2Component: Example2Component? = null
     }
 
@@ -29,10 +30,12 @@ class App : Application(), Example1ComponentProvider, Example2ComponentProvider
         appComponent = DaggerAppComponent.create()
     }
 
-    override fun provideExample1Component(): Example1Component {
-        if (example1Component == null)
-            example1Component = appComponent.createExample1Component().create(Example1CacheModule(this))
-        return example1Component!!
+    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()
+            else -> throw IllegalArgumentException("Dagger component not provided: $type")
+        }
     }
 
     override fun provideExample2Component(): Example2Component {

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

@@ -3,8 +3,8 @@ 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.Example1
 import ru.bis.basearchitectureexample.ui.fragments.Example2
+import ru.bis.example1.ui.fragments.Example1
 
 class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {

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

@@ -1,7 +1,5 @@
 <resources>
     <string name="app_name">BaseArchitectureExample</string>
     <string name="data_text">Data</string>
-    <string name="example1_title">Example 1 Fragment</string>
     <string name="example2_title">Example 2 Fragment</string>
-    <string name="load_data_failed">Load data from cache failed!</string>
 </resources>

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

@@ -10,9 +10,9 @@ ext {
     retrofitCoroutinesAdapterVersion = '0.9.2'
     okHttpVersion = '3.12.8'
     okHttpLoggingInterceptorVersion = '3.12.8'
-    constraintLayoutVersion = '1.1.3'
+    constraintLayoutVersion = '2.0.4'
     circularProgressBarVersion = '3.0.3'
-    daggerVersion = '2.23.1'
+    daggerVersion = '2.27'
     recyclerViewVersion = '1.1.0'
     speedViewVersion = '1.5.3'
     materialVersion = '1.2.0'

deps/deps_versions.gradle

@@ -23,6 +23,13 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
 }
 
 apply from: "$rootDir/deps/deps_versions.gradle"

entities/data/build.gradle

@@ -52,4 +52,7 @@ dependencies {
 
     implementation lifecycleExtensions
     annotationProcessor lifecycleCompiler
+
+    implementation dagger
+    kapt daggerCompiler
 }

entities/presentation/build.gradle

@@ -0,0 +1,8 @@
+package ru.sir.presentation.annotations
+
+import androidx.lifecycle.ViewModel
+import dagger.MapKey
+import kotlin.reflect.KClass
+
+@MapKey
+annotation class ViewModelKey(val value: KClass<out ViewModel>)

entities/presentation/src/main/java/ru/sir/presentation/annotations/ViewModelKey.kt

@@ -0,0 +1,15 @@
+package ru.sir.presentation.base
+
+import android.app.Application
+
+abstract class BaseApplication : Application() {
+    val components = mutableMapOf<Class<out BaseDaggerComponent>, BaseDaggerComponent>()
+
+    inline fun <reified T : BaseDaggerComponent> getComponent(): T {
+        if (components[T::class.java] == null)
+            components[T::class.java] = provideComponent(T::class.java)
+        return components[T::class.java] as T
+    }
+
+    abstract fun provideComponent(type: Class<out BaseDaggerComponent>): BaseDaggerComponent
+}