From 3e30a3456ee13e9b22d549ffb63126838c2436e8 Mon Sep 17 00:00:00 2001
From: GeorgeBozon <georgebozon@gmail.com>
Date: Wed, 13 Nov 2024 22:12:18 +0300
Subject: [PATCH 1/3] =?UTF-8?q?1.=20=D0=A0=D0=B5=D0=B0=D0=BB=D0=B8=D0=B7?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D1=82=D1=8C=20ApplicationComponent=20=D0=B8?=
 =?UTF-8?q?=20=D1=81=D0=B2=D1=8F=D0=B7=D0=B0=D1=82=D1=8C=20=D1=81=20=20Fra?=
 =?UTF-8?q?gmentProducerComponent=20=D0=B8=20FragmentReceiverComponent=20?=
 =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=D0=B0=D1=87?=
 =?UTF-8?q?=D0=B8=20ApplicationContext?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml              |  3 ++-
 .../main/java/ru/otus/daggerhomework/App.kt   | 10 ++++++++++
 .../daggerhomework/ApplicationComponent.kt    | 20 ++++++++++++++++++-
 .../FragmentProducerComponent.kt              | 19 ++++++++++++++++++
 .../daggerhomework/FragmentProducerModule.kt  | 17 ++++++++++++++++
 .../FragmentReceiverComponent.kt              | 17 ++++++++++++++++
 .../daggerhomework/FragmentReceiverModule.kt  | 17 ++++++++++++++++
 .../otus/daggerhomework/ViewModelReceiver.kt  |  3 ++-
 8 files changed, 103 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/java/ru/otus/daggerhomework/FragmentProducerComponent.kt
 create mode 100644 app/src/main/java/ru/otus/daggerhomework/FragmentProducerModule.kt
 create mode 100644 app/src/main/java/ru/otus/daggerhomework/FragmentReceiverComponent.kt
 create mode 100644 app/src/main/java/ru/otus/daggerhomework/FragmentReceiverModule.kt

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index fe328c68..eae16063 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -10,7 +10,8 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.DaggerHomework">
-        <activity android:name=".MainActivity">
+        <activity android:name=".MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/app/src/main/java/ru/otus/daggerhomework/App.kt b/app/src/main/java/ru/otus/daggerhomework/App.kt
index de363626..522c461f 100644
--- a/app/src/main/java/ru/otus/daggerhomework/App.kt
+++ b/app/src/main/java/ru/otus/daggerhomework/App.kt
@@ -3,4 +3,14 @@ package ru.otus.daggerhomework
 import android.app.Application
 
 class App :Application() {
+    lateinit var appCompoment: ApplicationComponent
+    override fun onCreate() {
+        super.onCreate()
+        appCompoment = DaggerApplicationComponent.factory().newAppComponent(applicationContext)
+    }
+
+}
+
+fun Application.asApp(): App {
+    return this as App
 }
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/daggerhomework/ApplicationComponent.kt b/app/src/main/java/ru/otus/daggerhomework/ApplicationComponent.kt
index fc47f256..b77b357d 100644
--- a/app/src/main/java/ru/otus/daggerhomework/ApplicationComponent.kt
+++ b/app/src/main/java/ru/otus/daggerhomework/ApplicationComponent.kt
@@ -1,4 +1,22 @@
 package ru.otus.daggerhomework
 
