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

Progress for LinearProgressIndicator and CircularProgressIndicator are now lambdas.

Browse source
This commit is contained in:
Benoit Marty 2023-11-02 14:51:42 +01:00
parent 2a0209e14d
commit 250389633b
5 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutView.kt
View file

@ -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(

12
features/poll/api/src/main/kotlin/io/element/android/features/poll/api/PollAnswerView.kt
View file

@ -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,

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 }
)
}
}