From 824beb34454912a4ed415bb697d18fdd3ca957a0 Mon Sep 17 00:00:00 2001
From: Artem Nagorny <agnagor3@mts.ru>
Date: Tue, 28 May 2024 10:38:14 +0300
Subject: [PATCH 1/2] =?UTF-8?q?=D0=A0=D0=B5=D1=88=D0=B5=D0=BD=D0=B8=D0=B5?=
 =?UTF-8?q?=20=D0=94=D0=97=20=D0=BF=D0=BE=20Dagger=202?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |  4 +-
 app/src/main/AndroidManifest.xml              |  4 +-
 .../main/java/ru/otus/daggerhomework/App.kt   | 17 +++++-
 .../daggerhomework/ApplicationComponent.kt    | 23 ++++++++
 .../ru/otus/daggerhomework/ColorGenerator.kt  |  4 +-
 .../ru/otus/daggerhomework/ColorObservable.kt | 29 +++++++++++
 .../ru/otus/daggerhomework/FeatureScope.kt    |  6 +++
 .../otus/daggerhomework/FragmentProducer.kt   | 19 ++++++-
 .../otus/daggerhomework/FragmentReceiver.kt   | 23 +++++++-
 .../ru/otus/daggerhomework/MainActivity.kt    | 23 ++++++++
 .../daggerhomework/MainActivityComponent.kt   | 52 +++++++++++++++++++
 .../otus/daggerhomework/ProducerComponent.kt  | 33 ++++++++++++
 .../otus/daggerhomework/ReceiverComponent.kt  | 30 +++++++++++
 .../otus/daggerhomework/ViewModelProducer.kt  | 31 +++++++++--
 .../otus/daggerhomework/ViewModelReceiver.kt  | 49 +++++++++++++++--
 app/src/main/res/layout/activity_main.xml     | 28 ++++++----
 16 files changed, 348 insertions(+), 27 deletions(-)
 create mode 100644 app/src/main/java/ru/otus/daggerhomework/ColorObservable.kt
 create mode 100644 app/src/main/java/ru/otus/daggerhomework/FeatureScope.kt
 create mode 100644 app/src/main/java/ru/otus/daggerhomework/MainActivityComponent.kt
 create mode 100644 app/src/main/java/ru/otus/daggerhomework/ProducerComponent.kt
 create mode 100644 app/src/main/java/ru/otus/daggerhomework/ReceiverComponent.kt

