diff --git a/app/build.gradle b/app/build.gradle deleted file mode 100644 index 705d0941..00000000 --- a/app/build.gradle +++ /dev/null @@ -1,43 +0,0 @@ -plugins { - id 'com.android.application' - id 'kotlin-android' - id 'kotlin-kapt' -} - -android { - compileSdkVersion 31 - - defaultConfig { - applicationId "ru.otus.daggerhomework" - minSdkVersion 23 - targetSdkVersion 31 - versionCode 1 - versionName "1.0" - - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - kotlinOptions { - jvmTarget = '1.8' - } -} - -dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - implementation 'androidx.core:core-ktx:1.6.0' - implementation 'androidx.appcompat:appcompat:1.3.1' - implementation 'com.google.android.material:material:1.4.0' - implementation 'androidx.constraintlayout:constraintlayout:2.1.0' - implementation 'com.google.dagger:dagger:2.42' - kapt 'com.google.dagger:dagger-compiler:2.42' -} \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts new file mode 100644 index 00000000..a6095618 --- /dev/null +++ b/app/build.gradle.kts @@ -0,0 +1,47 @@ +plugins { + id("com.android.application") + id("kotlin-android") + id("kotlin-kapt") +} + +android { + compileSdk = rootProject.extra["compileSdkVersion"] as Int + + defaultConfig { + applicationId = "com.mironchik.multimodule" + minSdk = rootProject.extra["minSdkVersion"] as Int + versionCode = 1 + versionName = "1.0" + } + + buildTypes { + getByName("release") { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro") + } + } + + compileOptions { + sourceCompatibility = rootProject.extra["javaCompatibility"] as JavaVersion + targetCompatibility = rootProject.extra["javaCompatibility"] as JavaVersion + } + + kotlinOptions { + jvmTarget = "17" + } + + namespace = "com.mironchik.multimodule" +} + +dependencies { + implementation(project(":modules:core:api_factory")) + implementation(project(":modules:features:producer_impl")) + implementation(project(":modules:features:receiver_impl")) + implementation(project(":modules:features:screen")) + + implementation(platform(project(":modules:platform"))) + implementation("com.google.dagger:dagger") + kapt("com.google.dagger:dagger-compiler:2.52") +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index fe328c68..3028bbed 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,22 +1,14 @@ + xmlns:android="http://schemas.android.com/apk/res/android"> - - - - - - - - + android:theme="@style/Theme.DaggerHomework"/> \ No newline at end of file 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 deleted file mode 100644 index a9e25a27..00000000 --- a/app/src/main/java/ru/otus/daggerhomework/ColorGenerator.kt +++ /dev/null @@ -1,20 +0,0 @@ -package ru.otus.daggerhomework - -import android.graphics.Color -import androidx.annotation.ColorInt -import androidx.annotation.ColorRes -import java.util.* - -interface ColorGenerator { - - @ColorInt - fun generateColor(): Int -} - -class ColorGeneratorImpl : ColorGenerator { - - override fun generateColor(): Int { - val rnd = Random() - return Color.argb(255, rnd.nextInt(256), rnd.nextInt(256), rnd.nextInt(256)) - } -} \ 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