2. Оставшиеся два задания

Author: GeorgeBozon

app/src/main/java/ru/otus/daggerhomework/EventsWriterReader.kt

@@ -3,8 +3,9 @@ package ru.otus.daggerhomework
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
+import javax.inject.Inject
 
-class EventsWriterReader : EventsReader, EventsWriter {
+class EventsWriterReader @Inject constructor() : EventsReader, EventsWriter {
     private val _eventsFlow = MutableSharedFlow<Int>(replay = 1)
 
     override val eventsFlow: Flow<Int>

app/src/main/java/ru/otus/daggerhomework/MainActivityModule.kt

@@ -1,6 +1,5 @@
 package ru.otus.daggerhomework
 
-import android.content.Context
 import androidx.lifecycle.ViewModel
 import dagger.Binds
 import dagger.Module
@@ -14,36 +13,29 @@ interface MainActivityModule {
     @Binds
     @ClassKey(ViewModelProducer::class)
     @IntoMap
+    @ActivityScope
     fun provideViewModelProducer(viewModel: ViewModelProducer): ViewModel
 
     @Binds
     @ClassKey(ViewModelReceiver::class)
     @IntoMap
+    @ActivityScope
     fun provideViewModelReceiver(viewModel: ViewModelReceiver): ViewModel
 
     @Binds
     @ActivityScope
     fun bindColorGenerator(colorGeneratorImpl: ColorGeneratorImpl): ColorGenerator
 
+    @Binds
+    @ActivityScope
+    fun bindEventWriter(eventsWriter: EventsWriterReader): EventsWriter
+
+    @Binds
+    @ActivityScope
+    fun bindEventReader(eventsReader: EventsWriterReader): EventsReader
+
     companion object{
-        @Provides
-        @ActivityScope
-        fun provideViewModelProducer(
-            @ActivityContext context: Context,
-            eventsWriter: EventsWriterReader,
-            colorGenerator: ColorGenerator
-        ): ViewModelProducer {
-            return ViewModelProducer(colorGenerator, context, eventsWriter)
-        }
 
-        @Provides
-        @ActivityScope
-        fun provideViewModelReceiver(
-            @ApplicationContext context: Context,
-            eventsReader: EventsWriterReader
-        ): ViewModelReceiver {
-            return ViewModelReceiver(context, eventsReader)
-        }
 
         @Provides
         @ActivityScope

app/src/main/java/ru/otus/daggerhomework/ViewModelProducer.kt

@@ -4,10 +4,11 @@ import android.content.Context
 import android.widget.Toast
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.ViewModel
+import javax.inject.Inject
 
-class ViewModelProducer(
+class ViewModelProducer @Inject constructor(
     private val colorGenerator: ColorGenerator,
-    private val context: Context,
+    @ActivityContext private val context: Context,
     private val eventsWriter: EventsWriter
 ): ViewModel() {
 

app/src/main/java/ru/otus/daggerhomework/ViewModelReceiver.kt

@@ -10,7 +10,7 @@ import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 class ViewModelReceiver @Inject constructor(
-    private val context: Context,
+    @ApplicationContext private val context: Context,
     val eventsReader: EventsReader
 ):ViewModel() {
     init {