From 417547d44e25e1e33ffcf0f0bb06ad3c9f0c0caa Mon Sep 17 00:00:00 2001
From: Evgeny Dubravin <dubrdubr23@gmail.com>
Date: Thu, 28 Mar 2024 17:10:25 +0700
Subject: [PATCH 1/5] =?UTF-8?q?feature=20TI-193:=20[Android]=20=D0=A0?=
 =?UTF-8?q?=D0=B5=D0=B0=D0=BB=D0=B8=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D1=8C=20?=
 =?UTF-8?q?ViewModel=20Factory?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle.kts                          |  3 --
 app/src/main/java/ru/touchin/template/App.kt  | 15 +++++++++-
 .../ru/touchin/template/SingleViewModel.kt    |  6 ++++
 .../template/base/activity/BaseActivity.kt    | 12 ++++++++
 .../template/base/fragment/BaseFragment.kt    | 12 ++++++++
 .../ru/touchin/template/di/AppComponent.kt    | 30 +++++++++++++++++++
 .../main/java/ru/touchin/template/di/DI.kt    | 16 ++++++++++
 .../touchin/template/di/SharedComponentExt.kt | 17 +++++++++++
 .../template/di/SharedComponentProvider.kt    | 15 ++++++++++
 .../touchin/template/di/modules/AppModule.kt  | 11 +++++++
 .../template/di/modules/NetworkModule.kt      |  7 +++++
 .../template/di/modules/RepositoryModule.kt   |  7 +++++
 .../template/di/modules/ViewModelModule.kt    | 22 ++++++++++++++
 .../template/di/viewmodel/ViewModelFactory.kt | 17 +++++++++++
 .../template/di/viewmodel/ViewModelKey.kt     |  9 ++++++
 common-template                               |  1 +
 16 files changed, 196 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/java/ru/touchin/template/SingleViewModel.kt
 create mode 100644 app/src/main/java/ru/touchin/template/base/activity/BaseActivity.kt
 create mode 100644 app/src/main/java/ru/touchin/template/base/fragment/BaseFragment.kt
 create mode 100644 app/src/main/java/ru/touchin/template/di/AppComponent.kt
 create mode 100644 app/src/main/java/ru/touchin/template/di/DI.kt
 create mode 100644 app/src/main/java/ru/touchin/template/di/SharedComponentExt.kt
 create mode 100644 app/src/main/java/ru/touchin/template/di/SharedComponentProvider.kt
 create mode 100644 app/src/main/java/ru/touchin/template/di/modules/AppModule.kt
 create mode 100644 app/src/main/java/ru/touchin/template/di/modules/NetworkModule.kt
 create mode 100644 app/src/main/java/ru/touchin/template/di/modules/RepositoryModule.kt
 create mode 100644 app/src/main/java/ru/touchin/template/di/modules/ViewModelModule.kt
 create mode 100644 app/src/main/java/ru/touchin/template/di/viewmodel/ViewModelFactory.kt
 create mode 100644 app/src/main/java/ru/touchin/template/di/viewmodel/ViewModelKey.kt
 create mode 160000 common-template

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 5103e8c..a7d316a 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,8 +1,5 @@
 plugins {
     id(Plugins.ANDROID_APP_PLUGIN_WITH_DEFAULT_CONFIG)
-    id(libs.plugins.android.application.get().pluginId)
-    id(libs.plugins.kotlin.android.get().pluginId)
-    id(libs.plugins.kotlin.kapt.get().pluginId)
     alias(libs.plugins.google.services)
     alias(libs.plugins.firebase.crashlytics)
     alias(libs.plugins.firebase.perf)
diff --git a/app/src/main/java/ru/touchin/template/App.kt b/app/src/main/java/ru/touchin/template/App.kt
index c6ffdc1..0048de1 100644
--- a/app/src/main/java/ru/touchin/template/App.kt
+++ b/app/src/main/java/ru/touchin/template/App.kt
@@ -1,5 +1,18 @@
 package ru.touchin.template
 
 import android.app.Application
+import ru.touchin.template.di.DI
+import ru.touchin.template.di.SharedComponent
+import ru.touchin.template.di.SharedComponentProvider
 
-class App : Application()
+class App : Application(), SharedComponentProvider {
+
+    override fun onCreate() {
+        super.onCreate()
+
+        DI.init(applicationContext)
+        DI.getComponent().inject(this)
+    }
+
+    override fun getModule(): SharedComponent = DI.getComponent()
+}
diff --git a/app/src/main/java/ru/touchin/template/SingleViewModel.kt b/app/src/main/java/ru/touchin/template/SingleViewModel.kt
new file mode 100644
index 0000000..15b24f0
--- /dev/null
+++ b/app/src/main/java/ru/touchin/template/SingleViewModel.kt
@@ -0,0 +1,6 @@
+package ru.touchin.template
+
+import androidx.lifecycle.ViewModel
+import javax.inject.Inject
+
+class SingleViewModel @Inject constructor() : ViewModel()
\ No newline at end of file
diff --git a/app/src/main/java/ru/touchin/template/base/activity/BaseActivity.kt b/app/src/main/java/ru/touchin/template/base/activity/BaseActivity.kt
new file mode 100644
index 0000000..df11275
--- /dev/null
+++ b/app/src/main/java/ru/touchin/template/base/activity/BaseActivity.kt
@@ -0,0 +1,12 @@
+package ru.touchin.template.base.activity
+
+import androidx.appcompat.app.AppCompatActivity
+import ru.touchin.template.di.SharedComponent
+import ru.touchin.template.di.getSharedModule
+
+class BaseActivity : AppCompatActivity() {
+
+    protected val viewModelFactory by lazy { getSharedComponent().viewModelFactory() }
+
+    protected fun getSharedComponent(): SharedComponent = getSharedModule()
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/touchin/template/base/fragment/BaseFragment.kt b/app/src/main/java/ru/touchin/template/base/fragment/BaseFragment.kt
new file mode 100644
index 0000000..c9c3c8e
--- /dev/null
+++ b/app/src/main/java/ru/touchin/template/base/fragment/BaseFragment.kt
@@ -0,0 +1,12 @@
+package ru.touchin.template.base.fragment
+
+import androidx.fragment.app.Fragment
+import ru.touchin.template.di.SharedComponent
+import ru.touchin.template.di.getSharedModule
+
+class BaseFragment : Fragment() {
+
+    protected val viewModelFactory by lazy { getSharedComponent().viewModelFactory() }
+
+    protected fun getSharedComponent(): SharedComponent = getSharedModule()
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/touchin/template/di/AppComponent.kt b/app/src/main/java/ru/touchin/template/di/AppComponent.kt
new file mode 100644
index 0000000..f4b7320
--- /dev/null
+++ b/app/src/main/java/ru/touchin/template/di/AppComponent.kt
@@ -0,0 +1,30 @@
+package ru.touchin.template.di
+
+import android.content.Context
+import dagger.BindsInstance
+import dagger.Component
+import javax.inject.Singleton
+import ru.touchin.template.App
+import ru.touchin.template.di.modules.AppModule
+import ru.touchin.template.di.modules.ViewModelModule
+
+@Component(
+        modules = [
+            AppModule::class,
+            ViewModelModule::class
+        ]
+)
+@Singleton
+interface AppComponent : SharedComponent {
+
+    @Component.Builder
+    interface Builder {
+
+        @BindsInstance
+        fun appContext(appContext: Context): Builder
+
+        fun build(): AppComponent
+    }
+
+    fun inject(entry: App)
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/touchin/template/di/DI.kt b/app/src/main/java/ru/touchin/template/di/DI.kt
new file mode 100644
index 0000000..626c007
--- /dev/null
+++ b/app/src/main/java/ru/touchin/template/di/DI.kt
@@ -0,0 +1,16 @@
+package ru.touchin.template.di
+
+import android.content.Context
+
+object DI {
+
+    private lateinit var appComponent: AppComponent
+
+    fun init(context: Context) {
+        appComponent = DaggerAppComponent.builder()
+                .appContext(context)
+                .build()
+    }
+
+    fun getComponent(): AppComponent = appComponent
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/touchin/template/di/SharedComponentExt.kt b/app/src/main/java/ru/touchin/template/di/SharedComponentExt.kt
new file mode 100644
index 0000000..36993ee
--- /dev/null
+++ b/app/src/main/java/ru/touchin/template/di/SharedComponentExt.kt
@@ -0,0 +1,17 @@
+package ru.touchin.template.di
+
+import android.app.Activity
+import android.content.Context
+import androidx.fragment.app.Fragment
+
+fun Context.getSharedModule(): SharedComponent {
+    return (applicationContext as SharedComponentProvider).getModule()
+}
+
+fun Activity.getSharedModule(): SharedComponent {
+    return (applicationContext as SharedComponentProvider).getModule()
+}
+
+fun Fragment.getSharedModule(): SharedComponent {
+    return requireContext().getSharedModule()
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/touchin/template/di/SharedComponentProvider.kt b/app/src/main/java/ru/touchin/template/di/SharedComponentProvider.kt
new file mode 100644
index 0000000..0ee19ab
--- /dev/null
+++ b/app/src/main/java/ru/touchin/template/di/SharedComponentProvider.kt
@@ -0,0 +1,15 @@
+package ru.touchin.template.di
+
+import dagger.Module
+import ru.touchin.template.di.viewmodel.ViewModelFactory
+
+interface SharedComponent {
+    fun viewModelFactory(): ViewModelFactory
+}
+
+@Module
+class SharedModule
+
+interface SharedComponentProvider {
+    fun getModule(): SharedComponent
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/touchin/template/di/modules/AppModule.kt b/app/src/main/java/ru/touchin/template/di/modules/AppModule.kt
new file mode 100644
index 0000000..0943510
--- /dev/null
+++ b/app/src/main/java/ru/touchin/template/di/modules/AppModule.kt
@@ -0,0 +1,11 @@
+package ru.touchin.template.di.modules
+
+import dagger.Module
+
+@Module(
+        includes = [
+            RepositoryModule::class,
+            NetworkModule::class
+        ]
+)
+class AppModule
\ No newline at end of file
diff --git a/app/src/main/java/ru/touchin/template/di/modules/NetworkModule.kt b/app/src/main/java/ru/touchin/template/di/modules/NetworkModule.kt
new file mode 100644
index 0000000..8c14718
--- /dev/null
+++ b/app/src/main/java/ru/touchin/template/di/modules/NetworkModule.kt
@@ -0,0 +1,7 @@
+package ru.touchin.template.di.modules
+
+import dagger.Module
+
+@Module
+class NetworkModule {
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/touchin/template/di/modules/RepositoryModule.kt b/app/src/main/java/ru/touchin/template/di/modules/RepositoryModule.kt
new file mode 100644
index 0000000..f995563
--- /dev/null
+++ b/app/src/main/java/ru/touchin/template/di/modules/RepositoryModule.kt
@@ -0,0 +1,7 @@
+package ru.touchin.template.di.modules
+
+import dagger.Module
+
+@Module
+class RepositoryModule {
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/touchin/template/di/modules/ViewModelModule.kt b/app/src/main/java/ru/touchin/template/di/modules/ViewModelModule.kt
new file mode 100644
index 0000000..9331a01
--- /dev/null
+++ b/app/src/main/java/ru/touchin/template/di/modules/ViewModelModule.kt
@@ -0,0 +1,22 @@
+package ru.touchin.template.di.modules
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import dagger.Binds
+import dagger.Module
+import dagger.multibindings.IntoMap
+import ru.touchin.template.SingleViewModel
+import ru.touchin.template.di.viewmodel.ViewModelFactory
+import ru.touchin.template.di.viewmodel.ViewModelKey
+
+@Module
+interface ViewModelModule {
+
+    @Binds
+    fun bindViewModelFactory(factory: ViewModelFactory): ViewModelProvider.Factory
+
+    @Binds
+    @IntoMap
+    @ViewModelKey(SingleViewModel::class)
+    fun bindsSingleViewModel(viewModel: SingleViewModel): ViewModel
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/touchin/template/di/viewmodel/ViewModelFactory.kt b/app/src/main/java/ru/touchin/template/di/viewmodel/ViewModelFactory.kt
new file mode 100644
index 0000000..297984b
--- /dev/null
+++ b/app/src/main/java/ru/touchin/template/di/viewmodel/ViewModelFactory.kt
@@ -0,0 +1,17 @@
+package ru.touchin.template.di.viewmodel
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import javax.inject.Inject
+import javax.inject.Provider
+
+class ViewModelFactory @Inject constructor(
+        private val viewModels: MutableMap<Class<out ViewModel>, Provider<ViewModel>>
+) : ViewModelProvider.Factory {
+
+    @Suppress("UNCHECKED_CAST")
+    override fun <T : ViewModel> create(modelClass: Class<T>): T {
+        val viewModel = viewModels[modelClass]?.get()
+        return viewModel as T
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/touchin/template/di/viewmodel/ViewModelKey.kt b/app/src/main/java/ru/touchin/template/di/viewmodel/ViewModelKey.kt
new file mode 100644
index 0000000..1f76f60
--- /dev/null
+++ b/app/src/main/java/ru/touchin/template/di/viewmodel/ViewModelKey.kt
@@ -0,0 +1,9 @@
+package ru.touchin.template.di.viewmodel
+
+import androidx.lifecycle.ViewModel
+import dagger.MapKey
+import kotlin.reflect.KClass
+
+@Target(AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER)
+@MapKey
+annotation class ViewModelKey(val value: KClass<out ViewModel>)
\ No newline at end of file
diff --git a/common-template b/common-template
new file mode 160000
index 0000000..d6f303b
--- /dev/null
+++ b/common-template
@@ -0,0 +1 @@
+Subproject commit d6f303bf879a2da1706cfdacaf2bbe0c326044bd
-- 
2.40.1


From c4b740f629d11839c35c02253633b5988e49914c Mon Sep 17 00:00:00 2001
From: Evgeny Dubravin <dubrdubr23@gmail.com>
Date: Fri, 29 Mar 2024 22:36:19 +0700
Subject: [PATCH 2/5] feature TI-194: [Android] DI

---
 app/src/main/AndroidManifest.xml              |  6 ++---
 .../ru/touchin/template/SingleActivity.kt     |  5 ----
 .../template/base/activity/BaseActivity.kt    |  7 ++++-
 .../template/base/fragment/BaseFragment.kt    |  5 +++-
 .../template/di/SharedComponentProvider.kt    |  2 ++
 .../template/di/modules/ViewModelModule.kt    |  9 ++++++-
 .../template/di/viewmodel/ViewModelFactory.kt | 27 +++++++++++++++++++
 app/src/main/res/layout/activity_main.xml     | 24 ++++++++++++++---
 app/src/main/res/layout/fragment_first.xml    | 27 +++++++++++++++++++
 app/src/main/res/layout/fragment_second.xml   | 27 +++++++++++++++++++
 10 files changed, 124 insertions(+), 15 deletions(-)
 delete mode 100644 app/src/main/java/ru/touchin/template/SingleActivity.kt
 create mode 100644 app/src/main/res/layout/fragment_first.xml
 create mode 100644 app/src/main/res/layout/fragment_second.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 498225a..0f6717f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -11,12 +11,12 @@
         android:label="@string/common_app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="false"
-        tools:ignore="GoogleAppIndexingWarning">
+        tools:ignore="GoogleAppIndexingWarning"
+        android:theme="@style/AppTheme">
 
         <activity
-            android:name="ru.touchin.template.SingleActivity"
+            android:name=".feature.SingleActivity"
             android:screenOrientation="portrait"
-            android:theme="@style/AppTheme"
             android:windowSoftInputMode="adjustResize"
             android:exported="true">
             <intent-filter>
diff --git a/app/src/main/java/ru/touchin/template/SingleActivity.kt b/app/src/main/java/ru/touchin/template/SingleActivity.kt
deleted file mode 100644
index e71c1db..0000000
--- a/app/src/main/java/ru/touchin/template/SingleActivity.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package ru.touchin.template
-
-import androidx.appcompat.app.AppCompatActivity
-
-class SingleActivity : AppCompatActivity()
diff --git a/app/src/main/java/ru/touchin/template/base/activity/BaseActivity.kt b/app/src/main/java/ru/touchin/template/base/activity/BaseActivity.kt
index df11275..0100cf3 100644
--- a/app/src/main/java/ru/touchin/template/base/activity/BaseActivity.kt
+++ b/app/src/main/java/ru/touchin/template/base/activity/BaseActivity.kt
@@ -1,12 +1,17 @@
 package ru.touchin.template.base.activity
 
 import androidx.appcompat.app.AppCompatActivity
+import androidx.lifecycle.ViewModel
 import ru.touchin.template.di.SharedComponent
 import ru.touchin.template.di.getSharedModule
 
-class BaseActivity : AppCompatActivity() {
+abstract class BaseActivity<T : ViewModel> : AppCompatActivity() {
+
+    protected val viewModel: T by lazy { createViewModelLazy().value }
 
     protected val viewModelFactory by lazy { getSharedComponent().viewModelFactory() }
 
+    abstract fun createViewModelLazy(): Lazy<T>
+
     protected fun getSharedComponent(): SharedComponent = getSharedModule()
 }
\ No newline at end of file
diff --git a/app/src/main/java/ru/touchin/template/base/fragment/BaseFragment.kt b/app/src/main/java/ru/touchin/template/base/fragment/BaseFragment.kt
index c9c3c8e..7125d9e 100644
--- a/app/src/main/java/ru/touchin/template/base/fragment/BaseFragment.kt
+++ b/app/src/main/java/ru/touchin/template/base/fragment/BaseFragment.kt
@@ -1,12 +1,15 @@
 package ru.touchin.template.base.fragment
 
 import androidx.fragment.app.Fragment
+import androidx.lifecycle.ViewModel
 import ru.touchin.template.di.SharedComponent
 import ru.touchin.template.di.getSharedModule
 
-class BaseFragment : Fragment() {
+abstract class BaseFragment<T : ViewModel> : Fragment() {
 
     protected val viewModelFactory by lazy { getSharedComponent().viewModelFactory() }
 
+    protected abstract fun createViewModelLazy(): Lazy<T>
+
     protected fun getSharedComponent(): SharedComponent = getSharedModule()
 }
\ No newline at end of file
diff --git a/app/src/main/java/ru/touchin/template/di/SharedComponentProvider.kt b/app/src/main/java/ru/touchin/template/di/SharedComponentProvider.kt
index 0ee19ab..771a420 100644
--- a/app/src/main/java/ru/touchin/template/di/SharedComponentProvider.kt
+++ b/app/src/main/java/ru/touchin/template/di/SharedComponentProvider.kt
@@ -2,9 +2,11 @@ package ru.touchin.template.di
 
 import dagger.Module
 import ru.touchin.template.di.viewmodel.ViewModelFactory
+import ru.touchin.template.feature.second.SecondViewModel
 
 interface SharedComponent {
     fun viewModelFactory(): ViewModelFactory
+    fun secondScreenViewModelFactory(): SecondViewModel.Factory
 }
 
 @Module
diff --git a/app/src/main/java/ru/touchin/template/di/modules/ViewModelModule.kt b/app/src/main/java/ru/touchin/template/di/modules/ViewModelModule.kt
index 9331a01..781d5ad 100644
--- a/app/src/main/java/ru/touchin/template/di/modules/ViewModelModule.kt
+++ b/app/src/main/java/ru/touchin/template/di/modules/ViewModelModule.kt
@@ -5,9 +5,10 @@ import androidx.lifecycle.ViewModelProvider
 import dagger.Binds
 import dagger.Module
 import dagger.multibindings.IntoMap
-import ru.touchin.template.SingleViewModel
 import ru.touchin.template.di.viewmodel.ViewModelFactory
 import ru.touchin.template.di.viewmodel.ViewModelKey
+import ru.touchin.template.feature.SingleViewModel
+import ru.touchin.template.feature.first.FirstViewModel
 
 @Module
 interface ViewModelModule {
@@ -19,4 +20,10 @@ interface ViewModelModule {
     @IntoMap
     @ViewModelKey(SingleViewModel::class)
     fun bindsSingleViewModel(viewModel: SingleViewModel): ViewModel
+
+    @Binds
+    @IntoMap
+    @ViewModelKey(FirstViewModel::class)
+    fun bindsFirstViewModel(viewModel: FirstViewModel): ViewModel
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/ru/touchin/template/di/viewmodel/ViewModelFactory.kt b/app/src/main/java/ru/touchin/template/di/viewmodel/ViewModelFactory.kt
index 297984b..699e68c 100644
--- a/app/src/main/java/ru/touchin/template/di/viewmodel/ViewModelFactory.kt
+++ b/app/src/main/java/ru/touchin/template/di/viewmodel/ViewModelFactory.kt
@@ -1,7 +1,13 @@
 package ru.touchin.template.di.viewmodel
 
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.AbstractSavedStateViewModelFactory
+import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
+import androidx.savedstate.SavedStateRegistryOwner
 import javax.inject.Inject
 import javax.inject.Provider
 
@@ -14,4 +20,25 @@ class ViewModelFactory @Inject constructor(
         val viewModel = viewModels[modelClass]?.get()
         return viewModel as T
     }
+}
+
+inline fun <reified VM : ViewModel> Fragment.assistedViewModel(
+        crossinline creator: (SavedStateHandle) -> VM,
+): Lazy<VM> = viewModels { createAbstractSavedStateViewModelFactory(arguments, creator) }
+
+inline fun <reified T : ViewModel> SavedStateRegistryOwner.createAbstractSavedStateViewModelFactory(
+        arguments: Bundle? = Bundle(),
+        crossinline creator: (SavedStateHandle) -> T,
+): ViewModelProvider.Factory {
+    return object : AbstractSavedStateViewModelFactory(
+            owner = this@createAbstractSavedStateViewModelFactory,
+            defaultArgs = arguments,
+    ) {
+        @Suppress("UNCHECKED_CAST")
+        override fun <T : ViewModel> create(
+                key: String,
+                modelClass: Class<T>,
+                handle: SavedStateHandle,
+        ): T = creator(handle) as T
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index a066a0d..9de21c1 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,6 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<androidx.fragment.app.FragmentContainerView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/fragment_container"
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" />
+    android:layout_height="match_parent"
+    android:background="@color/biometric_error_color">
+
+    <FrameLayout
+        android:id="@+id/activityScreensContainer"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginTop="40dp"
+        android:background="@color/colorPrimary"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
+
+
diff --git a/app/src/main/res/layout/fragment_first.xml b/app/src/main/res/layout/fragment_first.xml
new file mode 100644
index 0000000..a36f0ea
--- /dev/null
+++ b/app/src/main/res/layout/fragment_first.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:id="@+id/textView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintVertical_chainStyle="packed"
+        app:layout_constraintBottom_toTopOf="@+id/button"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <Button
+        android:id="@+id/button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintVertical_chainStyle="packed"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textView" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_second.xml b/app/src/main/res/layout/fragment_second.xml
new file mode 100644
index 0000000..a36f0ea
--- /dev/null
+++ b/app/src/main/res/layout/fragment_second.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:id="@+id/textView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintVertical_chainStyle="packed"
+        app:layout_constraintBottom_toTopOf="@+id/button"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <Button
+        android:id="@+id/button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintVertical_chainStyle="packed"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textView" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
-- 
2.40.1


From d71fda58534cbc229eaa5fc8cd06f8f9e9a5d7ab Mon Sep 17 00:00:00 2001
From: Evgeny Dubravin <dubrdubr23@gmail.com>
Date: Fri, 29 Mar 2024 22:41:40 +0700
Subject: [PATCH 3/5] feature TI-195: [Android] Cicirone Navigation

---
 app/build.gradle.kts                          |  3 +
 .../ru/touchin/template/SingleViewModel.kt    |  6 --
 .../template/base/fragment/BaseFragment.kt    | 10 ++-
 .../template/base/viewmodel/BaseController.kt |  6 ++
 .../ru/touchin/template/di/AppComponent.kt    |  7 +-
 .../template/di/modules/NavigationModule.kt   | 26 +++++++
 .../template/feature/SingleActivity.kt        | 47 ++++++++++++
 .../template/feature/SingleViewModel.kt       | 14 ++++
 .../template/feature/first/FirstFragment.kt   | 41 ++++++++++
 .../template/feature/first/FirstViewModel.kt  | 15 ++++
 .../template/feature/second/SecondFragment.kt | 75 +++++++++++++++++++
 .../feature/second/SecondViewModel.kt         | 34 +++++++++
 .../ru/touchin/template/navigation/Screens.kt | 16 ++++
 .../backpress/OnBackPressedListener.kt        |  6 ++
 .../navigation/router/RouterProvider.kt       |  7 ++
 15 files changed, 305 insertions(+), 8 deletions(-)
 delete mode 100644 app/src/main/java/ru/touchin/template/SingleViewModel.kt
 create mode 100644 app/src/main/java/ru/touchin/template/base/viewmodel/BaseController.kt
 create mode 100644 app/src/main/java/ru/touchin/template/di/modules/NavigationModule.kt
 create mode 100644 app/src/main/java/ru/touchin/template/feature/SingleActivity.kt
 create mode 100644 app/src/main/java/ru/touchin/template/feature/SingleViewModel.kt
 create mode 100644 app/src/main/java/ru/touchin/template/feature/first/FirstFragment.kt
 create mode 100644 app/src/main/java/ru/touchin/template/feature/first/FirstViewModel.kt
 create mode 100644 app/src/main/java/ru/touchin/template/feature/second/SecondFragment.kt
 create mode 100644 app/src/main/java/ru/touchin/template/feature/second/SecondViewModel.kt
 create mode 100644 app/src/main/java/ru/touchin/template/navigation/Screens.kt
 create mode 100644 app/src/main/java/ru/touchin/template/navigation/backpress/OnBackPressedListener.kt
 create mode 100644 app/src/main/java/ru/touchin/template/navigation/router/RouterProvider.kt

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index a7d316a..fce5ef5 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -88,6 +88,9 @@ dependencies {
     // Groupie
     implementation(libs.groupie)
     implementation(libs.groupie.viewbinding)
+
+    // Cicecrone
+    implementation(libs.cicerone)
 }
 
 apply(from = "${rootProject.ext["buildScriptsDir"]}/gradle/scripts/stringGenerator.gradle")
diff --git a/app/src/main/java/ru/touchin/template/SingleViewModel.kt b/app/src/main/java/ru/touchin/template/SingleViewModel.kt
deleted file mode 100644
index 15b24f0..0000000
--- a/app/src/main/java/ru/touchin/template/SingleViewModel.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package ru.touchin.template
-
-import androidx.lifecycle.ViewModel
-import javax.inject.Inject
-
-class SingleViewModel @Inject constructor() : ViewModel()
\ No newline at end of file
diff --git a/app/src/main/java/ru/touchin/template/base/fragment/BaseFragment.kt b/app/src/main/java/ru/touchin/template/base/fragment/BaseFragment.kt
index 7125d9e..71d59d2 100644
--- a/app/src/main/java/ru/touchin/template/base/fragment/BaseFragment.kt
+++ b/app/src/main/java/ru/touchin/template/base/fragment/BaseFragment.kt
@@ -2,14 +2,22 @@ package ru.touchin.template.base.fragment
 
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModel
+import ru.touchin.template.base.viewmodel.BaseController
 import ru.touchin.template.di.SharedComponent
 import ru.touchin.template.di.getSharedModule
+import ru.touchin.template.navigation.backpress.OnBackPressedListener
 
-abstract class BaseFragment<T : ViewModel> : Fragment() {
+abstract class BaseFragment<T : ViewModel> : Fragment(), OnBackPressedListener {
+
+    protected val viewModel: T by lazy { createViewModelLazy().value }
 
     protected val viewModelFactory by lazy { getSharedComponent().viewModelFactory() }
 
     protected abstract fun createViewModelLazy(): Lazy<T>
 
     protected fun getSharedComponent(): SharedComponent = getSharedModule()
+
+    override fun onBackPressed(): Boolean {
+        return (viewModel as BaseController).onBackClicked()
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ru/touchin/template/base/viewmodel/BaseController.kt b/app/src/main/java/ru/touchin/template/base/viewmodel/BaseController.kt
new file mode 100644
index 0000000..106042e
--- /dev/null
+++ b/app/src/main/java/ru/touchin/template/base/viewmodel/BaseController.kt
@@ -0,0 +1,6 @@
+package ru.touchin.template.base.viewmodel
+
+interface BaseController {
+
+    fun onBackClicked(): Boolean = true
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/touchin/template/di/AppComponent.kt b/app/src/main/java/ru/touchin/template/di/AppComponent.kt
index f4b7320..7537879 100644
--- a/app/src/main/java/ru/touchin/template/di/AppComponent.kt
+++ b/app/src/main/java/ru/touchin/template/di/AppComponent.kt
@@ -6,12 +6,15 @@ import dagger.Component
 import javax.inject.Singleton
 import ru.touchin.template.App
 import ru.touchin.template.di.modules.AppModule
+import ru.touchin.template.di.modules.NavigationModule
 import ru.touchin.template.di.modules.ViewModelModule
+import ru.touchin.template.feature.SingleActivity
 
 @Component(
         modules = [
             AppModule::class,
-            ViewModelModule::class
+            ViewModelModule::class,
+            NavigationModule::class
         ]
 )
 @Singleton
@@ -27,4 +30,6 @@ interface AppComponent : SharedComponent {
     }
 
     fun inject(entry: App)
+
+    fun inject(entry: SingleActivity)
 }
\ No newline at end of file
diff --git a/app/src/main/java/ru/touchin/template/di/modules/NavigationModule.kt b/app/src/main/java/ru/touchin/template/di/modules/NavigationModule.kt
new file mode 100644
index 0000000..7c584b3
--- /dev/null
+++ b/app/src/main/java/ru/touchin/template/di/modules/NavigationModule.kt
@@ -0,0 +1,26 @@
+package ru.touchin.template.di.modules
+
+import com.github.terrakok.cicerone.Cicerone
+import com.github.terrakok.cicerone.NavigatorHolder
+import com.github.terrakok.cicerone.Router
+import dagger.Module
+import dagger.Provides
+import javax.inject.Singleton
+
+@Module
+class NavigationModule {
+
+    private val cicerone: Cicerone<Router> = Cicerone.create()
+
+    @Provides
+    @Singleton
+    fun provideRouter(): Router {
+        return cicerone.router
+    }
+
+    @Provides
+    @Singleton
+    fun provideNavigatorHolder(): NavigatorHolder {
+        return cicerone.getNavigatorHolder()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/touchin/template/feature/SingleActivity.kt b/app/src/main/java/ru/touchin/template/feature/SingleActivity.kt
new file mode 100644
index 0000000..45cbb69
--- /dev/null
+++ b/app/src/main/java/ru/touchin/template/feature/SingleActivity.kt
@@ -0,0 +1,47 @@
+package ru.touchin.template.feature
+
+import android.os.Bundle
+import androidx.activity.viewModels
+import com.github.terrakok.cicerone.NavigatorHolder
+import com.github.terrakok.cicerone.androidx.AppNavigator
+import javax.inject.Inject
+import ru.touchin.template.R
+import ru.touchin.template.base.activity.BaseActivity
+import ru.touchin.template.databinding.ActivityMainBinding
+import ru.touchin.template.di.DI
+
+class SingleActivity : BaseActivity<SingleViewModel>() {
+
+    @Inject
+    lateinit var navigatorHolder: NavigatorHolder
+
+    private val rootNavigator by lazy {
+        AppNavigator(this, R.id.activityScreensContainer)
+    }
+
+    private lateinit var binding: ActivityMainBinding
+
+    override fun createViewModelLazy(): Lazy<SingleViewModel> = viewModels { viewModelFactory }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = ActivityMainBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+        DI.getComponent().inject(this)
+
+        viewModel.navigate()
+
+    }
+
+    override fun onResumeFragments() {
+        super.onResumeFragments()
+        navigatorHolder.setNavigator(rootNavigator)
+    }
+
+    override fun onPause() {
+        navigatorHolder.removeNavigator()
+        super.onPause()
+    }
+
+}
diff --git a/app/src/main/java/ru/touchin/template/feature/SingleViewModel.kt b/app/src/main/java/ru/touchin/template/feature/SingleViewModel.kt
new file mode 100644
index 0000000..394f3d5
--- /dev/null
+++ b/app/src/main/java/ru/touchin/template/feature/SingleViewModel.kt
@@ -0,0 +1,14 @@
+package ru.touchin.template.feature
+
+import androidx.lifecycle.ViewModel
+import com.github.terrakok.cicerone.Router
+import javax.inject.Inject
+import ru.touchin.template.navigation.Screens
+
+class SingleViewModel @Inject constructor(
+        private val router: Router,
+) : ViewModel() {
+    fun navigate() {
+        router.newRootScreen(Screens.First())
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/touchin/template/feature/first/FirstFragment.kt b/app/src/main/java/ru/touchin/template/feature/first/FirstFragment.kt
new file mode 100644
index 0000000..ddcd6c8
--- /dev/null
+++ b/app/src/main/java/ru/touchin/template/feature/first/FirstFragment.kt
@@ -0,0 +1,41 @@
+package ru.touchin.template.feature.first
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.viewModels
+import ru.touchin.template.base.fragment.BaseFragment
+import ru.touchin.template.databinding.FragmentFirstBinding
+
+class FirstFragment : BaseFragment<FirstViewModel>() {
+
+    private var _binding: FragmentFirstBinding? = null
+    private val binding get() = _binding!!
+
+    override fun createViewModelLazy() = viewModels<FirstViewModel> { viewModelFactory }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+        _binding = FragmentFirstBinding.inflate(layoutInflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        with(binding) {
+            button.apply {
+                text = "Next"
+                setOnClickListener { viewModel.onNextButtonClicked(this@FirstFragment::class.toString()) }
+            }
+
+            textView.text = "First Fragment"
+        }
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+
+        _binding = null
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/touchin/template/feature/first/FirstViewModel.kt b/app/src/main/java/ru/touchin/template/feature/first/FirstViewModel.kt
new file mode 100644
index 0000000..0b13b41
--- /dev/null
+++ b/app/src/main/java/ru/touchin/template/feature/first/FirstViewModel.kt
@@ -0,0 +1,15 @@
+package ru.touchin.template.feature.first
+
+import androidx.lifecycle.ViewModel
+import com.github.terrakok.cicerone.Router
+import javax.inject.Inject
+import ru.touchin.template.navigation.Screens
+
+class FirstViewModel @Inject constructor(
+        private val router: Router
+) : ViewModel() {
+
+    fun onNextButtonClicked(from: String) {
+        router.navigateTo(Screens.Second(from))
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/touchin/template/feature/second/SecondFragment.kt b/app/src/main/java/ru/touchin/template/feature/second/SecondFragment.kt
new file mode 100644
index 0000000..c4da57f
--- /dev/null
+++ b/app/src/main/java/ru/touchin/template/feature/second/SecondFragment.kt
@@ -0,0 +1,75 @@
+package ru.touchin.template.feature.second
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.os.bundleOf
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.flowWithLifecycle
+import androidx.lifecycle.lifecycleScope
+import kotlinx.coroutines.launch
+import ru.touchin.template.base.fragment.BaseFragment
+import ru.touchin.template.databinding.FragmentSecondBinding
+import ru.touchin.template.di.viewmodel.assistedViewModel
+
+class SecondFragment : BaseFragment<SecondViewModel>() {
+
+    companion object {
+        private const val FROM_KEY = "FROM"
+        private const val SCREEN_NAME_KEY = "SCREEN_NAME"
+        private const val FRAGMENT_NAME = "Second Fragment"
+
+        fun newInstance(from: String): SecondFragment {
+            val args = bundleOf(FROM_KEY to from, SCREEN_NAME_KEY to FRAGMENT_NAME)
+
+            val fragment = SecondFragment().apply {
+                arguments = args
+            }
+
+            return fragment
+        }
+    }
+
+    private var _binding: FragmentSecondBinding? = null
+    private val binding get() = _binding!!
+
+    private val secondViewModelFactory by lazy { getSharedComponent().secondScreenViewModelFactory() }
+
+    override fun createViewModelLazy() = assistedViewModel {
+        secondViewModelFactory.create(
+                arguments?.getString(FROM_KEY) ?: "Unkown Fragment",
+                arguments?.getString(SCREEN_NAME_KEY) ?: "Unknown"
+        )
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+        _binding = FragmentSecondBinding.inflate(layoutInflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        with(binding) {
+            button.apply {
+                text = "Back"
+                setOnClickListener { onBackPressed() }
+            }
+
+            viewLifecycleOwner.lifecycleScope.launch {
+                viewModel.state
+                        .flowWithLifecycle(lifecycle, Lifecycle.State.STARTED)
+                        .collect {
+                            textView.text = it
+                        }
+            }
+
+        }
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/touchin/template/feature/second/SecondViewModel.kt b/app/src/main/java/ru/touchin/template/feature/second/SecondViewModel.kt
new file mode 100644
index 0000000..d07cc14
--- /dev/null
+++ b/app/src/main/java/ru/touchin/template/feature/second/SecondViewModel.kt
@@ -0,0 +1,34 @@
+package ru.touchin.template.feature.second
+
+import androidx.lifecycle.ViewModel
+import com.github.terrakok.cicerone.Router
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import ru.touchin.template.base.viewmodel.BaseController
+
+class SecondViewModel @AssistedInject constructor(
+        @Assisted("from") from: String,
+        @Assisted("screenName") screenName: String,
+        private val rootRouter: Router
+) : ViewModel(), BaseController {
+
+    private val _state = MutableStateFlow("$from to $screenName")
+    val state: StateFlow<String> = _state.asStateFlow()
+
+    @AssistedFactory
+    interface Factory {
+        fun create(
+                @Assisted("from") from: String,
+                @Assisted("screenName") screenName: String
+        ): SecondViewModel
+    }
+
+    override fun onBackClicked(): Boolean {
+        rootRouter.exit()
+        return super.onBackClicked()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/touchin/template/navigation/Screens.kt b/app/src/main/java/ru/touchin/template/navigation/Screens.kt
new file mode 100644
index 0000000..51dabfd
--- /dev/null
+++ b/app/src/main/java/ru/touchin/template/navigation/Screens.kt
@@ -0,0 +1,16 @@
+package ru.touchin.template.navigation
+
+import com.github.terrakok.cicerone.androidx.FragmentScreen
+import ru.touchin.template.feature.first.FirstFragment
+import ru.touchin.template.feature.second.SecondFragment
+
+object Screens {
+
+    fun First(): FragmentScreen = FragmentScreen {
+        FirstFragment()
+    }
+
+    fun Second(from: String): FragmentScreen = FragmentScreen {
+        SecondFragment.newInstance(from)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/touchin/template/navigation/backpress/OnBackPressedListener.kt b/app/src/main/java/ru/touchin/template/navigation/backpress/OnBackPressedListener.kt
new file mode 100644
index 0000000..1679240
--- /dev/null
+++ b/app/src/main/java/ru/touchin/template/navigation/backpress/OnBackPressedListener.kt
@@ -0,0 +1,6 @@
+package ru.touchin.template.navigation.backpress
+
+interface OnBackPressedListener {
+
+    fun onBackPressed(): Boolean
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/touchin/template/navigation/router/RouterProvider.kt b/app/src/main/java/ru/touchin/template/navigation/router/RouterProvider.kt
new file mode 100644
index 0000000..14426c4
--- /dev/null
+++ b/app/src/main/java/ru/touchin/template/navigation/router/RouterProvider.kt
@@ -0,0 +1,7 @@
+package ru.touchin.template.navigation.router
+
+import com.github.terrakok.cicerone.Router
+
+interface RouterProvider {
+    val router: Router
+}
\ No newline at end of file
-- 
2.40.1


From 9b85bcf5623840b375f7411efb3f331ee0716d62 Mon Sep 17 00:00:00 2001
From: Evgeny Dubravin <dubrdubr23@gmail.com>
Date: Tue, 2 Apr 2024 03:42:28 +0700
Subject: [PATCH 4/5] add Auth Component

---
 .../java/ru/touchin/template/di/AppComponent.kt |  6 ++++--
 .../java/ru/touchin/template/di/AppScope.kt     |  6 ++++++
 .../touchin/template/di/auth/AuthComponent.kt   | 17 +++++++++++++++++
 .../ru/touchin/template/di/auth/AuthModule.kt   | 16 ++++++++++++++++
 .../ru/touchin/template/di/auth/AuthScope.kt    |  6 ++++++
 .../ru/touchin/template/di/modules/AppModule.kt |  4 +++-
 6 files changed, 52 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/java/ru/touchin/template/di/AppScope.kt
 create mode 100644 app/src/main/java/ru/touchin/template/di/auth/AuthComponent.kt
 create mode 100644 app/src/main/java/ru/touchin/template/di/auth/AuthModule.kt
 create mode 100644 app/src/main/java/ru/touchin/template/di/auth/AuthScope.kt

diff --git a/app/src/main/java/ru/touchin/template/di/AppComponent.kt b/app/src/main/java/ru/touchin/template/di/AppComponent.kt
index 7537879..27efa14 100644
--- a/app/src/main/java/ru/touchin/template/di/AppComponent.kt
+++ b/app/src/main/java/ru/touchin/template/di/AppComponent.kt
@@ -3,8 +3,8 @@ package ru.touchin.template.di
 import android.content.Context
 import dagger.BindsInstance
 import dagger.Component
-import javax.inject.Singleton
 import ru.touchin.template.App
+import ru.touchin.template.di.auth.AuthComponent
 import ru.touchin.template.di.modules.AppModule
 import ru.touchin.template.di.modules.NavigationModule
 import ru.touchin.template.di.modules.ViewModelModule
@@ -17,9 +17,11 @@ import ru.touchin.template.feature.SingleActivity
             NavigationModule::class
         ]
 )
-@Singleton
+@AppScope
 interface AppComponent : SharedComponent {
 
+    fun authComponent(): AuthComponent.Builder
+
     @Component.Builder
     interface Builder {
 
diff --git a/app/src/main/java/ru/touchin/template/di/AppScope.kt b/app/src/main/java/ru/touchin/template/di/AppScope.kt
new file mode 100644
index 0000000..f062861
--- /dev/null
+++ b/app/src/main/java/ru/touchin/template/di/AppScope.kt
@@ -0,0 +1,6 @@
+package ru.touchin.template.di
+
+import javax.inject.Scope
+
+@Scope
+annotation class AppScope
\ No newline at end of file
diff --git a/app/src/main/java/ru/touchin/template/di/auth/AuthComponent.kt b/app/src/main/java/ru/touchin/template/di/auth/AuthComponent.kt
new file mode 100644
index 0000000..e3c5dfc
--- /dev/null
+++ b/app/src/main/java/ru/touchin/template/di/auth/AuthComponent.kt
@@ -0,0 +1,17 @@
+package ru.touchin.template.di.auth
+
+import dagger.Subcomponent
+import ru.touchin.template.feature.first.FirstFragment
+
+@Subcomponent(modules = [AuthModule::class])
+@AuthScope
+interface AuthComponent {
+
+    @Subcomponent.Builder
+    interface Builder {
+
+        fun build(): AuthComponent
+    }
+
+    fun inject(entry: FirstFragment)
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/touchin/template/di/auth/AuthModule.kt b/app/src/main/java/ru/touchin/template/di/auth/AuthModule.kt
new file mode 100644
index 0000000..be8abd5
--- /dev/null
+++ b/app/src/main/java/ru/touchin/template/di/auth/AuthModule.kt
@@ -0,0 +1,16 @@
+package ru.touchin.template.di.auth
+
+import dagger.Module
+import dagger.Provides
+import ru.touchin.template.feature.second.SecondRepository
+import ru.touchin.template.feature.second.SecondRepositoryImpl
+
+@Module
+class AuthModule {
+
+    @Provides
+    @AuthScope
+    internal fun providesSecondRepository(): SecondRepository {
+        return SecondRepositoryImpl()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/touchin/template/di/auth/AuthScope.kt b/app/src/main/java/ru/touchin/template/di/auth/AuthScope.kt
new file mode 100644
index 0000000..64dbe7a
--- /dev/null
+++ b/app/src/main/java/ru/touchin/template/di/auth/AuthScope.kt
@@ -0,0 +1,6 @@
+package ru.touchin.template.di.auth
+
+import javax.inject.Scope
+
+@Scope
+annotation class AuthScope
\ No newline at end of file
diff --git a/app/src/main/java/ru/touchin/template/di/modules/AppModule.kt b/app/src/main/java/ru/touchin/template/di/modules/AppModule.kt
index 0943510..aab5a49 100644
--- a/app/src/main/java/ru/touchin/template/di/modules/AppModule.kt
+++ b/app/src/main/java/ru/touchin/template/di/modules/AppModule.kt
@@ -1,11 +1,13 @@
 package ru.touchin.template.di.modules
 
 import dagger.Module
+import ru.touchin.template.di.auth.AuthComponent
 
 @Module(
         includes = [
             RepositoryModule::class,
             NetworkModule::class
-        ]
+        ],
+        subcomponents = [AuthComponent::class]
 )
 class AppModule
\ No newline at end of file
-- 
2.40.1


From 60d2b9d766e7f805ffc548db7030d7d57228faaf Mon Sep 17 00:00:00 2001
From: Evgeny Dubravin <dubrdubr23@gmail.com>
Date: Fri, 12 Apr 2024 17:02:07 +0700
Subject: [PATCH 5/5] refactor ViewBinding lazy initialization

---
 .../template/base/fragment/BaseFragment.kt    |  8 +--
 .../template/base/viewmodel/BaseViewModel.kt  |  5 ++
 .../ru/touchin/template/di/auth/AuthModule.kt | 13 ++---
 .../template/di/modules/NavigationModule.kt   |  6 +--
 .../template/feature/first/FirstFragment.kt   | 20 ++------
 .../template/feature/first/FirstViewModel.kt  |  5 +-
 .../template/feature/second/SecondFragment.kt | 19 ++-----
 .../feature/second/SecondViewModel.kt         |  5 +-
 .../binding/FragmentViewBindingDelegate.kt    | 50 +++++++++++++++++++
 app/src/main/res/layout/activity_main.xml     |  2 +-
 10 files changed, 81 insertions(+), 52 deletions(-)
 create mode 100644 app/src/main/java/ru/touchin/template/base/viewmodel/BaseViewModel.kt
 create mode 100644 app/src/main/java/ru/touchin/template/utils/binding/FragmentViewBindingDelegate.kt

diff --git a/app/src/main/java/ru/touchin/template/base/fragment/BaseFragment.kt b/app/src/main/java/ru/touchin/template/base/fragment/BaseFragment.kt
index 71d59d2..39384c7 100644
--- a/app/src/main/java/ru/touchin/template/base/fragment/BaseFragment.kt
+++ b/app/src/main/java/ru/touchin/template/base/fragment/BaseFragment.kt
@@ -1,13 +1,13 @@
 package ru.touchin.template.base.fragment
 
+import androidx.annotation.LayoutRes
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.ViewModel
-import ru.touchin.template.base.viewmodel.BaseController
+import ru.touchin.template.base.viewmodel.BaseViewModel
 import ru.touchin.template.di.SharedComponent
 import ru.touchin.template.di.getSharedModule
 import ru.touchin.template.navigation.backpress.OnBackPressedListener
 
-abstract class BaseFragment<T : ViewModel> : Fragment(), OnBackPressedListener {
+abstract class BaseFragment<T : BaseViewModel>(@LayoutRes layoutId: Int) : Fragment(layoutId), OnBackPressedListener {
 
     protected val viewModel: T by lazy { createViewModelLazy().value }
 
@@ -18,6 +18,6 @@ abstract class BaseFragment<T : ViewModel> : Fragment(), OnBackPressedListener {
     protected fun getSharedComponent(): SharedComponent = getSharedModule()
 
     override fun onBackPressed(): Boolean {
-        return (viewModel as BaseController).onBackClicked()
+        return viewModel.onBackClicked()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ru/touchin/template/base/viewmodel/BaseViewModel.kt b/app/src/main/java/ru/touchin/template/base/viewmodel/BaseViewModel.kt
new file mode 100644
index 0000000..cb7386f
--- /dev/null
+++ b/app/src/main/java/ru/touchin/template/base/viewmodel/BaseViewModel.kt
@@ -0,0 +1,5 @@
+package ru.touchin.template.base.viewmodel
+
+import androidx.lifecycle.ViewModel
+
+abstract class BaseViewModel : ViewModel(), BaseController
\ No newline at end of file
diff --git a/app/src/main/java/ru/touchin/template/di/auth/AuthModule.kt b/app/src/main/java/ru/touchin/template/di/auth/AuthModule.kt
index be8abd5..e2e325a 100644
--- a/app/src/main/java/ru/touchin/template/di/auth/AuthModule.kt
+++ b/app/src/main/java/ru/touchin/template/di/auth/AuthModule.kt
@@ -1,16 +1,13 @@
 package ru.touchin.template.di.auth
 
 import dagger.Module
-import dagger.Provides
-import ru.touchin.template.feature.second.SecondRepository
-import ru.touchin.template.feature.second.SecondRepositoryImpl
 
 @Module
 class AuthModule {
 
-    @Provides
-    @AuthScope
-    internal fun providesSecondRepository(): SecondRepository {
-        return SecondRepositoryImpl()
-    }
+//    @Provides
+//    @AuthScope
+//    internal fun providesSecondRepository(): SecondRepository {
+//        return SecondRepositoryImpl()
+//    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ru/touchin/template/di/modules/NavigationModule.kt b/app/src/main/java/ru/touchin/template/di/modules/NavigationModule.kt
index 7c584b3..4838b23 100644
--- a/app/src/main/java/ru/touchin/template/di/modules/NavigationModule.kt
+++ b/app/src/main/java/ru/touchin/template/di/modules/NavigationModule.kt
@@ -5,7 +5,7 @@ import com.github.terrakok.cicerone.NavigatorHolder
 import com.github.terrakok.cicerone.Router
 import dagger.Module
 import dagger.Provides
-import javax.inject.Singleton
+import ru.touchin.template.di.AppScope
 
 @Module
 class NavigationModule {
@@ -13,13 +13,13 @@ class NavigationModule {
     private val cicerone: Cicerone<Router> = Cicerone.create()
 
     @Provides
-    @Singleton
+    @AppScope
     fun provideRouter(): Router {
         return cicerone.router
     }
 
     @Provides
-    @Singleton
+    @AppScope
     fun provideNavigatorHolder(): NavigatorHolder {
         return cicerone.getNavigatorHolder()
     }
diff --git a/app/src/main/java/ru/touchin/template/feature/first/FirstFragment.kt b/app/src/main/java/ru/touchin/template/feature/first/FirstFragment.kt
index ddcd6c8..128df58 100644
--- a/app/src/main/java/ru/touchin/template/feature/first/FirstFragment.kt
+++ b/app/src/main/java/ru/touchin/template/feature/first/FirstFragment.kt
@@ -1,25 +1,19 @@
 package ru.touchin.template.feature.first
 
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import androidx.fragment.app.viewModels
+import ru.touchin.template.R
 import ru.touchin.template.base.fragment.BaseFragment
 import ru.touchin.template.databinding.FragmentFirstBinding
+import ru.touchin.template.utils.binding.viewBinding
 
-class FirstFragment : BaseFragment<FirstViewModel>() {
+class FirstFragment : BaseFragment<FirstViewModel>(R.layout.fragment_first) {
 
-    private var _binding: FragmentFirstBinding? = null
-    private val binding get() = _binding!!
+    private val binding by viewBinding { FragmentFirstBinding.bind(it) }
 
     override fun createViewModelLazy() = viewModels<FirstViewModel> { viewModelFactory }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-        _binding = FragmentFirstBinding.inflate(layoutInflater, container, false)
-        return binding.root
-    }
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
@@ -32,10 +26,4 @@ class FirstFragment : BaseFragment<FirstViewModel>() {
             textView.text = "First Fragment"
         }
     }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-
-        _binding = null
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ru/touchin/template/feature/first/FirstViewModel.kt b/app/src/main/java/ru/touchin/template/feature/first/FirstViewModel.kt
index 0b13b41..02941c6 100644
--- a/app/src/main/java/ru/touchin/template/feature/first/FirstViewModel.kt
+++ b/app/src/main/java/ru/touchin/template/feature/first/FirstViewModel.kt
@@ -1,15 +1,16 @@
 package ru.touchin.template.feature.first
 
-import androidx.lifecycle.ViewModel
 import com.github.terrakok.cicerone.Router
 import javax.inject.Inject
+import ru.touchin.template.base.viewmodel.BaseViewModel
 import ru.touchin.template.navigation.Screens
 
 class FirstViewModel @Inject constructor(
         private val router: Router
-) : ViewModel() {
+) : BaseViewModel() {
 
     fun onNextButtonClicked(from: String) {
         router.navigateTo(Screens.Second(from))
     }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/ru/touchin/template/feature/second/SecondFragment.kt b/app/src/main/java/ru/touchin/template/feature/second/SecondFragment.kt
index c4da57f..7e17c92 100644
--- a/app/src/main/java/ru/touchin/template/feature/second/SecondFragment.kt
+++ b/app/src/main/java/ru/touchin/template/feature/second/SecondFragment.kt
@@ -1,19 +1,19 @@
 package ru.touchin.template.feature.second
 
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import androidx.core.os.bundleOf
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.lifecycleScope
 import kotlinx.coroutines.launch
+import ru.touchin.template.R
 import ru.touchin.template.base.fragment.BaseFragment
 import ru.touchin.template.databinding.FragmentSecondBinding
 import ru.touchin.template.di.viewmodel.assistedViewModel
+import ru.touchin.template.utils.binding.viewBinding
 
-class SecondFragment : BaseFragment<SecondViewModel>() {
+class SecondFragment : BaseFragment<SecondViewModel>(R.layout.fragment_second) {
 
     companion object {
         private const val FROM_KEY = "FROM"
@@ -31,8 +31,7 @@ class SecondFragment : BaseFragment<SecondViewModel>() {
         }
     }
 
-    private var _binding: FragmentSecondBinding? = null
-    private val binding get() = _binding!!
+    private val binding by viewBinding { FragmentSecondBinding.bind(it) }
 
     private val secondViewModelFactory by lazy { getSharedComponent().secondScreenViewModelFactory() }
 
@@ -43,11 +42,6 @@ class SecondFragment : BaseFragment<SecondViewModel>() {
         )
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-        _binding = FragmentSecondBinding.inflate(layoutInflater, container, false)
-        return binding.root
-    }
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
@@ -67,9 +61,4 @@ class SecondFragment : BaseFragment<SecondViewModel>() {
 
         }
     }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ru/touchin/template/feature/second/SecondViewModel.kt b/app/src/main/java/ru/touchin/template/feature/second/SecondViewModel.kt
index d07cc14..cc9fd9c 100644
--- a/app/src/main/java/ru/touchin/template/feature/second/SecondViewModel.kt
+++ b/app/src/main/java/ru/touchin/template/feature/second/SecondViewModel.kt
@@ -1,6 +1,5 @@
 package ru.touchin.template.feature.second
 
-import androidx.lifecycle.ViewModel
 import com.github.terrakok.cicerone.Router
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
@@ -8,13 +7,13 @@ import dagger.assisted.AssistedInject
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
-import ru.touchin.template.base.viewmodel.BaseController
+import ru.touchin.template.base.viewmodel.BaseViewModel
 
 class SecondViewModel @AssistedInject constructor(
         @Assisted("from") from: String,
         @Assisted("screenName") screenName: String,
         private val rootRouter: Router
-) : ViewModel(), BaseController {
+) : BaseViewModel() {
 
     private val _state = MutableStateFlow("$from to $screenName")
     val state: StateFlow<String> = _state.asStateFlow()
diff --git a/app/src/main/java/ru/touchin/template/utils/binding/FragmentViewBindingDelegate.kt b/app/src/main/java/ru/touchin/template/utils/binding/FragmentViewBindingDelegate.kt
new file mode 100644
index 0000000..f5e15b1
--- /dev/null
+++ b/app/src/main/java/ru/touchin/template/utils/binding/FragmentViewBindingDelegate.kt
@@ -0,0 +1,50 @@
+package ru.touchin.template.utils.binding
+
+import android.view.View
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import androidx.viewbinding.ViewBinding
+import kotlin.properties.ReadOnlyProperty
+import kotlin.reflect.KProperty
+
+typealias ViewBindingFactory<T> = (View) -> T
+
+class FragmentViewBindingDelegate<T : ViewBinding>(
+        val fragment: Fragment,
+        val viewBindingFactory: ViewBindingFactory<T>,
+) : ReadOnlyProperty<Fragment, T> {
+    private var binding: T? = null
+
+    init {
+        fragment.lifecycle.addObserver(object : DefaultLifecycleObserver {
+            override fun onCreate(owner: LifecycleOwner) {
+                fragment.viewLifecycleOwnerLiveData.observe(fragment) { lifecylelOwner ->
+                    lifecylelOwner.lifecycle.addObserver(object : DefaultLifecycleObserver {
+                        override fun onDestroy(owner: LifecycleOwner) {
+                            binding = null
+                        }
+                    })
+                }
+            }
+        })
+    }
+
+    override fun getValue(thisRef: Fragment, property: KProperty<*>): T {
+        val binding = this.binding
+
+        if (binding != null) return binding
+
+        val lifecycle = fragment.viewLifecycleOwner.lifecycle
+
+        if (!lifecycle.currentState.isAtLeast(Lifecycle.State.INITIALIZED)) {
+            throw IllegalStateException("Should not attempt to get bindings when Fragment views are destroyed.")
+        }
+
+        return viewBindingFactory(thisRef.requireView()).also { this.binding = it }
+    }
+}
+
+fun <T : ViewBinding> Fragment.viewBinding(viewBindingFactory: ViewBindingFactory<T>) =
+        FragmentViewBindingDelegate(this, viewBindingFactory)
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 9de21c1..305c3c3 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -4,7 +4,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/biometric_error_color">
+    android:background="@color/colorPrimaryDark">
 
     <FrameLayout
         android:id="@+id/activityScreensContainer"
-- 
2.40.1