diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d1346db..c8f8e88 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -12,7 +12,7 @@ composeJetbrains = "1.6.10" conventions = "0.0.74" detekt = "1.23.6" -detektCompose = "0.4.1" +detektCompose = "0.4.3" detektEygraber = "1.0.11" dokka = "1.9.20" diff --git a/library/src/commonMain/kotlin/com/eygraber/compose/colorpicker/ColorPicker.kt b/library/src/commonMain/kotlin/com/eygraber/compose/colorpicker/ColorPicker.kt index 1e0535f..4e378a8 100644 --- a/library/src/commonMain/kotlin/com/eygraber/compose/colorpicker/ColorPicker.kt +++ b/library/src/commonMain/kotlin/com/eygraber/compose/colorpicker/ColorPicker.kt @@ -58,7 +58,7 @@ public fun rememberColorPickerState( public fun ColorPicker( modifier: Modifier = Modifier, state: ColorPickerState = rememberColorPickerState(), - onColorSelected: (Color) -> Unit, + onSelectedColor: (Color) -> Unit, ) { BoxWithConstraints( modifier = modifier @@ -101,7 +101,7 @@ public fun ColorPicker( val currentColor = colorForPosition(selectedPosition) if(currentColor.isSpecified && currentColor != selectedColor) { selectedColor = currentColor - onColorSelected(currentColor) + onSelectedColor(currentColor) } } } @@ -115,7 +115,7 @@ public fun ColorPicker( if(newColor.isSpecified) { if(selectedColor != newColor) { selectedColor = newColor - onColorSelected(newColor) + onSelectedColor(newColor) } selectedPosition = clampedPosition } @@ -176,7 +176,7 @@ public fun ColorPicker( brightness: Float = 1F, magnifier: ColorPicker.Magnifier = ColorPicker.Magnifier.Default(), resetSelectedPosition: Boolean = false, - onColorSelected: (Color) -> Unit, + onSelectedColor: (Color) -> Unit, ) { ColorPicker( modifier = modifier, @@ -186,7 +186,7 @@ public fun ColorPicker( magnifier = magnifier, resetSelectedPosition = resetSelectedPosition, ), - onColorSelected, + onSelectedColor, ) } diff --git a/sample/shared/src/commonMain/kotlin/com/eygraber/compose/colorpicker/sample/Sample.kt b/sample/shared/src/commonMain/kotlin/com/eygraber/compose/colorpicker/sample/Sample.kt index 14b7240..d1ce027 100644 --- a/sample/shared/src/commonMain/kotlin/com/eygraber/compose/colorpicker/sample/Sample.kt +++ b/sample/shared/src/commonMain/kotlin/com/eygraber/compose/colorpicker/sample/Sample.kt @@ -63,13 +63,13 @@ fun Sample( alpha = alpha, brightness = brightness, defaultColor = defaultColor, - onSelectedColorChanged = { newSelectedColor -> + onSelectedColorChange = { newSelectedColor -> selectedColor = newSelectedColor }, - onAlphaChanged = { newAlpha -> + onAlphaChange = { newAlpha -> alpha = newAlpha }, - onBrightnessChanged = { newBrightness -> + onBrightnessChange = { newBrightness -> brightness = newBrightness }, resetSelectedPosition = { @@ -89,7 +89,7 @@ fun Sample( brightness = brightness, resetSelectedPosition = shouldResetSelectedPosition, ), - onColorSelected = { newSelectedColor -> + onSelectedColor = { newSelectedColor -> selectedColor = when { newSelectedColor.isSpecified -> newSelectedColor else -> defaultColor @@ -106,9 +106,9 @@ private fun ColumnScope.Controls( defaultColor: Color, alpha: Float, brightness: Float, - onSelectedColorChanged: (Color) -> Unit, - onAlphaChanged: (Float) -> Unit, - onBrightnessChanged: (Float) -> Unit, + onSelectedColorChange: (Color) -> Unit, + onAlphaChange: (Float) -> Unit, + onBrightnessChange: (Float) -> Unit, resetSelectedPosition: () -> Unit, ) { Row( @@ -128,9 +128,9 @@ private fun ColumnScope.Controls( IconButton( onClick = { - onSelectedColorChanged(defaultColor) - onAlphaChanged(1F) - onBrightnessChanged(1F) + onSelectedColorChange(defaultColor) + onAlphaChange(1F) + onBrightnessChange(1F) resetSelectedPosition() }, ) { @@ -156,7 +156,7 @@ private fun ColumnScope.Controls( Slider( value = alpha, onValueChange = { - onAlphaChanged(it) + onAlphaChange(it) }, valueRange = 0F..1F, steps = 0, @@ -169,7 +169,7 @@ private fun ColumnScope.Controls( Slider( value = brightness, onValueChange = { - onBrightnessChanged(it) + onBrightnessChange(it) }, valueRange = 0F..1F, steps = 0,