resetting to the previous color.

syslogic · syslogic · commit fafbdf40ecdf · 2022-07-03T08:34:08.000+02:00
diff --git a/library/src/main/java/io/syslogic/colorpicker/compose/ColorPickerComponent.kt b/library/src/main/java/io/syslogic/colorpicker/compose/ColorPickerComponent.kt
@@ -85,6 +85,7 @@ fun ColorPickerComponent(
                     .padding(all = rowPadding * 4)
             ) {
 
+                /* HSV */
                 if (showHSV) {
                     Column(
                         horizontalAlignment = Alignment.Start,
@@ -146,6 +147,7 @@ fun ColorPickerComponent(
                     }
                 }
 
+                /* ARGB */
                 if (showARGB) {
                     Column(
                         horizontalAlignment = Alignment.End,
@@ -366,7 +368,13 @@ fun ColorPickerComponent(
                         .pointerInput(Unit) {
                             detectTapGestures(
                                 onPress = {
-                                    onButtonClick(context, OldColor, initialColor.value.toInt(), listener)
+                                    /* reset to the previous color */
+                                    onButtonClick(context, OldColor, initialColor.hashCode(), listener)
+                                    currentColor = initialColor.hashCode()
+                                    currentAlpha = initialColor.alpha
+                                    currentHue = getHSV(initialColor)[0]
+                                    currentSat = getHSV(initialColor)[1]
+                                    currentVal = getHSV(initialColor)[2]
                                 }
                             )
                         }

Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,7 @@ fun ColorPickerComponent(`
`85`	`85`	`.padding(all = rowPadding * 4)`
`86`	`86`	`) {`
`87`	`87`
	`88`	`+ /* HSV */`
`88`	`89`	`if (showHSV) {`
`89`	`90`	`Column(`
`90`	`91`	`horizontalAlignment = Alignment.Start,`
`@@ -146,6 +147,7 @@ fun ColorPickerComponent(`
`146`	`147`	`}`
`147`	`148`	`}`
`148`	`149`
	`150`	`+ /* ARGB */`
`149`	`151`	`if (showARGB) {`
`150`	`152`	`Column(`
`151`	`153`	`horizontalAlignment = Alignment.End,`
`@@ -366,7 +368,13 @@ fun ColorPickerComponent(`
`366`	`368`	`.pointerInput(Unit) {`
`367`	`369`	`detectTapGestures(`
`368`	`370`	`onPress = {`
`369`		`- onButtonClick(context, OldColor, initialColor.value.toInt(), listener)`
	`371`	`+ /* reset to the previous color */`
	`372`	`+ onButtonClick(context, OldColor, initialColor.hashCode(), listener)`
	`373`	`+ currentColor = initialColor.hashCode()`
	`374`	`+ currentAlpha = initialColor.alpha`
	`375`	`+ currentHue = getHSV(initialColor)[0]`
	`376`	`+ currentSat = getHSV(initialColor)[1]`
	`377`	`+ currentVal = getHSV(initialColor)[2]`
`370`	`378`	`}`
`371`	`379`	`)`
`372`	`380`	`}`