From 206ad9780555c9548f0102860bbf297b8ca02903 Mon Sep 17 00:00:00 2001
From: anton <antonzaritsky@gmail.com>
Date: Mon, 6 Jun 2022 23:38:51 +0200
Subject: [PATCH 1/2] init commit

---
 app/src/main/AndroidManifest.xml              |  12 +-
 app/src/main/java/otus/homework/dagger/App.kt |  23 +++
 .../java/otus/homework/dagger/ColorFlow.kt    |   7 +
 .../homework/dagger}/ColorGenerator.kt        |   3 +-
 .../homework/dagger}/FragmentProducer.kt      |   9 +-
 .../homework/dagger}/FragmentReceiver.kt      |  11 +-
 .../homework/dagger}/MainActivity.kt          |   7 +-
 .../homework/dagger/MyViewModelFactory.kt     |  18 +++
 .../homework/dagger}/ViewModelProducer.kt     |  10 +-
 .../homework/dagger}/ViewModelReceiver.kt     |  10 +-
 .../homework/dagger/di/ActivityComponent.kt   |  34 +++++
 .../dagger/di/ApplicationComponent.kt         |  26 ++++
 .../homework/dagger/di/FragmentComponents.kt  |  59 ++++++++
 .../main/java/ru/otus/daggerhomework/App.kt   |   6 -
 .../daggerhomework/ApplicationComponent.kt    |   4 -
 .../drawable-v24/ic_launcher_foreground.xml   |  11 +-
 .../res/drawable/ic_launcher_background.xml   | 135 +++++++++---------
 .../res/mipmap-anydpi-v26/ic_launcher.xml     |   3 +-
 .../mipmap-anydpi-v26/ic_launcher_round.xml   |   3 +-
 app/src/main/res/values-night/themes.xml      |   4 +-
 app/src/main/res/values/strings.xml           |   2 +-
 app/src/main/res/values/themes.xml            |   4 +-
 22 files changed, 293 insertions(+), 108 deletions(-)
 create mode 100644 app/src/main/java/otus/homework/dagger/App.kt
 create mode 100644 app/src/main/java/otus/homework/dagger/ColorFlow.kt
 rename app/src/main/java/{ru/otus/daggerhomework => otus/homework/dagger}/ColorGenerator.kt (84%)
 rename app/src/main/java/{ru/otus/daggerhomework => otus/homework/dagger}/FragmentProducer.kt (73%)
 rename app/src/main/java/{ru/otus/daggerhomework => otus/homework/dagger}/FragmentReceiver.kt (70%)
 rename app/src/main/java/{ru/otus/daggerhomework => otus/homework/dagger}/MainActivity.kt (58%)
 create mode 100644 app/src/main/java/otus/homework/dagger/MyViewModelFactory.kt
 rename app/src/main/java/{ru/otus/daggerhomework => otus/homework/dagger}/ViewModelProducer.kt (62%)
 rename app/src/main/java/{ru/otus/daggerhomework => otus/homework/dagger}/ViewModelReceiver.kt (61%)
 create mode 100644 app/src/main/java/otus/homework/dagger/di/ActivityComponent.kt
 create mode 100644 app/src/main/java/otus/homework/dagger/di/ApplicationComponent.kt
 create mode 100644 app/src/main/java/otus/homework/dagger/di/FragmentComponents.kt
 delete mode 100644 app/src/main/java/ru/otus/daggerhomework/App.kt
 delete mode 100644 app/src/main/java/ru/otus/daggerhomework/ApplicationComponent.kt

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index fe328c68..95620b67 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"
-    package="ru.otus.daggerhomework">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="otus.homework.dagger">
 
