From 19d40b124f11b1e4a9a9fbe4a62a6ec054549a8e Mon Sep 17 00:00:00 2001
From: Danny Burge <lykovdaperm@gmail.com>
Date: Wed, 7 Dec 2022 17:47:15 +0500
Subject: [PATCH 1/2] =?UTF-8?q?=D0=92=D1=8B=D0=BF=D0=BE=D0=BB=D0=BD=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=B2=D1=81=D0=B5=D1=85=20=D0=B7=D0=B0?=
 =?UTF-8?q?=D0=B4=D0=B0=D0=BD=D0=B8=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |  3 ++
 app/src/main/AndroidManifest.xml              |  8 ++--
 .../main/java/ru/otus/daggerhomework/App.kt   | 13 ++++-
 .../daggerhomework/ApplicationComponent.kt    |  4 --
 .../ru/otus/daggerhomework/ColorGenerator.kt  | 10 +++-
 .../otus/daggerhomework/FragmentProducer.kt   | 40 +++++++++++++++-
 .../otus/daggerhomework/FragmentReceiver.kt   | 47 +++++++++++++++++--
 .../ru/otus/daggerhomework/IDataKeeper.kt     | 31 ++++++++++++
 .../ru/otus/daggerhomework/MainActivity.kt    | 31 +++++++++++-
 .../otus/daggerhomework/ViewModelProducer.kt  |  9 ++--
 .../otus/daggerhomework/ViewModelReceiver.kt  | 18 +++++--
 .../ru/otus/daggerhomework/di/Qualifiers.kt   |  9 ++++
 .../java/ru/otus/daggerhomework/di/Scopes.kt  | 12 +++++
 .../di/components/ActivityComponent.kt        | 31 ++++++++++++
 .../di/components/ApplicationComponent.kt     | 20 ++++++++
 .../components/FragmentProducerComponent.kt   | 23 +++++++++
 .../components/FragmentReceiverComponent.kt   | 23 +++++++++
 .../di/modules/DataKeeperModule.kt            | 15 ++++++
 app/src/main/res/layout/activity_main.xml     | 17 +++----
 19 files changed, 331 insertions(+), 33 deletions(-)
 delete mode 100644 app/src/main/java/ru/otus/daggerhomework/ApplicationComponent.kt
 create mode 100644 app/src/main/java/ru/otus/daggerhomework/IDataKeeper.kt
 create mode 100644 app/src/main/java/ru/otus/daggerhomework/di/Qualifiers.kt
 create mode 100644 app/src/main/java/ru/otus/daggerhomework/di/Scopes.kt
 create mode 100644 app/src/main/java/ru/otus/daggerhomework/di/components/ActivityComponent.kt
 create mode 100644 app/src/main/java/ru/otus/daggerhomework/di/components/ApplicationComponent.kt
 create mode 100644 app/src/main/java/ru/otus/daggerhomework/di/components/FragmentProducerComponent.kt
 create mode 100644 app/src/main/java/ru/otus/daggerhomework/di/components/FragmentReceiverComponent.kt
 create mode 100644 app/src/main/java/ru/otus/daggerhomework/di/modules/DataKeeperModule.kt

diff --git a/app/build.gradle b/app/build.gradle
index 705d0941..cca2437e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -40,4 +40,7 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
     implementation 'com.google.dagger:dagger:2.42'
     kapt 'com.google.dagger:dagger-compiler:2.42'
+
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.0'
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index fe328c68..82191fee 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="ru.otus.daggerhomework">
 
     <application
+        android:name=".App"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         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..1de6cb32 100644
--- a/app/src/main/java/ru/otus/daggerhomework/App.kt
+++ b/app/src/main/java/ru/otus/daggerhomework/App.kt
@@ -1,6 +1,17 @@
 package ru.otus.daggerhomework
 
 import android.app.Application
+import ru.otus.daggerhomework.di.components.ApplicationComponent
+import ru.otus.daggerhomework.di.components.DaggerApplicationComponent
 
