From 8711aec98531ca4ecb3e4e07699fb069c0e86054 Mon Sep 17 00:00:00 2001 From: Rodion Date: Sun, 11 Jul 2021 17:55:49 +0300 Subject: [PATCH] #7: Add Home module --- app/build.gradle.kts | 9 ++++----- .../majorkik/movieboxcompose/MovieBoxApplication.kt | 3 ++- buildSrc/src/main/kotlin/AndroidConfig.kt | 4 ++-- buildSrc/src/main/kotlin/ModuleDependency.kt | 1 + .../majorkik/core/ui/utils/SystemUIController.kt | 8 ++++---- settings.gradle.kts | 13 +++++++++++-- ui/home/src/main/AndroidManifest.xml | 2 ++ .../main/kotlin/com/majorkik/ui/main/KoinModule.kt | 6 ++++++ ui/main/build.gradle.kts | 3 --- 9 files changed, 32 insertions(+), 17 deletions(-) create mode 100644 ui/home/src/main/AndroidManifest.xml create mode 100644 ui/home/src/main/kotlin/com/majorkik/ui/main/KoinModule.kt diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 9435883a..fcb29acf 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -27,7 +27,9 @@ android { } buildFeatures { - compose = true + compose = false + viewBinding = false + dataBinding = false // Disable unused AGP features aidl = false @@ -45,11 +47,8 @@ dependencies { implementation(project(ModuleDependency.Core.ui)) implementation(project(ModuleDependency.UI.main)) + implementation(project(ModuleDependency.UI.home)) - implementation(Libs.Kotlin.stdlib) - implementation(Libs.Coroutines.android) - - implementation(Libs.AndroidX.coreKtx) implementation(Libs.AndroidX.compat) implementation(Libs.Koin.android) diff --git a/app/src/main/kotlin/com/majorkik/movieboxcompose/MovieBoxApplication.kt b/app/src/main/kotlin/com/majorkik/movieboxcompose/MovieBoxApplication.kt index db4fe75b..cd9d1f8d 100644 --- a/app/src/main/kotlin/com/majorkik/movieboxcompose/MovieBoxApplication.kt +++ b/app/src/main/kotlin/com/majorkik/movieboxcompose/MovieBoxApplication.kt @@ -1,6 +1,7 @@ package com.majorkik.movieboxcompose import android.app.Application +import com.majorkik.ui.main.uiMainModule import com.orhanobut.logger.AndroidLogAdapter import com.orhanobut.logger.Logger import org.koin.android.ext.koin.androidContext @@ -24,7 +25,7 @@ class MovieBoxApplication : Application() { startKoin { androidLogger() androidContext(this@MovieBoxApplication) - modules() + modules(uiMainModule,) } } } diff --git a/buildSrc/src/main/kotlin/AndroidConfig.kt b/buildSrc/src/main/kotlin/AndroidConfig.kt index 49deeae4..8a3a553d 100644 --- a/buildSrc/src/main/kotlin/AndroidConfig.kt +++ b/buildSrc/src/main/kotlin/AndroidConfig.kt @@ -4,8 +4,8 @@ object AndroidConfig { const val targetSdk = 30 const val buildTools = "30.0.2" - const val versionCode = 47 - const val versionName = "0.6.1" + const val versionCode = 48 + const val versionName = "0.7.1" const val applicationId = "com.majorkik.movieboxcompose" } diff --git a/buildSrc/src/main/kotlin/ModuleDependency.kt b/buildSrc/src/main/kotlin/ModuleDependency.kt index edb9115f..b1271b4c 100644 --- a/buildSrc/src/main/kotlin/ModuleDependency.kt +++ b/buildSrc/src/main/kotlin/ModuleDependency.kt @@ -4,6 +4,7 @@ object ModuleDependency { object UI { const val main = ":ui:main" + const val home = ":ui:home" } object Core { diff --git a/core/ui/src/main/kotlin/com/majorkik/core/ui/utils/SystemUIController.kt b/core/ui/src/main/kotlin/com/majorkik/core/ui/utils/SystemUIController.kt index 98ac41e5..5a5ef45d 100644 --- a/core/ui/src/main/kotlin/com/majorkik/core/ui/utils/SystemUIController.kt +++ b/core/ui/src/main/kotlin/com/majorkik/core/ui/utils/SystemUIController.kt @@ -65,10 +65,10 @@ private class SystemUiControllerImpl(private val window: Window) : SystemUIContr @Suppress("DEPRECATION") if (darkIcons) { window.decorView.systemUiVisibility = window.decorView.systemUiVisibility or - View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR + View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR } else { window.decorView.systemUiVisibility = window.decorView.systemUiVisibility and - View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR.inv() + View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR.inv() } } @@ -101,10 +101,10 @@ private class SystemUiControllerImpl(private val window: Window) : SystemUIContr @Suppress("DEPRECATION") if (darkIcons) { window.decorView.systemUiVisibility = window.decorView.systemUiVisibility or - View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR + View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR } else { window.decorView.systemUiVisibility = window.decorView.systemUiVisibility and - View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR.inv() + View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR.inv() } } } diff --git a/settings.gradle.kts b/settings.gradle.kts index 67cc9eef..7f30821f 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -25,7 +25,16 @@ rootProject.name = "moviebox-compose" // Main module include(":app") + // Core modules -include(":core:network", ":core:ui", ":core:base") +include( + ":core:network", + ":core:ui", + ":core:base" +) + // UI modules -include(":ui:main") +include( + ":ui:main", + ":ui:home" +) diff --git a/ui/home/src/main/AndroidManifest.xml b/ui/home/src/main/AndroidManifest.xml new file mode 100644 index 00000000..6b834dbe --- /dev/null +++ b/ui/home/src/main/AndroidManifest.xml @@ -0,0 +1,2 @@ + + diff --git a/ui/home/src/main/kotlin/com/majorkik/ui/main/KoinModule.kt b/ui/home/src/main/kotlin/com/majorkik/ui/main/KoinModule.kt new file mode 100644 index 00000000..6014ca14 --- /dev/null +++ b/ui/home/src/main/kotlin/com/majorkik/ui/main/KoinModule.kt @@ -0,0 +1,6 @@ +package com.majorkik.ui.main + +import org.koin.dsl.module + +val uiHomeModule = module { +} diff --git a/ui/main/build.gradle.kts b/ui/main/build.gradle.kts index 880164d0..11c0ab1a 100644 --- a/ui/main/build.gradle.kts +++ b/ui/main/build.gradle.kts @@ -25,8 +25,5 @@ android { dependencies { implementation(project(ModuleDependency.Core.ui)) - implementation(Libs.AndroidX.Activity.activityCompose) - implementation(Libs.AndroidX.compat) - implementation(Libs.Koin.android) }