Skip to content

Various small snippet fixes #168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 20, 2023
Merged

Various small snippet fixes #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
26eda72
Fix unused import in recompose highlighter
bentrengrove Nov 19, 2023
4caf3fd
Fix deprecations in progress indicators
bentrengrove Nov 19, 2023
a27e352
Fix text color and unused apis
bentrengrove Nov 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ...er/src/main/java/com/example/android/compose/recomposehighlighter/RecomposeHighlighter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
12 changes: 6 additions & 6 deletions compose/snippets/src/main/java/com/example/compose/snippets/components/ProgressIndicator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ fun LinearDeterminateIndicator() {

if (loading) {
LinearProgressIndicator(
progress = { currentProgress },
modifier = Modifier.fillMaxWidth(),
progress = currentProgress
)
}
}
Expand Down Expand Up @@ -130,8 +130,8 @@ fun CircularDeterminateIndicator() {

if (loading) {
CircularProgressIndicator(
progress = { currentProgress },
modifier = Modifier.width(64.dp),
progress = currentProgress
)
}
}
Expand All @@ -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,
)
}

Expand All @@ -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]
7 changes: 1 addition & 6 deletions compose/snippets/src/main/java/com/example/compose/snippets/text/TextSnippets.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -263,7 +262,6 @@ private object TextOverflowSnippet {
}

private object TextBrushSnippet1 {
@OptIn(ExperimentalTextApi::class)
@Composable
fun TextStyledBrushSnippet(text: String) {
// [START android_compose_text_brush]
Expand All @@ -282,7 +280,6 @@ private object TextBrushSnippet1 {
}

private object TextBrushSnippet2 {
@OptIn(ExperimentalTextApi::class)
@Composable
fun TextStyledBrushSnippet() {
val rainbowColors: List<Color> = listOf()
Expand All @@ -301,7 +298,6 @@ private object TextBrushSnippet2 {
}

private object TextBrushSnippet3 {
@OptIn(ExperimentalTextApi::class)
@Composable
fun TextStyledBrushSnippet() {
val rainbowColors: List<Color> = listOf()
Expand All @@ -326,7 +322,6 @@ private object TextBrushSnippet3 {
}

private object TextBrushSnippet4 {
@OptIn(ExperimentalTextApi::class)
@Composable
fun TextStyledBrushSnippet() {
val rainbowColors: List<Color> = listOf()
Expand Down Expand Up @@ -585,4 +580,4 @@ private object TextEffectiveStateManagement2 {
private val firaSansFamily = FontFamily()

val LightBlue = Color(0xFF0066FF)
val Purple = Color(0xFF0066FF)
val Purple = Color(0xFF800080)