-class App :Application() {
+class App : Application() {
+    lateinit var appComponent: ApplicationComponent
+
+    override fun onCreate() {
+        super.onCreate()
+
+        appComponent = DaggerApplicationComponent
+            .factory()
+            .create(this)
+    }
 }
\ 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
deleted file mode 100644
index fc47f256..00000000
--- a/app/src/main/java/ru/otus/daggerhomework/ApplicationComponent.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package ru.otus.daggerhomework
-
-interface ApplicationComponent {
-}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/daggerhomework/ColorGenerator.kt b/app/src/main/java/ru/otus/daggerhomework/ColorGenerator.kt
index a9e25a27..86ea124b 100644
--- a/app/src/main/java/ru/otus/daggerhomework/ColorGenerator.kt
+++ b/app/src/main/java/ru/otus/daggerhomework/ColorGenerator.kt
@@ -1,8 +1,8 @@
 package ru.otus.daggerhomework
 
 import android.graphics.Color
+import android.util.Log
 import androidx.annotation.ColorInt
-import androidx.annotation.ColorRes
 import java.util.*
 
 interface ColorGenerator {
@@ -15,6 +15,12 @@ class ColorGeneratorImpl : ColorGenerator {
 
     override fun generateColor(): Int {
         val rnd = Random()
-        return Color.argb(255, rnd.nextInt(256), rnd.nextInt(256), rnd.nextInt(256))
+        val color = Color.argb(
+            255,
+            rnd.nextInt(256),
+            rnd.nextInt(256),
+            rnd.nextInt(256)
+        )
+        return 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..cb605c38 100644
--- a/app/src/main/java/ru/otus/daggerhomework/FragmentProducer.kt
+++ b/app/src/main/java/ru/otus/daggerhomework/FragmentProducer.kt
@@ -1,26 +1,62 @@
 package ru.otus.daggerhomework
 
+import android.content.Context
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
 import androidx.fragment.app.Fragment
+import androidx.lifecycle.lifecycleScope
+import kotlinx.coroutines.launch
+import ru.otus.daggerhomework.di.ActivityContext
+import ru.otus.daggerhomework.di.ApplicationContext
+import ru.otus.daggerhomework.di.components.DaggerFragmentProducerComponent
+import ru.otus.daggerhomework.di.components.FragmentProducerComponent
+import javax.inject.Inject
+import javax.inject.Provider
 
 class FragmentProducer : Fragment() {
 
+    @Inject
+    lateinit var dataKeeper: Provider<IDataKeeper>
+
+    @Inject
+    @ActivityContext
+    lateinit var activityContext: Context
+
+    lateinit var fragmentProducerComponent: FragmentProducerComponent
+    private val colorGenerator = ColorGeneratorImpl()
+    lateinit var viewModelProducer: ViewModelProducer
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        return inflater.inflate(R.layout.fragment_a, container, true)
+        val activityComponent = (requireActivity() as MainActivity).activityComponent
+        fragmentProducerComponent = DaggerFragmentProducerComponent
+            .builder()
+            .activityComponent(activityComponent)
+            .build()
+
+        fragmentProducerComponent.inject(this)
+        viewModelProducer = ViewModelProducer(
+            colorGenerator,
+            activityContext,
+            dataKeeper.get()
+        )
+
+        return inflater.inflate(R.layout.fragment_a, container, false)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         view.findViewById<Button>(R.id.button).setOnClickListener {
-            //отправить результат через livedata в другой фрагмент
+            lifecycleScope.launch {
+                //отправить результат через livedata в другой фрагмент
+                viewModelProducer.generateColor()
+            }
         }
     }
 }
\ 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..0ac1fa14 100644
--- a/app/src/main/java/ru/otus/daggerhomework/FragmentReceiver.kt
+++ b/app/src/main/java/ru/otus/daggerhomework/FragmentReceiver.kt
@@ -1,31 +1,72 @@
 package ru.otus.daggerhomework
 
+import android.content.Context
 import android.os.Bundle
+import android.util.Log
 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.lifecycleScope
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.launch
+import ru.otus.daggerhomework.di.ActivityContext
+import ru.otus.daggerhomework.di.ApplicationContext
+import ru.otus.daggerhomework.di.components.DaggerFragmentReceiverComponent
+import ru.otus.daggerhomework.di.components.FragmentReceiverComponent
+import javax.inject.Inject
+import javax.inject.Provider
+
 
 class FragmentReceiver : Fragment() {
 
+    @Inject
+    lateinit var dataKeeper: Provider<IDataKeeper>
+
+    @Inject
+    @ApplicationContext
+    lateinit var applicationContext: Context
+
     private lateinit var frame: View
+    private lateinit var fragmentReceiverComponent: FragmentReceiverComponent
+    private lateinit var viewModelReceiver: ViewModelReceiver
 
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        return inflater.inflate(R.layout.fragment_b, container, true)
+        val activityComponent = (requireActivity() as MainActivity).activityComponent
+        fragmentReceiverComponent = DaggerFragmentReceiverComponent
+            .builder()
+            .activityComponent(activityComponent)
+            .build()
+        fragmentReceiverComponent.inject(this)
+
+        viewModelReceiver = ViewModelReceiver(
+            applicationContext,
+            dataKeeper.get()
+        )
+        lifecycleScope.launch {
+            viewModelReceiver.observeColors()
+        }
+
+        return inflater.inflate(R.layout.fragment_b, container, false)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         frame = view.findViewById(R.id.frame)
+
+        lifecycleScope.launch {
+            viewModelReceiver.colorData.collect { colorCode ->
+                populateColor(colorCode)
+            }
+        }
     }
 
-    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/IDataKeeper.kt b/app/src/main/java/ru/otus/daggerhomework/IDataKeeper.kt
new file mode 100644
index 00000000..56e3d289
--- /dev/null
+++ b/app/src/main/java/ru/otus/daggerhomework/IDataKeeper.kt
@@ -0,0 +1,31 @@
+package ru.otus.daggerhomework
+
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import ru.otus.daggerhomework.di.ActivityScope
+import javax.inject.Inject
+
+
+@ActivityScope
+interface IDataKeeper {
+
+    suspend fun saveData(newData: Int)
+
+    fun getFlow(): StateFlow<Int>
+}
+
+@ActivityScope
+class DataKeeper @Inject constructor() : IDataKeeper {
+
+    private val _colorData = MutableStateFlow<Int>(0)
+    private val colorData: StateFlow<Int> = _colorData
+
+    override suspend fun saveData(newData: Int) {
+        _colorData.emit(newData)
+    }
+
+    override fun getFlow(): StateFlow<Int> {
+        return colorData
+    }
+
+}
\ 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..64cea1c5 100644
--- a/app/src/main/java/ru/otus/daggerhomework/MainActivity.kt
+++ b/app/src/main/java/ru/otus/daggerhomework/MainActivity.kt
@@ -1,12 +1,39 @@
 package ru.otus.daggerhomework
 
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentContainerView
+import ru.otus.daggerhomework.di.components.ActivityComponent
+import ru.otus.daggerhomework.di.components.DaggerActivityComponent
+import javax.inject.Inject
+import javax.inject.Provider
 
 class MainActivity : AppCompatActivity() {
 
+    lateinit var activityComponent: ActivityComponent
+
+    @Inject
+    lateinit var dataKeeper: Provider<IDataKeeper>
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+
+        val appComponent = (application as App).appComponent
+        activityComponent = DaggerActivityComponent
+            .factory()
+            .create(
+                appComponent,
+                this
+            )
+
         setContentView(R.layout.activity_main)
+
+        supportFragmentManager
+            .beginTransaction()
+            .add(R.id.fragmentContainer, FragmentReceiver())
+            .add(R.id.fragmentContainer, FragmentProducer())
+            .commit()
     }
-}
\ 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..dedbbca7 100644
--- a/app/src/main/java/ru/otus/daggerhomework/ViewModelProducer.kt
+++ b/app/src/main/java/ru/otus/daggerhomework/ViewModelProducer.kt
@@ -1,16 +1,19 @@
 package ru.otus.daggerhomework
 
 import android.content.Context
+import android.util.Log
 import android.widget.Toast
 import androidx.fragment.app.FragmentActivity
 
 class ViewModelProducer(
     private val colorGenerator: ColorGenerator,
-    private val context: Context
+    private val context: Context,
+    private val dataKeeper: IDataKeeper
 ) {
-
-    fun generateColor() {
+    suspend fun generateColor() {
         if (context !is FragmentActivity) throw RuntimeException("Здесь нужен контекст активити")
         Toast.makeText(context, "Color sent", Toast.LENGTH_LONG).show()
+
+        dataKeeper.saveData(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 8a3a5ead..b435c4bf 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 kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.collect
 
 class ViewModelReceiver(
-    private val context: Context
+    private val context: Context,
+    dataKeeper: IDataKeeper
 ) {
+    private val _colorData = MutableStateFlow<Int>(0)
+    val colorData: StateFlow<Int> = _colorData
 
-    fun observeColors() {
+    private val colorFlow = dataKeeper.getFlow()
+
+    suspend fun observeColors() {
         if (context !is Application) throw RuntimeException("Здесь нужен контекст апликейшена")
-        Toast.makeText(context, "Color received", Toast.LENGTH_LONG).show()
+        colorFlow.collect { colorCode ->
+            Toast.makeText(context, "Color received", Toast.LENGTH_LONG).show()
+
+            _colorData.emit(colorCode)
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/daggerhomework/di/Qualifiers.kt b/app/src/main/java/ru/otus/daggerhomework/di/Qualifiers.kt
new file mode 100644
index 00000000..56a4a1fb
--- /dev/null
+++ b/app/src/main/java/ru/otus/daggerhomework/di/Qualifiers.kt
@@ -0,0 +1,9 @@
+package ru.otus.daggerhomework.di
+
+import javax.inject.Qualifier
+
+@Qualifier
+annotation class ApplicationContext
+
+@Qualifier
+annotation class ActivityContext
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/daggerhomework/di/Scopes.kt b/app/src/main/java/ru/otus/daggerhomework/di/Scopes.kt
new file mode 100644
index 00000000..400a27c3
--- /dev/null
+++ b/app/src/main/java/ru/otus/daggerhomework/di/Scopes.kt
@@ -0,0 +1,12 @@
+package ru.otus.daggerhomework.di
+
+import javax.inject.Scope
+
+@Scope
+annotation class ApplicationScope
+
+@Scope
+annotation class ActivityScope
+
+@Scope
+annotation class FragmentScope
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/daggerhomework/di/components/ActivityComponent.kt b/app/src/main/java/ru/otus/daggerhomework/di/components/ActivityComponent.kt
new file mode 100644
index 00000000..d91e13bb
--- /dev/null
+++ b/app/src/main/java/ru/otus/daggerhomework/di/components/ActivityComponent.kt
@@ -0,0 +1,31 @@
+package ru.otus.daggerhomework.di.components
+
+import android.content.Context
+import dagger.BindsInstance
+import dagger.Component
+import ru.otus.daggerhomework.IDataKeeper
+import ru.otus.daggerhomework.di.ActivityContext
+import ru.otus.daggerhomework.di.ActivityScope
+import ru.otus.daggerhomework.di.ApplicationContext
+import ru.otus.daggerhomework.di.modules.DataKeeperModule
+
+@ActivityScope
+@Component(dependencies = [ApplicationComponent::class], modules = [DataKeeperModule::class])
+interface ActivityComponent {
+
+    @ActivityContext
+    fun provideActivityContext(): Context
+
+    @ApplicationContext
+    fun provideApplicationContext(): Context
+
+    fun provideDataKeeper(): IDataKeeper
+
+    @Component.Factory
+    interface Factory {
+        fun create(
+            applicationComponent: ApplicationComponent,
+            @BindsInstance @ActivityContext context: Context
+        ): ActivityComponent
+    }
+}
diff --git a/app/src/main/java/ru/otus/daggerhomework/di/components/ApplicationComponent.kt b/app/src/main/java/ru/otus/daggerhomework/di/components/ApplicationComponent.kt
new file mode 100644
index 00000000..bc843046
--- /dev/null
+++ b/app/src/main/java/ru/otus/daggerhomework/di/components/ApplicationComponent.kt
@@ -0,0 +1,20 @@
+package ru.otus.daggerhomework.di.components
+
+import android.content.Context
+import dagger.BindsInstance
+import dagger.Component
+import ru.otus.daggerhomework.di.ApplicationContext
+import ru.otus.daggerhomework.di.ApplicationScope
+
+@ApplicationScope
+@Component
+interface ApplicationComponent {
+
+    @ApplicationContext
+    fun provideContext(): Context
+
+    @Component.Factory
+    interface Factory {
+        fun create(@BindsInstance @ApplicationContext context: Context): ApplicationComponent
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/daggerhomework/di/components/FragmentProducerComponent.kt b/app/src/main/java/ru/otus/daggerhomework/di/components/FragmentProducerComponent.kt
new file mode 100644
index 00000000..2ee17473
--- /dev/null
+++ b/app/src/main/java/ru/otus/daggerhomework/di/components/FragmentProducerComponent.kt
@@ -0,0 +1,23 @@
+package ru.otus.daggerhomework.di.components
+
+import android.content.Context
+import dagger.Component
+import ru.otus.daggerhomework.FragmentProducer
+import ru.otus.daggerhomework.IDataKeeper
+import ru.otus.daggerhomework.di.ActivityContext
+import ru.otus.daggerhomework.di.ApplicationContext
+import ru.otus.daggerhomework.di.FragmentScope
+
+@FragmentScope
+@Component(dependencies = [ActivityComponent::class])
+interface FragmentProducerComponent {
+    fun inject(fragmentProducer: FragmentProducer)
+
+    @ApplicationContext
+    fun provideApplicationContext(): Context
+
+    @ActivityContext
+    fun provideActivityContext(): Context
+
+    fun provideDataKeeper(): IDataKeeper
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/daggerhomework/di/components/FragmentReceiverComponent.kt b/app/src/main/java/ru/otus/daggerhomework/di/components/FragmentReceiverComponent.kt
new file mode 100644
index 00000000..f53c5e94
--- /dev/null
+++ b/app/src/main/java/ru/otus/daggerhomework/di/components/FragmentReceiverComponent.kt
@@ -0,0 +1,23 @@
+package ru.otus.daggerhomework.di.components
+
+import android.content.Context
+import dagger.Component
+import ru.otus.daggerhomework.FragmentReceiver
+import ru.otus.daggerhomework.IDataKeeper
+import ru.otus.daggerhomework.di.ActivityContext
+import ru.otus.daggerhomework.di.ApplicationContext
+import ru.otus.daggerhomework.di.FragmentScope
+
+@FragmentScope
+@Component(dependencies = [ActivityComponent::class])
+interface FragmentReceiverComponent {
+    fun inject(fragmentReceiver: FragmentReceiver)
+
+    @ApplicationContext
+    fun provideApplicationContext(): Context
+
+    @ActivityContext
+    fun provideActivityContext(): Context
+
+    fun provideDataKeeper(): IDataKeeper
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/daggerhomework/di/modules/DataKeeperModule.kt b/app/src/main/java/ru/otus/daggerhomework/di/modules/DataKeeperModule.kt
new file mode 100644
index 00000000..9565c5fd
--- /dev/null
+++ b/app/src/main/java/ru/otus/daggerhomework/di/modules/DataKeeperModule.kt
@@ -0,0 +1,15 @@
+package ru.otus.daggerhomework.di.modules
+
+import dagger.Binds
+import dagger.Module
+import ru.otus.daggerhomework.IDataKeeper
+import ru.otus.daggerhomework.DataKeeper
+import ru.otus.daggerhomework.di.ActivityScope
+import ru.otus.daggerhomework.di.ApplicationScope
+
+@Module
+interface DataKeeperModule {
+    @Binds
+    @ActivityScope
+    fun bindDataKeeper(dataKeeper: DataKeeper): IDataKeeper
+}
\ 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 79ae6993..32847e7e 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,19 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Hello World!"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/fragmentContainer"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From e0cdbc292a2e8fc2d5efd5a0ebeb4ec0e07d2580 Mon Sep 17 00:00:00 2001
From: DannyBurge <lykovdaperm@gmail.com>
Date: Thu, 22 Dec 2022 15:56:06 +0500
Subject: [PATCH 2/2] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B7=D0=B0=D0=BC=D0=B5=D1=87=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ru/otus/daggerhomework/ColorGenerator.kt  |  3 +-
 .../otus/daggerhomework/FragmentProducer.kt   | 29 +++++++++----------
 .../otus/daggerhomework/FragmentReceiver.kt   | 27 +++++++----------
 .../ru/otus/daggerhomework/IDataKeeper.kt     |  3 --
 .../ru/otus/daggerhomework/MainActivity.kt    |  3 --
 .../di/components/ActivityComponent.kt        |  9 +++++-
 .../components/FragmentProducerComponent.kt   | 12 ++------
 .../components/FragmentReceiverComponent.kt   |  9 ------
 .../di/modules/ColorGeneratorModule.kt        | 15 ++++++++++
 .../di/modules/DataKeeperModule.kt            |  3 +-
 10 files changed, 53 insertions(+), 60 deletions(-)
 create mode 100644 app/src/main/java/ru/otus/daggerhomework/di/modules/ColorGeneratorModule.kt

diff --git a/app/src/main/java/ru/otus/daggerhomework/ColorGenerator.kt b/app/src/main/java/ru/otus/daggerhomework/ColorGenerator.kt
index 86ea124b..d2c6c297 100644
--- a/app/src/main/java/ru/otus/daggerhomework/ColorGenerator.kt
+++ b/app/src/main/java/ru/otus/daggerhomework/ColorGenerator.kt
@@ -4,6 +4,7 @@ import android.graphics.Color
 import android.util.Log
 import androidx.annotation.ColorInt
 import java.util.*
+import javax.inject.Inject
 
 interface ColorGenerator {
 
@@ -11,7 +12,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/FragmentProducer.kt b/app/src/main/java/ru/otus/daggerhomework/FragmentProducer.kt
index cb605c38..9954055a 100644
--- a/app/src/main/java/ru/otus/daggerhomework/FragmentProducer.kt
+++ b/app/src/main/java/ru/otus/daggerhomework/FragmentProducer.kt
@@ -1,6 +1,5 @@
 package ru.otus.daggerhomework
 
-import android.content.Context
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -9,8 +8,6 @@ import android.widget.Button
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import kotlinx.coroutines.launch
-import ru.otus.daggerhomework.di.ActivityContext
-import ru.otus.daggerhomework.di.ApplicationContext
 import ru.otus.daggerhomework.di.components.DaggerFragmentProducerComponent
 import ru.otus.daggerhomework.di.components.FragmentProducerComponent
 import javax.inject.Inject
@@ -22,28 +19,30 @@ class FragmentProducer : Fragment() {
     lateinit var dataKeeper: Provider<IDataKeeper>
 
     @Inject
-    @ActivityContext
-    lateinit var activityContext: Context
+    lateinit var colorGenerator: Provider<ColorGenerator>
 
-    lateinit var fragmentProducerComponent: FragmentProducerComponent
-    private val colorGenerator = ColorGeneratorImpl()
     lateinit var viewModelProducer: ViewModelProducer
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         val activityComponent = (requireActivity() as MainActivity).activityComponent
-        fragmentProducerComponent = DaggerFragmentProducerComponent
+        val fragmentProducerComponent = DaggerFragmentProducerComponent
             .builder()
             .activityComponent(activityComponent)
             .build()
 
         fragmentProducerComponent.inject(this)
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+
         viewModelProducer = ViewModelProducer(
-            colorGenerator,
-            activityContext,
+            colorGenerator.get(),
+            requireContext(),
             dataKeeper.get()
         )
 
diff --git a/app/src/main/java/ru/otus/daggerhomework/FragmentReceiver.kt b/app/src/main/java/ru/otus/daggerhomework/FragmentReceiver.kt
index 0ac1fa14..b521f124 100644
--- a/app/src/main/java/ru/otus/daggerhomework/FragmentReceiver.kt
+++ b/app/src/main/java/ru/otus/daggerhomework/FragmentReceiver.kt
@@ -1,8 +1,6 @@
 package ru.otus.daggerhomework
 
-import android.content.Context
 import android.os.Bundle
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -11,10 +9,7 @@ import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
-import ru.otus.daggerhomework.di.ActivityContext
-import ru.otus.daggerhomework.di.ApplicationContext
 import ru.otus.daggerhomework.di.components.DaggerFragmentReceiverComponent
-import ru.otus.daggerhomework.di.components.FragmentReceiverComponent
 import javax.inject.Inject
 import javax.inject.Provider
 
@@ -24,28 +19,26 @@ class FragmentReceiver : Fragment() {
     @Inject
     lateinit var dataKeeper: Provider<IDataKeeper>
 
-    @Inject
-    @ApplicationContext
-    lateinit var applicationContext: Context
-
     private lateinit var frame: View
-    private lateinit var fragmentReceiverComponent: FragmentReceiverComponent
     private lateinit var viewModelReceiver: ViewModelReceiver
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         val activityComponent = (requireActivity() as MainActivity).activityComponent
-        fragmentReceiverComponent = DaggerFragmentReceiverComponent
+        val fragmentReceiverComponent = DaggerFragmentReceiverComponent
             .builder()
             .activityComponent(activityComponent)
             .build()
         fragmentReceiverComponent.inject(this)
+    }
 
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
         viewModelReceiver = ViewModelReceiver(
-            applicationContext,
+            requireContext().applicationContext,
             dataKeeper.get()
         )
         lifecycleScope.launch {
diff --git a/app/src/main/java/ru/otus/daggerhomework/IDataKeeper.kt b/app/src/main/java/ru/otus/daggerhomework/IDataKeeper.kt
index 56e3d289..f12a3443 100644
--- a/app/src/main/java/ru/otus/daggerhomework/IDataKeeper.kt
+++ b/app/src/main/java/ru/otus/daggerhomework/IDataKeeper.kt
@@ -5,8 +5,6 @@ import kotlinx.coroutines.flow.StateFlow
 import ru.otus.daggerhomework.di.ActivityScope
 import javax.inject.Inject
 
-
-@ActivityScope
 interface IDataKeeper {
 
     suspend fun saveData(newData: Int)
@@ -14,7 +12,6 @@ interface IDataKeeper {
     fun getFlow(): StateFlow<Int>
 }
 
-@ActivityScope
 class DataKeeper @Inject constructor() : IDataKeeper {
 
     private val _colorData = MutableStateFlow<Int>(0)
diff --git a/app/src/main/java/ru/otus/daggerhomework/MainActivity.kt b/app/src/main/java/ru/otus/daggerhomework/MainActivity.kt
index 64cea1c5..06ab4406 100644
--- a/app/src/main/java/ru/otus/daggerhomework/MainActivity.kt
+++ b/app/src/main/java/ru/otus/daggerhomework/MainActivity.kt
@@ -13,9 +13,6 @@ class MainActivity : AppCompatActivity() {
 
     lateinit var activityComponent: ActivityComponent
 
-    @Inject
-    lateinit var dataKeeper: Provider<IDataKeeper>
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
diff --git a/app/src/main/java/ru/otus/daggerhomework/di/components/ActivityComponent.kt b/app/src/main/java/ru/otus/daggerhomework/di/components/ActivityComponent.kt
index d91e13bb..f657a901 100644
--- a/app/src/main/java/ru/otus/daggerhomework/di/components/ActivityComponent.kt
+++ b/app/src/main/java/ru/otus/daggerhomework/di/components/ActivityComponent.kt
@@ -3,14 +3,19 @@ package ru.otus.daggerhomework.di.components
 import android.content.Context
 import dagger.BindsInstance
 import dagger.Component
+import ru.otus.daggerhomework.ColorGenerator
 import ru.otus.daggerhomework.IDataKeeper
 import ru.otus.daggerhomework.di.ActivityContext
 import ru.otus.daggerhomework.di.ActivityScope
 import ru.otus.daggerhomework.di.ApplicationContext
+import ru.otus.daggerhomework.di.modules.ColorGeneratorModule
 import ru.otus.daggerhomework.di.modules.DataKeeperModule
 
 @ActivityScope
-@Component(dependencies = [ApplicationComponent::class], modules = [DataKeeperModule::class])
+@Component(
+    dependencies = [ApplicationComponent::class],
+    modules = [DataKeeperModule::class, ColorGeneratorModule::class]
+)
 interface ActivityComponent {
 
     @ActivityContext
@@ -21,6 +26,8 @@ interface ActivityComponent {
 
     fun provideDataKeeper(): IDataKeeper
 
+    fun provideColorGenerator(): ColorGenerator
+
     @Component.Factory
     interface Factory {
         fun create(
diff --git a/app/src/main/java/ru/otus/daggerhomework/di/components/FragmentProducerComponent.kt b/app/src/main/java/ru/otus/daggerhomework/di/components/FragmentProducerComponent.kt
index 2ee17473..f5302497 100644
--- a/app/src/main/java/ru/otus/daggerhomework/di/components/FragmentProducerComponent.kt
+++ b/app/src/main/java/ru/otus/daggerhomework/di/components/FragmentProducerComponent.kt
@@ -1,11 +1,9 @@
 package ru.otus.daggerhomework.di.components
 
-import android.content.Context
 import dagger.Component
+import ru.otus.daggerhomework.ColorGenerator
 import ru.otus.daggerhomework.FragmentProducer
 import ru.otus.daggerhomework.IDataKeeper
-import ru.otus.daggerhomework.di.ActivityContext
-import ru.otus.daggerhomework.di.ApplicationContext
 import ru.otus.daggerhomework.di.FragmentScope
 
 @FragmentScope
@@ -13,11 +11,7 @@ import ru.otus.daggerhomework.di.FragmentScope
 interface FragmentProducerComponent {
     fun inject(fragmentProducer: FragmentProducer)
 
-    @ApplicationContext
-    fun provideApplicationContext(): Context
-
-    @ActivityContext
-    fun provideActivityContext(): Context
-
     fun provideDataKeeper(): IDataKeeper
+
+    fun provideColorGenerator(): ColorGenerator
 }
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/daggerhomework/di/components/FragmentReceiverComponent.kt b/app/src/main/java/ru/otus/daggerhomework/di/components/FragmentReceiverComponent.kt
index f53c5e94..fd69bfa5 100644
--- a/app/src/main/java/ru/otus/daggerhomework/di/components/FragmentReceiverComponent.kt
+++ b/app/src/main/java/ru/otus/daggerhomework/di/components/FragmentReceiverComponent.kt
@@ -1,11 +1,8 @@
 package ru.otus.daggerhomework.di.components
 
-import android.content.Context
 import dagger.Component
 import ru.otus.daggerhomework.FragmentReceiver
 import ru.otus.daggerhomework.IDataKeeper
-import ru.otus.daggerhomework.di.ActivityContext
-import ru.otus.daggerhomework.di.ApplicationContext
 import ru.otus.daggerhomework.di.FragmentScope
 
 @FragmentScope
@@ -13,11 +10,5 @@ import ru.otus.daggerhomework.di.FragmentScope
 interface FragmentReceiverComponent {
     fun inject(fragmentReceiver: FragmentReceiver)
 
-    @ApplicationContext
-    fun provideApplicationContext(): Context
-
-    @ActivityContext
-    fun provideActivityContext(): Context
-
     fun provideDataKeeper(): IDataKeeper
 }
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/daggerhomework/di/modules/ColorGeneratorModule.kt b/app/src/main/java/ru/otus/daggerhomework/di/modules/ColorGeneratorModule.kt
new file mode 100644
index 00000000..8e259eda
--- /dev/null
+++ b/app/src/main/java/ru/otus/daggerhomework/di/modules/ColorGeneratorModule.kt
@@ -0,0 +1,15 @@
+package ru.otus.daggerhomework.di.modules
+
+import dagger.Binds
+import dagger.Module
+import ru.otus.daggerhomework.ColorGenerator
+import ru.otus.daggerhomework.ColorGeneratorImpl
+import ru.otus.daggerhomework.di.ActivityScope
+
+
+@Module
+interface ColorGeneratorModule {
+    @Binds
+    @ActivityScope
+    fun bindColorGenerator(colorGenerator: ColorGeneratorImpl): ColorGenerator
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/daggerhomework/di/modules/DataKeeperModule.kt b/app/src/main/java/ru/otus/daggerhomework/di/modules/DataKeeperModule.kt
index 9565c5fd..6d385587 100644
--- a/app/src/main/java/ru/otus/daggerhomework/di/modules/DataKeeperModule.kt
+++ b/app/src/main/java/ru/otus/daggerhomework/di/modules/DataKeeperModule.kt
@@ -2,10 +2,9 @@ package ru.otus.daggerhomework.di.modules
 
 import dagger.Binds
 import dagger.Module
-import ru.otus.daggerhomework.IDataKeeper
 import ru.otus.daggerhomework.DataKeeper
+import ru.otus.daggerhomework.IDataKeeper
 import ru.otus.daggerhomework.di.ActivityScope
-import ru.otus.daggerhomework.di.ApplicationScope
 
 @Module
 interface DataKeeperModule {