diff --git a/app/build.gradle b/app/build.gradle
index 705d0941..e1e81ed7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,12 +5,12 @@ plugins {
 }
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 34
 
     defaultConfig {
         applicationId "ru.otus.daggerhomework"
         minSdkVersion 23
-        targetSdkVersion 31
+        targetSdkVersion 34
         versionCode 1
         versionName "1.0"
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index fe328c68..89276e20 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -4,13 +4,15 @@
     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..731a4d0d 100644
--- a/app/src/main/java/ru/otus/daggerhomework/App.kt
+++ b/app/src/main/java/ru/otus/daggerhomework/App.kt
@@ -2,5 +2,20 @@ package ru.otus.daggerhomework
 
 import android.app.Application
 
-class App :Application() {
+class App : Application() {
+  override fun onCreate() {
+    super.onCreate()
+    initializeDI()
+  }
+
+  fun getApplicationComponent(): ApplicationComponent = appComponent
+
+  private fun initializeDI() {
+    appComponent = DaggerApplicationComponent.factory()
+      .create(this)
+  }
+
+  companion object {
+    private lateinit var appComponent: ApplicationComponent
+  }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/daggerhomework/ApplicationComponent.kt b/app/src/main/java/ru/otus/daggerhomework/ApplicationComponent.kt
index fc47f256..47e78804 100644
--- a/app/src/main/java/ru/otus/daggerhomework/ApplicationComponent.kt
+++ b/app/src/main/java/ru/otus/daggerhomework/ApplicationComponent.kt
@@ -1,4 +1,27 @@
 package ru.otus.daggerhomework
 
+import android.content.Context
+import dagger.BindsInstance
+import dagger.Component
+import javax.inject.Qualifier
+import javax.inject.Singleton
+
+@Qualifier
+annotation class ContextApplication
+
+@Singleton
+@Component(
+  modules = [],
+)
 interface ApplicationComponent {
+
+  @Component.Factory
+  interface Factory {
+    fun create(
+      @BindsInstance @ContextApplication context: Context,
+    ): ApplicationComponent
+  }
+
+  @ContextApplication
+  fun provideApplicationContext(): Context
 }
\ 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..9e2ff35a 100644
--- a/app/src/main/java/ru/otus/daggerhomework/ColorGenerator.kt
+++ b/app/src/main/java/ru/otus/daggerhomework/ColorGenerator.kt
@@ -2,8 +2,8 @@ package ru.otus.daggerhomework
 
 import android.graphics.Color
 import androidx.annotation.ColorInt
-import androidx.annotation.ColorRes
 import java.util.*
+import javax.inject.Inject
 
 interface ColorGenerator {
 
@@ -11,7 +11,7 @@ interface ColorGenerator {
     fun generateColor(): Int
 }
 
-class ColorGeneratorImpl : ColorGenerator {
+class ColorGeneratorImpl @Inject constructor() : ColorGenerator {
 
     override fun generateColor(): Int {
         val rnd = Random()
diff --git a/app/src/main/java/ru/otus/daggerhomework/ColorObservable.kt b/app/src/main/java/ru/otus/daggerhomework/ColorObservable.kt
new file mode 100644
index 00000000..6da8eaf1
--- /dev/null
+++ b/app/src/main/java/ru/otus/daggerhomework/ColorObservable.kt
@@ -0,0 +1,29 @@
+package ru.otus.daggerhomework
+
+interface IObserver<T> {
+  fun notify(data: T)
+}
+
+interface IColorObservable {
+  fun add(observer: IObserver<Int>)
+
+  fun remove(observer: IObserver<Int>)
+
+  fun notify(data: Int)
+}
+
+class ColorObservableImpl: IColorObservable {
+  private val observers = mutableListOf<IObserver<Int>>()
+
+  override fun add(observer: IObserver<Int>) {
+    observers.add(observer)
+  }
+
+  override fun remove(observer: IObserver<Int>) {
+    observers.remove(observer)
+  }
+
+  override fun notify(data: Int) {
+    observers.forEach { it.notify(data) }
+  }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/daggerhomework/FeatureScope.kt b/app/src/main/java/ru/otus/daggerhomework/FeatureScope.kt
new file mode 100644
index 00000000..18985287
--- /dev/null
+++ b/app/src/main/java/ru/otus/daggerhomework/FeatureScope.kt
@@ -0,0 +1,6 @@
+package ru.otus.daggerhomework
+
+import javax.inject.Scope
+
+@Scope
+annotation class FeatureScope
\ 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..0125494a 100644
--- a/app/src/main/java/ru/otus/daggerhomework/FragmentProducer.kt
+++ b/app/src/main/java/ru/otus/daggerhomework/FragmentProducer.kt
@@ -6,21 +6,38 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
 import androidx.fragment.app.Fragment
+import androidx.lifecycle.ViewModelProvider
+import javax.inject.Inject
 
 class FragmentProducer : Fragment() {
+    @Inject
+    lateinit var viewModelFactory: ViewModelProvider.Factory
+
+    private lateinit var viewModelProducer: ViewModelProducer
 
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        return inflater.inflate(R.layout.fragment_a, container, true)
+        ProducerComponent
+            .getProducerComponent(
+                (requireActivity() as MainActivity).getMainActivityComponent(),
+            )
+            .inject(this)
+
+        return inflater.inflate(R.layout.fragment_a, container, false)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+
+        viewModelProducer = ViewModelProvider(this, viewModelFactory)
+            .get(ViewModelProducer::class.java)
+
         view.findViewById<Button>(R.id.button).setOnClickListener {
             //отправить результат через 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..9f99fe89 100644
--- a/app/src/main/java/ru/otus/daggerhomework/FragmentReceiver.kt
+++ b/app/src/main/java/ru/otus/daggerhomework/FragmentReceiver.kt
@@ -4,11 +4,17 @@ 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 javax.inject.Inject
 
 class FragmentReceiver : Fragment() {
+    @Inject
+    lateinit var viewModelFactory: ViewModelProvider.Factory
+
+
+    private lateinit var viewModelReceiver: ViewModelReceiver
 
     private lateinit var frame: View
 
@@ -17,12 +23,25 @@ class FragmentReceiver : Fragment() {
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        return inflater.inflate(R.layout.fragment_b, container, true)
+        ReceiverComponent
+            .getReceiverComponent(
+                (requireActivity() as MainActivity).getMainActivityComponent()
+            )
+            .inject(this)
+
+        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)
+        viewModelReceiver = ViewModelProvider(this, viewModelFactory)
+            .get(ViewModelReceiver::class.java)
+
+        viewModelReceiver.state.observe(viewLifecycleOwner) {
+            populateColor(it)
+        }
     }
 
     fun populateColor(@ColorInt color: Int) {
diff --git a/app/src/main/java/ru/otus/daggerhomework/MainActivity.kt b/app/src/main/java/ru/otus/daggerhomework/MainActivity.kt
index 1b85e946..d30a5591 100644
--- a/app/src/main/java/ru/otus/daggerhomework/MainActivity.kt
+++ b/app/src/main/java/ru/otus/daggerhomework/MainActivity.kt
@@ -1,12 +1,35 @@
 package ru.otus.daggerhomework
 
+import android.content.Context
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import javax.inject.Inject
 
 class MainActivity : AppCompatActivity() {
+    @Inject
+    @ContextApplication
+    lateinit var _applicationContext: Context
+
+    @Inject
+    @ContextActivity
+    lateinit var _activityContext: Context
+
+    private lateinit var mainActivityComponent: MainActivityComponent
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
+
+        mainActivityComponent = DaggerMainActivityComponent
+            .factory()
+            .create(
+                applicationComponent = (application as App)
+                    .getApplicationComponent(),
+                context = this,
+            )
+        mainActivityComponent.inject(this)
     }
+
+    fun getMainActivityComponent(): MainActivityComponent =
+        mainActivityComponent
 }
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/daggerhomework/MainActivityComponent.kt b/app/src/main/java/ru/otus/daggerhomework/MainActivityComponent.kt
new file mode 100644
index 00000000..3cfb4108
--- /dev/null
+++ b/app/src/main/java/ru/otus/daggerhomework/MainActivityComponent.kt
@@ -0,0 +1,52 @@
+package ru.otus.daggerhomework
+
+import android.content.Context
+import dagger.BindsInstance
+import dagger.Component
+import dagger.Module
+import dagger.Provides
+import javax.inject.Qualifier
+import javax.inject.Scope
+
+@Scope
+annotation class ActivityScope
+
+@Qualifier
+annotation class ContextActivity
+
+@ActivityScope
+@Component(
+  modules = [MainActivityModule::class],
+  dependencies = [ApplicationComponent::class],
+)
+interface MainActivityComponent {
+
+  @Component.Factory
+  interface Factory {
+    fun create(
+      applicationComponent: ApplicationComponent,
+      @BindsInstance @ContextActivity context: Context,
+    ): MainActivityComponent
+  }
+
+  @ContextApplication
+  fun provideApplicationContext(): Context
+
+  @ContextActivity
+  fun provideActivityContext(): Context
+
+  fun provideObservable(): IColorObservable
+
+  fun inject(mainActivity: MainActivity)
+}
+
+@Module
+interface MainActivityModule {
+  companion object {
+    @ActivityScope
+    @Provides
+    fun provideObservable(): IColorObservable {
+      return ColorObservableImpl()
+    }
+  }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/daggerhomework/ProducerComponent.kt b/app/src/main/java/ru/otus/daggerhomework/ProducerComponent.kt
new file mode 100644
index 00000000..35bfad77
--- /dev/null
+++ b/app/src/main/java/ru/otus/daggerhomework/ProducerComponent.kt
@@ -0,0 +1,33 @@
+package ru.otus.daggerhomework
+
+import androidx.lifecycle.ViewModelProvider
+import dagger.Binds
+import dagger.Component
+import dagger.Module
+
+@FeatureScope
+@Component(
+  modules = [ProducerModule::class],
+  dependencies = [MainActivityComponent::class],
+)
+interface ProducerComponent {
+  companion object {
+    fun getProducerComponent(cmpt: MainActivityComponent): ProducerComponent {
+      return DaggerProducerComponent
+        .builder()
+        .mainActivityComponent(cmpt)
+        .build()
+    }
+  }
+
+  fun inject(fragmentProducer: FragmentProducer)
+}
+
+@Module
+interface ProducerModule {
+  @Binds
+  fun bindFactory(factory: ViewModelProducerFactory): ViewModelProvider.Factory
+
+  @Binds
+  fun bindColorGenerator(impl: ColorGeneratorImpl): ColorGenerator
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/daggerhomework/ReceiverComponent.kt b/app/src/main/java/ru/otus/daggerhomework/ReceiverComponent.kt
new file mode 100644
index 00000000..732a9798
--- /dev/null
+++ b/app/src/main/java/ru/otus/daggerhomework/ReceiverComponent.kt
@@ -0,0 +1,30 @@
+package ru.otus.daggerhomework
+
+import androidx.lifecycle.ViewModelProvider
+import dagger.Binds
+import dagger.Component
+import dagger.Module
+
+@FeatureScope
+@Component(
+  modules = [ReceiverModule::class],
+  dependencies = [MainActivityComponent::class],
+)
+interface ReceiverComponent {
+  companion object {
+    fun getReceiverComponent(cmpt: MainActivityComponent): ReceiverComponent {
+      return DaggerReceiverComponent
+        .builder()
+        .mainActivityComponent(cmpt)
+        .build()
+    }
+  }
+
+  fun inject(fragmentReceiver: FragmentReceiver)
+}
+
+@Module
+interface ReceiverModule {
+  @Binds
+  fun bindFactory(factory: ViewModelReceiverFactory): ViewModelProvider.Factory
+}
\ 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..809733c5 100644
--- a/app/src/main/java/ru/otus/daggerhomework/ViewModelProducer.kt
+++ b/app/src/main/java/ru/otus/daggerhomework/ViewModelProducer.kt
@@ -3,14 +3,39 @@ package ru.otus.daggerhomework
 import android.content.Context
 import android.widget.Toast
 import androidx.fragment.app.FragmentActivity
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import javax.inject.Inject
 
 class ViewModelProducer(
     private val colorGenerator: ColorGenerator,
-    private val context: Context
-) {
+    @ContextActivity private val context: Context,
+    private val colorObservable: IColorObservable,
+): ViewModel() {
 
     fun generateColor() {
         if (context !is FragmentActivity) throw RuntimeException("Здесь нужен контекст активити")
-        Toast.makeText(context, "Color sent", Toast.LENGTH_LONG).show()
+
+        val newColor = colorGenerator.generateColor()
+        colorObservable.notify(newColor)
+
+        Toast.makeText(context, "Color sent $newColor", Toast.LENGTH_LONG).show()
+    }
+}
+
+class ViewModelProducerFactory @Inject constructor(
+    private val colorGenerator: ColorGenerator,
+    @ContextActivity private val context: Context,
+    private val colorObservable: IColorObservable,
+) : ViewModelProvider.Factory {
+    override fun <T : ViewModel?> create(modelClass: Class<T>): T {
+        if (modelClass.isAssignableFrom(ViewModelProducer::class.java))
+            return ViewModelProducer(
+                colorGenerator,
+                context,
+                colorObservable,
+            ) as T
+        else throw IllegalArgumentException()
     }
+
 }
\ 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..72c00fb2 100644
--- a/app/src/main/java/ru/otus/daggerhomework/ViewModelReceiver.kt
+++ b/app/src/main/java/ru/otus/daggerhomework/ViewModelReceiver.kt
@@ -3,13 +3,54 @@ package ru.otus.daggerhomework
 import android.app.Application
 import android.content.Context
 import android.widget.Toast
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import javax.inject.Inject
 
 class ViewModelReceiver(
-    private val context: Context
-) {
+    @ContextApplication private val context: Context,
+    private val colorObservable: IColorObservable,
+) : ViewModel() {
+    private val mutableState = MutableLiveData<Int>()
+    val state: LiveData<Int> = mutableState
 
-    fun observeColors() {
+    private val colorObserver = object : IObserver<Int> {
+        override fun notify(data: Int) {
+            observeColors(data)
+        }
+    }
+
+    init {
+        colorObservable.add(colorObserver)
+    }
+
+    override fun onCleared() {
+        super.onCleared()
+
+        colorObservable.remove(colorObserver)
+    }
+
+    fun observeColors(color: Int) {
         if (context !is Application) throw RuntimeException("Здесь нужен контекст апликейшена")
-        Toast.makeText(context, "Color received", Toast.LENGTH_LONG).show()
+        Toast.makeText(context, "Color received $color", Toast.LENGTH_LONG).show()
+
+        mutableState.value = color
     }
+}
+
+class ViewModelReceiverFactory @Inject constructor(
+    @ContextApplication private val context: Context,
+    private val colorObservable: IColorObservable,
+) : ViewModelProvider.Factory {
+    override fun <T : ViewModel?> create(modelClass: Class<T>): T {
+        if (modelClass.isAssignableFrom(ViewModelReceiver::class.java))
+            return ViewModelReceiver(
+                context,
+                colorObservable,
+            ) as T
+        else throw IllegalArgumentException()
+    }
+
 }
\ 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..fb3aae7d 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,19 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
+<LinearLayout
     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"
+    android:orientation="vertical"
     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/fr_receiver"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:name="ru.otus.daggerhomework.FragmentReceiver"
+    />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/fr_producer"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:name="ru.otus.daggerhomework.FragmentProducer"
+        />
+</LinearLayout>
\ No newline at end of file

From eb7f399f83ee25b977b02ad6affe09b7e3e41db0 Mon Sep 17 00:00:00 2001
From: Artem Nagorny <agnagor3@mts.ru>
Date: Wed, 19 Jun 2024 21:06:46 +0300
Subject: [PATCH 2/2] Fix #1

---
 .../ru/otus/daggerhomework/ApplicationComponent.kt   |  4 +---
 .../java/ru/otus/daggerhomework/ColorObservable.kt   |  4 +++-
 .../ru/otus/daggerhomework/MainActivityComponent.kt  | 12 ++++--------
 .../java/ru/otus/daggerhomework/ViewModelProducer.kt |  2 +-
 .../java/ru/otus/daggerhomework/ViewModelReceiver.kt |  2 +-
 5 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/ru/otus/daggerhomework/ApplicationComponent.kt b/app/src/main/java/ru/otus/daggerhomework/ApplicationComponent.kt
index 47e78804..6bdf167d 100644
--- a/app/src/main/java/ru/otus/daggerhomework/ApplicationComponent.kt
+++ b/app/src/main/java/ru/otus/daggerhomework/ApplicationComponent.kt
@@ -10,9 +10,7 @@ import javax.inject.Singleton
 annotation class ContextApplication
 
 @Singleton
-@Component(
-  modules = [],
-)
+@Component()
 interface ApplicationComponent {
 
   @Component.Factory
diff --git a/app/src/main/java/ru/otus/daggerhomework/ColorObservable.kt b/app/src/main/java/ru/otus/daggerhomework/ColorObservable.kt
index 6da8eaf1..d2e02b3c 100644
--- a/app/src/main/java/ru/otus/daggerhomework/ColorObservable.kt
+++ b/app/src/main/java/ru/otus/daggerhomework/ColorObservable.kt
@@ -1,5 +1,7 @@
 package ru.otus.daggerhomework
 
+import javax.inject.Inject
+
 interface IObserver<T> {
   fun notify(data: T)
 }
@@ -12,7 +14,7 @@ interface IColorObservable {
   fun notify(data: Int)
 }
 
-class ColorObservableImpl: IColorObservable {
+class ColorObservableImpl @Inject constructor() : IColorObservable {
   private val observers = mutableListOf<IObserver<Int>>()
 
   override fun add(observer: IObserver<Int>) {
diff --git a/app/src/main/java/ru/otus/daggerhomework/MainActivityComponent.kt b/app/src/main/java/ru/otus/daggerhomework/MainActivityComponent.kt
index 3cfb4108..0c2d90d1 100644
--- a/app/src/main/java/ru/otus/daggerhomework/MainActivityComponent.kt
+++ b/app/src/main/java/ru/otus/daggerhomework/MainActivityComponent.kt
@@ -1,10 +1,10 @@
 package ru.otus.daggerhomework
 
 import android.content.Context
+import dagger.Binds
 import dagger.BindsInstance
 import dagger.Component
 import dagger.Module
-import dagger.Provides
 import javax.inject.Qualifier
 import javax.inject.Scope
 
@@ -42,11 +42,7 @@ interface MainActivityComponent {
 
 @Module
 interface MainActivityModule {
-  companion object {
-    @ActivityScope
-    @Provides
-    fun provideObservable(): IColorObservable {
-      return ColorObservableImpl()
-    }
-  }
+  @ActivityScope
+  @Binds
+  fun bindObservable(impl: ColorObservableImpl): IColorObservable
 }
\ 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 809733c5..205dd9ef 100644
--- a/app/src/main/java/ru/otus/daggerhomework/ViewModelProducer.kt
+++ b/app/src/main/java/ru/otus/daggerhomework/ViewModelProducer.kt
@@ -9,7 +9,7 @@ import javax.inject.Inject
 
 class ViewModelProducer(
     private val colorGenerator: ColorGenerator,
-    @ContextActivity private val context: Context,
+    private val context: Context,
     private val colorObservable: IColorObservable,
 ): ViewModel() {
 
diff --git a/app/src/main/java/ru/otus/daggerhomework/ViewModelReceiver.kt b/app/src/main/java/ru/otus/daggerhomework/ViewModelReceiver.kt
index 72c00fb2..5cb82057 100644
--- a/app/src/main/java/ru/otus/daggerhomework/ViewModelReceiver.kt
+++ b/app/src/main/java/ru/otus/daggerhomework/ViewModelReceiver.kt
@@ -10,7 +10,7 @@ import androidx.lifecycle.ViewModelProvider
 import javax.inject.Inject
 
 class ViewModelReceiver(
-    @ContextApplication private val context: Context,
+    private val context: Context,
     private val colorObservable: IColorObservable,
 ) : ViewModel() {
     private val mutableState = MutableLiveData<Int>()