+    <uses-permission android:name="android.permission.INTERNET" />
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
+        android:name=".App"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.DaggerHomework">
-        <activity android:name=".MainActivity">
+        android:theme="@style/Theme.Flow" >
+        <activity android:name="otus.homework.dagger.MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/app/src/main/java/otus/homework/dagger/App.kt b/app/src/main/java/otus/homework/dagger/App.kt
new file mode 100644
index 00000000..e6f461dd
--- /dev/null
+++ b/app/src/main/java/otus/homework/dagger/App.kt
@@ -0,0 +1,23 @@
+package otus.homework.dagger
+
+import android.app.Application
+import otus.homework.dagger.di.*
+import otus.homework.dagger.di.AppModule
+
+class App : Application() {
+
+    override fun onCreate() {
+        super.onCreate()
+        appComponent = DaggerAppComponent.builder().appModule(AppModule(this)).build()
+        activityComponent = DaggerActivityComponent.factory().create(appComponent)
+        fragmentReceverComponent = DaggerFragmentReceiverComponent.factory().create(activityComponent)
+        fragmentProducerComponent = DaggerFragmentProducerComponent.factory().create(activityComponent)
+    }
+
+    companion object {
+        lateinit var appComponent: AppComponent
+        lateinit var activityComponent: ActivityComponent
+        lateinit var fragmentReceverComponent: FragmentReceiverComponent
+        lateinit var fragmentProducerComponent: FragmentProducerComponent
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/dagger/ColorFlow.kt b/app/src/main/java/otus/homework/dagger/ColorFlow.kt
new file mode 100644
index 00000000..5f31f2b4
--- /dev/null
+++ b/app/src/main/java/otus/homework/dagger/ColorFlow.kt
@@ -0,0 +1,7 @@
+package otus.homework.dagger
+
+import androidx.lifecycle.MutableLiveData
+
+class ColorFlow {
+    var colorObserver = MutableLiveData<Int>()
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/daggerhomework/ColorGenerator.kt b/app/src/main/java/otus/homework/dagger/ColorGenerator.kt
similarity index 84%
rename from app/src/main/java/ru/otus/daggerhomework/ColorGenerator.kt
rename to app/src/main/java/otus/homework/dagger/ColorGenerator.kt
index a9e25a27..0afe58a4 100644
--- a/app/src/main/java/ru/otus/daggerhomework/ColorGenerator.kt
+++ b/app/src/main/java/otus/homework/dagger/ColorGenerator.kt
@@ -1,8 +1,7 @@
-package ru.otus.daggerhomework
+package otus.homework.dagger
 
 import android.graphics.Color
 import androidx.annotation.ColorInt
-import androidx.annotation.ColorRes
 import java.util.*
 
 interface ColorGenerator {
diff --git a/app/src/main/java/ru/otus/daggerhomework/FragmentProducer.kt b/app/src/main/java/otus/homework/dagger/FragmentProducer.kt
similarity index 73%
rename from app/src/main/java/ru/otus/daggerhomework/FragmentProducer.kt
rename to app/src/main/java/otus/homework/dagger/FragmentProducer.kt
index 00dd10dc..1cb3c5eb 100644
--- a/app/src/main/java/ru/otus/daggerhomework/FragmentProducer.kt
+++ b/app/src/main/java/otus/homework/dagger/FragmentProducer.kt
@@ -1,4 +1,4 @@
-package ru.otus.daggerhomework
+package otus.homework.dagger
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -6,20 +6,27 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
 import androidx.fragment.app.Fragment
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.get
+import javax.inject.Inject
 
 class FragmentProducer : Fragment() {
 
+    @Inject lateinit var viewModel: ViewModelProducer
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
+        App.activityComponent.injectInto(this)
         return inflater.inflate(R.layout.fragment_a, container, true)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         view.findViewById<Button>(R.id.button).setOnClickListener {
+            viewModel.generateColor()
             //отправить результат через livedata в другой фрагмент
         }
     }
diff --git a/app/src/main/java/ru/otus/daggerhomework/FragmentReceiver.kt b/app/src/main/java/otus/homework/dagger/FragmentReceiver.kt
similarity index 70%
rename from app/src/main/java/ru/otus/daggerhomework/FragmentReceiver.kt
rename to app/src/main/java/otus/homework/dagger/FragmentReceiver.kt
index e6a3d9af..16ff1adf 100644
--- a/app/src/main/java/ru/otus/daggerhomework/FragmentReceiver.kt
+++ b/app/src/main/java/otus/homework/dagger/FragmentReceiver.kt
@@ -1,4 +1,4 @@
-package ru.otus.daggerhomework
+package otus.homework.dagger
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -7,16 +7,25 @@ import android.view.ViewGroup
 import android.widget.Button
 import androidx.annotation.ColorInt
 import androidx.fragment.app.Fragment
+import androidx.lifecycle.ViewModelProvider
+import javax.inject.Inject
 
 class FragmentReceiver : Fragment() {
 
     private lateinit var frame: View
+    @Inject lateinit var viewModel: ViewModelReceiver
+
 
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
+        App.activityComponent.injectInto(this)
+        viewModel.observer.colorObserver.observe(this) {
+            populateColor(it)
+            viewModel.observeColors()
+        }
         return inflater.inflate(R.layout.fragment_b, container, true)
     }
 
diff --git a/app/src/main/java/ru/otus/daggerhomework/MainActivity.kt b/app/src/main/java/otus/homework/dagger/MainActivity.kt
similarity index 58%
rename from app/src/main/java/ru/otus/daggerhomework/MainActivity.kt
rename to app/src/main/java/otus/homework/dagger/MainActivity.kt
index 1b85e946..7e5791b7 100644
--- a/app/src/main/java/ru/otus/daggerhomework/MainActivity.kt
+++ b/app/src/main/java/otus/homework/dagger/MainActivity.kt
@@ -1,12 +1,15 @@
-package ru.otus.daggerhomework
+package otus.homework.dagger
 
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
 
 class MainActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
+        App.appComponent.injectInto(this)
+        Toast.makeText(App.appComponent.context, "context.toString()", Toast.LENGTH_LONG).show()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/dagger/MyViewModelFactory.kt b/app/src/main/java/otus/homework/dagger/MyViewModelFactory.kt
new file mode 100644
index 00000000..6bc61eed
--- /dev/null
+++ b/app/src/main/java/otus/homework/dagger/MyViewModelFactory.kt
@@ -0,0 +1,18 @@
+package otus.homework.dagger
+
+import android.content.Context
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+
+class MyViewModelFactory constructor(private val context: Context) : ViewModelProvider.Factory {
+
+    override fun <T : ViewModel> create(modelClass: Class<T>): T {
+        return if (modelClass.isAssignableFrom(ViewModelProducer::class.java)) {
+            ViewModelProducer(context = context, colorGenerator = ColorGeneratorImpl()) as T
+        } else if (modelClass.isAssignableFrom(ViewModelReceiver::class.java)) {
+            ViewModelReceiver(context) as T
+        } else {
+            throw IllegalArgumentException("ViewModel Not Found")
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/daggerhomework/ViewModelProducer.kt b/app/src/main/java/otus/homework/dagger/ViewModelProducer.kt
similarity index 62%
rename from app/src/main/java/ru/otus/daggerhomework/ViewModelProducer.kt
rename to app/src/main/java/otus/homework/dagger/ViewModelProducer.kt
index bc035089..22ce1c7f 100644
--- a/app/src/main/java/ru/otus/daggerhomework/ViewModelProducer.kt
+++ b/app/src/main/java/otus/homework/dagger/ViewModelProducer.kt
@@ -1,16 +1,22 @@
-package ru.otus.daggerhomework
+package otus.homework.dagger
 
 import android.content.Context
 import android.widget.Toast
 import androidx.fragment.app.FragmentActivity
+import androidx.lifecycle.ViewModel
+import java.lang.RuntimeException
+import javax.inject.Inject
 
 class ViewModelProducer(
     private val colorGenerator: ColorGenerator,
     private val context: Context
-) {
+) : ViewModel() {
+    @Inject
+    lateinit var observer: ColorFlow
 
     fun generateColor() {
         if (context !is FragmentActivity) throw RuntimeException("Здесь нужен контекст активити")
         Toast.makeText(context, "Color sent", Toast.LENGTH_LONG).show()
+        observer.colorObserver.value = 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/otus/homework/dagger/ViewModelReceiver.kt
similarity index 61%
rename from app/src/main/java/ru/otus/daggerhomework/ViewModelReceiver.kt
rename to app/src/main/java/otus/homework/dagger/ViewModelReceiver.kt
index 8a3a5ead..7505651d 100644
--- a/app/src/main/java/ru/otus/daggerhomework/ViewModelReceiver.kt
+++ b/app/src/main/java/otus/homework/dagger/ViewModelReceiver.kt
@@ -1,12 +1,18 @@
-package ru.otus.daggerhomework
+package otus.homework.dagger
 
 import android.app.Application
 import android.content.Context
 import android.widget.Toast
+import androidx.fragment.app.FragmentActivity
+import androidx.lifecycle.ViewModel
+import java.lang.RuntimeException
+import javax.inject.Inject
 
 class ViewModelReceiver(
     private val context: Context
-) {
+) : ViewModel() {
+    @Inject
+    lateinit var observer: ColorFlow
 
     fun observeColors() {
         if (context !is Application) throw RuntimeException("Здесь нужен контекст апликейшена")
diff --git a/app/src/main/java/otus/homework/dagger/di/ActivityComponent.kt b/app/src/main/java/otus/homework/dagger/di/ActivityComponent.kt
new file mode 100644
index 00000000..ed907d11
--- /dev/null
+++ b/app/src/main/java/otus/homework/dagger/di/ActivityComponent.kt
@@ -0,0 +1,34 @@
+package otus.homework.dagger.di
+
+import android.content.Context
+import dagger.Component
+import dagger.Module
+import dagger.Provides
+import otus.homework.dagger.ColorFlow
+import otus.homework.dagger.FragmentProducer
+import otus.homework.dagger.FragmentReceiver
+import javax.inject.Scope
+
+@ActivityScope
+@Component(dependencies = [AppComponent::class], modules = [ActivityModule::class])
+interface ActivityComponent {
+    var context: Context
+
+    fun injectInto(producer: FragmentProducer)
+    fun injectInto(receiver: FragmentReceiver)
+
+    @Component.Factory
+    interface Factory {
+        fun create(appComponent: AppComponent): ActivityComponent
+    }
+}
+
+@Module
+class ActivityModule {
+    @get:Provides
+    @ActivityScope
+    var observer = ColorFlow()
+}
+
+@Scope
+annotation class ActivityScope
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/dagger/di/ApplicationComponent.kt b/app/src/main/java/otus/homework/dagger/di/ApplicationComponent.kt
new file mode 100644
index 00000000..4ec5d315
--- /dev/null
+++ b/app/src/main/java/otus/homework/dagger/di/ApplicationComponent.kt
@@ -0,0 +1,26 @@
+package otus.homework.dagger.di
+
+import android.content.Context
+import dagger.Component
+import dagger.Module
+import dagger.Provides
+import otus.homework.dagger.App
+import otus.homework.dagger.MainActivity
+import javax.inject.Singleton
+
+@Singleton
+@Component(modules = [AppModule::class])
+interface AppComponent {
+    var context: Context
+
+    fun injectInto(activity: MainActivity)
+}
+
+@Module
+internal class AppModule(var app: App) {
+    @Singleton
+    @Provides
+    fun provideContext(): Context {
+        return app.applicationContext
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/dagger/di/FragmentComponents.kt b/app/src/main/java/otus/homework/dagger/di/FragmentComponents.kt
new file mode 100644
index 00000000..c7aceba9
--- /dev/null
+++ b/app/src/main/java/otus/homework/dagger/di/FragmentComponents.kt
@@ -0,0 +1,59 @@
+package otus.homework.dagger.di
+
+import android.content.Context
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModelStoreOwner
+import dagger.Component
+import dagger.Module
+import dagger.Provides
+import otus.homework.dagger.MyViewModelFactory
+import otus.homework.dagger.ViewModelProducer
+import otus.homework.dagger.ViewModelReceiver
+import javax.inject.Scope
+
+@FragmentScope
+@Component(dependencies = [ActivityComponent::class], modules = [FragmentReceiverModule::class])
+interface FragmentReceiverComponent {
+    var context: Context
+    var vmReceiver: ViewModelReceiver
+
+    @Component.Factory
+    interface Factory {
+        fun create(activityComponent: ActivityComponent): FragmentReceiverComponent
+    }
+}
+
+@Module
+class FragmentReceiverModule(var context: Context) {
+
+    @Provides
+    @FragmentScope
+    fun provideVMReceiver(owner: ViewModelStoreOwner) : ViewModelReceiver {
+        return ViewModelProvider(owner, MyViewModelFactory(context))[ViewModelReceiver::class.java]
+    }
+}
+
+@FragmentScope
+@Component(dependencies = [ActivityComponent::class], modules = [FragmentProducerModule::class])
+interface FragmentProducerComponent {
+
+    var context: Context
+    var vmProducer: ViewModelProducer
+
+    @Component.Factory
+    interface Factory {
+        fun create(activityComponent: ActivityComponent): FragmentProducerComponent
+    }
+}
+@Module
+class FragmentProducerModule(var context: Context) {
+
+    @Provides
+    @FragmentScope
+    fun provideVMReceiver(owner: ViewModelStoreOwner) : ViewModelProducer {
+        return ViewModelProvider(owner, MyViewModelFactory(context))[ViewModelProducer::class.java]
+    }
+}
+
+@Scope
+annotation class FragmentScope
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/daggerhomework/App.kt b/app/src/main/java/ru/otus/daggerhomework/App.kt
deleted file mode 100644
index de363626..00000000
--- a/app/src/main/java/ru/otus/daggerhomework/App.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package ru.otus.daggerhomework
-
-import android.app.Application
-
-class App :Application() {
-}
\ 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/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
index 7361bc1a..2b068d11 100644
--- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
+++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -1,10 +1,9 @@
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
     android:height="108dp"
-    android:viewportHeight="108"
     android:viewportWidth="108"
-    android:width="108dp">
+    android:viewportHeight="108">
     <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
         <aapt:attr name="android:fillColor">
             <gradient
@@ -26,6 +25,6 @@
         android:fillColor="#FFFFFF"
         android:fillType="nonZero"
         android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
-        android:strokeColor="#00000000"
-        android:strokeWidth="1" />
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
index 74852f7d..07d5da9c 100644
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ b/app/src/main/res/drawable/ic_launcher_background.xml
@@ -1,171 +1,170 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
     android:height="108dp"
-    android:viewportHeight="108"
     android:viewportWidth="108"
-    android:width="108dp">
+    android:viewportHeight="108">
     <path
         android:fillColor="#3DDC84"
         android:pathData="M0,0h108v108h-108z" />
     <path
         android:fillColor="#00000000"
         android:pathData="M9,0L9,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
     <path
         android:fillColor="#00000000"
         android:pathData="M19,0L19,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
     <path
         android:fillColor="#00000000"
         android:pathData="M29,0L29,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
     <path
         android:fillColor="#00000000"
         android:pathData="M39,0L39,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
     <path
         android:fillColor="#00000000"
         android:pathData="M49,0L49,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
     <path
         android:fillColor="#00000000"
         android:pathData="M59,0L59,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
     <path
         android:fillColor="#00000000"
         android:pathData="M69,0L69,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
     <path
         android:fillColor="#00000000"
         android:pathData="M79,0L79,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
     <path
         android:fillColor="#00000000"
         android:pathData="M89,0L89,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
     <path
         android:fillColor="#00000000"
         android:pathData="M99,0L99,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
     <path
         android:fillColor="#00000000"
         android:pathData="M0,9L108,9"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
     <path
         android:fillColor="#00000000"
         android:pathData="M0,19L108,19"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
     <path
         android:fillColor="#00000000"
         android:pathData="M0,29L108,29"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
     <path
         android:fillColor="#00000000"
         android:pathData="M0,39L108,39"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
     <path
         android:fillColor="#00000000"
         android:pathData="M0,49L108,49"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
     <path
         android:fillColor="#00000000"
         android:pathData="M0,59L108,59"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
     <path
         android:fillColor="#00000000"
         android:pathData="M0,69L108,69"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
     <path
         android:fillColor="#00000000"
         android:pathData="M0,79L108,79"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
     <path
         android:fillColor="#00000000"
         android:pathData="M0,89L108,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
     <path
         android:fillColor="#00000000"
         android:pathData="M0,99L108,99"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
     <path
         android:fillColor="#00000000"
         android:pathData="M19,29L89,29"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
     <path
         android:fillColor="#00000000"
         android:pathData="M19,39L89,39"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
     <path
         android:fillColor="#00000000"
         android:pathData="M19,49L89,49"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
     <path
         android:fillColor="#00000000"
         android:pathData="M19,59L89,59"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
     <path
         android:fillColor="#00000000"
         android:pathData="M19,69L89,69"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
     <path
         android:fillColor="#00000000"
         android:pathData="M19,79L89,79"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
     <path
         android:fillColor="#00000000"
         android:pathData="M29,19L29,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
     <path
         android:fillColor="#00000000"
         android:pathData="M39,19L39,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
     <path
         android:fillColor="#00000000"
         android:pathData="M49,19L49,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
     <path
         android:fillColor="#00000000"
         android:pathData="M59,19L59,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
     <path
         android:fillColor="#00000000"
         android:pathData="M69,19L69,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
     <path
         android:fillColor="#00000000"
         android:pathData="M79,19L79,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
 </vector>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index 9f692741..eca70cfe 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@drawable/ic_launcher_background" />
     <foreground android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index 9f692741..eca70cfe 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@drawable/ic_launcher_background" />
     <foreground android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 6d7884d4..1249138f 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.DaggerHomework" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <style name="Theme.Flow" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/purple_200</item>
         <item name="colorPrimaryVariant">@color/purple_700</item>
@@ -10,7 +10,7 @@
         <item name="colorSecondaryVariant">@color/teal_200</item>
         <item name="colorOnSecondary">@color/black</item>
         <!-- Status bar color. -->
-        <item tools:targetApi="l" name="android:statusBarColor">?attr/colorPrimaryVariant</item>
+        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d499dbe6..cb8671a1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,4 +1,4 @@
 <resources>
-    <string name="app_name">DaggerHomework</string>
+    <string name="app_name">Dagger Homework</string>
     <string name="generate_color">Generate Color</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index d0d2679b..a791f96b 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.DaggerHomework" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <style name="Theme.Flow" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/purple_500</item>
         <item name="colorPrimaryVariant">@color/purple_700</item>
@@ -10,7 +10,7 @@
         <item name="colorSecondaryVariant">@color/teal_700</item>
         <item name="colorOnSecondary">@color/black</item>
         <!-- Status bar color. -->
-        <item tools:targetApi="l" name="android:statusBarColor">?attr/colorPrimaryVariant</item>
+        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->
     </style>
 </resources>
\ No newline at end of file

From d6460ad31dd0735f62807e358a49b8ec83f9289f Mon Sep 17 00:00:00 2001
From: anton <antonzaritsky@gmail.com>
Date: Thu, 16 Jun 2022 15:35:44 +0200
Subject: [PATCH 2/2] finished homework

---
 app/build.gradle                              | 15 ++++---
 app/src/main/java/otus/homework/dagger/App.kt | 17 +++-----
 .../java/otus/homework/dagger/ColorFlow.kt    |  7 ---
 .../otus/homework/dagger/ColorGenerator.kt    |  3 +-
 .../otus/homework/dagger/FragmentProducer.kt  | 19 +++++---
 .../otus/homework/dagger/FragmentReceiver.kt  | 31 +++++++++----
 .../java/otus/homework/dagger/MainActivity.kt |  8 ++--
 .../homework/dagger/MyViewModelFactory.kt     | 18 --------
 .../homework/dagger/ViewModelFactories.kt     | 38 ++++++++++++++++
 .../otus/homework/dagger/ViewModelProducer.kt | 12 +++---
 .../otus/homework/dagger/ViewModelReceiver.kt | 10 ++---
 .../homework/dagger/di/ActivityComponent.kt   | 29 ++++++++-----
 .../otus/homework/dagger/di/AppComponent.kt   | 21 +++++++++
 .../dagger/di/ApplicationComponent.kt         | 26 -----------
 .../homework/dagger/di/FragmentComponents.kt  | 43 +++++++++----------
 app/src/main/res/layout/activity_main.xml     | 32 +++++++++++---
 16 files changed, 191 insertions(+), 138 deletions(-)
 delete mode 100644 app/src/main/java/otus/homework/dagger/ColorFlow.kt
 delete mode 100644 app/src/main/java/otus/homework/dagger/MyViewModelFactory.kt
 create mode 100644 app/src/main/java/otus/homework/dagger/ViewModelFactories.kt
 create mode 100644 app/src/main/java/otus/homework/dagger/di/AppComponent.kt
 delete mode 100644 app/src/main/java/otus/homework/dagger/di/ApplicationComponent.kt

diff --git a/app/build.gradle b/app/build.gradle
index 705d0941..9ea1f757 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,12 +5,12 @@ plugins {
 }
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 32
 
     defaultConfig {
         applicationId "ru.otus.daggerhomework"
         minSdkVersion 23
-        targetSdkVersion 31
+        targetSdkVersion 32
         versionCode 1
         versionName "1.0"
 
@@ -35,9 +35,14 @@ android {
 dependencies {
     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 'androidx.appcompat:appcompat:1.4.2'
+    implementation 'com.google.android.material:material:1.6.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.0-rc02'
+    implementation 'androidx.fragment:fragment-ktx:1.4.1'
+
     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/java/otus/homework/dagger/App.kt b/app/src/main/java/otus/homework/dagger/App.kt
index e6f461dd..d296bd2e 100644
--- a/app/src/main/java/otus/homework/dagger/App.kt
+++ b/app/src/main/java/otus/homework/dagger/App.kt
@@ -2,22 +2,15 @@ package otus.homework.dagger
 
 import android.app.Application
 import otus.homework.dagger.di.*
-import otus.homework.dagger.di.AppModule
 
 class App : Application() {
 
+    lateinit var appComponent: AppComponent
+
     override fun onCreate() {
         super.onCreate()
-        appComponent = DaggerAppComponent.builder().appModule(AppModule(this)).build()
-        activityComponent = DaggerActivityComponent.factory().create(appComponent)
-        fragmentReceverComponent = DaggerFragmentReceiverComponent.factory().create(activityComponent)
-        fragmentProducerComponent = DaggerFragmentProducerComponent.factory().create(activityComponent)
-    }
-
-    companion object {
-        lateinit var appComponent: AppComponent
-        lateinit var activityComponent: ActivityComponent
-        lateinit var fragmentReceverComponent: FragmentReceiverComponent
-        lateinit var fragmentProducerComponent: FragmentProducerComponent
+        appComponent = DaggerAppComponent
+                .factory()
+            .create(applicationContext)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/dagger/ColorFlow.kt b/app/src/main/java/otus/homework/dagger/ColorFlow.kt
deleted file mode 100644
index 5f31f2b4..00000000
--- a/app/src/main/java/otus/homework/dagger/ColorFlow.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package otus.homework.dagger
-
-import androidx.lifecycle.MutableLiveData
-
-class ColorFlow {
-    var colorObserver = MutableLiveData<Int>()
-}
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/dagger/ColorGenerator.kt b/app/src/main/java/otus/homework/dagger/ColorGenerator.kt
index 0afe58a4..85a372d1 100644
--- a/app/src/main/java/otus/homework/dagger/ColorGenerator.kt
+++ b/app/src/main/java/otus/homework/dagger/ColorGenerator.kt
@@ -3,6 +3,7 @@ package otus.homework.dagger
 import android.graphics.Color
 import androidx.annotation.ColorInt
 import java.util.*
+import javax.inject.Inject
 
 interface ColorGenerator {
 
@@ -10,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/otus/homework/dagger/FragmentProducer.kt b/app/src/main/java/otus/homework/dagger/FragmentProducer.kt
index 1cb3c5eb..c71c1826 100644
--- a/app/src/main/java/otus/homework/dagger/FragmentProducer.kt
+++ b/app/src/main/java/otus/homework/dagger/FragmentProducer.kt
@@ -1,25 +1,27 @@
 package otus.homework.dagger
 
+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.ViewModelProvider
-import androidx.lifecycle.get
+import androidx.fragment.app.viewModels
+import otus.homework.dagger.di.DaggerFragmentProducerComponent
 import javax.inject.Inject
 
 class FragmentProducer : Fragment() {
 
-    @Inject lateinit var viewModel: ViewModelProducer
+    @Inject
+    lateinit var viewModelFactory: VMFactoryProducer
+    private val viewModel: ViewModelProducer by viewModels { viewModelFactory }
 
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        App.activityComponent.injectInto(this)
         return inflater.inflate(R.layout.fragment_a, container, true)
     }
 
@@ -27,7 +29,14 @@ class FragmentProducer : Fragment() {
         super.onViewCreated(view, savedInstanceState)
         view.findViewById<Button>(R.id.button).setOnClickListener {
             viewModel.generateColor()
-            //отправить результат через livedata в другой фрагмент
         }
     }
+
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+        DaggerFragmentProducerComponent
+            .factory()
+            .create((requireActivity() as MainActivity).activityComponent)
+            .inject(this)
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/dagger/FragmentReceiver.kt b/app/src/main/java/otus/homework/dagger/FragmentReceiver.kt
index 16ff1adf..4c534f68 100644
--- a/app/src/main/java/otus/homework/dagger/FragmentReceiver.kt
+++ b/app/src/main/java/otus/homework/dagger/FragmentReceiver.kt
@@ -1,40 +1,53 @@
 package otus.homework.dagger
 
+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.annotation.ColorInt
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.ViewModelProvider
+import androidx.fragment.app.viewModels
+import otus.homework.dagger.di.DaggerFragmentReceiverComponent
 import javax.inject.Inject
 
 class FragmentReceiver : Fragment() {
 
     private lateinit var frame: View
-    @Inject lateinit var viewModel: ViewModelReceiver
 
+    @Inject
+    lateinit var viewModelFactory: VMFactoryReceiver
+    private val viewModel: ViewModelReceiver by viewModels { viewModelFactory }
 
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        App.activityComponent.injectInto(this)
-        viewModel.observer.colorObserver.observe(this) {
-            populateColor(it)
-            viewModel.observeColors()
-        }
         return inflater.inflate(R.layout.fragment_b, container, true)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         frame = view.findViewById(R.id.frame)
+        viewModel.observer.observe(viewLifecycleOwner) {
+            populateColor(it)
+            viewModel.observeColors()
+        }
     }
 
-    fun populateColor(@ColorInt color: Int) {
+    private fun populateColor(@ColorInt color: Int) {
         frame.setBackgroundColor(color)
     }
+
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+        DaggerFragmentReceiverComponent
+            .factory()
+            .create(
+                (requireActivity().applicationContext as App).appComponent,
+                (requireActivity() as MainActivity).activityComponent
+            )
+            .inject(this)
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/dagger/MainActivity.kt b/app/src/main/java/otus/homework/dagger/MainActivity.kt
index 7e5791b7..4da89ade 100644
--- a/app/src/main/java/otus/homework/dagger/MainActivity.kt
+++ b/app/src/main/java/otus/homework/dagger/MainActivity.kt
@@ -1,15 +1,17 @@
 package otus.homework.dagger
 
 import android.os.Bundle
-import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
+import otus.homework.dagger.di.ActivityComponent
+import otus.homework.dagger.di.DaggerActivityComponent
 
 class MainActivity : AppCompatActivity() {
 
+    lateinit var activityComponent: ActivityComponent
+
     override fun onCreate(savedInstanceState: Bundle?) {
+        activityComponent = DaggerActivityComponent.factory().create(this)
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
-        App.appComponent.injectInto(this)
-        Toast.makeText(App.appComponent.context, "context.toString()", Toast.LENGTH_LONG).show()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/dagger/MyViewModelFactory.kt b/app/src/main/java/otus/homework/dagger/MyViewModelFactory.kt
deleted file mode 100644
index 6bc61eed..00000000
--- a/app/src/main/java/otus/homework/dagger/MyViewModelFactory.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package otus.homework.dagger
-
-import android.content.Context
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
-
-class MyViewModelFactory constructor(private val context: Context) : ViewModelProvider.Factory {
-
-    override fun <T : ViewModel> create(modelClass: Class<T>): T {
-        return if (modelClass.isAssignableFrom(ViewModelProducer::class.java)) {
-            ViewModelProducer(context = context, colorGenerator = ColorGeneratorImpl()) as T
-        } else if (modelClass.isAssignableFrom(ViewModelReceiver::class.java)) {
-            ViewModelReceiver(context) as T
-        } else {
-            throw IllegalArgumentException("ViewModel Not Found")
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/dagger/ViewModelFactories.kt b/app/src/main/java/otus/homework/dagger/ViewModelFactories.kt
new file mode 100644
index 00000000..8497e4c9
--- /dev/null
+++ b/app/src/main/java/otus/homework/dagger/ViewModelFactories.kt
@@ -0,0 +1,38 @@
+package otus.homework.dagger
+
+import android.content.Context
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import otus.homework.dagger.di.ActivityScope
+import otus.homework.dagger.di.AppScope
+import javax.inject.Inject
+
+class VMFactoryProducer @Inject constructor(
+    private val colorGenerator: ColorGenerator,
+    @ActivityScope private val context: Context,
+    private val observer: MutableLiveData<Int>
+) : ViewModelProvider.Factory {
+
+    override fun <T : ViewModel> create(modelClass: Class<T>): T {
+        return if (modelClass.isAssignableFrom(ViewModelProducer::class.java)) {
+            ViewModelProducer(context = context, colorGenerator = colorGenerator, observer = observer) as T
+        } else {
+            throw IllegalArgumentException("ViewModel Not Found")
+        }
+    }
+}
+
+class VMFactoryReceiver @Inject constructor(
+    @AppScope private val context: Context,
+    private val observer: MutableLiveData<Int>
+) : ViewModelProvider.Factory {
+
+    override fun <T : ViewModel> create(modelClass: Class<T>): T {
+        return if (modelClass.isAssignableFrom(ViewModelReceiver::class.java)) {
+            ViewModelReceiver(context, observer = observer) as T
+        } else {
+            throw IllegalArgumentException("ViewModel Not Found")
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/dagger/ViewModelProducer.kt b/app/src/main/java/otus/homework/dagger/ViewModelProducer.kt
index 22ce1c7f..4ec1a167 100644
--- a/app/src/main/java/otus/homework/dagger/ViewModelProducer.kt
+++ b/app/src/main/java/otus/homework/dagger/ViewModelProducer.kt
@@ -3,20 +3,20 @@ package otus.homework.dagger
 import android.content.Context
 import android.widget.Toast
 import androidx.fragment.app.FragmentActivity
+import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import java.lang.RuntimeException
 import javax.inject.Inject
 
-class ViewModelProducer(
-    private val colorGenerator: ColorGenerator,
-    private val context: Context
+class ViewModelProducer @Inject constructor (
+    private val colorGenerator: ColorGenerator?,
+    private val context: Context,
+    private val observer: MutableLiveData<Int>
 ) : ViewModel() {
-    @Inject
-    lateinit var observer: ColorFlow
 
     fun generateColor() {
         if (context !is FragmentActivity) throw RuntimeException("Здесь нужен контекст активити")
+        observer.value = colorGenerator?.generateColor()
         Toast.makeText(context, "Color sent", Toast.LENGTH_LONG).show()
-        observer.colorObserver.value = colorGenerator.generateColor()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/dagger/ViewModelReceiver.kt b/app/src/main/java/otus/homework/dagger/ViewModelReceiver.kt
index 7505651d..5ea297af 100644
--- a/app/src/main/java/otus/homework/dagger/ViewModelReceiver.kt
+++ b/app/src/main/java/otus/homework/dagger/ViewModelReceiver.kt
@@ -3,16 +3,14 @@ package otus.homework.dagger
 import android.app.Application
 import android.content.Context
 import android.widget.Toast
-import androidx.fragment.app.FragmentActivity
+import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import java.lang.RuntimeException
 import javax.inject.Inject
 
-class ViewModelReceiver(
-    private val context: Context
+class ViewModelReceiver @Inject constructor(
+    private val context: Context,
+    val observer: MutableLiveData<Int>
 ) : ViewModel() {
-    @Inject
-    lateinit var observer: ColorFlow
 
     fun observeColors() {
         if (context !is Application) throw RuntimeException("Здесь нужен контекст апликейшена")
diff --git a/app/src/main/java/otus/homework/dagger/di/ActivityComponent.kt b/app/src/main/java/otus/homework/dagger/di/ActivityComponent.kt
index ed907d11..9cebffa1 100644
--- a/app/src/main/java/otus/homework/dagger/di/ActivityComponent.kt
+++ b/app/src/main/java/otus/homework/dagger/di/ActivityComponent.kt
@@ -1,25 +1,34 @@
 package otus.homework.dagger.di
 
 import android.content.Context
+import androidx.lifecycle.MutableLiveData
+import dagger.BindsInstance
 import dagger.Component
 import dagger.Module
 import dagger.Provides
-import otus.homework.dagger.ColorFlow
-import otus.homework.dagger.FragmentProducer
-import otus.homework.dagger.FragmentReceiver
 import javax.inject.Scope
 
 @ActivityScope
-@Component(dependencies = [AppComponent::class], modules = [ActivityModule::class])
+@Component(modules = [MainActivityModule::class])
 interface ActivityComponent {
-    var context: Context
-
-    fun injectInto(producer: FragmentProducer)
-    fun injectInto(receiver: FragmentReceiver)
 
     @Component.Factory
     interface Factory {
-        fun create(appComponent: AppComponent): ActivityComponent
+        fun create(@BindsInstance context: Context): ActivityComponent
+    }
+
+    fun activityContext(): Context
+
+    val observer: MutableLiveData<Int>
+}
+
+@Module
+class MainActivityModule {
+
+    @Provides
+    @ActivityScope
+    fun provideColorEvent(): MutableLiveData<Int> {
+        return MutableLiveData<Int>()
     }
 }
 
@@ -27,7 +36,7 @@ interface ActivityComponent {
 class ActivityModule {
     @get:Provides
     @ActivityScope
-    var observer = ColorFlow()
+    var observer = MutableLiveData<Int>()
 }
 
 @Scope
diff --git a/app/src/main/java/otus/homework/dagger/di/AppComponent.kt b/app/src/main/java/otus/homework/dagger/di/AppComponent.kt
new file mode 100644
index 00000000..0ceadb0e
--- /dev/null
+++ b/app/src/main/java/otus/homework/dagger/di/AppComponent.kt
@@ -0,0 +1,21 @@
+package otus.homework.dagger.di
+
+import android.content.Context
+import dagger.BindsInstance
+import dagger.Component
+import javax.inject.Qualifier
+
+@AppScope
+@Component
+interface AppComponent {
+    @AppScope
+    fun applicationContext(): Context
+
+    @Component.Factory
+    interface Factory {
+        fun create(@AppScope @BindsInstance appContext: Context): AppComponent
+    }
+}
+
+@Qualifier
+annotation class AppScope
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/dagger/di/ApplicationComponent.kt b/app/src/main/java/otus/homework/dagger/di/ApplicationComponent.kt
deleted file mode 100644
index 4ec5d315..00000000
--- a/app/src/main/java/otus/homework/dagger/di/ApplicationComponent.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package otus.homework.dagger.di
-
-import android.content.Context
-import dagger.Component
-import dagger.Module
-import dagger.Provides
-import otus.homework.dagger.App
-import otus.homework.dagger.MainActivity
-import javax.inject.Singleton
-
-@Singleton
-@Component(modules = [AppModule::class])
-interface AppComponent {
-    var context: Context
-
-    fun injectInto(activity: MainActivity)
-}
-
-@Module
-internal class AppModule(var app: App) {
-    @Singleton
-    @Provides
-    fun provideContext(): Context {
-        return app.applicationContext
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/dagger/di/FragmentComponents.kt b/app/src/main/java/otus/homework/dagger/di/FragmentComponents.kt
index c7aceba9..bd1794e9 100644
--- a/app/src/main/java/otus/homework/dagger/di/FragmentComponents.kt
+++ b/app/src/main/java/otus/homework/dagger/di/FragmentComponents.kt
@@ -1,58 +1,55 @@
 package otus.homework.dagger.di
 
-import android.content.Context
-import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelStoreOwner
+import dagger.Binds
 import dagger.Component
 import dagger.Module
-import dagger.Provides
-import otus.homework.dagger.MyViewModelFactory
-import otus.homework.dagger.ViewModelProducer
-import otus.homework.dagger.ViewModelReceiver
+import otus.homework.dagger.ColorGenerator
+import otus.homework.dagger.ColorGeneratorImpl
+import otus.homework.dagger.FragmentProducer
+import otus.homework.dagger.FragmentReceiver
 import javax.inject.Scope
 
 @FragmentScope
-@Component(dependencies = [ActivityComponent::class], modules = [FragmentReceiverModule::class])
+@Component(dependencies = [AppComponent::class, ActivityComponent::class], modules = [FragmentReceiverModule::class])
 interface FragmentReceiverComponent {
-    var context: Context
-    var vmReceiver: ViewModelReceiver
+
+    fun inject(fragmentReceiver: FragmentReceiver)
 
     @Component.Factory
     interface Factory {
-        fun create(activityComponent: ActivityComponent): FragmentReceiverComponent
+        fun create(
+            appComponent: AppComponent,
+            activityComponent: ActivityComponent
+        ): FragmentReceiverComponent
     }
 }
 
 @Module
-class FragmentReceiverModule(var context: Context) {
+interface FragmentReceiverModule {
 
-    @Provides
     @FragmentScope
-    fun provideVMReceiver(owner: ViewModelStoreOwner) : ViewModelReceiver {
-        return ViewModelProvider(owner, MyViewModelFactory(context))[ViewModelReceiver::class.java]
-    }
+    @Binds
+    fun bindColorGenerator(colorGeneratorImpl: ColorGeneratorImpl): ColorGenerator
 }
 
 @FragmentScope
 @Component(dependencies = [ActivityComponent::class], modules = [FragmentProducerModule::class])
 interface FragmentProducerComponent {
 
-    var context: Context
-    var vmProducer: ViewModelProducer
+    fun inject(fragmentProducer: FragmentProducer)
 
     @Component.Factory
     interface Factory {
         fun create(activityComponent: ActivityComponent): FragmentProducerComponent
     }
 }
+
 @Module
-class FragmentProducerModule(var context: Context) {
+interface FragmentProducerModule {
 
-    @Provides
     @FragmentScope
-    fun provideVMReceiver(owner: ViewModelStoreOwner) : ViewModelProducer {
-        return ViewModelProvider(owner, MyViewModelFactory(context))[ViewModelProducer::class.java]
-    }
+    @Binds
+    fun bindColorGenerator(colorGeneratorImpl: ColorGeneratorImpl): ColorGenerator
 }
 
 @Scope
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 79ae6993..a6a94e43 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,19 +1,37 @@
 <?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:id="@+id/fragment_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
-    <TextView
+    <fragment
+        android:id="@+id/fragment_producer"
+        android:name="otus.homework.dagger.FragmentProducer"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.5"
+        app:layout_constraintBottom_toTopOf="@id/guideline"
+        tools:context=".FragmentProducer" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Hello World!"
+        android:orientation="horizontal"
+        app:layout_constraintGuide_percent="0.5" />
+
+    <fragment
+        android:id="@+id/fragment_receiver"
+        android:name="otus.homework.dagger.FragmentReceiver"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintVertical_bias="0.5"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toBottomOf="@id/guideline"
+        tools:context=".FragmentReceiver" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file