diff --git a/app/build.gradle b/app/build.gradle index a5609bb9..c99e8410 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,14 +4,18 @@ plugins { id 'kotlin-kapt' } +kapt { + correctErrorTypes true +} + android { - compileSdkVersion 30 + compileSdkVersion 31 buildToolsVersion "30.0.3" defaultConfig { applicationId "ru.otus.daggerhomework" minSdkVersion 23 - targetSdkVersion 30 + targetSdkVersion 31 versionCode 1 versionName "1.0" @@ -41,4 +45,7 @@ dependencies { implementation 'androidx.constraintlayout:constraintlayout:2.1.0' implementation 'com.google.dagger:dagger:2.38.1' kapt 'com.google.dagger:dagger-compiler:2.38.1' + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1" + implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.4.1" + implementation "androidx.fragment:fragment-ktx:1.4.1" } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index fe328c68..6a8aefaa 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,16 +1,17 @@ - - + diff --git a/app/src/main/java/ru/otus/daggerhomework/App.kt b/app/src/main/java/ru/otus/daggerhomework/App.kt deleted file mode 100644 index de363626..00000000 --- a/app/src/main/java/ru/otus/daggerhomework/App.kt +++ /dev/null @@ -1,6 +0,0 @@ -package ru.otus.daggerhomework - -import android.app.Application - -class App :Application() { -} \ 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..f0ca940b 100644 --- a/app/src/main/java/ru/otus/daggerhomework/ColorGenerator.kt +++ b/app/src/main/java/ru/otus/daggerhomework/ColorGenerator.kt @@ -4,6 +4,7 @@ import android.graphics.Color import androidx.annotation.ColorInt import androidx.annotation.ColorRes import java.util.* +import javax.inject.Inject interface ColorGenerator { @@ -11,7 +12,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/Event.kt b/app/src/main/java/ru/otus/daggerhomework/Event.kt new file mode 100644 index 00000000..cdd271b6 --- /dev/null +++ b/app/src/main/java/ru/otus/daggerhomework/Event.kt @@ -0,0 +1,5 @@ +package ru.otus.daggerhomework + +interface Event { + class ShowColor(val color: Int) : Event +} \ No newline at end of file diff --git a/app/src/main/java/ru/otus/daggerhomework/EventObservable.kt b/app/src/main/java/ru/otus/daggerhomework/EventObservable.kt new file mode 100644 index 00000000..8ae7bc32 --- /dev/null +++ b/app/src/main/java/ru/otus/daggerhomework/EventObservable.kt @@ -0,0 +1,7 @@ +package ru.otus.daggerhomework + +import kotlinx.coroutines.flow.SharedFlow + +interface EventObservable { + val events: SharedFlow +} \ 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 deleted file mode 100644 index 00dd10dc..00000000 --- a/app/src/main/java/ru/otus/daggerhomework/FragmentProducer.kt +++ /dev/null @@ -1,26 +0,0 @@ -package ru.otus.daggerhomework - -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 - -class FragmentProducer : Fragment() { - - override fun onCreateView( - inflater: LayoutInflater, - container: ViewGroup?, - savedInstanceState: Bundle? - ): View? { - return inflater.inflate(R.layout.fragment_a, container, true) - } - - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - super.onViewCreated(view, savedInstanceState) - view.findViewById