From 2102cbe0075ed9310a0482626f62f764636df222 Mon Sep 17 00:00:00 2001 From: Jan Skrasek Date: Thu, 23 Sep 2021 09:25:08 +0200 Subject: [PATCH] radio|checkbox: sync isError parameter name with MDC --- .../compose/catalog/screens/CheckboxScreen.kt | 6 +++--- .../compose/catalog/screens/RadioScreen.kt | 8 ++++---- .../orbit/compose/ui/controls/Checkbox.kt | 4 ++-- .../compose/ui/controls/CheckboxField.kt | 4 ++-- .../kiwi/orbit/compose/ui/controls/Radio.kt | 20 +++++++++---------- .../orbit/compose/ui/controls/RadioField.kt | 4 ++-- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/catalog/src/main/java/kiwi/orbit/compose/catalog/screens/CheckboxScreen.kt b/catalog/src/main/java/kiwi/orbit/compose/catalog/screens/CheckboxScreen.kt index f8cc98c70..294abf5aa 100644 --- a/catalog/src/main/java/kiwi/orbit/compose/catalog/screens/CheckboxScreen.kt +++ b/catalog/src/main/java/kiwi/orbit/compose/catalog/screens/CheckboxScreen.kt @@ -53,7 +53,7 @@ fun CheckboxScreenInner() { Spacer(Modifier.size(32.dp)) var checkbox3 by remember { mutableStateOf(false) } - Checkbox(checked = checkbox3, error = true, onCheckedChange = { checkbox3 = !checkbox3 }) + Checkbox(checked = checkbox3, isError = true, onCheckedChange = { checkbox3 = !checkbox3 }) Spacer(Modifier.size(32.dp)) @@ -65,7 +65,7 @@ fun CheckboxScreenInner() { Spacer(Modifier.size(32.dp)) - Checkbox(checked = false, enabled = false, error = true, onCheckedChange = {}) + Checkbox(checked = false, enabled = false, isError = true, onCheckedChange = {}) } Spacer(Modifier.size(32.dp)) @@ -111,7 +111,7 @@ fun CheckboxScreenInner() { checked = checkbox5, onCheckedChange = { checkbox5 = !checkbox5 }, modifier = Modifier.fillMaxWidth(), - error = true, + isError = true, description = { Text("May the Force be with you.") }, ) { Text("Star Wars") diff --git a/catalog/src/main/java/kiwi/orbit/compose/catalog/screens/RadioScreen.kt b/catalog/src/main/java/kiwi/orbit/compose/catalog/screens/RadioScreen.kt index 997a8edf0..f7209bcea 100644 --- a/catalog/src/main/java/kiwi/orbit/compose/catalog/screens/RadioScreen.kt +++ b/catalog/src/main/java/kiwi/orbit/compose/catalog/screens/RadioScreen.kt @@ -51,7 +51,7 @@ fun RadioScreenInner() { Spacer(Modifier.size(32.dp)) - Radio(selected = selected == 2, onClick = { selected = 2 }, error = true) + Radio(selected = selected == 2, onClick = { selected = 2 }, isError = true) Spacer(Modifier.size(32.dp)) @@ -63,7 +63,7 @@ fun RadioScreenInner() { Spacer(Modifier.size(32.dp)) - Radio(selected = false, enabled = false, onClick = {}, error = true) + Radio(selected = false, enabled = false, onClick = {}, isError = true) } Spacer(Modifier.size(32.dp)) @@ -106,7 +106,7 @@ fun RadioScreenInner() { selected = selected2 == 1, onClick = { selected2 = 1 }, modifier = Modifier.fillMaxWidth(), - error = true, + isError = true, description = { Text("May the Force be with you.") }, ) { Text("Star Wars") @@ -137,7 +137,7 @@ fun RadioScreenInner() { onClick = { selected3 = 1 }, modifier = Modifier.fillMaxWidth(), enabled = false, - error = true, + isError = true, description = { Text("May the Force be with you.") }, ) { Text("Star Wars") diff --git a/ui/src/main/java/kiwi/orbit/compose/ui/controls/Checkbox.kt b/ui/src/main/java/kiwi/orbit/compose/ui/controls/Checkbox.kt index a2284d691..d8f8b749f 100644 --- a/ui/src/main/java/kiwi/orbit/compose/ui/controls/Checkbox.kt +++ b/ui/src/main/java/kiwi/orbit/compose/ui/controls/Checkbox.kt @@ -34,7 +34,7 @@ public fun Checkbox( onCheckedChange: (() -> Unit)?, modifier: Modifier = Modifier, enabled: Boolean = true, - error: Boolean = false, + isError: Boolean = false, interactionSource: MutableInteractionSource = remember { MutableInteractionSource() }, ) { val borderColor by animateColorAsState( @@ -75,7 +75,7 @@ public fun Checkbox( } val errorAlpha by animateFloatAsState( - targetValue = if (error && enabled) 1.0f else 0.0f, + targetValue = if (isError && enabled) 1.0f else 0.0f, animationSpec = tween(durationMillis = CheckboxAnimationDuration) ) val errorStrokeColor = OrbitTheme.colors.critical.main diff --git a/ui/src/main/java/kiwi/orbit/compose/ui/controls/CheckboxField.kt b/ui/src/main/java/kiwi/orbit/compose/ui/controls/CheckboxField.kt index 1c89649f2..07f30024b 100644 --- a/ui/src/main/java/kiwi/orbit/compose/ui/controls/CheckboxField.kt +++ b/ui/src/main/java/kiwi/orbit/compose/ui/controls/CheckboxField.kt @@ -29,7 +29,7 @@ public fun CheckboxField( onCheckedChange: (() -> Unit)?, modifier: Modifier = Modifier, enabled: Boolean = true, - error: Boolean = false, + isError: Boolean = false, contentPadding: PaddingValues = PaddingValues(horizontal = 16.dp, vertical = 12.dp), description: (@Composable () -> Unit)? = null, label: @Composable ColumnScope.() -> Unit, @@ -65,7 +65,7 @@ public fun CheckboxField( end = 10.dp ), enabled = enabled, - error = error, + isError = isError, interactionSource = interactionSource, ) val topPadding = contentPadding.calculateTopPadding().coerceAtLeast(checkboxVerticalShift) diff --git a/ui/src/main/java/kiwi/orbit/compose/ui/controls/Radio.kt b/ui/src/main/java/kiwi/orbit/compose/ui/controls/Radio.kt index 68be0adfc..dd08b86ae 100644 --- a/ui/src/main/java/kiwi/orbit/compose/ui/controls/Radio.kt +++ b/ui/src/main/java/kiwi/orbit/compose/ui/controls/Radio.kt @@ -28,7 +28,7 @@ public fun Radio( onClick: (() -> Unit)?, modifier: Modifier = Modifier, enabled: Boolean = true, - error: Boolean = false, + isError: Boolean = false, interactionSource: MutableInteractionSource = remember { MutableInteractionSource() }, ) { val borderWidth by animateDpAsState( @@ -67,7 +67,7 @@ public fun Radio( } val errorAlpha by animateFloatAsState( - targetValue = if (error && enabled) 1f else 0f, + targetValue = if (isError && enabled) 1f else 0f, animationSpec = tween(durationMillis = RadioAnimationDuration) ) val errorStrokeColor = OrbitTheme.colors.critical.main @@ -90,15 +90,15 @@ private fun DrawScope.drawRadio(borderWidth: Dp, borderColor: Color, backgroundC } private fun DrawScope.drawError(strokeColor: Color, shadowColor: Color, alpha: Float) { - if (alpha != 0f) { - val shadowWidth = 4.dp.toPx() - val shadowRadius = ErrorShadowRadius.toPx() - shadowWidth / 2 - drawCircle(shadowColor, shadowRadius, alpha = alpha, style = Stroke(shadowWidth)) + if (alpha == 0f) return - val strokeWidth = 2.dp.toPx() - val strokeRadius = RadioRadiusSize.toPx() - strokeWidth / 2 - drawCircle(strokeColor, strokeRadius, alpha = alpha, style = Stroke(strokeWidth)) - } + val shadowWidth = 4.dp.toPx() + val shadowRadius = ErrorShadowRadius.toPx() - shadowWidth / 2 + drawCircle(shadowColor, shadowRadius, alpha = alpha, style = Stroke(shadowWidth)) + + val strokeWidth = 2.dp.toPx() + val strokeRadius = RadioRadiusSize.toPx() - strokeWidth / 2 + drawCircle(strokeColor, strokeRadius, alpha = alpha, style = Stroke(strokeWidth)) } private const val RadioAnimationDuration = 100 diff --git a/ui/src/main/java/kiwi/orbit/compose/ui/controls/RadioField.kt b/ui/src/main/java/kiwi/orbit/compose/ui/controls/RadioField.kt index 6d3311bc7..019130c6a 100644 --- a/ui/src/main/java/kiwi/orbit/compose/ui/controls/RadioField.kt +++ b/ui/src/main/java/kiwi/orbit/compose/ui/controls/RadioField.kt @@ -29,7 +29,7 @@ public fun RadioField( onClick: (() -> Unit)?, modifier: Modifier = Modifier, enabled: Boolean = true, - error: Boolean = false, + isError: Boolean = false, contentPadding: PaddingValues = PaddingValues(horizontal = 16.dp, vertical = 12.dp), description: (@Composable () -> Unit)? = null, label: @Composable ColumnScope.() -> Unit, @@ -66,7 +66,7 @@ public fun RadioField( end = 10.dp ), enabled = enabled, - error = error, + isError = isError, interactionSource = interactionSource, ) val topPadding = contentPadding.calculateTopPadding().coerceAtLeast(radioVerticalShift)