+import android.content.Context
+import dagger.BindsInstance
+import dagger.Component
+import javax.inject.Qualifier
+
+@Component
 interface ApplicationComponent {
-}
\ No newline at end of file
+
+   @ApplicationContext
+   fun provideContext(): Context
+
+   @Component.Factory
+   interface Factory{
+
+      fun newAppComponent(@ApplicationContext @BindsInstance context: Context): ApplicationComponent
+   }
+}
+
+@Qualifier
+annotation class ApplicationContext
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/daggerhomework/FragmentProducerComponent.kt b/app/src/main/java/ru/otus/daggerhomework/FragmentProducerComponent.kt
new file mode 100644
index 00000000..dec7bacc
--- /dev/null
+++ b/app/src/main/java/ru/otus/daggerhomework/FragmentProducerComponent.kt
@@ -0,0 +1,19 @@
+package ru.otus.daggerhomework
+
+import dagger.Component
+import javax.inject.Singleton
+
+@Singleton
+@Component(
+    modules = [FragmentProducerModule::class],
+    dependencies = [ApplicationComponent::class]
+)
+interface FragmentProducerComponent {
+
+    companion object {
+        fun getFragmentProducerComponent(applicationComponent: ApplicationComponent): FragmentProducerComponent {
+            return DaggerFragmentProducerComponent.builder()
+                .applicationComponent(applicationComponent).build()
+        }
+    }
+}
diff --git a/app/src/main/java/ru/otus/daggerhomework/FragmentProducerModule.kt b/app/src/main/java/ru/otus/daggerhomework/FragmentProducerModule.kt
new file mode 100644
index 00000000..068fa7c3
--- /dev/null
+++ b/app/src/main/java/ru/otus/daggerhomework/FragmentProducerModule.kt
@@ -0,0 +1,17 @@
+package ru.otus.daggerhomework
+
+import android.content.Context
+import dagger.Module
+import dagger.Provides
+
+@Module
+interface FragmentProducerModule {
+    companion object{
+
+        @Provides
+        fun provideContext(@ApplicationContext context: Context): Context{
+            return context
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/daggerhomework/FragmentReceiverComponent.kt b/app/src/main/java/ru/otus/daggerhomework/FragmentReceiverComponent.kt
new file mode 100644
index 00000000..7d0546ed
--- /dev/null
+++ b/app/src/main/java/ru/otus/daggerhomework/FragmentReceiverComponent.kt
@@ -0,0 +1,17 @@
+package ru.otus.daggerhomework
+
+import dagger.Component
+
+@Component(
+    modules = [FragmentReceiverModule::class],
+    dependencies = [ApplicationComponent::class]
+)
+interface FragmentReceiverComponent {
+
+    companion object {
+        fun getFragmentReceiverComponent(applicationComponent: ApplicationComponent): FragmentReceiverComponent {
+            return DaggerFragmentReceiverComponent.builder()
+                .applicationComponent(applicationComponent).build()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/daggerhomework/FragmentReceiverModule.kt b/app/src/main/java/ru/otus/daggerhomework/FragmentReceiverModule.kt
new file mode 100644
index 00000000..b7a13146
--- /dev/null
+++ b/app/src/main/java/ru/otus/daggerhomework/FragmentReceiverModule.kt
@@ -0,0 +1,17 @@
+package ru.otus.daggerhomework
+
+import android.content.Context
+import dagger.Module
+import dagger.Provides
+
+@Module
+interface FragmentReceiverModule {
+    companion object{
+
+        @Provides
+        fun provideContext(@ApplicationContext context: Context): Context{
+            return context
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/daggerhomework/ViewModelReceiver.kt b/app/src/main/java/ru/otus/daggerhomework/ViewModelReceiver.kt
index 8a3a5ead..2d22c149 100644
--- a/app/src/main/java/ru/otus/daggerhomework/ViewModelReceiver.kt
+++ b/app/src/main/java/ru/otus/daggerhomework/ViewModelReceiver.kt
@@ -3,8 +3,9 @@ package ru.otus.daggerhomework
 import android.app.Application
 import android.content.Context
 import android.widget.Toast
+import javax.inject.Inject
 
-class ViewModelReceiver(
+class ViewModelReceiver @Inject constructor(
     private val context: Context
 ) {
 

From 2893c78050693fdb2968efa2fcf14fcecbaf87cc Mon Sep 17 00:00:00 2001
From: GeorgeBozon <georgebozon@gmail.com>
Date: Thu, 14 Nov 2024 16:51:04 +0300
Subject: [PATCH 2/3] =?UTF-8?q?2.=20=D0=9E=D1=81=D1=82=D0=B0=D0=B2=D1=88?=
 =?UTF-8?q?=D0=B8=D0=B5=D1=81=D1=8F=20=D0=B4=D0=B2=D0=B0=20=D0=B7=D0=B0?=
 =?UTF-8?q?=D0=B4=D0=B0=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              | 10 +++++
 app/src/main/AndroidManifest.xml              |  1 +
 .../daggerhomework/ApplicationComponent.kt    |  2 +
 .../ru/otus/daggerhomework/ColorGenerator.kt  |  4 +-
 .../ru/otus/daggerhomework/EventsReader.kt    |  7 +++
 .../ru/otus/daggerhomework/EventsWriter.kt    |  5 +++
 .../otus/daggerhomework/EventsWriterReader.kt | 17 +++++++
 .../otus/daggerhomework/FragmentProducer.kt   | 13 +++++-
 .../FragmentProducerComponent.kt              | 16 ++++---
 .../daggerhomework/FragmentProducerModule.kt  | 17 -------
 .../otus/daggerhomework/FragmentReceiver.kt   | 27 +++++++++--
 .../FragmentReceiverComponent.kt              | 10 +++--
 .../daggerhomework/FragmentReceiverModule.kt  | 17 -------
 .../ru/otus/daggerhomework/MainActivity.kt    |  4 ++
 .../daggerhomework/MainActivityComponent.kt   | 32 +++++++++++++
 .../otus/daggerhomework/MainActivityModule.kt | 45 +++++++++++++++++++
 .../otus/daggerhomework/ViewModelFactory.kt   | 15 +++++++
 .../otus/daggerhomework/ViewModelProducer.kt  | 12 +++--
 .../otus/daggerhomework/ViewModelReceiver.kt  | 18 ++++++--
 app/src/main/res/layout/activity_main.xml     |  1 +
 app/src/main/res/values/strings.xml           |  1 +
 21 files changed, 215 insertions(+), 59 deletions(-)
 create mode 100644 app/src/main/java/ru/otus/daggerhomework/EventsReader.kt
 create mode 100644 app/src/main/java/ru/otus/daggerhomework/EventsWriter.kt
 create mode 100644 app/src/main/java/ru/otus/daggerhomework/EventsWriterReader.kt
 delete mode 100644 app/src/main/java/ru/otus/daggerhomework/FragmentProducerModule.kt
 delete mode 100644 app/src/main/java/ru/otus/daggerhomework/FragmentReceiverModule.kt
 create mode 100644 app/src/main/java/ru/otus/daggerhomework/MainActivityComponent.kt
 create mode 100644 app/src/main/java/ru/otus/daggerhomework/MainActivityModule.kt
 create mode 100644 app/src/main/java/ru/otus/daggerhomework/ViewModelFactory.kt

diff --git a/app/build.gradle b/app/build.gradle
index 705d0941..e5f7d73d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -33,11 +33,21 @@ android {
 }
 
 dependencies {
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.0"
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.0'
+    implementation 'androidx.activity:activity-ktx:1.2.3'
+
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'androidx.core:core-ktx:1.6.0'
     implementation 'androidx.appcompat:appcompat:1.3.1'
     implementation 'com.google.android.material:material:1.4.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
+
+    implementation "com.google.dagger:dagger-android:2.42"
+    implementation "com.google.dagger:dagger-android-support:2.42"
+    kapt "com.google.dagger:dagger-android-processor:2.42"
+
     implementation 'com.google.dagger:dagger:2.42'
     kapt 'com.google.dagger:dagger-compiler:2.42'
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index eae16063..89276e20 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -4,6 +4,7 @@
     package="ru.otus.daggerhomework">
 
     <application
+        android:name=".App"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
diff --git a/app/src/main/java/ru/otus/daggerhomework/ApplicationComponent.kt b/app/src/main/java/ru/otus/daggerhomework/ApplicationComponent.kt
index b77b357d..63de287d 100644
--- a/app/src/main/java/ru/otus/daggerhomework/ApplicationComponent.kt
+++ b/app/src/main/java/ru/otus/daggerhomework/ApplicationComponent.kt
@@ -4,8 +4,10 @@ import android.content.Context
 import dagger.BindsInstance
 import dagger.Component
 import javax.inject.Qualifier
+import javax.inject.Singleton
 
 @Component
+@Singleton
 interface ApplicationComponent {
 
    @ApplicationContext
diff --git a/app/src/main/java/ru/otus/daggerhomework/ColorGenerator.kt b/app/src/main/java/ru/otus/daggerhomework/ColorGenerator.kt
index a9e25a27..e87ddf9b 100644
--- a/app/src/main/java/ru/otus/daggerhomework/ColorGenerator.kt
+++ b/app/src/main/java/ru/otus/daggerhomework/ColorGenerator.kt
@@ -2,8 +2,8 @@ package ru.otus.daggerhomework
 
 import android.graphics.Color
 import androidx.annotation.ColorInt
-import androidx.annotation.ColorRes
 import java.util.*
+import javax.inject.Inject
 
 interface ColorGenerator {
 
@@ -11,7 +11,7 @@ interface ColorGenerator {
     fun generateColor(): Int
 }
 
-class ColorGeneratorImpl : ColorGenerator {
+class ColorGeneratorImpl @Inject constructor(): ColorGenerator {
 
     override fun generateColor(): Int {
         val rnd = Random()
diff --git a/app/src/main/java/ru/otus/daggerhomework/EventsReader.kt b/app/src/main/java/ru/otus/daggerhomework/EventsReader.kt
new file mode 100644
index 00000000..9521a883
--- /dev/null
+++ b/app/src/main/java/ru/otus/daggerhomework/EventsReader.kt
@@ -0,0 +1,7 @@
+package ru.otus.daggerhomework
+
+import kotlinx.coroutines.flow.Flow
+
+interface EventsReader {
+    val eventsFlow: Flow<Int>
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/daggerhomework/EventsWriter.kt b/app/src/main/java/ru/otus/daggerhomework/EventsWriter.kt
new file mode 100644
index 00000000..266adf03
--- /dev/null
+++ b/app/src/main/java/ru/otus/daggerhomework/EventsWriter.kt
@@ -0,0 +1,5 @@
+package ru.otus.daggerhomework
+
+interface EventsWriter {
+    fun writeEvent(color: Int)
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/daggerhomework/EventsWriterReader.kt b/app/src/main/java/ru/otus/daggerhomework/EventsWriterReader.kt
new file mode 100644
index 00000000..df0b509d
--- /dev/null
+++ b/app/src/main/java/ru/otus/daggerhomework/EventsWriterReader.kt
@@ -0,0 +1,17 @@
+package ru.otus.daggerhomework
+
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import javax.inject.Inject
+
+class EventsWriterReader @Inject constructor() : EventsReader, EventsWriter {
+    private val _eventsFlow = MutableSharedFlow<Int>(replay = 1)
+
+    override val eventsFlow: Flow<Int>
+        get() = _eventsFlow.asSharedFlow()
+
+    override fun writeEvent(color: Int) {
+        _eventsFlow.tryEmit(color)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/daggerhomework/FragmentProducer.kt b/app/src/main/java/ru/otus/daggerhomework/FragmentProducer.kt
index 00dd10dc..c1889aa9 100644
--- a/app/src/main/java/ru/otus/daggerhomework/FragmentProducer.kt
+++ b/app/src/main/java/ru/otus/daggerhomework/FragmentProducer.kt
@@ -6,21 +6,30 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
 import androidx.fragment.app.Fragment
+import androidx.lifecycle.ViewModelProvider
+import javax.inject.Inject
 
 class FragmentProducer : Fragment() {
+    @Inject
+    lateinit var viewModelFactory: ViewModelFactory
 
+    private val viewModel: ViewModelProducer by lazy {
+        ViewModelProvider(this, viewModelFactory)[ViewModelProducer::class.java]
+    }
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        return inflater.inflate(R.layout.fragment_a, container, true)
+        return inflater.inflate(R.layout.fragment_a, container, false)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+       FragmentProducerComponent.getFragmentProducerComponent(
+          (requireActivity() as MainActivity).mainActivityComponent).inject(this)
         view.findViewById<Button>(R.id.button).setOnClickListener {
-            //отправить результат через livedata в другой фрагмент
+            viewModel.generateColor()
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/daggerhomework/FragmentProducerComponent.kt b/app/src/main/java/ru/otus/daggerhomework/FragmentProducerComponent.kt
index dec7bacc..c1c93568 100644
--- a/app/src/main/java/ru/otus/daggerhomework/FragmentProducerComponent.kt
+++ b/app/src/main/java/ru/otus/daggerhomework/FragmentProducerComponent.kt
@@ -1,19 +1,23 @@
 package ru.otus.daggerhomework
 
 import dagger.Component
-import javax.inject.Singleton
+import javax.inject.Scope
 
-@Singleton
+@FragmentScope
 @Component(
-    modules = [FragmentProducerModule::class],
-    dependencies = [ApplicationComponent::class]
+    dependencies = [MainActivityComponent::class]
 )
 interface FragmentProducerComponent {
+    fun inject(fragmentProducer: FragmentProducer)
 
     companion object {
-        fun getFragmentProducerComponent(applicationComponent: ApplicationComponent): FragmentProducerComponent {
+        fun getFragmentProducerComponent(mainActivityComponent: MainActivityComponent): FragmentProducerComponent {
             return DaggerFragmentProducerComponent.builder()
-                .applicationComponent(applicationComponent).build()
+                .mainActivityComponent(mainActivityComponent).build()
         }
     }
 }
+
+@Scope
+@Retention(AnnotationRetention.RUNTIME)
+annotation class FragmentScope
diff --git a/app/src/main/java/ru/otus/daggerhomework/FragmentProducerModule.kt b/app/src/main/java/ru/otus/daggerhomework/FragmentProducerModule.kt
deleted file mode 100644
index 068fa7c3..00000000
--- a/app/src/main/java/ru/otus/daggerhomework/FragmentProducerModule.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package ru.otus.daggerhomework
-
-import android.content.Context
-import dagger.Module
-import dagger.Provides
-
-@Module
-interface FragmentProducerModule {
-    companion object{
-
-        @Provides
-        fun provideContext(@ApplicationContext context: Context): Context{
-            return context
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/daggerhomework/FragmentReceiver.kt b/app/src/main/java/ru/otus/daggerhomework/FragmentReceiver.kt
index e6a3d9af..47ad91a1 100644
--- a/app/src/main/java/ru/otus/daggerhomework/FragmentReceiver.kt
+++ b/app/src/main/java/ru/otus/daggerhomework/FragmentReceiver.kt
@@ -4,12 +4,22 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Button
 import androidx.annotation.ColorInt
 import androidx.fragment.app.Fragment
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.launch
+import javax.inject.Inject
 
 class FragmentReceiver : Fragment() {
-
+    @Inject
+    lateinit var viewModelFactory: ViewModelFactory
+    private val viewModel: ViewModelReceiver by lazy {
+        ViewModelProvider(this, viewModelFactory)[ViewModelReceiver::class.java]
+    }
     private lateinit var frame: View
 
     override fun onCreateView(
@@ -17,15 +27,24 @@ class FragmentReceiver : Fragment() {
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        return inflater.inflate(R.layout.fragment_b, container, true)
+        return inflater.inflate(R.layout.fragment_b, container, false)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        FragmentReceiverComponent.getFragmentReceiverComponent(
+            (requireActivity() as MainActivity).mainActivityComponent).inject(this)
         frame = view.findViewById(R.id.frame)
+        lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.CREATED){
+                viewModel.eventsReader.eventsFlow.collect {
+                    populateColor(it)
+                }
+            }
+        }
     }
 
-    fun populateColor(@ColorInt color: Int) {
+    private fun populateColor(@ColorInt color: Int) {
         frame.setBackgroundColor(color)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/daggerhomework/FragmentReceiverComponent.kt b/app/src/main/java/ru/otus/daggerhomework/FragmentReceiverComponent.kt
index 7d0546ed..ebf8d76b 100644
--- a/app/src/main/java/ru/otus/daggerhomework/FragmentReceiverComponent.kt
+++ b/app/src/main/java/ru/otus/daggerhomework/FragmentReceiverComponent.kt
@@ -2,16 +2,18 @@ package ru.otus.daggerhomework
 
 import dagger.Component
 
+@FragmentScope
 @Component(
-    modules = [FragmentReceiverModule::class],
-    dependencies = [ApplicationComponent::class]
+    dependencies = [MainActivityComponent::class]
 )
 interface FragmentReceiverComponent {
 
+    fun inject(fragmentReceiver: FragmentReceiver)
+
     companion object {
-        fun getFragmentReceiverComponent(applicationComponent: ApplicationComponent): FragmentReceiverComponent {
+        fun getFragmentReceiverComponent(mainActivityComponent: MainActivityComponent): FragmentReceiverComponent {
             return DaggerFragmentReceiverComponent.builder()
-                .applicationComponent(applicationComponent).build()
+                .mainActivityComponent(mainActivityComponent).build()
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/daggerhomework/FragmentReceiverModule.kt b/app/src/main/java/ru/otus/daggerhomework/FragmentReceiverModule.kt
deleted file mode 100644
index b7a13146..00000000
--- a/app/src/main/java/ru/otus/daggerhomework/FragmentReceiverModule.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package ru.otus.daggerhomework
-
-import android.content.Context
-import dagger.Module
-import dagger.Provides
-
-@Module
-interface FragmentReceiverModule {
-    companion object{
-
-        @Provides
-        fun provideContext(@ApplicationContext context: Context): Context{
-            return context
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/daggerhomework/MainActivity.kt b/app/src/main/java/ru/otus/daggerhomework/MainActivity.kt
index 1b85e946..99884c22 100644
--- a/app/src/main/java/ru/otus/daggerhomework/MainActivity.kt
+++ b/app/src/main/java/ru/otus/daggerhomework/MainActivity.kt
@@ -4,9 +4,13 @@ import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 
 class MainActivity : AppCompatActivity() {
+    lateinit var mainActivityComponent: MainActivityComponent
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
+        mainActivityComponent = DaggerMainActivityComponent.factory().create(this, application.asApp().appCompoment)
+        supportFragmentManager.beginTransaction().add(R.id.container, FragmentReceiver()).commit()
+        supportFragmentManager.beginTransaction().add(R.id.container, FragmentProducer()).commit()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/daggerhomework/MainActivityComponent.kt b/app/src/main/java/ru/otus/daggerhomework/MainActivityComponent.kt
new file mode 100644
index 00000000..4c7c100c
--- /dev/null
+++ b/app/src/main/java/ru/otus/daggerhomework/MainActivityComponent.kt
@@ -0,0 +1,32 @@
+package ru.otus.daggerhomework
+
+import android.content.Context
+import androidx.lifecycle.ViewModel
+import dagger.BindsInstance
+import dagger.Component
+import javax.inject.Qualifier
+import javax.inject.Scope
+
+@Component(dependencies = [ApplicationComponent::class],
+    modules = [MainActivityModule::class]
+)
+@ActivityScope
+interface MainActivityComponent {
+
+    fun getMap(): Map<Class<*>, ViewModel>
+
+    @Component.Factory
+    interface Factory{
+        fun create(
+          @ActivityContext @BindsInstance context: Context,
+            applicationComponent: ApplicationComponent
+        ): MainActivityComponent
+    }
+}
+
+@Qualifier
+annotation class ActivityContext
+
+@Scope
+@Retention(AnnotationRetention.RUNTIME)
+annotation class ActivityScope
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/daggerhomework/MainActivityModule.kt b/app/src/main/java/ru/otus/daggerhomework/MainActivityModule.kt
new file mode 100644
index 00000000..9a70a3e8
--- /dev/null
+++ b/app/src/main/java/ru/otus/daggerhomework/MainActivityModule.kt
@@ -0,0 +1,45 @@
+package ru.otus.daggerhomework
+
+import androidx.lifecycle.ViewModel
+import dagger.Binds
+import dagger.Module
+import dagger.Provides
+import dagger.multibindings.ClassKey
+import dagger.multibindings.IntoMap
+
+@Module
+interface MainActivityModule {
+
+    @Binds
+    @ClassKey(ViewModelProducer::class)
+    @IntoMap
+    @ActivityScope
+    fun provideViewModelProducer(viewModel: ViewModelProducer): ViewModel
+
+    @Binds
+    @ClassKey(ViewModelReceiver::class)
+    @IntoMap
+    @ActivityScope
+    fun provideViewModelReceiver(viewModel: ViewModelReceiver): ViewModel
+
+    @Binds
+    @ActivityScope
+    fun bindColorGenerator(colorGeneratorImpl: ColorGeneratorImpl): ColorGenerator
+
+    @Binds
+    @ActivityScope
+    fun bindEventWriter(eventsWriter: EventsWriterReader): EventsWriter
+
+    @Binds
+    @ActivityScope
+    fun bindEventReader(eventsReader: EventsWriterReader): EventsReader
+
+    companion object{
+
+
+        @Provides
+        @ActivityScope
+        fun provideEventsReaderWriter() = EventsWriterReader()
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/daggerhomework/ViewModelFactory.kt b/app/src/main/java/ru/otus/daggerhomework/ViewModelFactory.kt
new file mode 100644
index 00000000..8a4e43b8
--- /dev/null
+++ b/app/src/main/java/ru/otus/daggerhomework/ViewModelFactory.kt
@@ -0,0 +1,15 @@
+package ru.otus.daggerhomework
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import javax.inject.Inject
+
+class ViewModelFactory  @Inject constructor(
+    private val viewModels: Map<Class<*>, @JvmSuppressWildcards ViewModel>
+) : ViewModelProvider.Factory {
+
+     override fun <T : ViewModel> create(modelClass: Class<T>): T {
+        return viewModels[modelClass] as T
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/daggerhomework/ViewModelProducer.kt b/app/src/main/java/ru/otus/daggerhomework/ViewModelProducer.kt
index bc035089..d7b98a60 100644
--- a/app/src/main/java/ru/otus/daggerhomework/ViewModelProducer.kt
+++ b/app/src/main/java/ru/otus/daggerhomework/ViewModelProducer.kt
@@ -3,14 +3,18 @@ package ru.otus.daggerhomework
 import android.content.Context
 import android.widget.Toast
 import androidx.fragment.app.FragmentActivity
+import androidx.lifecycle.ViewModel
+import javax.inject.Inject
 
-class ViewModelProducer(
+class ViewModelProducer @Inject constructor(
     private val colorGenerator: ColorGenerator,
-    private val context: Context
-) {
+    @ActivityContext private val context: Context,
+    private val eventsWriter: EventsWriter
+): ViewModel() {
 
     fun generateColor() {
         if (context !is FragmentActivity) throw RuntimeException("Здесь нужен контекст активити")
         Toast.makeText(context, "Color sent", Toast.LENGTH_LONG).show()
+        eventsWriter.writeEvent(colorGenerator.generateColor())
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/ru/otus/daggerhomework/ViewModelReceiver.kt b/app/src/main/java/ru/otus/daggerhomework/ViewModelReceiver.kt
index 2d22c149..0ee0e6d6 100644
--- a/app/src/main/java/ru/otus/daggerhomework/ViewModelReceiver.kt
+++ b/app/src/main/java/ru/otus/daggerhomework/ViewModelReceiver.kt
@@ -3,13 +3,25 @@ package ru.otus.daggerhomework
 import android.app.Application
 import android.content.Context
 import android.widget.Toast
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 class ViewModelReceiver @Inject constructor(
-    private val context: Context
-) {
+    @ApplicationContext private val context: Context,
+    val eventsReader: EventsReader
+):ViewModel() {
+    init {
+        viewModelScope.launch {
+            eventsReader.eventsFlow.collect {
+                observeColors()
+            }
+        }
+    }
 
-    fun observeColors() {
+    private fun observeColors() {
         if (context !is Application) throw RuntimeException("Здесь нужен контекст апликейшена")
         Toast.makeText(context, "Color received", Toast.LENGTH_LONG).show()
     }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 79ae6993..aa78c43e 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout
+    android:id="@+id/container"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d499dbe6..906b27ed 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,4 +1,5 @@
 <resources>
     <string name="app_name">DaggerHomework</string>
     <string name="generate_color">Generate Color</string>
+    <string name="click">click skock</string>
 </resources>
\ No newline at end of file

From 4fb730fa4792dff9471128b8195ff339188fd208 Mon Sep 17 00:00:00 2001
From: GeorgeBozon <georgebozon@gmail.com>
Date: Sat, 23 Aug 2025 20:25:14 +0300
Subject: [PATCH 3/3] =?UTF-8?q?3.=20=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=B8=D0=BB=20=D0=B7=D0=B0=D0=BC=D0=B5=D1=87=D0=B0=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ru/otus/daggerhomework/FragmentProducer.kt  |  6 +-----
 .../ru/otus/daggerhomework/FragmentReceiver.kt  |  8 +++-----
 .../daggerhomework/MainActivityComponent.kt     | 14 +++++++++++---
 .../otus/daggerhomework/MainActivityModule.kt   | 17 -----------------
 .../ru/otus/daggerhomework/ViewModelFactory.kt  | 15 ---------------
 .../ru/otus/daggerhomework/ViewModelProducer.kt |  3 +--
 .../ru/otus/daggerhomework/ViewModelReceiver.kt | 10 ++++++----
 7 files changed, 22 insertions(+), 51 deletions(-)
 delete mode 100644 app/src/main/java/ru/otus/daggerhomework/ViewModelFactory.kt

diff --git a/app/src/main/java/ru/otus/daggerhomework/FragmentProducer.kt b/app/src/main/java/ru/otus/daggerhomework/FragmentProducer.kt
index c1889aa9..2a67aecb 100644
--- a/app/src/main/java/ru/otus/daggerhomework/FragmentProducer.kt
+++ b/app/src/main/java/ru/otus/daggerhomework/FragmentProducer.kt
@@ -6,16 +6,12 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.ViewModelProvider
 import javax.inject.Inject
 
 class FragmentProducer : Fragment() {
     @Inject
-    lateinit var viewModelFactory: ViewModelFactory
+    lateinit var viewModel: ViewModelProducer
 
-    private val viewModel: ViewModelProducer by lazy {
-        ViewModelProvider(this, viewModelFactory)[ViewModelProducer::class.java]
-    }
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
diff --git a/app/src/main/java/ru/otus/daggerhomework/FragmentReceiver.kt b/app/src/main/java/ru/otus/daggerhomework/FragmentReceiver.kt
index 47ad91a1..6ba3ca07 100644
--- a/app/src/main/java/ru/otus/daggerhomework/FragmentReceiver.kt
+++ b/app/src/main/java/ru/otus/daggerhomework/FragmentReceiver.kt
@@ -7,7 +7,6 @@ import android.view.ViewGroup
 import androidx.annotation.ColorInt
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import kotlinx.coroutines.flow.collect
@@ -15,11 +14,9 @@ import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 class FragmentReceiver : Fragment() {
+
     @Inject
-    lateinit var viewModelFactory: ViewModelFactory
-    private val viewModel: ViewModelReceiver by lazy {
-        ViewModelProvider(this, viewModelFactory)[ViewModelReceiver::class.java]
-    }
+    lateinit var viewModel: ViewModelReceiver
     private lateinit var frame: View
 
     override fun onCreateView(
@@ -35,6 +32,7 @@ class FragmentReceiver : Fragment() {
         FragmentReceiverComponent.getFragmentReceiverComponent(
             (requireActivity() as MainActivity).mainActivityComponent).inject(this)
         frame = view.findViewById(R.id.frame)
+        viewModel.initViewModel()
         lifecycleScope.launch {
             repeatOnLifecycle(Lifecycle.State.CREATED){
                 viewModel.eventsReader.eventsFlow.collect {
diff --git a/app/src/main/java/ru/otus/daggerhomework/MainActivityComponent.kt b/app/src/main/java/ru/otus/daggerhomework/MainActivityComponent.kt
index 4c7c100c..070c2980 100644
--- a/app/src/main/java/ru/otus/daggerhomework/MainActivityComponent.kt
+++ b/app/src/main/java/ru/otus/daggerhomework/MainActivityComponent.kt
@@ -1,7 +1,6 @@
 package ru.otus.daggerhomework
 
 import android.content.Context
-import androidx.lifecycle.ViewModel
 import dagger.BindsInstance
 import dagger.Component
 import javax.inject.Qualifier
@@ -13,7 +12,17 @@ import javax.inject.Scope
 @ActivityScope
 interface MainActivityComponent {
 
-    fun getMap(): Map<Class<*>, ViewModel>
+    fun getColorGenerator(): ColorGenerator
+
+    fun getEventReader(): EventsReader
+
+    fun getEventWriter(): EventsWriter
+
+    @ApplicationContext
+    fun provideContext(): Context
+
+    @ActivityContext
+    fun provideActivityContext(): Context
 
     @Component.Factory
     interface Factory{
@@ -28,5 +37,4 @@ interface MainActivityComponent {
 annotation class ActivityContext
 
 @Scope
-@Retention(AnnotationRetention.RUNTIME)
 annotation class ActivityScope
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/daggerhomework/MainActivityModule.kt b/app/src/main/java/ru/otus/daggerhomework/MainActivityModule.kt
index 9a70a3e8..4692e2f9 100644
--- a/app/src/main/java/ru/otus/daggerhomework/MainActivityModule.kt
+++ b/app/src/main/java/ru/otus/daggerhomework/MainActivityModule.kt
@@ -1,27 +1,12 @@
 package ru.otus.daggerhomework
 
-import androidx.lifecycle.ViewModel
 import dagger.Binds
 import dagger.Module
 import dagger.Provides
-import dagger.multibindings.ClassKey
-import dagger.multibindings.IntoMap
 
 @Module
 interface MainActivityModule {
 
-    @Binds
-    @ClassKey(ViewModelProducer::class)
-    @IntoMap
-    @ActivityScope
-    fun provideViewModelProducer(viewModel: ViewModelProducer): ViewModel
-
-    @Binds
-    @ClassKey(ViewModelReceiver::class)
-    @IntoMap
-    @ActivityScope
-    fun provideViewModelReceiver(viewModel: ViewModelReceiver): ViewModel
-
     @Binds
     @ActivityScope
     fun bindColorGenerator(colorGeneratorImpl: ColorGeneratorImpl): ColorGenerator
@@ -36,10 +21,8 @@ interface MainActivityModule {
 
     companion object{
 
-
         @Provides
         @ActivityScope
         fun provideEventsReaderWriter() = EventsWriterReader()
-
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/daggerhomework/ViewModelFactory.kt b/app/src/main/java/ru/otus/daggerhomework/ViewModelFactory.kt
deleted file mode 100644
index 8a4e43b8..00000000
--- a/app/src/main/java/ru/otus/daggerhomework/ViewModelFactory.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package ru.otus.daggerhomework
-
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
-import javax.inject.Inject
-
-class ViewModelFactory  @Inject constructor(
-    private val viewModels: Map<Class<*>, @JvmSuppressWildcards ViewModel>
-) : ViewModelProvider.Factory {
-
-     override fun <T : ViewModel> create(modelClass: Class<T>): T {
-        return viewModels[modelClass] as T
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/daggerhomework/ViewModelProducer.kt b/app/src/main/java/ru/otus/daggerhomework/ViewModelProducer.kt
index d7b98a60..07b7c5bb 100644
--- a/app/src/main/java/ru/otus/daggerhomework/ViewModelProducer.kt
+++ b/app/src/main/java/ru/otus/daggerhomework/ViewModelProducer.kt
@@ -3,14 +3,13 @@ package ru.otus.daggerhomework
 import android.content.Context
 import android.widget.Toast
 import androidx.fragment.app.FragmentActivity
-import androidx.lifecycle.ViewModel
 import javax.inject.Inject
 
 class ViewModelProducer @Inject constructor(
     private val colorGenerator: ColorGenerator,
     @ActivityContext private val context: Context,
     private val eventsWriter: EventsWriter
-): ViewModel() {
+){
 
     fun generateColor() {
         if (context !is FragmentActivity) throw RuntimeException("Здесь нужен контекст активити")
diff --git a/app/src/main/java/ru/otus/daggerhomework/ViewModelReceiver.kt b/app/src/main/java/ru/otus/daggerhomework/ViewModelReceiver.kt
index 0ee0e6d6..c28a0724 100644
--- a/app/src/main/java/ru/otus/daggerhomework/ViewModelReceiver.kt
+++ b/app/src/main/java/ru/otus/daggerhomework/ViewModelReceiver.kt
@@ -3,8 +3,8 @@ package ru.otus.daggerhomework
 import android.app.Application
 import android.content.Context
 import android.widget.Toast
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
 import javax.inject.Inject
@@ -12,8 +12,10 @@ import javax.inject.Inject
 class ViewModelReceiver @Inject constructor(
     @ApplicationContext private val context: Context,
     val eventsReader: EventsReader
-):ViewModel() {
-    init {
+){
+    private val viewModelScope = CoroutineScope(Dispatchers.Main)
+
+    fun initViewModel(){
         viewModelScope.launch {
             eventsReader.eventsFlow.collect {
                 observeColors()