From ebc3535cfe4ce091a3710c5f50bea1690ae52fda Mon Sep 17 00:00:00 2001 From: compose-devrel-github-bot Date: Fri, 14 Jul 2023 09:44:20 +0000 Subject: [PATCH 1/8] =?UTF-8?q?=F0=9F=A4=96=20Update=20Dependencies?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Crane/gradle/libs.versions.toml | 18 +++++++++++------- JetLagged/gradle/libs.versions.toml | 18 +++++++++++------- JetNews/gradle/libs.versions.toml | 14 +++++++------- Jetcaster/gradle/libs.versions.toml | 18 +++++++++++------- Jetchat/gradle/libs.versions.toml | 18 +++++++++++------- Jetsnack/gradle/libs.versions.toml | 18 +++++++++++------- Jetsurvey/gradle/libs.versions.toml | 18 +++++++++++------- Owl/gradle/libs.versions.toml | 18 +++++++++++------- Reply/gradle/libs.versions.toml | 18 +++++++++++------- scripts/libs.versions.toml | 18 +++++++++++------- 10 files changed, 106 insertions(+), 70 deletions(-) diff --git a/Crane/gradle/libs.versions.toml b/Crane/gradle/libs.versions.toml index e57c91175c..c4f02f3c9e 100644 --- a/Crane/gradle/libs.versions.toml +++ b/Crane/gradle/libs.versions.toml @@ -4,32 +4,33 @@ ##### [versions] accompanist = "0.30.1" -androidGradlePlugin = "8.0.1" -androidx-activity-compose = "1.7.1" +androidGradlePlugin = "8.0.2" +androidx-activity-compose = "1.7.2" androidx-appcompat = "1.6.1" androidx-benchmark = "1.1.0" androidx-benchmark-junit4 = "1.1.1" -androidx-compose-bom = "2023.05.01" +androidx-compose-bom = "2023.06.01" androidx-constraintlayout = "1.0.1" androidx-corektx = "1.9.0" +androidx-glance = "1.0.0-beta01" androidx-lifecycle-compose = "2.6.1" androidx-lifecycle-runtime-compose = "2.6.1" -androidx-navigation = "2.6.0-rc01" +androidx-navigation = "2.7.0-beta02" androidx-palette = "1.0.0" androidx-test = "1.5.0" androidx-test-espresso = "3.5.1" androidx-test-ext-junit = "1.1.5" androidx-test-ext-truth = "1.5.0" -androidx-window = "1.1.0-rc01" +androidx-window = "1.2.0-alpha03" androidxHiltNavigationCompose = "1.0.0" androix-test-uiautomator = "2.2.0" coil = "2.2.2" # @keep compileSdk = "33" compose-compiler = "1.4.0" -coroutines = "1.6.4" +coroutines = "1.7.2" google-maps = "18.1.0" -gradle-versions = "0.46.0" +gradle-versions = "0.47.0" hilt = "2.43.2" hiltExt = "1.0.0" # @pin When updating to AGP 7.4.0-alpha10 and up we can update this https://developer.android.com/studio/write/java8-support#library-desugaring-versions @@ -85,6 +86,9 @@ androidx-compose-ui-util = { module = "androidx.compose.ui:ui-util" } androidx-compose-ui-viewbinding = { module = "androidx.compose.ui:ui-viewbinding" } androidx-constraintlayout-compose = { module = "androidx.constraintlayout:constraintlayout-compose", version.ref = "androidx-constraintlayout" } androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx-corektx" } +androidx-glance = { module = "androidx.glance:glance", version.ref = "androidx-glance" } +androidx-glance-appwidget = { module = "androidx.glance:glance-appwidget", version.ref = "androidx-glance" } +androidx-glance-material3 = { module = "androidx.glance:glance-material3", version.ref = "androidx-glance" } androidx-hilt-navigation-compose = { module = "androidx.hilt:hilt-navigation-compose", version.ref = "androidxHiltNavigationCompose" } androidx-lifecycle-livedata-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle-compose" } androidx-lifecycle-runtime = "androidx.lifecycle:lifecycle-runtime-ktx:2.6.0-alpha04" diff --git a/JetLagged/gradle/libs.versions.toml b/JetLagged/gradle/libs.versions.toml index e57c91175c..c4f02f3c9e 100644 --- a/JetLagged/gradle/libs.versions.toml +++ b/JetLagged/gradle/libs.versions.toml @@ -4,32 +4,33 @@ ##### [versions] accompanist = "0.30.1" -androidGradlePlugin = "8.0.1" -androidx-activity-compose = "1.7.1" +androidGradlePlugin = "8.0.2" +androidx-activity-compose = "1.7.2" androidx-appcompat = "1.6.1" androidx-benchmark = "1.1.0" androidx-benchmark-junit4 = "1.1.1" -androidx-compose-bom = "2023.05.01" +androidx-compose-bom = "2023.06.01" androidx-constraintlayout = "1.0.1" androidx-corektx = "1.9.0" +androidx-glance = "1.0.0-beta01" androidx-lifecycle-compose = "2.6.1" androidx-lifecycle-runtime-compose = "2.6.1" -androidx-navigation = "2.6.0-rc01" +androidx-navigation = "2.7.0-beta02" androidx-palette = "1.0.0" androidx-test = "1.5.0" androidx-test-espresso = "3.5.1" androidx-test-ext-junit = "1.1.5" androidx-test-ext-truth = "1.5.0" -androidx-window = "1.1.0-rc01" +androidx-window = "1.2.0-alpha03" androidxHiltNavigationCompose = "1.0.0" androix-test-uiautomator = "2.2.0" coil = "2.2.2" # @keep compileSdk = "33" compose-compiler = "1.4.0" -coroutines = "1.6.4" +coroutines = "1.7.2" google-maps = "18.1.0" -gradle-versions = "0.46.0" +gradle-versions = "0.47.0" hilt = "2.43.2" hiltExt = "1.0.0" # @pin When updating to AGP 7.4.0-alpha10 and up we can update this https://developer.android.com/studio/write/java8-support#library-desugaring-versions @@ -85,6 +86,9 @@ androidx-compose-ui-util = { module = "androidx.compose.ui:ui-util" } androidx-compose-ui-viewbinding = { module = "androidx.compose.ui:ui-viewbinding" } androidx-constraintlayout-compose = { module = "androidx.constraintlayout:constraintlayout-compose", version.ref = "androidx-constraintlayout" } androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx-corektx" } +androidx-glance = { module = "androidx.glance:glance", version.ref = "androidx-glance" } +androidx-glance-appwidget = { module = "androidx.glance:glance-appwidget", version.ref = "androidx-glance" } +androidx-glance-material3 = { module = "androidx.glance:glance-material3", version.ref = "androidx-glance" } androidx-hilt-navigation-compose = { module = "androidx.hilt:hilt-navigation-compose", version.ref = "androidxHiltNavigationCompose" } androidx-lifecycle-livedata-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle-compose" } androidx-lifecycle-runtime = "androidx.lifecycle:lifecycle-runtime-ktx:2.6.0-alpha04" diff --git a/JetNews/gradle/libs.versions.toml b/JetNews/gradle/libs.versions.toml index 2c7f619320..c4f02f3c9e 100644 --- a/JetNews/gradle/libs.versions.toml +++ b/JetNews/gradle/libs.versions.toml @@ -4,33 +4,33 @@ ##### [versions] accompanist = "0.30.1" -androidGradlePlugin = "8.0.1" -androidx-activity-compose = "1.7.1" +androidGradlePlugin = "8.0.2" +androidx-activity-compose = "1.7.2" androidx-appcompat = "1.6.1" androidx-benchmark = "1.1.0" androidx-benchmark-junit4 = "1.1.1" -androidx-compose-bom = "2023.05.01" +androidx-compose-bom = "2023.06.01" androidx-constraintlayout = "1.0.1" androidx-corektx = "1.9.0" androidx-glance = "1.0.0-beta01" androidx-lifecycle-compose = "2.6.1" androidx-lifecycle-runtime-compose = "2.6.1" -androidx-navigation = "2.6.0-rc01" +androidx-navigation = "2.7.0-beta02" androidx-palette = "1.0.0" androidx-test = "1.5.0" androidx-test-espresso = "3.5.1" androidx-test-ext-junit = "1.1.5" androidx-test-ext-truth = "1.5.0" -androidx-window = "1.1.0-rc01" +androidx-window = "1.2.0-alpha03" androidxHiltNavigationCompose = "1.0.0" androix-test-uiautomator = "2.2.0" coil = "2.2.2" # @keep compileSdk = "33" compose-compiler = "1.4.0" -coroutines = "1.6.4" +coroutines = "1.7.2" google-maps = "18.1.0" -gradle-versions = "0.46.0" +gradle-versions = "0.47.0" hilt = "2.43.2" hiltExt = "1.0.0" # @pin When updating to AGP 7.4.0-alpha10 and up we can update this https://developer.android.com/studio/write/java8-support#library-desugaring-versions diff --git a/Jetcaster/gradle/libs.versions.toml b/Jetcaster/gradle/libs.versions.toml index e57c91175c..c4f02f3c9e 100644 --- a/Jetcaster/gradle/libs.versions.toml +++ b/Jetcaster/gradle/libs.versions.toml @@ -4,32 +4,33 @@ ##### [versions] accompanist = "0.30.1" -androidGradlePlugin = "8.0.1" -androidx-activity-compose = "1.7.1" +androidGradlePlugin = "8.0.2" +androidx-activity-compose = "1.7.2" androidx-appcompat = "1.6.1" androidx-benchmark = "1.1.0" androidx-benchmark-junit4 = "1.1.1" -androidx-compose-bom = "2023.05.01" +androidx-compose-bom = "2023.06.01" androidx-constraintlayout = "1.0.1" androidx-corektx = "1.9.0" +androidx-glance = "1.0.0-beta01" androidx-lifecycle-compose = "2.6.1" androidx-lifecycle-runtime-compose = "2.6.1" -androidx-navigation = "2.6.0-rc01" +androidx-navigation = "2.7.0-beta02" androidx-palette = "1.0.0" androidx-test = "1.5.0" androidx-test-espresso = "3.5.1" androidx-test-ext-junit = "1.1.5" androidx-test-ext-truth = "1.5.0" -androidx-window = "1.1.0-rc01" +androidx-window = "1.2.0-alpha03" androidxHiltNavigationCompose = "1.0.0" androix-test-uiautomator = "2.2.0" coil = "2.2.2" # @keep compileSdk = "33" compose-compiler = "1.4.0" -coroutines = "1.6.4" +coroutines = "1.7.2" google-maps = "18.1.0" -gradle-versions = "0.46.0" +gradle-versions = "0.47.0" hilt = "2.43.2" hiltExt = "1.0.0" # @pin When updating to AGP 7.4.0-alpha10 and up we can update this https://developer.android.com/studio/write/java8-support#library-desugaring-versions @@ -85,6 +86,9 @@ androidx-compose-ui-util = { module = "androidx.compose.ui:ui-util" } androidx-compose-ui-viewbinding = { module = "androidx.compose.ui:ui-viewbinding" } androidx-constraintlayout-compose = { module = "androidx.constraintlayout:constraintlayout-compose", version.ref = "androidx-constraintlayout" } androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx-corektx" } +androidx-glance = { module = "androidx.glance:glance", version.ref = "androidx-glance" } +androidx-glance-appwidget = { module = "androidx.glance:glance-appwidget", version.ref = "androidx-glance" } +androidx-glance-material3 = { module = "androidx.glance:glance-material3", version.ref = "androidx-glance" } androidx-hilt-navigation-compose = { module = "androidx.hilt:hilt-navigation-compose", version.ref = "androidxHiltNavigationCompose" } androidx-lifecycle-livedata-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle-compose" } androidx-lifecycle-runtime = "androidx.lifecycle:lifecycle-runtime-ktx:2.6.0-alpha04" diff --git a/Jetchat/gradle/libs.versions.toml b/Jetchat/gradle/libs.versions.toml index e57c91175c..c4f02f3c9e 100644 --- a/Jetchat/gradle/libs.versions.toml +++ b/Jetchat/gradle/libs.versions.toml @@ -4,32 +4,33 @@ ##### [versions] accompanist = "0.30.1" -androidGradlePlugin = "8.0.1" -androidx-activity-compose = "1.7.1" +androidGradlePlugin = "8.0.2" +androidx-activity-compose = "1.7.2" androidx-appcompat = "1.6.1" androidx-benchmark = "1.1.0" androidx-benchmark-junit4 = "1.1.1" -androidx-compose-bom = "2023.05.01" +androidx-compose-bom = "2023.06.01" androidx-constraintlayout = "1.0.1" androidx-corektx = "1.9.0" +androidx-glance = "1.0.0-beta01" androidx-lifecycle-compose = "2.6.1" androidx-lifecycle-runtime-compose = "2.6.1" -androidx-navigation = "2.6.0-rc01" +androidx-navigation = "2.7.0-beta02" androidx-palette = "1.0.0" androidx-test = "1.5.0" androidx-test-espresso = "3.5.1" androidx-test-ext-junit = "1.1.5" androidx-test-ext-truth = "1.5.0" -androidx-window = "1.1.0-rc01" +androidx-window = "1.2.0-alpha03" androidxHiltNavigationCompose = "1.0.0" androix-test-uiautomator = "2.2.0" coil = "2.2.2" # @keep compileSdk = "33" compose-compiler = "1.4.0" -coroutines = "1.6.4" +coroutines = "1.7.2" google-maps = "18.1.0" -gradle-versions = "0.46.0" +gradle-versions = "0.47.0" hilt = "2.43.2" hiltExt = "1.0.0" # @pin When updating to AGP 7.4.0-alpha10 and up we can update this https://developer.android.com/studio/write/java8-support#library-desugaring-versions @@ -85,6 +86,9 @@ androidx-compose-ui-util = { module = "androidx.compose.ui:ui-util" } androidx-compose-ui-viewbinding = { module = "androidx.compose.ui:ui-viewbinding" } androidx-constraintlayout-compose = { module = "androidx.constraintlayout:constraintlayout-compose", version.ref = "androidx-constraintlayout" } androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx-corektx" } +androidx-glance = { module = "androidx.glance:glance", version.ref = "androidx-glance" } +androidx-glance-appwidget = { module = "androidx.glance:glance-appwidget", version.ref = "androidx-glance" } +androidx-glance-material3 = { module = "androidx.glance:glance-material3", version.ref = "androidx-glance" } androidx-hilt-navigation-compose = { module = "androidx.hilt:hilt-navigation-compose", version.ref = "androidxHiltNavigationCompose" } androidx-lifecycle-livedata-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle-compose" } androidx-lifecycle-runtime = "androidx.lifecycle:lifecycle-runtime-ktx:2.6.0-alpha04" diff --git a/Jetsnack/gradle/libs.versions.toml b/Jetsnack/gradle/libs.versions.toml index e57c91175c..c4f02f3c9e 100644 --- a/Jetsnack/gradle/libs.versions.toml +++ b/Jetsnack/gradle/libs.versions.toml @@ -4,32 +4,33 @@ ##### [versions] accompanist = "0.30.1" -androidGradlePlugin = "8.0.1" -androidx-activity-compose = "1.7.1" +androidGradlePlugin = "8.0.2" +androidx-activity-compose = "1.7.2" androidx-appcompat = "1.6.1" androidx-benchmark = "1.1.0" androidx-benchmark-junit4 = "1.1.1" -androidx-compose-bom = "2023.05.01" +androidx-compose-bom = "2023.06.01" androidx-constraintlayout = "1.0.1" androidx-corektx = "1.9.0" +androidx-glance = "1.0.0-beta01" androidx-lifecycle-compose = "2.6.1" androidx-lifecycle-runtime-compose = "2.6.1" -androidx-navigation = "2.6.0-rc01" +androidx-navigation = "2.7.0-beta02" androidx-palette = "1.0.0" androidx-test = "1.5.0" androidx-test-espresso = "3.5.1" androidx-test-ext-junit = "1.1.5" androidx-test-ext-truth = "1.5.0" -androidx-window = "1.1.0-rc01" +androidx-window = "1.2.0-alpha03" androidxHiltNavigationCompose = "1.0.0" androix-test-uiautomator = "2.2.0" coil = "2.2.2" # @keep compileSdk = "33" compose-compiler = "1.4.0" -coroutines = "1.6.4" +coroutines = "1.7.2" google-maps = "18.1.0" -gradle-versions = "0.46.0" +gradle-versions = "0.47.0" hilt = "2.43.2" hiltExt = "1.0.0" # @pin When updating to AGP 7.4.0-alpha10 and up we can update this https://developer.android.com/studio/write/java8-support#library-desugaring-versions @@ -85,6 +86,9 @@ androidx-compose-ui-util = { module = "androidx.compose.ui:ui-util" } androidx-compose-ui-viewbinding = { module = "androidx.compose.ui:ui-viewbinding" } androidx-constraintlayout-compose = { module = "androidx.constraintlayout:constraintlayout-compose", version.ref = "androidx-constraintlayout" } androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx-corektx" } +androidx-glance = { module = "androidx.glance:glance", version.ref = "androidx-glance" } +androidx-glance-appwidget = { module = "androidx.glance:glance-appwidget", version.ref = "androidx-glance" } +androidx-glance-material3 = { module = "androidx.glance:glance-material3", version.ref = "androidx-glance" } androidx-hilt-navigation-compose = { module = "androidx.hilt:hilt-navigation-compose", version.ref = "androidxHiltNavigationCompose" } androidx-lifecycle-livedata-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle-compose" } androidx-lifecycle-runtime = "androidx.lifecycle:lifecycle-runtime-ktx:2.6.0-alpha04" diff --git a/Jetsurvey/gradle/libs.versions.toml b/Jetsurvey/gradle/libs.versions.toml index e57c91175c..c4f02f3c9e 100644 --- a/Jetsurvey/gradle/libs.versions.toml +++ b/Jetsurvey/gradle/libs.versions.toml @@ -4,32 +4,33 @@ ##### [versions] accompanist = "0.30.1" -androidGradlePlugin = "8.0.1" -androidx-activity-compose = "1.7.1" +androidGradlePlugin = "8.0.2" +androidx-activity-compose = "1.7.2" androidx-appcompat = "1.6.1" androidx-benchmark = "1.1.0" androidx-benchmark-junit4 = "1.1.1" -androidx-compose-bom = "2023.05.01" +androidx-compose-bom = "2023.06.01" androidx-constraintlayout = "1.0.1" androidx-corektx = "1.9.0" +androidx-glance = "1.0.0-beta01" androidx-lifecycle-compose = "2.6.1" androidx-lifecycle-runtime-compose = "2.6.1" -androidx-navigation = "2.6.0-rc01" +androidx-navigation = "2.7.0-beta02" androidx-palette = "1.0.0" androidx-test = "1.5.0" androidx-test-espresso = "3.5.1" androidx-test-ext-junit = "1.1.5" androidx-test-ext-truth = "1.5.0" -androidx-window = "1.1.0-rc01" +androidx-window = "1.2.0-alpha03" androidxHiltNavigationCompose = "1.0.0" androix-test-uiautomator = "2.2.0" coil = "2.2.2" # @keep compileSdk = "33" compose-compiler = "1.4.0" -coroutines = "1.6.4" +coroutines = "1.7.2" google-maps = "18.1.0" -gradle-versions = "0.46.0" +gradle-versions = "0.47.0" hilt = "2.43.2" hiltExt = "1.0.0" # @pin When updating to AGP 7.4.0-alpha10 and up we can update this https://developer.android.com/studio/write/java8-support#library-desugaring-versions @@ -85,6 +86,9 @@ androidx-compose-ui-util = { module = "androidx.compose.ui:ui-util" } androidx-compose-ui-viewbinding = { module = "androidx.compose.ui:ui-viewbinding" } androidx-constraintlayout-compose = { module = "androidx.constraintlayout:constraintlayout-compose", version.ref = "androidx-constraintlayout" } androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx-corektx" } +androidx-glance = { module = "androidx.glance:glance", version.ref = "androidx-glance" } +androidx-glance-appwidget = { module = "androidx.glance:glance-appwidget", version.ref = "androidx-glance" } +androidx-glance-material3 = { module = "androidx.glance:glance-material3", version.ref = "androidx-glance" } androidx-hilt-navigation-compose = { module = "androidx.hilt:hilt-navigation-compose", version.ref = "androidxHiltNavigationCompose" } androidx-lifecycle-livedata-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle-compose" } androidx-lifecycle-runtime = "androidx.lifecycle:lifecycle-runtime-ktx:2.6.0-alpha04" diff --git a/Owl/gradle/libs.versions.toml b/Owl/gradle/libs.versions.toml index e57c91175c..c4f02f3c9e 100644 --- a/Owl/gradle/libs.versions.toml +++ b/Owl/gradle/libs.versions.toml @@ -4,32 +4,33 @@ ##### [versions] accompanist = "0.30.1" -androidGradlePlugin = "8.0.1" -androidx-activity-compose = "1.7.1" +androidGradlePlugin = "8.0.2" +androidx-activity-compose = "1.7.2" androidx-appcompat = "1.6.1" androidx-benchmark = "1.1.0" androidx-benchmark-junit4 = "1.1.1" -androidx-compose-bom = "2023.05.01" +androidx-compose-bom = "2023.06.01" androidx-constraintlayout = "1.0.1" androidx-corektx = "1.9.0" +androidx-glance = "1.0.0-beta01" androidx-lifecycle-compose = "2.6.1" androidx-lifecycle-runtime-compose = "2.6.1" -androidx-navigation = "2.6.0-rc01" +androidx-navigation = "2.7.0-beta02" androidx-palette = "1.0.0" androidx-test = "1.5.0" androidx-test-espresso = "3.5.1" androidx-test-ext-junit = "1.1.5" androidx-test-ext-truth = "1.5.0" -androidx-window = "1.1.0-rc01" +androidx-window = "1.2.0-alpha03" androidxHiltNavigationCompose = "1.0.0" androix-test-uiautomator = "2.2.0" coil = "2.2.2" # @keep compileSdk = "33" compose-compiler = "1.4.0" -coroutines = "1.6.4" +coroutines = "1.7.2" google-maps = "18.1.0" -gradle-versions = "0.46.0" +gradle-versions = "0.47.0" hilt = "2.43.2" hiltExt = "1.0.0" # @pin When updating to AGP 7.4.0-alpha10 and up we can update this https://developer.android.com/studio/write/java8-support#library-desugaring-versions @@ -85,6 +86,9 @@ androidx-compose-ui-util = { module = "androidx.compose.ui:ui-util" } androidx-compose-ui-viewbinding = { module = "androidx.compose.ui:ui-viewbinding" } androidx-constraintlayout-compose = { module = "androidx.constraintlayout:constraintlayout-compose", version.ref = "androidx-constraintlayout" } androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx-corektx" } +androidx-glance = { module = "androidx.glance:glance", version.ref = "androidx-glance" } +androidx-glance-appwidget = { module = "androidx.glance:glance-appwidget", version.ref = "androidx-glance" } +androidx-glance-material3 = { module = "androidx.glance:glance-material3", version.ref = "androidx-glance" } androidx-hilt-navigation-compose = { module = "androidx.hilt:hilt-navigation-compose", version.ref = "androidxHiltNavigationCompose" } androidx-lifecycle-livedata-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle-compose" } androidx-lifecycle-runtime = "androidx.lifecycle:lifecycle-runtime-ktx:2.6.0-alpha04" diff --git a/Reply/gradle/libs.versions.toml b/Reply/gradle/libs.versions.toml index e57c91175c..c4f02f3c9e 100644 --- a/Reply/gradle/libs.versions.toml +++ b/Reply/gradle/libs.versions.toml @@ -4,32 +4,33 @@ ##### [versions] accompanist = "0.30.1" -androidGradlePlugin = "8.0.1" -androidx-activity-compose = "1.7.1" +androidGradlePlugin = "8.0.2" +androidx-activity-compose = "1.7.2" androidx-appcompat = "1.6.1" androidx-benchmark = "1.1.0" androidx-benchmark-junit4 = "1.1.1" -androidx-compose-bom = "2023.05.01" +androidx-compose-bom = "2023.06.01" androidx-constraintlayout = "1.0.1" androidx-corektx = "1.9.0" +androidx-glance = "1.0.0-beta01" androidx-lifecycle-compose = "2.6.1" androidx-lifecycle-runtime-compose = "2.6.1" -androidx-navigation = "2.6.0-rc01" +androidx-navigation = "2.7.0-beta02" androidx-palette = "1.0.0" androidx-test = "1.5.0" androidx-test-espresso = "3.5.1" androidx-test-ext-junit = "1.1.5" androidx-test-ext-truth = "1.5.0" -androidx-window = "1.1.0-rc01" +androidx-window = "1.2.0-alpha03" androidxHiltNavigationCompose = "1.0.0" androix-test-uiautomator = "2.2.0" coil = "2.2.2" # @keep compileSdk = "33" compose-compiler = "1.4.0" -coroutines = "1.6.4" +coroutines = "1.7.2" google-maps = "18.1.0" -gradle-versions = "0.46.0" +gradle-versions = "0.47.0" hilt = "2.43.2" hiltExt = "1.0.0" # @pin When updating to AGP 7.4.0-alpha10 and up we can update this https://developer.android.com/studio/write/java8-support#library-desugaring-versions @@ -85,6 +86,9 @@ androidx-compose-ui-util = { module = "androidx.compose.ui:ui-util" } androidx-compose-ui-viewbinding = { module = "androidx.compose.ui:ui-viewbinding" } androidx-constraintlayout-compose = { module = "androidx.constraintlayout:constraintlayout-compose", version.ref = "androidx-constraintlayout" } androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx-corektx" } +androidx-glance = { module = "androidx.glance:glance", version.ref = "androidx-glance" } +androidx-glance-appwidget = { module = "androidx.glance:glance-appwidget", version.ref = "androidx-glance" } +androidx-glance-material3 = { module = "androidx.glance:glance-material3", version.ref = "androidx-glance" } androidx-hilt-navigation-compose = { module = "androidx.hilt:hilt-navigation-compose", version.ref = "androidxHiltNavigationCompose" } androidx-lifecycle-livedata-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle-compose" } androidx-lifecycle-runtime = "androidx.lifecycle:lifecycle-runtime-ktx:2.6.0-alpha04" diff --git a/scripts/libs.versions.toml b/scripts/libs.versions.toml index e57c91175c..c4f02f3c9e 100644 --- a/scripts/libs.versions.toml +++ b/scripts/libs.versions.toml @@ -4,32 +4,33 @@ ##### [versions] accompanist = "0.30.1" -androidGradlePlugin = "8.0.1" -androidx-activity-compose = "1.7.1" +androidGradlePlugin = "8.0.2" +androidx-activity-compose = "1.7.2" androidx-appcompat = "1.6.1" androidx-benchmark = "1.1.0" androidx-benchmark-junit4 = "1.1.1" -androidx-compose-bom = "2023.05.01" +androidx-compose-bom = "2023.06.01" androidx-constraintlayout = "1.0.1" androidx-corektx = "1.9.0" +androidx-glance = "1.0.0-beta01" androidx-lifecycle-compose = "2.6.1" androidx-lifecycle-runtime-compose = "2.6.1" -androidx-navigation = "2.6.0-rc01" +androidx-navigation = "2.7.0-beta02" androidx-palette = "1.0.0" androidx-test = "1.5.0" androidx-test-espresso = "3.5.1" androidx-test-ext-junit = "1.1.5" androidx-test-ext-truth = "1.5.0" -androidx-window = "1.1.0-rc01" +androidx-window = "1.2.0-alpha03" androidxHiltNavigationCompose = "1.0.0" androix-test-uiautomator = "2.2.0" coil = "2.2.2" # @keep compileSdk = "33" compose-compiler = "1.4.0" -coroutines = "1.6.4" +coroutines = "1.7.2" google-maps = "18.1.0" -gradle-versions = "0.46.0" +gradle-versions = "0.47.0" hilt = "2.43.2" hiltExt = "1.0.0" # @pin When updating to AGP 7.4.0-alpha10 and up we can update this https://developer.android.com/studio/write/java8-support#library-desugaring-versions @@ -85,6 +86,9 @@ androidx-compose-ui-util = { module = "androidx.compose.ui:ui-util" } androidx-compose-ui-viewbinding = { module = "androidx.compose.ui:ui-viewbinding" } androidx-constraintlayout-compose = { module = "androidx.constraintlayout:constraintlayout-compose", version.ref = "androidx-constraintlayout" } androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx-corektx" } +androidx-glance = { module = "androidx.glance:glance", version.ref = "androidx-glance" } +androidx-glance-appwidget = { module = "androidx.glance:glance-appwidget", version.ref = "androidx-glance" } +androidx-glance-material3 = { module = "androidx.glance:glance-material3", version.ref = "androidx-glance" } androidx-hilt-navigation-compose = { module = "androidx.hilt:hilt-navigation-compose", version.ref = "androidxHiltNavigationCompose" } androidx-lifecycle-livedata-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle-compose" } androidx-lifecycle-runtime = "androidx.lifecycle:lifecycle-runtime-ktx:2.6.0-alpha04" From 285a6a5dae0b3bfd2e07e03b85faf8db05869355 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Mlynari=C4=8D?= Date: Fri, 14 Jul 2023 12:00:36 +0200 Subject: [PATCH 2/8] Update compileSDK to 34 --- Crane/gradle/libs.versions.toml | 2 +- JetLagged/gradle/libs.versions.toml | 2 +- JetNews/gradle/libs.versions.toml | 2 +- Jetcaster/gradle/libs.versions.toml | 2 +- Jetchat/gradle/libs.versions.toml | 2 +- Jetsnack/gradle/libs.versions.toml | 2 +- Jetsurvey/gradle/libs.versions.toml | 2 +- Owl/gradle/libs.versions.toml | 2 +- Reply/gradle/libs.versions.toml | 2 +- scripts/libs.versions.toml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Crane/gradle/libs.versions.toml b/Crane/gradle/libs.versions.toml index c4f02f3c9e..c7198122cb 100644 --- a/Crane/gradle/libs.versions.toml +++ b/Crane/gradle/libs.versions.toml @@ -26,7 +26,7 @@ androidxHiltNavigationCompose = "1.0.0" androix-test-uiautomator = "2.2.0" coil = "2.2.2" # @keep -compileSdk = "33" +compileSdk = "34" compose-compiler = "1.4.0" coroutines = "1.7.2" google-maps = "18.1.0" diff --git a/JetLagged/gradle/libs.versions.toml b/JetLagged/gradle/libs.versions.toml index c4f02f3c9e..c7198122cb 100644 --- a/JetLagged/gradle/libs.versions.toml +++ b/JetLagged/gradle/libs.versions.toml @@ -26,7 +26,7 @@ androidxHiltNavigationCompose = "1.0.0" androix-test-uiautomator = "2.2.0" coil = "2.2.2" # @keep -compileSdk = "33" +compileSdk = "34" compose-compiler = "1.4.0" coroutines = "1.7.2" google-maps = "18.1.0" diff --git a/JetNews/gradle/libs.versions.toml b/JetNews/gradle/libs.versions.toml index c4f02f3c9e..c7198122cb 100644 --- a/JetNews/gradle/libs.versions.toml +++ b/JetNews/gradle/libs.versions.toml @@ -26,7 +26,7 @@ androidxHiltNavigationCompose = "1.0.0" androix-test-uiautomator = "2.2.0" coil = "2.2.2" # @keep -compileSdk = "33" +compileSdk = "34" compose-compiler = "1.4.0" coroutines = "1.7.2" google-maps = "18.1.0" diff --git a/Jetcaster/gradle/libs.versions.toml b/Jetcaster/gradle/libs.versions.toml index c4f02f3c9e..c7198122cb 100644 --- a/Jetcaster/gradle/libs.versions.toml +++ b/Jetcaster/gradle/libs.versions.toml @@ -26,7 +26,7 @@ androidxHiltNavigationCompose = "1.0.0" androix-test-uiautomator = "2.2.0" coil = "2.2.2" # @keep -compileSdk = "33" +compileSdk = "34" compose-compiler = "1.4.0" coroutines = "1.7.2" google-maps = "18.1.0" diff --git a/Jetchat/gradle/libs.versions.toml b/Jetchat/gradle/libs.versions.toml index c4f02f3c9e..c7198122cb 100644 --- a/Jetchat/gradle/libs.versions.toml +++ b/Jetchat/gradle/libs.versions.toml @@ -26,7 +26,7 @@ androidxHiltNavigationCompose = "1.0.0" androix-test-uiautomator = "2.2.0" coil = "2.2.2" # @keep -compileSdk = "33" +compileSdk = "34" compose-compiler = "1.4.0" coroutines = "1.7.2" google-maps = "18.1.0" diff --git a/Jetsnack/gradle/libs.versions.toml b/Jetsnack/gradle/libs.versions.toml index c4f02f3c9e..c7198122cb 100644 --- a/Jetsnack/gradle/libs.versions.toml +++ b/Jetsnack/gradle/libs.versions.toml @@ -26,7 +26,7 @@ androidxHiltNavigationCompose = "1.0.0" androix-test-uiautomator = "2.2.0" coil = "2.2.2" # @keep -compileSdk = "33" +compileSdk = "34" compose-compiler = "1.4.0" coroutines = "1.7.2" google-maps = "18.1.0" diff --git a/Jetsurvey/gradle/libs.versions.toml b/Jetsurvey/gradle/libs.versions.toml index c4f02f3c9e..c7198122cb 100644 --- a/Jetsurvey/gradle/libs.versions.toml +++ b/Jetsurvey/gradle/libs.versions.toml @@ -26,7 +26,7 @@ androidxHiltNavigationCompose = "1.0.0" androix-test-uiautomator = "2.2.0" coil = "2.2.2" # @keep -compileSdk = "33" +compileSdk = "34" compose-compiler = "1.4.0" coroutines = "1.7.2" google-maps = "18.1.0" diff --git a/Owl/gradle/libs.versions.toml b/Owl/gradle/libs.versions.toml index c4f02f3c9e..c7198122cb 100644 --- a/Owl/gradle/libs.versions.toml +++ b/Owl/gradle/libs.versions.toml @@ -26,7 +26,7 @@ androidxHiltNavigationCompose = "1.0.0" androix-test-uiautomator = "2.2.0" coil = "2.2.2" # @keep -compileSdk = "33" +compileSdk = "34" compose-compiler = "1.4.0" coroutines = "1.7.2" google-maps = "18.1.0" diff --git a/Reply/gradle/libs.versions.toml b/Reply/gradle/libs.versions.toml index c4f02f3c9e..c7198122cb 100644 --- a/Reply/gradle/libs.versions.toml +++ b/Reply/gradle/libs.versions.toml @@ -26,7 +26,7 @@ androidxHiltNavigationCompose = "1.0.0" androix-test-uiautomator = "2.2.0" coil = "2.2.2" # @keep -compileSdk = "33" +compileSdk = "34" compose-compiler = "1.4.0" coroutines = "1.7.2" google-maps = "18.1.0" diff --git a/scripts/libs.versions.toml b/scripts/libs.versions.toml index c4f02f3c9e..c7198122cb 100644 --- a/scripts/libs.versions.toml +++ b/scripts/libs.versions.toml @@ -26,7 +26,7 @@ androidxHiltNavigationCompose = "1.0.0" androix-test-uiautomator = "2.2.0" coil = "2.2.2" # @keep -compileSdk = "33" +compileSdk = "34" compose-compiler = "1.4.0" coroutines = "1.7.2" google-maps = "18.1.0" From 9036a2871445bf0dafe81775baa43f592a477c6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Mlynari=C4=8D?= Date: Fri, 14 Jul 2023 12:30:30 +0200 Subject: [PATCH 3/8] [Crane] Fix pager page sizes --- .../compose/samples/crane/home/CraneHome.kt | 30 +++++++++++-------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/Crane/app/src/main/java/androidx/compose/samples/crane/home/CraneHome.kt b/Crane/app/src/main/java/androidx/compose/samples/crane/home/CraneHome.kt index 27a7048f88..bea341232a 100644 --- a/Crane/app/src/main/java/androidx/compose/samples/crane/home/CraneHome.kt +++ b/Crane/app/src/main/java/androidx/compose/samples/crane/home/CraneHome.kt @@ -96,7 +96,7 @@ fun CraneHome( } @OptIn( - ExperimentalMaterialApi::class, ExperimentalAnimationApi::class, + ExperimentalMaterialApi::class, ExperimentalFoundationApi::class ) @Composable @@ -111,9 +111,11 @@ fun CraneHomeContent( val suggestedDestinations by viewModel.suggestedDestinations.observeAsState() val onPeopleChanged: (Int) -> Unit = { viewModel.updatePeople(it) } - val pagerState = rememberPagerState(initialPage = CraneScreen.Fly.ordinal) - val coroutineScope = rememberCoroutineScope() val craneScreenValues = CraneScreen.values() + val pagerState = + rememberPagerState(initialPage = CraneScreen.Fly.ordinal) { craneScreenValues.size } + + val coroutineScope = rememberCoroutineScope() BackdropScaffold( modifier = modifier, scaffoldState = rememberBackdropScaffoldState(BackdropValue.Revealed), @@ -133,19 +135,16 @@ fun CraneHomeContent( }, backLayerContent = { SearchContent( - widthSize, - craneScreenValues[pagerState.currentPage], - viewModel, - onPeopleChanged, - onDateSelectionClicked, - onExploreItemClicked + widthSize = widthSize, + tabSelected = craneScreenValues[pagerState.currentPage], + viewModel = viewModel, + onPeopleChanged = onPeopleChanged, + onDateSelectionClicked = onDateSelectionClicked, + onExploreItemClicked = onExploreItemClicked ) }, frontLayerContent = { - HorizontalPager( - pageCount = craneScreenValues.size, - state = pagerState - ) { page -> + HorizontalPager(state = pagerState) { page -> when (craneScreenValues[page]) { CraneScreen.Fly -> { suggestedDestinations?.let { destinations -> @@ -157,6 +156,7 @@ fun CraneHomeContent( ) } } + CraneScreen.Sleep -> { ExploreSection( widthSize = widthSize, @@ -165,6 +165,7 @@ fun CraneHomeContent( onItemClicked = onExploreItemClicked ) } + CraneScreen.Eat -> { ExploreSection( widthSize = widthSize, @@ -202,6 +203,7 @@ private fun HomeTabBar( } private const val TAB_SWITCH_ANIM_DURATION = 300 + @OptIn(ExperimentalAnimationApi::class) @Composable private fun SearchContent( @@ -244,6 +246,7 @@ private fun SearchContent( onExploreItemClicked = onExploreItemClicked ) ) + CraneScreen.Sleep -> SleepSearchContent( widthSize = widthSize, datesSelected = selectedDates, @@ -253,6 +256,7 @@ private fun SearchContent( onExploreItemClicked = onExploreItemClicked ) ) + CraneScreen.Eat -> EatSearchContent( widthSize = widthSize, datesSelected = selectedDates, From e168600a57f47b626a5b6f96066d8d36c39e82b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Mlynari=C4=8D?= Date: Fri, 14 Jul 2023 12:30:47 +0200 Subject: [PATCH 4/8] [Jetcaster] Fix pager page size --- .../src/main/java/com/example/jetcaster/ui/home/Home.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/Home.kt b/Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/Home.kt index 60c7e48fc7..4dabdfd352 100644 --- a/Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/Home.kt +++ b/Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/Home.kt @@ -86,10 +86,10 @@ import com.example.jetcaster.util.contrastAgainst import com.example.jetcaster.util.quantityStringResource import com.example.jetcaster.util.rememberDominantColorState import com.example.jetcaster.util.verticalGradientScrim +import kotlinx.collections.immutable.PersistentList import java.time.Duration import java.time.LocalDateTime import java.time.OffsetDateTime -import kotlinx.collections.immutable.PersistentList @Composable fun Home( @@ -185,7 +185,7 @@ fun HomeContent( } DynamicThemePrimaryColorsFromImage(dominantColorState) { - val pagerState = rememberPagerState() + val pagerState = rememberPagerState { featuredPodcasts.size } val selectedImageUrl = featuredPodcasts.getOrNull(pagerState.currentPage) ?.podcast?.imageUrl @@ -255,6 +255,7 @@ fun HomeContent( HomeCategory.Library -> { // TODO } + HomeCategory.Discover -> { Discover( navigateToPlayer = navigateToPlayer, @@ -326,7 +327,6 @@ fun FollowedPodcasts( onPodcastUnfollowed: (String) -> Unit, ) { HorizontalPager( - pageCount = items.size, state = pagerState, modifier = modifier ) { page -> @@ -405,6 +405,7 @@ private fun lastUpdated(updated: OffsetDateTime): String { val weeks = days / 7 quantityStringResource(R.plurals.updated_weeks_ago, weeks, weeks) } + days > 0 -> quantityStringResource(R.plurals.updated_days_ago, days, days) else -> stringResource(R.string.updated_today) } From 495ac6284a74b4ca54bed1c291e3853adbf9e9be Mon Sep 17 00:00:00 2001 From: mlykotom Date: Fri, 14 Jul 2023 10:34:14 +0000 Subject: [PATCH 5/8] =?UTF-8?q?=F0=9F=A4=96=20Apply=20Spotless?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/src/main/java/com/example/jetcaster/ui/home/Home.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/Home.kt b/Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/Home.kt index 4dabdfd352..f9dee7eb07 100644 --- a/Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/Home.kt +++ b/Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/Home.kt @@ -86,10 +86,10 @@ import com.example.jetcaster.util.contrastAgainst import com.example.jetcaster.util.quantityStringResource import com.example.jetcaster.util.rememberDominantColorState import com.example.jetcaster.util.verticalGradientScrim -import kotlinx.collections.immutable.PersistentList import java.time.Duration import java.time.LocalDateTime import java.time.OffsetDateTime +import kotlinx.collections.immutable.PersistentList @Composable fun Home( From 639c938177a6422298b8ec8cb91b26a84c976c01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Mlynari=C4=8D?= Date: Fri, 14 Jul 2023 12:36:26 +0200 Subject: [PATCH 6/8] [JetSurvey] Fix animation changes --- .../compose/jetsurvey/survey/SurveyRoute.kt | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/survey/SurveyRoute.kt b/Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/survey/SurveyRoute.kt index b587951b0d..87b5b18ae7 100644 --- a/Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/survey/SurveyRoute.kt +++ b/Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/survey/SurveyRoute.kt @@ -21,11 +21,10 @@ import android.content.ContextWrapper import androidx.activity.compose.BackHandler import androidx.appcompat.app.AppCompatActivity import androidx.compose.animation.AnimatedContent -import androidx.compose.animation.AnimatedContentScope -import androidx.compose.animation.ExperimentalAnimationApi +import androidx.compose.animation.AnimatedContentTransitionScope import androidx.compose.animation.core.TweenSpec import androidx.compose.animation.core.tween -import androidx.compose.animation.with +import androidx.compose.animation.togetherWith import androidx.compose.foundation.layout.padding import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier @@ -40,7 +39,6 @@ private const val CONTENT_ANIMATION_DURATION = 300 /** * Displays a [SurveyQuestionsScreen] tied to the passed [SurveyViewModel] */ -@OptIn(ExperimentalAnimationApi::class) @Composable fun SurveyRoute( onSurveyComplete: () -> Unit, @@ -74,20 +72,22 @@ fun SurveyRoute( AnimatedContent( targetState = surveyScreenData, transitionSpec = { - val animationSpec: TweenSpec = - tween(CONTENT_ANIMATION_DURATION) + val animationSpec: TweenSpec = tween(CONTENT_ANIMATION_DURATION) + val direction = getTransitionDirection( initialIndex = initialState.questionIndex, targetIndex = targetState.questionIndex, ) + slideIntoContainer( towards = direction, animationSpec = animationSpec, - ) with slideOutOfContainer( + ) togetherWith slideOutOfContainer( towards = direction, animationSpec = animationSpec ) - } + }, + label = "surveyScreenDataAnimation" ) { targetState -> when (targetState.surveyQuestion) { @@ -139,21 +139,20 @@ fun SurveyRoute( } } -@OptIn(ExperimentalAnimationApi::class) private fun getTransitionDirection( initialIndex: Int, targetIndex: Int -): AnimatedContentScope.SlideDirection { +): AnimatedContentTransitionScope.SlideDirection { return if (targetIndex > initialIndex) { // Going forwards in the survey: Set the initial offset to start // at the size of the content so it slides in from right to left, and // slides out from the left of the screen to -fullWidth - AnimatedContentScope.SlideDirection.Left + AnimatedContentTransitionScope.SlideDirection.Left } else { // Going back to the previous question in the set, we do the same // transition as above, but with different offsets - the inverse of // above, negative fullWidth to enter, and fullWidth to exit. - AnimatedContentScope.SlideDirection.Right + AnimatedContentTransitionScope.SlideDirection.Right } } From 51c8a39661afb48530780085fe85d5716e5dfcf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Mlynari=C4=8D?= Date: Fri, 14 Jul 2023 12:44:11 +0200 Subject: [PATCH 7/8] [Jetcaster] Fix custom Modifier --- .../main/java/com/example/jetcaster/util/GradientScrim.kt | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Jetcaster/app/src/main/java/com/example/jetcaster/util/GradientScrim.kt b/Jetcaster/app/src/main/java/com/example/jetcaster/util/GradientScrim.kt index 552575fd08..48abd124c5 100644 --- a/Jetcaster/app/src/main/java/com/example/jetcaster/util/GradientScrim.kt +++ b/Jetcaster/app/src/main/java/com/example/jetcaster/util/GradientScrim.kt @@ -17,11 +17,8 @@ package com.example.jetcaster.util import androidx.annotation.FloatRange -import androidx.compose.runtime.getValue -import androidx.compose.runtime.setValue import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier -import androidx.compose.ui.draw.alpha import androidx.compose.ui.geometry.Offset import androidx.compose.ui.geometry.Rect import androidx.compose.ui.graphics.Brush @@ -56,7 +53,6 @@ fun Modifier.verticalGradientScrim( numStops: Int = 16 ) = this then VerticalGradientElement(color, startYPercentage, endYPercentage, decay, numStops) -@OptIn(ExperimentalComposeUiApi::class) private data class VerticalGradientElement( var color: Color, var startYPercentage: Float = 0f, @@ -100,7 +96,8 @@ private data class VerticalGradientElement( override fun create() = VerticalGradientModifier(createOnDraw()) - override fun update(node: VerticalGradientModifier) = node.apply { + + override fun update(node: VerticalGradientModifier) { node.onDraw = createOnDraw() } From 928cf2957b4beead5b9dfc3532f55b08089f0e2f Mon Sep 17 00:00:00 2001 From: mlykotom Date: Fri, 14 Jul 2023 10:47:07 +0000 Subject: [PATCH 8/8] =?UTF-8?q?=F0=9F=A4=96=20Apply=20Spotless?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/example/jetcaster/util/GradientScrim.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/Jetcaster/app/src/main/java/com/example/jetcaster/util/GradientScrim.kt b/Jetcaster/app/src/main/java/com/example/jetcaster/util/GradientScrim.kt index 48abd124c5..5c6a996361 100644 --- a/Jetcaster/app/src/main/java/com/example/jetcaster/util/GradientScrim.kt +++ b/Jetcaster/app/src/main/java/com/example/jetcaster/util/GradientScrim.kt @@ -96,7 +96,6 @@ private data class VerticalGradientElement( override fun create() = VerticalGradientModifier(createOnDraw()) - override fun update(node: VerticalGradientModifier) { node.onDraw = createOnDraw() }