Skip to content

Commit e4c5f27

Browse files
authored
Various small snippet fixes (#168)
* Fix unused import in recompose highlighter Fixes #5 * Fix deprecations in progress indicators Also fix backwards colors Fixes #157 * Fix text color and unused apis Fixes #150
1 parent 142fdf2 commit e4c5f27

File tree

3 files changed

+7
-13
lines changed

3 files changed

+7
-13
lines changed

compose/recomposehighlighter/src/main/java/com/example/android/compose/recomposehighlighter/RecomposeHighlighter.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ import androidx.compose.ui.graphics.drawscope.Stroke
3232
import androidx.compose.ui.graphics.lerp
3333
import androidx.compose.ui.platform.debugInspectorInfo
3434
import androidx.compose.ui.unit.dp
35-
import androidx.compose.ui.util.lerp
3635
import kotlin.math.min
3736
import kotlinx.coroutines.delay
3837

compose/snippets/src/main/java/com/example/compose/snippets/components/ProgressIndicator.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ fun LinearDeterminateIndicator() {
8888

8989
if (loading) {
9090
LinearProgressIndicator(
91+
progress = { currentProgress },
9192
modifier = Modifier.fillMaxWidth(),
92-
progress = currentProgress
9393
)
9494
}
9595
}
@@ -130,8 +130,8 @@ fun CircularDeterminateIndicator() {
130130

131131
if (loading) {
132132
CircularProgressIndicator(
133+
progress = { currentProgress },
133134
modifier = Modifier.width(64.dp),
134-
progress = currentProgress
135135
)
136136
}
137137
}
@@ -150,8 +150,8 @@ fun IndeterminateLinearIndicator() {
150150

151151
LinearProgressIndicator(
152152
modifier = Modifier.fillMaxWidth(),
153-
color = MaterialTheme.colorScheme.surfaceVariant,
154-
trackColor = MaterialTheme.colorScheme.secondary,
153+
color = MaterialTheme.colorScheme.secondary,
154+
trackColor = MaterialTheme.colorScheme.surfaceVariant,
155155
)
156156
}
157157

@@ -169,8 +169,8 @@ fun IndeterminateCircularIndicator() {
169169

170170
CircularProgressIndicator(
171171
modifier = Modifier.width(64.dp),
172-
color = MaterialTheme.colorScheme.surfaceVariant,
173-
trackColor = MaterialTheme.colorScheme.secondary,
172+
color = MaterialTheme.colorScheme.secondary,
173+
trackColor = MaterialTheme.colorScheme.surfaceVariant,
174174
)
175175
}
176176
// [END android_compose_components_indeterminateindicator]

compose/snippets/src/main/java/com/example/compose/snippets/text/TextSnippets.kt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ import androidx.compose.ui.graphics.Color.Companion.Cyan
4444
import androidx.compose.ui.graphics.Shadow
4545
import androidx.compose.ui.res.stringResource
4646
import androidx.compose.ui.text.AnnotatedString
47-
import androidx.compose.ui.text.ExperimentalTextApi
4847
import androidx.compose.ui.text.ParagraphStyle
4948
import androidx.compose.ui.text.PlatformTextStyle
5049
import androidx.compose.ui.text.SpanStyle
@@ -263,7 +262,6 @@ private object TextOverflowSnippet {
263262
}
264263

265264
private object TextBrushSnippet1 {
266-
@OptIn(ExperimentalTextApi::class)
267265
@Composable
268266
fun TextStyledBrushSnippet(text: String) {
269267
// [START android_compose_text_brush]
@@ -282,7 +280,6 @@ private object TextBrushSnippet1 {
282280
}
283281

284282
private object TextBrushSnippet2 {
285-
@OptIn(ExperimentalTextApi::class)
286283
@Composable
287284
fun TextStyledBrushSnippet() {
288285
val rainbowColors: List<Color> = listOf()
@@ -301,7 +298,6 @@ private object TextBrushSnippet2 {
301298
}
302299

303300
private object TextBrushSnippet3 {
304-
@OptIn(ExperimentalTextApi::class)
305301
@Composable
306302
fun TextStyledBrushSnippet() {
307303
val rainbowColors: List<Color> = listOf()
@@ -326,7 +322,6 @@ private object TextBrushSnippet3 {
326322
}
327323

328324
private object TextBrushSnippet4 {
329-
@OptIn(ExperimentalTextApi::class)
330325
@Composable
331326
fun TextStyledBrushSnippet() {
332327
val rainbowColors: List<Color> = listOf()
@@ -585,4 +580,4 @@ private object TextEffectiveStateManagement2 {
585580
private val firaSansFamily = FontFamily()
586581

587582
val LightBlue = Color(0xFF0066FF)
588-
val Purple = Color(0xFF0066FF)
583+
val Purple = Color(0xFF800080)

0 commit comments

Comments
 (0)