From 8cc9ab92c7f7b9f94d678b49253c75644dea4b99 Mon Sep 17 00:00:00 2001 From: compose-devrel-github-bot Date: Wed, 7 Feb 2024 22:46:03 +0000 Subject: [PATCH 1/3] =?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 | 12 ++++++------ JetLagged/gradle/libs.versions.toml | 12 ++++++------ JetNews/gradle/libs.versions.toml | 12 ++++++------ Jetcaster/gradle/libs.versions.toml | 12 ++++++------ Jetchat/gradle/libs.versions.toml | 12 ++++++------ Jetsnack/gradle/libs.versions.toml | 12 ++++++------ Jetsurvey/gradle/libs.versions.toml | 12 ++++++------ Owl/gradle/libs.versions.toml | 12 ++++++------ Reply/gradle/libs.versions.toml | 12 ++++++------ scripts/libs.versions.toml | 12 ++++++------ 10 files changed, 60 insertions(+), 60 deletions(-) diff --git a/Crane/gradle/libs.versions.toml b/Crane/gradle/libs.versions.toml index c81099ca09..3eeb338e7e 100644 --- a/Crane/gradle/libs.versions.toml +++ b/Crane/gradle/libs.versions.toml @@ -3,25 +3,25 @@ # Do not add a dependency to an individual sample, edit the global version instead. ##### [versions] -accompanist = "0.32.0" +accompanist = "0.34.0" androidGradlePlugin = "8.2.2" androidx-activity-compose = "1.8.2" androidx-appcompat = "1.6.1" androidx-benchmark = "1.2.0" androidx-benchmark-junit4 = "1.2.1" -androidx-compose-bom = "2024.01.00" +androidx-compose-bom = "2024.02.00" androidx-constraintlayout = "1.0.1" -androidx-corektx = "1.13.0-alpha04" +androidx-corektx = "1.13.0-alpha05" androidx-glance = "1.0.0" androidx-lifecycle-compose = "2.7.0" androidx-lifecycle-runtime-compose = "2.7.0" -androidx-navigation = "2.7.6" +androidx-navigation = "2.7.7" 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.3.0-alpha01" +androidx-window = "1.3.0-alpha02" androidxHiltNavigationCompose = "1.1.0" androix-test-uiautomator = "2.2.0" coil = "2.4.0" @@ -51,7 +51,7 @@ room = "2.6.0" secrets = "2.0.1" # @keep targetSdk = "33" -version-catalog-update = "0.8.3" +version-catalog-update = "0.8.4" [libraries] accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" } diff --git a/JetLagged/gradle/libs.versions.toml b/JetLagged/gradle/libs.versions.toml index c81099ca09..3eeb338e7e 100644 --- a/JetLagged/gradle/libs.versions.toml +++ b/JetLagged/gradle/libs.versions.toml @@ -3,25 +3,25 @@ # Do not add a dependency to an individual sample, edit the global version instead. ##### [versions] -accompanist = "0.32.0" +accompanist = "0.34.0" androidGradlePlugin = "8.2.2" androidx-activity-compose = "1.8.2" androidx-appcompat = "1.6.1" androidx-benchmark = "1.2.0" androidx-benchmark-junit4 = "1.2.1" -androidx-compose-bom = "2024.01.00" +androidx-compose-bom = "2024.02.00" androidx-constraintlayout = "1.0.1" -androidx-corektx = "1.13.0-alpha04" +androidx-corektx = "1.13.0-alpha05" androidx-glance = "1.0.0" androidx-lifecycle-compose = "2.7.0" androidx-lifecycle-runtime-compose = "2.7.0" -androidx-navigation = "2.7.6" +androidx-navigation = "2.7.7" 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.3.0-alpha01" +androidx-window = "1.3.0-alpha02" androidxHiltNavigationCompose = "1.1.0" androix-test-uiautomator = "2.2.0" coil = "2.4.0" @@ -51,7 +51,7 @@ room = "2.6.0" secrets = "2.0.1" # @keep targetSdk = "33" -version-catalog-update = "0.8.3" +version-catalog-update = "0.8.4" [libraries] accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" } diff --git a/JetNews/gradle/libs.versions.toml b/JetNews/gradle/libs.versions.toml index c81099ca09..3eeb338e7e 100644 --- a/JetNews/gradle/libs.versions.toml +++ b/JetNews/gradle/libs.versions.toml @@ -3,25 +3,25 @@ # Do not add a dependency to an individual sample, edit the global version instead. ##### [versions] -accompanist = "0.32.0" +accompanist = "0.34.0" androidGradlePlugin = "8.2.2" androidx-activity-compose = "1.8.2" androidx-appcompat = "1.6.1" androidx-benchmark = "1.2.0" androidx-benchmark-junit4 = "1.2.1" -androidx-compose-bom = "2024.01.00" +androidx-compose-bom = "2024.02.00" androidx-constraintlayout = "1.0.1" -androidx-corektx = "1.13.0-alpha04" +androidx-corektx = "1.13.0-alpha05" androidx-glance = "1.0.0" androidx-lifecycle-compose = "2.7.0" androidx-lifecycle-runtime-compose = "2.7.0" -androidx-navigation = "2.7.6" +androidx-navigation = "2.7.7" 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.3.0-alpha01" +androidx-window = "1.3.0-alpha02" androidxHiltNavigationCompose = "1.1.0" androix-test-uiautomator = "2.2.0" coil = "2.4.0" @@ -51,7 +51,7 @@ room = "2.6.0" secrets = "2.0.1" # @keep targetSdk = "33" -version-catalog-update = "0.8.3" +version-catalog-update = "0.8.4" [libraries] accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" } diff --git a/Jetcaster/gradle/libs.versions.toml b/Jetcaster/gradle/libs.versions.toml index c81099ca09..3eeb338e7e 100644 --- a/Jetcaster/gradle/libs.versions.toml +++ b/Jetcaster/gradle/libs.versions.toml @@ -3,25 +3,25 @@ # Do not add a dependency to an individual sample, edit the global version instead. ##### [versions] -accompanist = "0.32.0" +accompanist = "0.34.0" androidGradlePlugin = "8.2.2" androidx-activity-compose = "1.8.2" androidx-appcompat = "1.6.1" androidx-benchmark = "1.2.0" androidx-benchmark-junit4 = "1.2.1" -androidx-compose-bom = "2024.01.00" +androidx-compose-bom = "2024.02.00" androidx-constraintlayout = "1.0.1" -androidx-corektx = "1.13.0-alpha04" +androidx-corektx = "1.13.0-alpha05" androidx-glance = "1.0.0" androidx-lifecycle-compose = "2.7.0" androidx-lifecycle-runtime-compose = "2.7.0" -androidx-navigation = "2.7.6" +androidx-navigation = "2.7.7" 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.3.0-alpha01" +androidx-window = "1.3.0-alpha02" androidxHiltNavigationCompose = "1.1.0" androix-test-uiautomator = "2.2.0" coil = "2.4.0" @@ -51,7 +51,7 @@ room = "2.6.0" secrets = "2.0.1" # @keep targetSdk = "33" -version-catalog-update = "0.8.3" +version-catalog-update = "0.8.4" [libraries] accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" } diff --git a/Jetchat/gradle/libs.versions.toml b/Jetchat/gradle/libs.versions.toml index c81099ca09..3eeb338e7e 100644 --- a/Jetchat/gradle/libs.versions.toml +++ b/Jetchat/gradle/libs.versions.toml @@ -3,25 +3,25 @@ # Do not add a dependency to an individual sample, edit the global version instead. ##### [versions] -accompanist = "0.32.0" +accompanist = "0.34.0" androidGradlePlugin = "8.2.2" androidx-activity-compose = "1.8.2" androidx-appcompat = "1.6.1" androidx-benchmark = "1.2.0" androidx-benchmark-junit4 = "1.2.1" -androidx-compose-bom = "2024.01.00" +androidx-compose-bom = "2024.02.00" androidx-constraintlayout = "1.0.1" -androidx-corektx = "1.13.0-alpha04" +androidx-corektx = "1.13.0-alpha05" androidx-glance = "1.0.0" androidx-lifecycle-compose = "2.7.0" androidx-lifecycle-runtime-compose = "2.7.0" -androidx-navigation = "2.7.6" +androidx-navigation = "2.7.7" 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.3.0-alpha01" +androidx-window = "1.3.0-alpha02" androidxHiltNavigationCompose = "1.1.0" androix-test-uiautomator = "2.2.0" coil = "2.4.0" @@ -51,7 +51,7 @@ room = "2.6.0" secrets = "2.0.1" # @keep targetSdk = "33" -version-catalog-update = "0.8.3" +version-catalog-update = "0.8.4" [libraries] accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" } diff --git a/Jetsnack/gradle/libs.versions.toml b/Jetsnack/gradle/libs.versions.toml index c81099ca09..3eeb338e7e 100644 --- a/Jetsnack/gradle/libs.versions.toml +++ b/Jetsnack/gradle/libs.versions.toml @@ -3,25 +3,25 @@ # Do not add a dependency to an individual sample, edit the global version instead. ##### [versions] -accompanist = "0.32.0" +accompanist = "0.34.0" androidGradlePlugin = "8.2.2" androidx-activity-compose = "1.8.2" androidx-appcompat = "1.6.1" androidx-benchmark = "1.2.0" androidx-benchmark-junit4 = "1.2.1" -androidx-compose-bom = "2024.01.00" +androidx-compose-bom = "2024.02.00" androidx-constraintlayout = "1.0.1" -androidx-corektx = "1.13.0-alpha04" +androidx-corektx = "1.13.0-alpha05" androidx-glance = "1.0.0" androidx-lifecycle-compose = "2.7.0" androidx-lifecycle-runtime-compose = "2.7.0" -androidx-navigation = "2.7.6" +androidx-navigation = "2.7.7" 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.3.0-alpha01" +androidx-window = "1.3.0-alpha02" androidxHiltNavigationCompose = "1.1.0" androix-test-uiautomator = "2.2.0" coil = "2.4.0" @@ -51,7 +51,7 @@ room = "2.6.0" secrets = "2.0.1" # @keep targetSdk = "33" -version-catalog-update = "0.8.3" +version-catalog-update = "0.8.4" [libraries] accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" } diff --git a/Jetsurvey/gradle/libs.versions.toml b/Jetsurvey/gradle/libs.versions.toml index c81099ca09..3eeb338e7e 100644 --- a/Jetsurvey/gradle/libs.versions.toml +++ b/Jetsurvey/gradle/libs.versions.toml @@ -3,25 +3,25 @@ # Do not add a dependency to an individual sample, edit the global version instead. ##### [versions] -accompanist = "0.32.0" +accompanist = "0.34.0" androidGradlePlugin = "8.2.2" androidx-activity-compose = "1.8.2" androidx-appcompat = "1.6.1" androidx-benchmark = "1.2.0" androidx-benchmark-junit4 = "1.2.1" -androidx-compose-bom = "2024.01.00" +androidx-compose-bom = "2024.02.00" androidx-constraintlayout = "1.0.1" -androidx-corektx = "1.13.0-alpha04" +androidx-corektx = "1.13.0-alpha05" androidx-glance = "1.0.0" androidx-lifecycle-compose = "2.7.0" androidx-lifecycle-runtime-compose = "2.7.0" -androidx-navigation = "2.7.6" +androidx-navigation = "2.7.7" 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.3.0-alpha01" +androidx-window = "1.3.0-alpha02" androidxHiltNavigationCompose = "1.1.0" androix-test-uiautomator = "2.2.0" coil = "2.4.0" @@ -51,7 +51,7 @@ room = "2.6.0" secrets = "2.0.1" # @keep targetSdk = "33" -version-catalog-update = "0.8.3" +version-catalog-update = "0.8.4" [libraries] accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" } diff --git a/Owl/gradle/libs.versions.toml b/Owl/gradle/libs.versions.toml index c81099ca09..3eeb338e7e 100644 --- a/Owl/gradle/libs.versions.toml +++ b/Owl/gradle/libs.versions.toml @@ -3,25 +3,25 @@ # Do not add a dependency to an individual sample, edit the global version instead. ##### [versions] -accompanist = "0.32.0" +accompanist = "0.34.0" androidGradlePlugin = "8.2.2" androidx-activity-compose = "1.8.2" androidx-appcompat = "1.6.1" androidx-benchmark = "1.2.0" androidx-benchmark-junit4 = "1.2.1" -androidx-compose-bom = "2024.01.00" +androidx-compose-bom = "2024.02.00" androidx-constraintlayout = "1.0.1" -androidx-corektx = "1.13.0-alpha04" +androidx-corektx = "1.13.0-alpha05" androidx-glance = "1.0.0" androidx-lifecycle-compose = "2.7.0" androidx-lifecycle-runtime-compose = "2.7.0" -androidx-navigation = "2.7.6" +androidx-navigation = "2.7.7" 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.3.0-alpha01" +androidx-window = "1.3.0-alpha02" androidxHiltNavigationCompose = "1.1.0" androix-test-uiautomator = "2.2.0" coil = "2.4.0" @@ -51,7 +51,7 @@ room = "2.6.0" secrets = "2.0.1" # @keep targetSdk = "33" -version-catalog-update = "0.8.3" +version-catalog-update = "0.8.4" [libraries] accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" } diff --git a/Reply/gradle/libs.versions.toml b/Reply/gradle/libs.versions.toml index c81099ca09..3eeb338e7e 100644 --- a/Reply/gradle/libs.versions.toml +++ b/Reply/gradle/libs.versions.toml @@ -3,25 +3,25 @@ # Do not add a dependency to an individual sample, edit the global version instead. ##### [versions] -accompanist = "0.32.0" +accompanist = "0.34.0" androidGradlePlugin = "8.2.2" androidx-activity-compose = "1.8.2" androidx-appcompat = "1.6.1" androidx-benchmark = "1.2.0" androidx-benchmark-junit4 = "1.2.1" -androidx-compose-bom = "2024.01.00" +androidx-compose-bom = "2024.02.00" androidx-constraintlayout = "1.0.1" -androidx-corektx = "1.13.0-alpha04" +androidx-corektx = "1.13.0-alpha05" androidx-glance = "1.0.0" androidx-lifecycle-compose = "2.7.0" androidx-lifecycle-runtime-compose = "2.7.0" -androidx-navigation = "2.7.6" +androidx-navigation = "2.7.7" 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.3.0-alpha01" +androidx-window = "1.3.0-alpha02" androidxHiltNavigationCompose = "1.1.0" androix-test-uiautomator = "2.2.0" coil = "2.4.0" @@ -51,7 +51,7 @@ room = "2.6.0" secrets = "2.0.1" # @keep targetSdk = "33" -version-catalog-update = "0.8.3" +version-catalog-update = "0.8.4" [libraries] accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" } diff --git a/scripts/libs.versions.toml b/scripts/libs.versions.toml index c81099ca09..3eeb338e7e 100644 --- a/scripts/libs.versions.toml +++ b/scripts/libs.versions.toml @@ -3,25 +3,25 @@ # Do not add a dependency to an individual sample, edit the global version instead. ##### [versions] -accompanist = "0.32.0" +accompanist = "0.34.0" androidGradlePlugin = "8.2.2" androidx-activity-compose = "1.8.2" androidx-appcompat = "1.6.1" androidx-benchmark = "1.2.0" androidx-benchmark-junit4 = "1.2.1" -androidx-compose-bom = "2024.01.00" +androidx-compose-bom = "2024.02.00" androidx-constraintlayout = "1.0.1" -androidx-corektx = "1.13.0-alpha04" +androidx-corektx = "1.13.0-alpha05" androidx-glance = "1.0.0" androidx-lifecycle-compose = "2.7.0" androidx-lifecycle-runtime-compose = "2.7.0" -androidx-navigation = "2.7.6" +androidx-navigation = "2.7.7" 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.3.0-alpha01" +androidx-window = "1.3.0-alpha02" androidxHiltNavigationCompose = "1.1.0" androix-test-uiautomator = "2.2.0" coil = "2.4.0" @@ -51,7 +51,7 @@ room = "2.6.0" secrets = "2.0.1" # @keep targetSdk = "33" -version-catalog-update = "0.8.3" +version-catalog-update = "0.8.4" [libraries] accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" } From b25e70139c26eea5056ebe7115336933c8cde367 Mon Sep 17 00:00:00 2001 From: "Ian G. Clifton" Date: Wed, 7 Feb 2024 15:13:53 -0800 Subject: [PATCH 2/3] Switched RichTooltipBox to TooltipBox --- .../jetchat/conversation/RecordButton.kt | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/Jetchat/app/src/main/java/com/example/compose/jetchat/conversation/RecordButton.kt b/Jetchat/app/src/main/java/com/example/compose/jetchat/conversation/RecordButton.kt index a27d198318..3e79f80375 100644 --- a/Jetchat/app/src/main/java/com/example/compose/jetchat/conversation/RecordButton.kt +++ b/Jetchat/app/src/main/java/com/example/compose/jetchat/conversation/RecordButton.kt @@ -36,9 +36,11 @@ import androidx.compose.material.icons.filled.Mic import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon import androidx.compose.material3.LocalContentColor -import androidx.compose.material3.RichTooltipBox -import androidx.compose.material3.RichTooltipState +import androidx.compose.material3.RichTooltip import androidx.compose.material3.Text +import androidx.compose.material3.TooltipBox +import androidx.compose.material3.TooltipDefaults +import androidx.compose.material3.TooltipState import androidx.compose.material3.contentColorFor import androidx.compose.runtime.Composable import androidx.compose.runtime.remember @@ -51,8 +53,8 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import com.example.compose.jetchat.R -import kotlin.math.abs import kotlinx.coroutines.launch +import kotlin.math.abs @OptIn(ExperimentalMaterial3Api::class) @Composable @@ -99,10 +101,15 @@ fun RecordButton( .background(LocalContentColor.current) ) val scope = rememberCoroutineScope() - val tooltipState = remember { RichTooltipState() } - RichTooltipBox( - text = { Text(stringResource(R.string.touch_and_hold_to_record)) }, - tooltipState = tooltipState + val tooltipState = remember { TooltipState() } + TooltipBox( + positionProvider = TooltipDefaults.rememberRichTooltipPositionProvider(), + tooltip = { + RichTooltip { + Text(stringResource(R.string.touch_and_hold_to_record)) + } + }, + state = tooltipState ) { Icon( Icons.Default.Mic, From 4d4612f12a4650dc5c2102165c8d714fbf6369f2 Mon Sep 17 00:00:00 2001 From: IanGClifton Date: Wed, 7 Feb 2024 23:16:24 +0000 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=A4=96=20Apply=20Spotless?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/compose/jetchat/conversation/RecordButton.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Jetchat/app/src/main/java/com/example/compose/jetchat/conversation/RecordButton.kt b/Jetchat/app/src/main/java/com/example/compose/jetchat/conversation/RecordButton.kt index 3e79f80375..98151544ba 100644 --- a/Jetchat/app/src/main/java/com/example/compose/jetchat/conversation/RecordButton.kt +++ b/Jetchat/app/src/main/java/com/example/compose/jetchat/conversation/RecordButton.kt @@ -53,8 +53,8 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import com.example.compose.jetchat.R -import kotlinx.coroutines.launch import kotlin.math.abs +import kotlinx.coroutines.launch @OptIn(ExperimentalMaterial3Api::class) @Composable @@ -105,9 +105,9 @@ fun RecordButton( TooltipBox( positionProvider = TooltipDefaults.rememberRichTooltipPositionProvider(), tooltip = { - RichTooltip { - Text(stringResource(R.string.touch_and_hold_to_record)) - } + RichTooltip { + Text(stringResource(R.string.touch_and_hold_to_record)) + } }, state = tooltipState ) {