From d4f360c75d4543a085016b7d2c104d5a1ce2f712 Mon Sep 17 00:00:00 2001 From: Ahmad Ansori Palembani Date: Thu, 13 Jun 2024 13:00:38 +0700 Subject: [PATCH] style: Fix inconsistent color between indeterminate and determinate progress indicator --- .../presentation/component/CircularProgressIndicator.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/dev/yokai/presentation/component/CircularProgressIndicator.kt b/app/src/main/java/dev/yokai/presentation/component/CircularProgressIndicator.kt index 6f7f36d130..6a85f90196 100644 --- a/app/src/main/java/dev/yokai/presentation/component/CircularProgressIndicator.kt +++ b/app/src/main/java/dev/yokai/presentation/component/CircularProgressIndicator.kt @@ -50,7 +50,9 @@ fun CombinedCircularProgressIndicator( ) { indeterminate -> if (indeterminate) { // Indeterminate - CircularProgressIndicator() + CircularProgressIndicator( + color = if (isInverted()) MaterialTheme.colorScheme.inversePrimary else MaterialTheme.colorScheme.primary, + ) } else { // Determinate val infiniteTransition = rememberInfiniteTransition(label = "infiniteRotation") @@ -71,7 +73,7 @@ fun CombinedCircularProgressIndicator( CircularProgressIndicator( progress = { animatedProgress }, modifier = Modifier.rotate(rotation), - color = if (isInverted()) MaterialTheme.colorScheme.inversePrimary else MaterialTheme.colorScheme.primary + color = if (isInverted()) MaterialTheme.colorScheme.inversePrimary else MaterialTheme.colorScheme.primary, ) } }