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"> - + 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..6bdf167d 100644 --- a/app/src/main/java/ru/otus/daggerhomework/ApplicationComponent.kt +++ b/app/src/main/java/ru/otus/daggerhomework/ApplicationComponent.kt @@ -1,4 +1,25 @@ 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() 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..d2e02b3c --- /dev/null +++ b/app/src/main/java/ru/otus/daggerhomework/ColorObservable.kt @@ -0,0 +1,31 @@ +package ru.otus.daggerhomework + +import javax.inject.Inject + +interface IObserver { + fun notify(data: T) +} + +interface IColorObservable { + fun add(observer: IObserver) + + fun remove(observer: IObserver) + + fun notify(data: Int) +} + +class ColorObservableImpl @Inject constructor() : IColorObservable { + private val observers = mutableListOf>() + + override fun add(observer: IObserver) { + observers.add(observer) + } + + override fun remove(observer: IObserver) { + 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