init commit

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" />
 

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
+    }
+}

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>()
+}

app/src/main/java/ru/otus/daggerhomework/ColorGenerator.kt → 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 {

app/src/main/java/ru/otus/daggerhomework/FragmentProducer.kt → app/src/main/java/otus/homework/dagger/FragmentProducer.kt

@@ -1,25 +1,32 @@
-package ru.otus.daggerhomework
+package otus.homework.dagger
 
 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 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 в другой фрагмент
         }
     }

app/src/main/java/ru/otus/daggerhomework/FragmentReceiver.kt → 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)
     }
 

app/src/main/java/ru/otus/daggerhomework/MainActivity.kt → 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()
     }
 }

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")
+        }
+    }
+}

app/src/main/java/ru/otus/daggerhomework/ViewModelProducer.kt → 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()
     }
 }

app/src/main/java/ru/otus/daggerhomework/ViewModelReceiver.kt → 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("Здесь нужен контекст апликейшена")

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

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
+    }
+}

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

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>