Skip to content

Commit 9bd42a9

Browse files
committed
Fix loading indicator colors to match Figma design
1 parent 99a11b9 commit 9bd42a9

File tree

3 files changed

+37
-12
lines changed

3 files changed

+37
-12
lines changed

RELEASE-NOTES.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
*** Use [*****] to indicate smoke tests of all critical flows should be run on the final APK before release (e.g. major library or targetSdk updates).
33
*** For entries which are touching the Android Wear app's, start entry with `[WEAR]` too.
44

5+
23.9
6+
-----
7+
- [*][Woo POS] Fixed loading indicator colors to match the design [https://github.com/woocommerce/woocommerce-android/pull/15043]
8+
59
23.8
610
-----
711
- [*] Fixed system back button not working on Order Creation screen [https://github.com/woocommerce/woocommerce-android/pull/15016]

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/component/WooPosButtons.kt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ import androidx.compose.ui.Modifier
3434
import androidx.compose.ui.draw.alpha
3535
import androidx.compose.ui.draw.clip
3636
import androidx.compose.ui.graphics.Color
37-
import androidx.compose.ui.graphics.compositeOver
3837
import androidx.compose.ui.graphics.vector.ImageVector
3938
import androidx.compose.ui.text.font.FontWeight
4039
import androidx.compose.ui.tooling.preview.PreviewFontScale
@@ -264,11 +263,8 @@ private fun Button(
264263

265264
@Composable
266265
private fun ButtonsLoadingIndicator(size: Dp) {
267-
WooPosCircularLoadingIndicator(
266+
WooPosButtonLoadingIndicator(
268267
modifier = Modifier.size(size),
269-
spinnerPrimaryColor = MaterialTheme.colorScheme.secondary,
270-
spinnerSecondaryColor = Color.White.copy(alpha = 0.2f)
271-
.compositeOver(MaterialTheme.colorScheme.primaryContainer),
272268
)
273269
}
274270

Lines changed: 32 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import androidx.compose.animation.core.infiniteRepeatable
66
import androidx.compose.animation.core.rememberInfiniteTransition
77
import androidx.compose.animation.core.tween
88
import androidx.compose.foundation.Canvas
9+
import androidx.compose.foundation.background
910
import androidx.compose.foundation.layout.Box
1011
import androidx.compose.foundation.layout.fillMaxSize
1112
import androidx.compose.foundation.layout.size
@@ -27,8 +28,30 @@ import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosThe
2728
@Composable
2829
fun WooPosCircularLoadingIndicator(
2930
modifier: Modifier = Modifier,
30-
spinnerPrimaryColor: Color = MaterialTheme.colorScheme.primary,
31-
spinnerSecondaryColor: Color = MaterialTheme.colorScheme.secondary,
31+
) {
32+
WooPosLoadingIndicatorInternal(
33+
modifier = modifier,
34+
spinnerPrimaryColor = MaterialTheme.colorScheme.primary,
35+
spinnerSecondaryColor = MaterialTheme.colorScheme.secondary,
36+
)
37+
}
38+
39+
@Composable
40+
fun WooPosButtonLoadingIndicator(
41+
modifier: Modifier = Modifier,
42+
) {
43+
WooPosLoadingIndicatorInternal(
44+
modifier = modifier,
45+
spinnerPrimaryColor = MaterialTheme.colorScheme.onPrimary,
46+
spinnerSecondaryColor = MaterialTheme.colorScheme.secondary,
47+
)
48+
}
49+
50+
@Composable
51+
private fun WooPosLoadingIndicatorInternal(
52+
modifier: Modifier = Modifier,
53+
spinnerPrimaryColor: Color,
54+
spinnerSecondaryColor: Color,
3255
) {
3356
val infiniteTransition = rememberInfiniteTransition(label = "RotationTransition")
3457
val animatedRotation by infiniteTransition.animateFloat(
@@ -73,7 +96,7 @@ fun WooPosCircularLoadingIndicator(
7396

7497
@Composable
7598
@WooPosPreview
76-
fun PreviewCircularLoadingIndicatorBig() {
99+
fun PreviewWooPosCircularLoadingIndicator() {
77100
WooPosTheme {
78101
Box(
79102
modifier = Modifier.fillMaxSize(),
@@ -88,14 +111,16 @@ fun PreviewCircularLoadingIndicatorBig() {
88111

89112
@Composable
90113
@WooPosPreview
91-
fun PreviewCircularLoadingIndicatorSmall() {
114+
fun PreviewWooPosButtonLoadingIndicator() {
92115
WooPosTheme {
93116
Box(
94-
modifier = Modifier.fillMaxSize(),
117+
modifier = Modifier
118+
.fillMaxSize()
119+
.background(MaterialTheme.colorScheme.primary),
95120
contentAlignment = Alignment.Center
96121
) {
97-
WooPosCircularLoadingIndicator(
98-
modifier = Modifier.size(64.dp)
122+
WooPosButtonLoadingIndicator(
123+
modifier = Modifier.size(32.dp)
99124
)
100125
}
101126
}

0 commit comments

Comments
 (0)