From 5f5df6a809071f6ee37d2ccffb6c02b753462cd4 Mon Sep 17 00:00:00 2001 From: michaelbel Date: Sun, 21 May 2023 22:45:47 +0300 Subject: [PATCH 01/18] Update project --- .github/workflows/distribution_app.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/distribution_app.yml b/.github/workflows/distribution_app.yml index cd788020f..5588b19e3 100644 --- a/.github/workflows/distribution_app.yml +++ b/.github/workflows/distribution_app.yml @@ -27,11 +27,11 @@ jobs: with: fetch-depth: 0 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: 11 + java-version: 17 - name: Make Gradlew Executable run: chmod +x ./gradlew From 0474ce59d89b4c2326f0683ad749ce3113598b10 Mon Sep 17 00:00:00 2001 From: michaelbel Date: Tue, 30 May 2023 21:48:45 +0300 Subject: [PATCH 02/18] Update project --- .../main/kotlin/org/michaelbel/movies/MainActivity.kt | 2 -- .../main/kotlin/org/michaelbel/movies/MainViewModel.kt | 10 +--------- gradle/libs.versions.toml | 8 ++++---- 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/app/src/main/kotlin/org/michaelbel/movies/MainActivity.kt b/app/src/main/kotlin/org/michaelbel/movies/MainActivity.kt index 1bc9c8a40..5c46e7bb9 100644 --- a/app/src/main/kotlin/org/michaelbel/movies/MainActivity.kt +++ b/app/src/main/kotlin/org/michaelbel/movies/MainActivity.kt @@ -5,7 +5,6 @@ import androidx.activity.compose.setContent import androidx.activity.viewModels import androidx.appcompat.app.AppCompatActivity import androidx.compose.runtime.getValue -import androidx.compose.ui.unit.LayoutDirection import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen import androidx.core.view.WindowCompat import androidx.lifecycle.compose.collectAsStateWithLifecycle @@ -36,7 +35,6 @@ internal class MainActivity: AppCompatActivity() { setContent { val currentTheme: AppTheme by viewModel.currentTheme.collectAsStateWithLifecycle() val dynamicColors: Boolean by viewModel.dynamicColors.collectAsStateWithLifecycle() - val layoutDirection: LayoutDirection by viewModel.layoutDirection.collectAsStateWithLifecycle() val navHostController: NavHostController = rememberNavController().apply { addOnDestinationChangedListener(viewModel::analyticsTrackDestination) diff --git a/app/src/main/kotlin/org/michaelbel/movies/MainViewModel.kt b/app/src/main/kotlin/org/michaelbel/movies/MainViewModel.kt index 29e61d73c..58a3dc518 100644 --- a/app/src/main/kotlin/org/michaelbel/movies/MainViewModel.kt +++ b/app/src/main/kotlin/org/michaelbel/movies/MainViewModel.kt @@ -1,13 +1,11 @@ package org.michaelbel.movies import android.os.Bundle -import androidx.compose.ui.unit.LayoutDirection import androidx.navigation.NavDestination import androidx.work.OneTimeWorkRequestBuilder import androidx.work.WorkManager import androidx.work.workDataOf import dagger.hilt.android.lifecycle.HiltViewModel -import javax.inject.Inject import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.stateIn @@ -18,6 +16,7 @@ import org.michaelbel.movies.common.viewmodel.BaseViewModel import org.michaelbel.movies.domain.interactor.settings.SettingsInteractor import org.michaelbel.movies.domain.workers.AccountUpdateWorker import org.michaelbel.movies.domain.workers.MoviesDatabaseWorker +import javax.inject.Inject @HiltViewModel internal class MainViewModel @Inject constructor( @@ -40,13 +39,6 @@ internal class MainViewModel @Inject constructor( initialValue = false ) - val layoutDirection: StateFlow = settingsInteractor.layoutDirection - .stateIn( - scope = this, - started = SharingStarted.Lazily, - initialValue = LayoutDirection.Ltr - ) - init { fetchRemoteConfig() prepopulateDatabase() diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d4fe88b65..b2bf98dd4 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ min-sdk = "21" compile-sdk = "33" target-sdk = "33" -gradle = "8.0.1" +gradle = "8.0.2" kotlin = "1.8.21" kotlin-ksp = "1.8.21-1.0.11" kotlin-coroutines = "1.7.1" @@ -15,7 +15,7 @@ spotless = "6.18.0" google-services = "4.3.15" play-services-ads = "22.1.0" play-services-base = "18.2.0" -firebase-analytics = "21.2.2" +firebase-analytics = "21.3.0" firebase-appdistribution = "3.2.0" firebase-config = "21.4.0" firebase-crashlytics-plugin = "2.9.4" @@ -33,7 +33,7 @@ androidx-compose-compiler = "1.4.7" androidx-compose-material = "1.4.3" androidx-compose-material3 = "1.1.0" androidx-appcompat = "1.7.0-alpha02" -androidx-activity = "1.7.1" +androidx-activity = "1.7.2" androidx-browser = "1.5.0" androidx-core = "1.10.1" androidx-core-splashscreen = "1.0.1" @@ -42,7 +42,7 @@ androidx-lifecycle = "2.6.1" androidx-hilt-navigation-compose = "1.0.0" androidx-hilt-work = "1.0.0" androidx-navigation = "2.5.3" -androidx-paging = "1.0.0-alpha19" +androidx-paging = "1.0.0-alpha20" androidx-datastore = "1.0.0" androidx-startup = "1.1.1" androidx-room = "2.5.1" From af0d44ada90ee6562315b1d9b7edc82acef6294c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 13 Jul 2023 13:46:33 +0300 Subject: [PATCH 03/18] Bump io.coil-kt:coil-compose from 2.3.0 to 2.4.0 (#143) Bumps [io.coil-kt:coil-compose](https://github.com/coil-kt/coil) from 2.3.0 to 2.4.0. - [Release notes](https://github.com/coil-kt/coil/releases) - [Changelog](https://github.com/coil-kt/coil/blob/main/CHANGELOG.md) - [Commits](https://github.com/coil-kt/coil/compare/2.3.0...2.4.0) --- updated-dependencies: - dependency-name: io.coil-kt:coil-compose dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b2bf98dd4..be5c10331 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -53,7 +53,7 @@ androidx-espresso-core = "3.5.1" androidx-benchmark = "1.1.1" androidx-profile-installer = "1.3.1" androidx-work = "2.8.1" -coil = "2.3.0" +coil = "2.4.0" okhttp = "4.11.0" retrofit = "2.9.0" retrofit-converter-serialization = "1.0.0" From 8859e32bfde7e70fd9a06fd7021b4cd0331e8dc1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 13 Jul 2023 13:50:45 +0300 Subject: [PATCH 04/18] Bump io.gitlab.arturbosch.detekt from 1.22.0 to 1.23.0 (#144) Bumps [io.gitlab.arturbosch.detekt](https://github.com/detekt/detekt) from 1.22.0 to 1.23.0. - [Release notes](https://github.com/detekt/detekt/releases) - [Commits](https://github.com/detekt/detekt/compare/v1.22.0...v1.23.0) --- updated-dependencies: - dependency-name: io.gitlab.arturbosch.detekt dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index be5c10331..fcd544c1a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -10,7 +10,7 @@ kotlin-ksp = "1.8.21-1.0.11" kotlin-coroutines = "1.7.1" kotlin-serialization = "1.5.1" compose-compiler = "1.4.7" -detekt = "1.22.0" +detekt = "1.23.0" spotless = "6.18.0" google-services = "4.3.15" play-services-ads = "22.1.0" From 00e64d7823099f91b5856b7b4b47dea697ba8474 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 13 Jul 2023 14:00:15 +0300 Subject: [PATCH 05/18] Bump com.diffplug.spotless from 6.18.0 to 6.19.0 (#145) Bumps com.diffplug.spotless from 6.18.0 to 6.19.0. --- updated-dependencies: - dependency-name: com.diffplug.spotless dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Michael Bely From 48bf69ddf117dc884e03c9129756ba6c33ab982e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 13 Jul 2023 14:03:14 +0300 Subject: [PATCH 06/18] Bump kotlin-coroutines from 1.7.1 to 1.7.2 (#148) Bumps `kotlin-coroutines` from 1.7.1 to 1.7.2. Updates `org.jetbrains.kotlinx:kotlinx-coroutines-core` from 1.7.1 to 1.7.2 - [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases) - [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md) - [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.7.1...1.7.2) Updates `org.jetbrains.kotlinx:kotlinx-coroutines-android` from 1.7.1 to 1.7.2 - [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases) - [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md) - [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.7.1...1.7.2) Updates `org.jetbrains.kotlinx:kotlinx-coroutines-test` from 1.7.1 to 1.7.2 - [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases) - [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md) - [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.7.1...1.7.2) --- updated-dependencies: - dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-core dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-android dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-test dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index fcd544c1a..aaaa40f10 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,7 +7,7 @@ target-sdk = "33" gradle = "8.0.2" kotlin = "1.8.21" kotlin-ksp = "1.8.21-1.0.11" -kotlin-coroutines = "1.7.1" +kotlin-coroutines = "1.7.2" kotlin-serialization = "1.5.1" compose-compiler = "1.4.7" detekt = "1.23.0" From 13aa8f07f05a4eeaac6c8d40d669e5a229871e0b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 13 Jul 2023 14:06:33 +0300 Subject: [PATCH 07/18] Bump chucker from 3.5.2 to 4.0.0 (#149) Bumps `chucker` from 3.5.2 to 4.0.0. Updates `com.github.chuckerteam.chucker:library` from 3.5.2 to 4.0.0 - [Release notes](https://github.com/ChuckerTeam/chucker/releases) - [Changelog](https://github.com/ChuckerTeam/chucker/blob/main/CHANGELOG.md) - [Commits](https://github.com/ChuckerTeam/chucker/compare/3.5.2...4.0.0) Updates `com.github.chuckerteam.chucker:library-no-op` from 3.5.2 to 4.0.0 - [Release notes](https://github.com/ChuckerTeam/chucker/releases) - [Changelog](https://github.com/ChuckerTeam/chucker/blob/main/CHANGELOG.md) - [Commits](https://github.com/ChuckerTeam/chucker/compare/3.5.2...4.0.0) --- updated-dependencies: - dependency-name: com.github.chuckerteam.chucker:library dependency-type: direct:production update-type: version-update:semver-major - dependency-name: com.github.chuckerteam.chucker:library-no-op dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index aaaa40f10..3c2409f08 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -57,7 +57,7 @@ coil = "2.4.0" okhttp = "4.11.0" retrofit = "2.9.0" retrofit-converter-serialization = "1.0.0" -chucker = "3.5.2" +chucker = "4.0.0" timber = "5.0.1" javapoet = "1.13.0" junit = "4.13.2" From caeeb000c1330599ccabd93c3e7adda571780af7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 13 Jul 2023 14:11:47 +0300 Subject: [PATCH 08/18] Bump com.diffplug.spotless from 6.18.0 to 6.19.0 (#152) Bumps com.diffplug.spotless from 6.18.0 to 6.19.0. --- updated-dependencies: - dependency-name: com.diffplug.spotless dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3c2409f08..b846941c6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -11,7 +11,7 @@ kotlin-coroutines = "1.7.2" kotlin-serialization = "1.5.1" compose-compiler = "1.4.7" detekt = "1.23.0" -spotless = "6.18.0" +spotless = "6.19.0" google-services = "4.3.15" play-services-ads = "22.1.0" play-services-base = "18.2.0" From 3a3fe17f2991d85c01798fbc44c8703dde72ada1 Mon Sep 17 00:00:00 2001 From: michaelbel Date: Thu, 13 Jul 2023 14:29:14 +0300 Subject: [PATCH 09/18] Update project --- gradle/libs.versions.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b846941c6..3ec88425f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,11 +5,11 @@ min-sdk = "21" compile-sdk = "33" target-sdk = "33" gradle = "8.0.2" -kotlin = "1.8.21" -kotlin-ksp = "1.8.21-1.0.11" +kotlin = "1.8.22" +kotlin-ksp = "1.8.22-1.0.11" kotlin-coroutines = "1.7.2" kotlin-serialization = "1.5.1" -compose-compiler = "1.4.7" +compose-compiler = "1.4.8" detekt = "1.23.0" spotless = "6.19.0" google-services = "4.3.15" From fd3947d43d93958e5cc444db804eac2ba5f778f9 Mon Sep 17 00:00:00 2001 From: michaelbel Date: Thu, 13 Jul 2023 14:43:53 +0300 Subject: [PATCH 10/18] Update project --- core/analytics-impl/build.gradle.kts | 2 +- core/analytics/build.gradle.kts | 2 +- core/common/build.gradle.kts | 12 +++++----- core/network/build.gradle.kts | 2 +- gradle/libs.versions.toml | 36 ++++++++++++++-------------- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/core/analytics-impl/build.gradle.kts b/core/analytics-impl/build.gradle.kts index b229f7fa6..763635372 100644 --- a/core/analytics-impl/build.gradle.kts +++ b/core/analytics-impl/build.gradle.kts @@ -29,5 +29,5 @@ android { } dependencies { - implementation(libs.firebase.analytics) + implementation(libs.firebase.analytics.ktx) } \ No newline at end of file diff --git a/core/analytics/build.gradle.kts b/core/analytics/build.gradle.kts index 5f0b79d1f..d91b3ce84 100644 --- a/core/analytics/build.gradle.kts +++ b/core/analytics/build.gradle.kts @@ -36,5 +36,5 @@ android { } dependencies { - implementation(libs.firebase.analytics) + implementation(libs.firebase.analytics.ktx) } \ No newline at end of file diff --git a/core/common/build.gradle.kts b/core/common/build.gradle.kts index 06b942c1d..481c624be 100644 --- a/core/common/build.gradle.kts +++ b/core/common/build.gradle.kts @@ -56,16 +56,16 @@ dependencies { implementation(project(":core:analytics")) api(project(":core:entities")) api(libs.bundles.kotlin.coroutines) - api(libs.firebase.config) - api(libs.play.services.base) - api(libs.play.core) - api(libs.androidx.core) + api(libs.firebase.config.ktx) + api(libs.gms.play.services.base) + api(libs.play.core.ktx) + api(libs.androidx.core.ktx) api(libs.androidx.activity.compose) api(libs.bundles.lifecycle) api(libs.timber) implementation(libs.bundles.appcompat) - implementation(libs.firebase.crashlytics) - implementation(libs.firebase.messaging) + implementation(libs.firebase.crashlytics.ktx) + implementation(libs.firebase.messaging.ktx) implementation(libs.androidx.startup.runtime) implementation(libs.androidx.browser) diff --git a/core/network/build.gradle.kts b/core/network/build.gradle.kts index 4c6e4ede1..40f6fe264 100644 --- a/core/network/build.gradle.kts +++ b/core/network/build.gradle.kts @@ -47,7 +47,7 @@ android { } dependencies { - api(libs.kotlin.serialization) + api(libs.kotlin.serialization.json) implementation(libs.okhttp.logging.interceptor) implementation(libs.retrofit.converter.serialization) api(libs.retrofit) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3ec88425f..57bec1ea2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,20 +8,20 @@ gradle = "8.0.2" kotlin = "1.8.22" kotlin-ksp = "1.8.22-1.0.11" kotlin-coroutines = "1.7.2" -kotlin-serialization = "1.5.1" +kotlin-serialization-json = "1.5.1" compose-compiler = "1.4.8" detekt = "1.23.0" spotless = "6.19.0" google-services = "4.3.15" -play-services-ads = "22.1.0" -play-services-base = "18.2.0" -firebase-analytics = "21.3.0" +gms-play-services-ads = "22.1.0" +gms-play-services-base = "18.2.0" +firebase-analytics-ktx = "21.3.0" firebase-appdistribution = "3.2.0" -firebase-config = "21.4.0" +firebase-config-ktx = "21.4.0" firebase-crashlytics-plugin = "2.9.4" -firebase-crashlytics = "18.3.7" -firebase-messaging = "23.1.2" -play-core = "1.8.1" +firebase-crashlytics-ktx = "18.3.7" +firebase-messaging-ktx = "23.1.2" +play-core-ktx = "1.8.1" accompanist = "0.30.1" material = "1.9.0" material-compose-theme-adapter = "1.2.1" @@ -35,7 +35,7 @@ androidx-compose-material3 = "1.1.0" androidx-appcompat = "1.7.0-alpha02" androidx-activity = "1.7.2" androidx-browser = "1.5.0" -androidx-core = "1.10.1" +androidx-core-ktx = "1.10.1" androidx-core-splashscreen = "1.0.1" androidx-constraintlayout = "1.0.1" androidx-lifecycle = "2.6.1" @@ -68,14 +68,14 @@ palantir-git = "3.0.0" kotlin-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlin-coroutines" } kotlin-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlin-coroutines" } kotlin-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlin-coroutines" } -kotlin-serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlin-serialization" } -play-services-ads = { module = "com.google.android.gms:play-services-ads", version.ref = "play-services-ads" } -play-services-base = { module = "com.google.android.gms:play-services-base", version.ref = "play-services-base" } -firebase-analytics = { module = "com.google.firebase:firebase-analytics-ktx", version.ref = "firebase-analytics" } -firebase-config = { module = "com.google.firebase:firebase-config-ktx", version.ref = "firebase-config" } -firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics-ktx", version.ref = "firebase-crashlytics" } -firebase-messaging = { module = "com.google.firebase:firebase-messaging-ktx", version.ref = "firebase-messaging" } -play-core = { module = "com.google.android.play:core-ktx", version.ref = "play-core" } +kotlin-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlin-serialization-json" } +gms-play-services-ads = { module = "com.google.android.gms:play-services-ads", version.ref = "gms-play-services-ads" } +gms-play-services-base = { module = "com.google.android.gms:play-services-base", version.ref = "gms-play-services-base" } +firebase-analytics-ktx = { module = "com.google.firebase:firebase-analytics-ktx", version.ref = "firebase-analytics-ktx" } +firebase-config-ktx = { module = "com.google.firebase:firebase-config-ktx", version.ref = "firebase-config-ktx" } +firebase-crashlytics-ktx = { module = "com.google.firebase:firebase-crashlytics-ktx", version.ref = "firebase-crashlytics-ktx" } +firebase-messaging-ktx = { module = "com.google.firebase:firebase-messaging-ktx", version.ref = "firebase-messaging-ktx" } +play-core-ktx = { module = "com.google.android.play:core-ktx", version.ref = "play-core-ktx" } accompanist-appcompat-theme = { module = "com.google.accompanist:accompanist-appcompat-theme", version.ref = "accompanist" } accompanist-drawablepainter = { module = "com.google.accompanist:accompanist-drawablepainter", version.ref = "accompanist" } accompanist-insets = { module = "com.google.accompanist:accompanist-insets", version.ref = "accompanist" } @@ -103,7 +103,7 @@ androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "a androidx-appcompat-resources = { module = "androidx.appcompat:appcompat-resources", version.ref = "androidx-appcompat" } androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity" } androidx-browser = { module = "androidx.browser:browser", version.ref = "androidx-browser" } -androidx-core = { module = "androidx.core:core-ktx", version.ref = "androidx-core" } +androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx-core-ktx" } androidx-core-splashscreen = { module = "androidx.core:core-splashscreen", version.ref = "androidx-core-splashscreen" } androidx-constraintlayout-compose = { module = "androidx.constraintlayout:constraintlayout-compose", version.ref = "androidx-constraintlayout" } androidx-lifecycle-runtime-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidx-lifecycle" } From b22bc0196eb7355299e188b0653a6dd27b1ba952 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 21 Jul 2023 16:25:20 +0300 Subject: [PATCH 11/18] Bump hilt from 2.46.1 to 2.47 (#153) Bumps `hilt` from 2.46.1 to 2.47. Updates `com.google.dagger:hilt-android` from 2.46.1 to 2.47 - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/compare/dagger-2.46.1...dagger-2.47) Updates `com.google.dagger:hilt-compiler` from 2.46.1 to 2.47 - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/compare/dagger-2.46.1...dagger-2.47) Updates `com.google.dagger.hilt.android` from 2.46.1 to 2.47 - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/compare/dagger-2.46.1...dagger-2.47) --- updated-dependencies: - dependency-name: com.google.dagger:hilt-android dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.google.dagger:hilt-compiler dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.google.dagger.hilt.android dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 57bec1ea2..cc265a1a1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -25,7 +25,7 @@ play-core-ktx = "1.8.1" accompanist = "0.30.1" material = "1.9.0" material-compose-theme-adapter = "1.2.1" -hilt = "2.46.1" +hilt = "2.47" androidx-compose-foundation = "1.4.3" androidx-compose-runtime = "1.4.3" androidx-compose-ui = "1.4.3" From e67aa486c077e4c0a6ea1ef3648f3884f242e22b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 21 Jul 2023 16:28:42 +0300 Subject: [PATCH 12/18] Bump com.diffplug.spotless from 6.19.0 to 6.20.0 (#154) Bumps com.diffplug.spotless from 6.19.0 to 6.20.0. --- updated-dependencies: - dependency-name: com.diffplug.spotless dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index cc265a1a1..bac270b9f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -11,7 +11,7 @@ kotlin-coroutines = "1.7.2" kotlin-serialization-json = "1.5.1" compose-compiler = "1.4.8" detekt = "1.23.0" -spotless = "6.19.0" +spotless = "6.20.0" google-services = "4.3.15" gms-play-services-ads = "22.1.0" gms-play-services-base = "18.2.0" From 4d33aba2b6c700d087c052a2630c21ab80324db1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 21 Jul 2023 16:35:43 +0300 Subject: [PATCH 13/18] Bump kotlin from 1.8.21 to 1.9.0 (#150) Bumps `kotlin` from 1.8.21 to 1.9.0. Updates `org.jetbrains.kotlin:kotlin-gradle-plugin` from 1.8.21 to 1.9.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.8.21...v1.9.0) Updates `org.jetbrains.kotlin.android` from 1.8.21 to 1.9.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.8.21...v1.9.0) Updates `org.jetbrains.kotlin.plugin.serialization` from 1.8.21 to 1.9.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.8.21...v1.9.0) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-gradle-plugin dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin.android dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin.plugin.serialization dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index bac270b9f..93c95a9a9 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,7 +5,7 @@ min-sdk = "21" compile-sdk = "33" target-sdk = "33" gradle = "8.0.2" -kotlin = "1.8.22" +kotlin = "1.9.0" kotlin-ksp = "1.8.22-1.0.11" kotlin-coroutines = "1.7.2" kotlin-serialization-json = "1.5.1" From 570ad5b574075a20e57f3b3c248658e0f86cd706 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 21 Jul 2023 16:52:52 +0300 Subject: [PATCH 14/18] Bump com.google.devtools.ksp from 1.8.22-1.0.11 to 1.9.0-1.0.12 (#155) Bumps [com.google.devtools.ksp](https://github.com/google/ksp) from 1.8.22-1.0.11 to 1.9.0-1.0.12. - [Release notes](https://github.com/google/ksp/releases) - [Commits](https://github.com/google/ksp/compare/1.8.22-1.0.11...1.9.0-1.0.12) --- updated-dependencies: - dependency-name: com.google.devtools.ksp dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Michael Bely --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 93c95a9a9..0d3b87824 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,7 +6,7 @@ compile-sdk = "33" target-sdk = "33" gradle = "8.0.2" kotlin = "1.9.0" -kotlin-ksp = "1.8.22-1.0.11" +kotlin-ksp = "1.9.0-1.0.12" kotlin-coroutines = "1.7.2" kotlin-serialization-json = "1.5.1" compose-compiler = "1.4.8" From b5689c6649407ba67ff11ce9dd3360e23e51437d Mon Sep 17 00:00:00 2001 From: michaelbel Date: Fri, 21 Jul 2023 16:54:03 +0300 Subject: [PATCH 15/18] Update project --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0d3b87824..ccca4bc33 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,7 +9,7 @@ kotlin = "1.9.0" kotlin-ksp = "1.9.0-1.0.12" kotlin-coroutines = "1.7.2" kotlin-serialization-json = "1.5.1" -compose-compiler = "1.4.8" +compose-compiler = "1.5.0" detekt = "1.23.0" spotless = "6.20.0" google-services = "4.3.15" From 1e9c1e7d7a1d7ee309c90fdb815eb67a9b378da7 Mon Sep 17 00:00:00 2001 From: michaelbel Date: Fri, 21 Jul 2023 21:16:28 +0300 Subject: [PATCH 16/18] Update project --- .../common/localization/model/AppLanguage.kt | 8 ++------ .../michaelbel/movies/common/theme/AppTheme.kt | 12 +++--------- .../movies/account/ui/AccountScreenContent.kt | 3 +-- .../movies/account/ui/AccountToolbar.kt | 3 +-- .../michaelbel/movies/auth/ui/AuthLinksBox.kt | 3 +-- .../org/michaelbel/movies/auth/ui/AuthToolbar.kt | 3 +-- .../movies/details/ui/DetailsToolbar.kt | 2 +- .../org/michaelbel/movies/feed/ui/FeedContent.kt | 16 +++++++++++----- .../org/michaelbel/movies/feed/ui/FeedToolbar.kt | 2 +- .../movies/settings/ui/SettingsToolbar.kt | 2 +- 10 files changed, 23 insertions(+), 31 deletions(-) diff --git a/core/common/src/main/kotlin/org/michaelbel/movies/common/localization/model/AppLanguage.kt b/core/common/src/main/kotlin/org/michaelbel/movies/common/localization/model/AppLanguage.kt index 95cbd27df..a21525a99 100644 --- a/core/common/src/main/kotlin/org/michaelbel/movies/common/localization/model/AppLanguage.kt +++ b/core/common/src/main/kotlin/org/michaelbel/movies/common/localization/model/AppLanguage.kt @@ -5,13 +5,9 @@ import org.michaelbel.movies.common.localization.exceptions.InvalidLocaleExcepti sealed class AppLanguage( val code: String ) { - object English: AppLanguage("en") { - override fun toString(): String = "English" - } + data object English: AppLanguage("en") - object Russian: AppLanguage("ru") { - override fun toString(): String = "Russian" - } + data object Russian: AppLanguage("ru") companion object { fun transform(code: String): AppLanguage { diff --git a/core/common/src/main/kotlin/org/michaelbel/movies/common/theme/AppTheme.kt b/core/common/src/main/kotlin/org/michaelbel/movies/common/theme/AppTheme.kt index 4bafd448b..d09b2013b 100644 --- a/core/common/src/main/kotlin/org/michaelbel/movies/common/theme/AppTheme.kt +++ b/core/common/src/main/kotlin/org/michaelbel/movies/common/theme/AppTheme.kt @@ -6,17 +6,11 @@ import org.michaelbel.movies.common.theme.exceptions.InvalidThemeException sealed class AppTheme( val theme: Int ) { - object NightNo: AppTheme(AppCompatDelegate.MODE_NIGHT_NO) { - override fun toString(): String = "NightNo" - } + data object NightNo: AppTheme(AppCompatDelegate.MODE_NIGHT_NO) - object NightYes: AppTheme(AppCompatDelegate.MODE_NIGHT_YES) { - override fun toString(): String = "NightYes" - } + data object NightYes: AppTheme(AppCompatDelegate.MODE_NIGHT_YES) - object FollowSystem: AppTheme(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM) { - override fun toString(): String = "FollowSystem" - } + data object FollowSystem: AppTheme(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM) companion object { fun transform(theme: Int): AppTheme { diff --git a/feature/account-impl/src/main/kotlin/org/michaelbel/movies/account/ui/AccountScreenContent.kt b/feature/account-impl/src/main/kotlin/org/michaelbel/movies/account/ui/AccountScreenContent.kt index b4d8df738..92bbfc2c7 100644 --- a/feature/account-impl/src/main/kotlin/org/michaelbel/movies/account/ui/AccountScreenContent.kt +++ b/feature/account-impl/src/main/kotlin/org/michaelbel/movies/account/ui/AccountScreenContent.kt @@ -169,8 +169,7 @@ internal fun AccountScreenContent( ) { if (loading) { CircularProgressIndicator( - modifier = Modifier - .size(24.dp), + modifier = Modifier.size(24.dp), strokeWidth = 2.dp ) } else { diff --git a/feature/account-impl/src/main/kotlin/org/michaelbel/movies/account/ui/AccountToolbar.kt b/feature/account-impl/src/main/kotlin/org/michaelbel/movies/account/ui/AccountToolbar.kt index 5662cb571..dd6f0719e 100644 --- a/feature/account-impl/src/main/kotlin/org/michaelbel/movies/account/ui/AccountToolbar.kt +++ b/feature/account-impl/src/main/kotlin/org/michaelbel/movies/account/ui/AccountToolbar.kt @@ -57,8 +57,7 @@ fun AccountToolbar( private fun AccountToolbarPreview() { MoviesTheme { AccountToolbar( - modifier = Modifier - .background(MaterialTheme.colorScheme.primaryContainer), + modifier = Modifier.background(MaterialTheme.colorScheme.primaryContainer), onNavigationIconClick = {} ) } diff --git a/feature/auth-impl/src/main/kotlin/org/michaelbel/movies/auth/ui/AuthLinksBox.kt b/feature/auth-impl/src/main/kotlin/org/michaelbel/movies/auth/ui/AuthLinksBox.kt index 066bd0613..ef6e40e00 100644 --- a/feature/auth-impl/src/main/kotlin/org/michaelbel/movies/auth/ui/AuthLinksBox.kt +++ b/feature/auth-impl/src/main/kotlin/org/michaelbel/movies/auth/ui/AuthLinksBox.kt @@ -87,8 +87,7 @@ private fun AuthLinksBoxPreview() { AuthLinksBox( onTermsOfUseClick = {}, onPrivacyPolicyClick = {}, - modifier = Modifier - .background(MaterialTheme.colorScheme.primaryContainer) + modifier = Modifier.background(MaterialTheme.colorScheme.primaryContainer) ) } } \ No newline at end of file diff --git a/feature/auth-impl/src/main/kotlin/org/michaelbel/movies/auth/ui/AuthToolbar.kt b/feature/auth-impl/src/main/kotlin/org/michaelbel/movies/auth/ui/AuthToolbar.kt index cb20736a5..f6219c4dc 100644 --- a/feature/auth-impl/src/main/kotlin/org/michaelbel/movies/auth/ui/AuthToolbar.kt +++ b/feature/auth-impl/src/main/kotlin/org/michaelbel/movies/auth/ui/AuthToolbar.kt @@ -57,8 +57,7 @@ fun AuthToolbar( private fun AuthToolbarPreview() { MoviesTheme { AuthToolbar( - modifier = Modifier - .background(MaterialTheme.colorScheme.primaryContainer), + modifier = Modifier.background(MaterialTheme.colorScheme.primaryContainer), onNavigationIconClick = {} ) } diff --git a/feature/details-impl/src/main/kotlin/org/michaelbel/movies/details/ui/DetailsToolbar.kt b/feature/details-impl/src/main/kotlin/org/michaelbel/movies/details/ui/DetailsToolbar.kt index aa798e787..9e52fe9f5 100644 --- a/feature/details-impl/src/main/kotlin/org/michaelbel/movies/details/ui/DetailsToolbar.kt +++ b/feature/details-impl/src/main/kotlin/org/michaelbel/movies/details/ui/DetailsToolbar.kt @@ -64,7 +64,7 @@ fun DetailsToolbar( ) } }, - colors = TopAppBarDefaults.smallTopAppBarColors( + colors = TopAppBarDefaults.topAppBarColors( containerColor = Color.Transparent ) ) diff --git a/feature/feed-impl/src/main/kotlin/org/michaelbel/movies/feed/ui/FeedContent.kt b/feature/feed-impl/src/main/kotlin/org/michaelbel/movies/feed/ui/FeedContent.kt index de4eff286..a91853485 100644 --- a/feature/feed-impl/src/main/kotlin/org/michaelbel/movies/feed/ui/FeedContent.kt +++ b/feature/feed-impl/src/main/kotlin/org/michaelbel/movies/feed/ui/FeedContent.kt @@ -14,7 +14,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.unit.dp import androidx.paging.compose.LazyPagingItems -import androidx.paging.compose.items +import androidx.paging.compose.itemContentType +import androidx.paging.compose.itemKey import org.michaelbel.movies.domain.data.entity.MovieDb import org.michaelbel.movies.entities.isTmdbApiKeyEmpty import org.michaelbel.movies.ui.ktx.isNotEmpty @@ -34,10 +35,15 @@ fun FeedContent( state = listState, contentPadding = contentPadding ) { - items(pagingItems) { movieItem -> - movieItem?.let { movie -> + items( + count = pagingItems.itemCount, + key = pagingItems.itemKey(), + contentType = pagingItems.itemContentType() + ) { index -> + val movieDb: MovieDb? = pagingItems[index] + if (movieDb != null) { FeedMovieBox( - movie = movie, + movie = movieDb, modifier = Modifier .fillMaxWidth() .padding( @@ -47,7 +53,7 @@ fun FeedContent( .clip(MaterialTheme.shapes.small) .background(MaterialTheme.colorScheme.inversePrimary) .clickable { - onMovieClick(movie.movieId) + onMovieClick(movieDb.movieId) } ) } diff --git a/feature/feed-impl/src/main/kotlin/org/michaelbel/movies/feed/ui/FeedToolbar.kt b/feature/feed-impl/src/main/kotlin/org/michaelbel/movies/feed/ui/FeedToolbar.kt index 99e344503..1ae04ddf5 100644 --- a/feature/feed-impl/src/main/kotlin/org/michaelbel/movies/feed/ui/FeedToolbar.kt +++ b/feature/feed-impl/src/main/kotlin/org/michaelbel/movies/feed/ui/FeedToolbar.kt @@ -77,7 +77,7 @@ fun FeedToolbar( } } }, - colors = TopAppBarDefaults.smallTopAppBarColors( + colors = TopAppBarDefaults.topAppBarColors( containerColor = MaterialTheme.colorScheme.inversePrimary ) ) diff --git a/feature/settings-impl/src/main/kotlin/org/michaelbel/movies/settings/ui/SettingsToolbar.kt b/feature/settings-impl/src/main/kotlin/org/michaelbel/movies/settings/ui/SettingsToolbar.kt index 2f58fad3c..8bd9ebd10 100644 --- a/feature/settings-impl/src/main/kotlin/org/michaelbel/movies/settings/ui/SettingsToolbar.kt +++ b/feature/settings-impl/src/main/kotlin/org/michaelbel/movies/settings/ui/SettingsToolbar.kt @@ -50,7 +50,7 @@ internal fun SettingsToolbar( ) } }, - colors = TopAppBarDefaults.smallTopAppBarColors( + colors = TopAppBarDefaults.topAppBarColors( containerColor = Color.Transparent ) ) From 7cb22c1fa61adfc5998a18413de4317f1e5c89b1 Mon Sep 17 00:00:00 2001 From: michaelbel Date: Sun, 23 Jul 2023 17:42:35 +0300 Subject: [PATCH 17/18] Update project --- readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/readme.md b/readme.md index 236123d70..eb88a18d6 100644 --- a/readme.md +++ b/readme.md @@ -2,6 +2,7 @@ Movies = [![check-pr-badge](https://github.com/michaelbel/movies/actions/workflows/check_pr.yml/badge.svg?branch=develop)](https://github.com/michaelbel/movies/actions/workflows/check_pr.yml) +[![google-play-downloads](https://PlayBadges.pavi2410.me/badge/downloads?id=org.michaelbel.moviemade)](https://play.google.com/store/apps/details?id=org.michaelbel.moviemade) [![paypal-badge](https://img.shields.io/badge/Donate-Paypal-FF5252.svg)](https://paypal.me/michaelbel) [![last-commit-badge](https://img.shields.io/github/last-commit/michaelbel/moviemade?color=FF5252)](https://github.com/michaelbel/moviemade/commits) From c9682c80fbcbbe7d7de2ab53948dbcdcdeaf6227 Mon Sep 17 00:00:00 2001 From: michaelbel Date: Sun, 23 Jul 2023 17:47:10 +0300 Subject: [PATCH 18/18] Update project --- .github/workflows/check_pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check_pr.yml b/.github/workflows/check_pr.yml index 268149ec1..4f16a8f1f 100644 --- a/.github/workflows/check_pr.yml +++ b/.github/workflows/check_pr.yml @@ -47,7 +47,7 @@ jobs: java-version: 17 - name: Setup Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/gradle-build-action@v2.4.2 - name: Decode Keystore File id: decode_keystore_file