Merge pull request #2 from Kirito398/MVVM

Mvvm

Author: Kirito398

.idea/codeStyles/Project.xml

@@ -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"
@@ -38,5 +54,6 @@ dependencies {
     implementation project(path: ':features:example1')
 
     implementation dagger
+    implementation project(path: ':features:recycler_view_example')
     kapt daggerCompiler
 }

.idea/compiler.xml

@@ -1,43 +1,37 @@
 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.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.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 ru.sir.recycler_view_example.di.components.RecyclerViewExampleComponent
+import ru.sir.recycler_view_example.di.modules.CacheModule as RecyclerViewExampleCacheModule
+import java.lang.IllegalArgumentException
 
-class App : Application(), Example1ComponentProvider, Example2ComponentProvider {
+class App : BaseApplication() {
     companion object {
         lateinit var appComponent: AppComponent
-        lateinit var appContext: Context
-        private var example1Component: Example1Component? = null
-        private var example2Component: Example2Component? = null
     }
 
     override fun onCreate() {
         super.onCreate()
-
-        appContext = applicationContext
         initAppComponent()
     }
 
     private fun initAppComponent() {
         appComponent = DaggerAppComponent.create()
     }
 
-    override fun provideExample1Component(): Example1Component {
-        if (example1Component == null)
-            example1Component = appComponent.createExample1Component().create(Example1CacheModule(this))
-        return example1Component!!
-    }
-
-    override fun provideExample2Component(): Example2Component {
-        if (example2Component == null)
-            example2Component = appComponent.createExample2Component().create()
-        return example2Component!!
+    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(Example2CacheModule(this))
+            RecyclerViewExampleComponent::class.java -> appComponent.createRecyclerViewExampleComponent().create(RecyclerViewExampleCacheModule(this))
+            else -> throw IllegalArgumentException("Dagger component not provided: $type")
+        }
     }
 }

.idea/gradle.xml

@@ -3,9 +3,11 @@ package ru.bis.basearchitectureexample.di.components
 import dagger.Component
 import ru.bis.example1.di.components.Example1Component
 import ru.bis.example2.di.components.Example2Component
+import ru.sir.recycler_view_example.di.components.RecyclerViewExampleComponent
 
 @Component
 interface AppComponent {
     fun createExample1Component(): Example1Component.Factory
     fun createExample2Component(): Example2Component.Factory
+    fun createRecyclerViewExampleComponent(): RecyclerViewExampleComponent.Factory
 }

.idea/misc.xml

@@ -1,24 +1,25 @@
 package ru.bis.basearchitectureexample.ui
 
-import androidx.appcompat.app.AppCompatActivity
-import android.os.Bundle
+import androidx.navigation.findNavController
+import androidx.navigation.ui.NavigationUI
+import com.google.android.material.bottomnavigation.BottomNavigationView
 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.NavActions
+import ru.sir.presentation.base.BaseActivity
+import ru.sir.presentation.navigation.UiAction
 
-class MainActivity : AppCompatActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
+class MainActivity : BaseActivity() {
+    override val layoutId: Int = R.layout.activity_main
+    override fun getNavController() = findNavController(R.id.navHostFragment)
 
-        openDefaultFragments()
+    override fun onActivityCreated() {
+        val bottomNavigation: BottomNavigationView = findViewById(R.id.navigationView)
+        NavigationUI.setupWithNavController(bottomNavigation, navigator)
     }
 
-    private fun openDefaultFragments() {
-        supportFragmentManager
-            .beginTransaction()
-            .replace(R.id.example1Layout, Example1())
-            .replace(R.id.example2Layout, Example2())
-            .commit()
+    override fun navigateTo(action: UiAction) {
+        when(action.id) {
+            NavActions.OPEN_EXAMPLE_2 -> { navigator.navigate(R.id.example2) }
+        }
     }
-}
+}