Skip to content

Commit

Permalink
Tweaking progress indicators.
Browse files Browse the repository at this point in the history
  • Loading branch information
jakeroseman committed Aug 24, 2023
1 parent cb909ad commit 50a8353
Showing 1 changed file with 15 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ package com.example.compose.snippets.components
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width
import androidx.compose.material3.Button
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.LinearProgressIndicator
Expand Down Expand Up @@ -70,6 +72,7 @@ fun LinearDeterminateIndicator() {
Column(
verticalArrangement = Arrangement.spacedBy(12.dp),
horizontalAlignment = Alignment.CenterHorizontally,
modifier = Modifier.fillMaxWidth()
) {
Button(onClick = {
loading = true
Expand All @@ -84,7 +87,10 @@ fun LinearDeterminateIndicator() {
}

if (loading) {
LinearProgressIndicator(progress = currentProgress)
LinearProgressIndicator(
modifier = Modifier.fillMaxWidth(),
progress = currentProgress
)
}
}
}
Expand All @@ -93,7 +99,7 @@ fun LinearDeterminateIndicator() {
suspend fun loadProgress(updateProgress: (Float) -> Unit) {
for (i in 1..100) {
updateProgress(i.toFloat() / 100)
delay(500)
delay(100)
}
}
// [END android_compose_components_determinateindicator]
Expand All @@ -108,6 +114,7 @@ fun CircularDeterminateIndicator() {
Column(
verticalArrangement = Arrangement.spacedBy(12.dp),
horizontalAlignment = Alignment.CenterHorizontally,
modifier = Modifier.fillMaxWidth()
) {
Button(onClick = {
loading = true
Expand All @@ -122,7 +129,10 @@ fun CircularDeterminateIndicator() {
}

if (loading) {
CircularProgressIndicator(progress = currentProgress)
CircularProgressIndicator(
modifier = Modifier.width(64.dp),
progress = currentProgress
)
}
}
}
Expand All @@ -139,6 +149,7 @@ fun IndeterminateLinearIndicator() {
if (!loading) return

LinearProgressIndicator(
modifier = Modifier.fillMaxWidth(),
color = MaterialTheme.colorScheme.surfaceVariant,
trackColor = MaterialTheme.colorScheme.secondary,
)
Expand All @@ -157,6 +168,7 @@ fun IndeterminateCircularIndicator() {
if (!loading) return

CircularProgressIndicator(
modifier = Modifier.width(64.dp),
color = MaterialTheme.colorScheme.surfaceVariant,
trackColor = MaterialTheme.colorScheme.secondary,
)
Expand Down

0 comments on commit 50a8353

Please sign in to comment.