From 26eda724b41cd28bcec9606a1194cb8106c1dc3c Mon Sep 17 00:00:00 2001 From: Ben Trengrove Date: Mon, 20 Nov 2023 09:35:49 +1100 Subject: [PATCH 1/3] Fix unused import in recompose highlighter Fixes #5 --- .../android/compose/recomposehighlighter/RecomposeHighlighter.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/compose/recomposehighlighter/src/main/java/com/example/android/compose/recomposehighlighter/RecomposeHighlighter.kt b/compose/recomposehighlighter/src/main/java/com/example/android/compose/recomposehighlighter/RecomposeHighlighter.kt index 06982367d..fd44e823c 100644 --- a/compose/recomposehighlighter/src/main/java/com/example/android/compose/recomposehighlighter/RecomposeHighlighter.kt +++ b/compose/recomposehighlighter/src/main/java/com/example/android/compose/recomposehighlighter/RecomposeHighlighter.kt @@ -32,7 +32,6 @@ import androidx.compose.ui.graphics.drawscope.Stroke import androidx.compose.ui.graphics.lerp import androidx.compose.ui.platform.debugInspectorInfo import androidx.compose.ui.unit.dp -import androidx.compose.ui.util.lerp import kotlin.math.min import kotlinx.coroutines.delay From 4caf3fda0664ca9687cb55f0a0d8bf1e999ef93a Mon Sep 17 00:00:00 2001 From: Ben Trengrove Date: Mon, 20 Nov 2023 09:48:58 +1100 Subject: [PATCH 2/3] Fix deprecations in progress indicators Also fix backwards colors Fixes #157 --- .../compose/snippets/components/ProgressIndicator.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/compose/snippets/src/main/java/com/example/compose/snippets/components/ProgressIndicator.kt b/compose/snippets/src/main/java/com/example/compose/snippets/components/ProgressIndicator.kt index 9faec0d80..4d5055457 100644 --- a/compose/snippets/src/main/java/com/example/compose/snippets/components/ProgressIndicator.kt +++ b/compose/snippets/src/main/java/com/example/compose/snippets/components/ProgressIndicator.kt @@ -88,8 +88,8 @@ fun LinearDeterminateIndicator() { if (loading) { LinearProgressIndicator( + progress = { currentProgress }, modifier = Modifier.fillMaxWidth(), - progress = currentProgress ) } } @@ -130,8 +130,8 @@ fun CircularDeterminateIndicator() { if (loading) { CircularProgressIndicator( + progress = { currentProgress }, modifier = Modifier.width(64.dp), - progress = currentProgress ) } } @@ -150,8 +150,8 @@ fun IndeterminateLinearIndicator() { LinearProgressIndicator( modifier = Modifier.fillMaxWidth(), - color = MaterialTheme.colorScheme.surfaceVariant, - trackColor = MaterialTheme.colorScheme.secondary, + color = MaterialTheme.colorScheme.secondary, + trackColor = MaterialTheme.colorScheme.surfaceVariant, ) } @@ -169,8 +169,8 @@ fun IndeterminateCircularIndicator() { CircularProgressIndicator( modifier = Modifier.width(64.dp), - color = MaterialTheme.colorScheme.surfaceVariant, - trackColor = MaterialTheme.colorScheme.secondary, + color = MaterialTheme.colorScheme.secondary, + trackColor = MaterialTheme.colorScheme.surfaceVariant, ) } // [END android_compose_components_indeterminateindicator] From a27e3528fb24fbc3da007405240ff7047e3885c1 Mon Sep 17 00:00:00 2001 From: Ben Trengrove Date: Mon, 20 Nov 2023 09:55:47 +1100 Subject: [PATCH 3/3] Fix text color and unused apis Fixes #150 --- .../java/com/example/compose/snippets/text/TextSnippets.kt | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/compose/snippets/src/main/java/com/example/compose/snippets/text/TextSnippets.kt b/compose/snippets/src/main/java/com/example/compose/snippets/text/TextSnippets.kt index 2b48a91f8..bfb8b837e 100644 --- a/compose/snippets/src/main/java/com/example/compose/snippets/text/TextSnippets.kt +++ b/compose/snippets/src/main/java/com/example/compose/snippets/text/TextSnippets.kt @@ -44,7 +44,6 @@ import androidx.compose.ui.graphics.Color.Companion.Cyan import androidx.compose.ui.graphics.Shadow import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.AnnotatedString -import androidx.compose.ui.text.ExperimentalTextApi import androidx.compose.ui.text.ParagraphStyle import androidx.compose.ui.text.PlatformTextStyle import androidx.compose.ui.text.SpanStyle @@ -263,7 +262,6 @@ private object TextOverflowSnippet { } private object TextBrushSnippet1 { - @OptIn(ExperimentalTextApi::class) @Composable fun TextStyledBrushSnippet(text: String) { // [START android_compose_text_brush] @@ -282,7 +280,6 @@ private object TextBrushSnippet1 { } private object TextBrushSnippet2 { - @OptIn(ExperimentalTextApi::class) @Composable fun TextStyledBrushSnippet() { val rainbowColors: List = listOf() @@ -301,7 +298,6 @@ private object TextBrushSnippet2 { } private object TextBrushSnippet3 { - @OptIn(ExperimentalTextApi::class) @Composable fun TextStyledBrushSnippet() { val rainbowColors: List = listOf() @@ -326,7 +322,6 @@ private object TextBrushSnippet3 { } private object TextBrushSnippet4 { - @OptIn(ExperimentalTextApi::class) @Composable fun TextStyledBrushSnippet() { val rainbowColors: List = listOf() @@ -585,4 +580,4 @@ private object TextEffectiveStateManagement2 { private val firaSansFamily = FontFamily() val LightBlue = Color(0xFF0066FF) -val Purple = Color(0xFF0066FF) +val Purple = Color(0xFF800080)