From 250389633b06d815ce2b480293cf5616a2c44927 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 2 Nov 2023 14:51:42 +0100 Subject: [PATCH] Progress for LinearProgressIndicator and CircularProgressIndicator are now lambdas. --- .../android/features/logout/impl/LogoutView.kt | 2 +- .../android/features/poll/api/PollAnswerView.kt | 12 +++++++----- .../designsystem/components/ProgressDialog.kt | 2 +- .../theme/components/CircularProgressIndicator.kt | 6 +++--- .../theme/components/LinearProgressIndicator.kt | 6 +++--- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutView.kt b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutView.kt index 486e3964fa..0b6a8e3375 100644 --- a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutView.kt +++ b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutView.kt @@ -217,7 +217,7 @@ private fun Content( ) { LinearProgressIndicator( modifier = Modifier.fillMaxWidth(), - progress = state.backupUploadState.backedUpCount.toFloat() / state.backupUploadState.totalCount.toFloat(), + progress = { state.backupUploadState.backedUpCount.toFloat() / state.backupUploadState.totalCount.toFloat() }, trackColor = ElementTheme.colors.progressIndicatorTrackColor, ) Text( diff --git a/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/PollAnswerView.kt b/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/PollAnswerView.kt index ac86e64fa6..30c7829d70 100644 --- a/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/PollAnswerView.kt +++ b/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/PollAnswerView.kt @@ -33,8 +33,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.StrokeCap import androidx.compose.ui.res.pluralStringResource import androidx.compose.ui.unit.dp -import io.element.android.libraries.designsystem.preview.PreviewsDayNight import io.element.android.libraries.designsystem.preview.ElementPreview +import io.element.android.libraries.designsystem.preview.PreviewsDayNight import io.element.android.libraries.designsystem.theme.components.Icon import io.element.android.libraries.designsystem.theme.components.LinearProgressIndicator import io.element.android.libraries.designsystem.theme.components.Text @@ -96,10 +96,12 @@ internal fun PollAnswerView( LinearProgressIndicator( modifier = Modifier.fillMaxWidth(), color = if (answerItem.isWinner) ElementTheme.colors.textSuccessPrimary else answerItem.isEnabled.toEnabledColor(), - progress = when { - answerItem.isDisclosed -> answerItem.percentage - answerItem.isSelected -> 1f - else -> 0f + progress = { + when { + answerItem.isDisclosed -> answerItem.percentage + answerItem.isSelected -> 1f + else -> 0f + } }, trackColor = ElementTheme.colors.progressIndicatorTrackColor, strokeCap = StrokeCap.Round, diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/ProgressDialog.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/ProgressDialog.kt index 542697b5f0..e678f7817c 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/ProgressDialog.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/ProgressDialog.kt @@ -75,7 +75,7 @@ fun ProgressDialog( } is ProgressDialogType.Determinate -> { CircularProgressIndicator( - progress = type.progress, + progress = { type.progress }, color = MaterialTheme.colorScheme.primary ) } diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/CircularProgressIndicator.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/CircularProgressIndicator.kt index 392e267c77..5c869db9eb 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/CircularProgressIndicator.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/CircularProgressIndicator.kt @@ -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 } ) } } diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/LinearProgressIndicator.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/LinearProgressIndicator.kt index 54985eaa51..6d081da298 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/LinearProgressIndicator.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/LinearProgressIndicator.kt @@ -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 } ) } }