diff --git a/app/build.gradle b/app/build.gradle index 705d0941..cca2437e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -40,4 +40,7 @@ dependencies { implementation 'androidx.constraintlayout:constraintlayout:2.1.0' implementation 'com.google.dagger:dagger:2.42' kapt 'com.google.dagger:dagger-compiler:2.42' + + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3' + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.0' } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index fe328c68..82191fee 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,16 +1,18 @@ - - + diff --git a/app/src/main/java/ru/otus/daggerhomework/App.kt b/app/src/main/java/ru/otus/daggerhomework/App.kt index de363626..1de6cb32 100644 --- a/app/src/main/java/ru/otus/daggerhomework/App.kt +++ b/app/src/main/java/ru/otus/daggerhomework/App.kt @@ -1,6 +1,17 @@ package ru.otus.daggerhomework import android.app.Application +import ru.otus.daggerhomework.di.components.ApplicationComponent +import ru.otus.daggerhomework.di.components.DaggerApplicationComponent -class App :Application() { +class App : Application() { + lateinit var appComponent: ApplicationComponent + + override fun onCreate() { + super.onCreate() + + appComponent = DaggerApplicationComponent + .factory() + .create(this) + } } \ No newline at end of file diff --git a/app/src/main/java/ru/otus/daggerhomework/ApplicationComponent.kt b/app/src/main/java/ru/otus/daggerhomework/ApplicationComponent.kt deleted file mode 100644 index fc47f256..00000000 --- a/app/src/main/java/ru/otus/daggerhomework/ApplicationComponent.kt +++ /dev/null @@ -1,4 +0,0 @@ -package ru.otus.daggerhomework - -interface ApplicationComponent { -} \ No newline at end of file diff --git a/app/src/main/java/ru/otus/daggerhomework/ColorGenerator.kt b/app/src/main/java/ru/otus/daggerhomework/ColorGenerator.kt index a9e25a27..d2c6c297 100644 --- a/app/src/main/java/ru/otus/daggerhomework/ColorGenerator.kt +++ b/app/src/main/java/ru/otus/daggerhomework/ColorGenerator.kt @@ -1,9 +1,10 @@ package ru.otus.daggerhomework import android.graphics.Color +import android.util.Log import androidx.annotation.ColorInt -import androidx.annotation.ColorRes import java.util.* +import javax.inject.Inject interface ColorGenerator { @@ -11,10 +12,16 @@ interface ColorGenerator { fun generateColor(): Int } -class ColorGeneratorImpl : ColorGenerator { +class ColorGeneratorImpl @Inject constructor() : ColorGenerator { override fun generateColor(): Int { val rnd = Random() - return Color.argb(255, rnd.nextInt(256), rnd.nextInt(256), rnd.nextInt(256)) + val color = Color.argb( + 255, + rnd.nextInt(256), + rnd.nextInt(256), + rnd.nextInt(256) + ) + return color } } \ No newline at end of file diff --git a/app/src/main/java/ru/otus/daggerhomework/FragmentProducer.kt b/app/src/main/java/ru/otus/daggerhomework/FragmentProducer.kt index 00dd10dc..9954055a 100644 --- a/app/src/main/java/ru/otus/daggerhomework/FragmentProducer.kt +++ b/app/src/main/java/ru/otus/daggerhomework/FragmentProducer.kt @@ -6,21 +6,56 @@ import android.view.View import android.view.ViewGroup import android.widget.Button import androidx.fragment.app.Fragment +import androidx.lifecycle.lifecycleScope +import kotlinx.coroutines.launch +import ru.otus.daggerhomework.di.components.DaggerFragmentProducerComponent +import ru.otus.daggerhomework.di.components.FragmentProducerComponent +import javax.inject.Inject +import javax.inject.Provider class FragmentProducer : Fragment() { + @Inject + lateinit var dataKeeper: Provider + + @Inject + lateinit var colorGenerator: Provider + + lateinit var viewModelProducer: ViewModelProducer + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + val activityComponent = (requireActivity() as MainActivity).activityComponent + val fragmentProducerComponent = DaggerFragmentProducerComponent + .builder() + .activityComponent(activityComponent) + .build() + + fragmentProducerComponent.inject(this) + } + override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View? { - return inflater.inflate(R.layout.fragment_a, container, true) + + viewModelProducer = ViewModelProducer( + colorGenerator.get(), + requireContext(), + dataKeeper.get() + ) + + return inflater.inflate(R.layout.fragment_a, container, false) } override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) view.findViewById