Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Merge pull request #1597 from vector-im/renovate/androidx.compose.material3-material3-1.x

Browse source 
Update dependency androidx.compose.material3:material3 to v1.2.0-alpha10
This commit is contained in:
Benoit Marty 2023-11-02 17:06:11 +01:00 • committed by GitHub
commit 19bd43186d
6 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/ProgressDialog.kt
View file

@ -75,7 +75,7 @@ fun ProgressDialog(
}
is ProgressDialogType.Determinate -> {
CircularProgressIndicator(
progress = type.progress,
progress = { type.progress },
color = MaterialTheme.colorScheme.primary
)
}

6
libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/CircularProgressIndicator.kt
View file

@ -31,7 +31,7 @@ import io.element.android.libraries.designsystem.preview.PreviewGroup
@Composable
fun CircularProgressIndicator(
progress: Float,
progress: () -> Float,
modifier: Modifier = Modifier,
color: Color = ProgressIndicatorDefaults.circularColor,
strokeWidth: Dp = ProgressIndicatorDefaults.CircularStrokeWidth
@ -54,7 +54,7 @@ fun CircularProgressIndicator(
// Use a determinate progress indicator to improve the preview rendering
androidx.compose.material3.CircularProgressIndicator(
modifier = modifier,
progress = 0.75F,
progress = { 0.75F },
color = color,
strokeWidth = strokeWidth,
)
@ -79,7 +79,7 @@ private fun ContentToPreview() {
)
// Fixed progress
CircularProgressIndicator(
progress = 0.90F
progress = { 0.90F }
)
}
}

6
libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/LinearProgressIndicator.kt
View file

@ -31,7 +31,7 @@ import io.element.android.libraries.designsystem.preview.PreviewGroup
@Composable
fun LinearProgressIndicator(
progress: Float,
progress: () -> Float,
modifier: Modifier = Modifier,
color: Color = ProgressIndicatorDefaults.linearColor,
trackColor: Color = ProgressIndicatorDefaults.linearTrackColor,
@ -57,7 +57,7 @@ fun LinearProgressIndicator(
// Use a determinate progress indicator to improve the preview rendering
androidx.compose.material3.LinearProgressIndicator(
modifier = modifier,
progress = 0.75F,
progress = { 0.75F },
color = color,
trackColor = trackColor,
strokeCap = strokeCap,
@ -84,7 +84,7 @@ private fun ContentToPreview() {
)
// Fixed progress
LinearProgressIndicator(
progress = 0.90F
progress = { 0.90F }
)
}
}