Add Spotless configuration and clean up classic color picker ui.

Author: Rebecca Franks

CODE_OF_CONDUCT.md

@@ -119,11 +119,11 @@ This Code of Conduct is adapted from the [Contributor Covenant][homepage],
 version 2.0, available at
 [https://www.contributor-covenant.org/version/2/0/code_of_conduct.html][v2.0].
 
-Community Impact Guidelines were inspired by 
+Community Impact Guidelines were inspired by
 [Mozilla's code of conduct enforcement ladder][Mozilla CoC].
 
 For answers to common questions about this code of conduct, see the FAQ at
-[https://www.contributor-covenant.org/faq][FAQ]. Translations are available 
+[https://www.contributor-covenant.org/faq][FAQ]. Translations are available
 at [https://www.contributor-covenant.org/translations][translations].
 
 [homepage]: https://www.contributor-covenant.org

README.md

@@ -44,15 +44,15 @@ Or add the `HarmonyColorPicker` to your Compose hierarchy for an HSV color wheel
     modifier = Modifier.size(400.dp),
     onColorChanged = { hsvColor ->
         currentColor.value = hsvColor.toColor()
-        extraColors.value = hsvColor.getColors(colorHarmonyMode = harmonyMode.value) 
+        extraColors.value = hsvColor.getColors(colorHarmonyMode = harmonyMode.value)
 })
 ```
 
-The `HarmonyColorPicker` allows for you to set a certain `ColorHarmonyMode` on the wheel. 
-This will then display multiple magnifiers on top of the wheel for the different harmony modes: ie complementary, triadic, analogous, shades, monochromatic, tetradic. 
+The `HarmonyColorPicker` allows for you to set a certain `ColorHarmonyMode` on the wheel.
+This will then display multiple magnifiers on top of the wheel for the different harmony modes: ie complementary, triadic, analogous, shades, monochromatic, tetradic.
 If you wish to not display other magnifiers - set `ColorHarmonyMode.NONE` as your `harmonyMode` on the wheel.
 
-# ClassicColorPicker: 
+# ClassicColorPicker:
 ## Customizing the control
 
 ### Size
@@ -119,11 +119,14 @@ HarmonyColorPicker(
 
 # Library Contribution Information
 
-### To make a release
+## Code Formatting
+
+This project uses spotless to enforce code formatting. Run `./gradlew spotlessApply` to run formatting before committing.
+
+### Releases
 
 1. Update the version number in color-picker/build.gradle.kts
 2. Make a PR into main and get that merged
 3. Run "Deploy to Sonatype" GitHub Action.
-4. Login to Sonatype and "Close" release. After a few minutes, click "Release". 
+4. Login to Sonatype and "Close" release. After a few minutes, click "Release".
 5. Release should then be available for download on maven (might take like 30 min to propagate).
-

app/src/main/java/com/godaddy/android/colorpicker/ClassicColorPickerScreen.kt

@@ -19,12 +19,14 @@ import com.godaddy.android.colorpicker.theme.ComposeColorPickerTheme
 @Composable
 fun ClassicColorPickerScreen(navController: NavController) {
     Column {
-        TopAppBar(title = {
-            Text(stringResource(R.string.classic_color_picker_sample))
-        },
+        TopAppBar(
+            title = {
+                Text(stringResource(R.string.classic_color_picker_sample))
+            },
             navigationIcon = {
                 BackButton { navController.navigateUp() }
-            })
+            }
+        )
         val currentColor = remember {
             mutableStateOf(Color.Black)
         }
@@ -40,20 +42,17 @@ fun ClassicColorPickerScreen(navController: NavController) {
             }
         )
     }
-
 }
 
-
 @Composable
 fun ClassicColorPickerPreview() {
     ComposeColorPickerTheme {
         ClassicColorPicker(
             modifier = Modifier.height(300.dp),
             color = Color.Green,
             onColorChanged = {
-
-            })
-
+            }
+        )
     }
 }
 
@@ -65,7 +64,7 @@ fun ClassicColorPickerNoAlphaPreview() {
             color = Color.Magenta,
             showAlphaBar = false,
             onColorChanged = {
-
-            })
+            }
+        )
     }
 }

app/src/main/java/com/godaddy/android/colorpicker/ColorPreviewInfo.kt

@@ -3,7 +3,14 @@ package com.godaddy.android.colorpicker
 import androidx.compose.foundation.Canvas
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.GridCells
 import androidx.compose.foundation.lazy.LazyVerticalGrid
 import androidx.compose.foundation.lazy.items
@@ -21,9 +28,9 @@ fun ColorPreviewInfo(currentColor: Color) {
         Text(
             modifier = Modifier.padding(16.dp),
             text = "a: ${currentColor.alpha} \n" +
-                    "r: ${currentColor.red} \n" +
-                    "g: ${currentColor.green} \n" +
-                    "b: ${currentColor.blue}"
+                "r: ${currentColor.red} \n" +
+                "g: ${currentColor.green} \n" +
+                "b: ${currentColor.blue}"
         )
         Spacer(
             modifier = Modifier

app/src/main/java/com/godaddy/android/colorpicker/HarmonyColorPickerScreen.kt

@@ -4,7 +4,11 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.size
-import androidx.compose.material.*
+import androidx.compose.material.DropdownMenu
+import androidx.compose.material.DropdownMenuItem
+import androidx.compose.material.Text
+import androidx.compose.material.TextButton
+import androidx.compose.material.TopAppBar
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -20,12 +24,14 @@ import com.godaddy.android.colorpicker.theme.BackButton
 @Composable
 fun HarmonyColorPickerScreen(navController: NavController) {
     Column {
-        TopAppBar(title = {
-            Text(stringResource(R.string.harmony_color_picker_sample))
-        },
+        TopAppBar(
+            title = {
+                Text(stringResource(R.string.harmony_color_picker_sample))
+            },
             navigationIcon = {
                 BackButton { navController.navigateUp() }
-            })
+            }
+        )
         val currentColor = remember {
             mutableStateOf(Color.Black)
         }
@@ -62,8 +68,8 @@ fun HarmonyColorPickerScreen(navController: NavController) {
             onColorChanged = { hsvColor ->
                 currentColor.value = hsvColor.toColor()
                 extraColors.value = hsvColor.getColors(colorHarmonyMode = harmonyMode.value)
-            })
+            }
+        )
         ColorPaletteBar(modifier = Modifier.fillMaxWidth().height(70.dp), colors = extraColors.value)
     }
-
 }

app/src/main/java/com/godaddy/android/colorpicker/Routes.kt app/src/main/java/com/godaddy/android/colorpicker/Route.kt

@@ -42,4 +42,4 @@ fun ComposeColorPickerTheme(
         colors = colors,
         content = content
     )
-}
+}

app/src/main/java/com/godaddy/android/colorpicker/theme/Theme.kt

@@ -22,3 +22,9 @@ allprojects {
         maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
     }
 }
+
+plugins {
+    id("com.diffplug.spotless") version "6.2.0"
+}
+
+apply("${project.rootDir}/gradle/spotless.gradle")

build.gradle.kts

@@ -5,6 +5,6 @@ package com.godaddy.android.colorpicker
  *
  * returns @ColorInt
  */
-fun HsvColor.toColorInt() : Int{
+fun HsvColor.toColorInt(): Int {
     return android.graphics.Color.HSVToColor((alpha * 255).toInt(), floatArrayOf(hue, saturation, value))
-}
+}

color-picker/src/androidMain/kotlin/com/godaddy/android/colorpicker/HsvColorExt.kt

@@ -41,30 +41,32 @@ internal fun AlphaBar(
             )
         )
     }
-    Canvas(modifier = modifier
-        .fillMaxSize()
-        .pointerInput(Unit) {
-            forEachGesture {
-                awaitPointerEventScope {
-                    val down = awaitFirstDown()
-                    onAlphaChanged(
-                        getAlphaFromPosition(
-                            down.position.x,
-                            this.size.width.toFloat()
-                        ).coerceIn(0f, 1f)
-                    )
-                    drag(down.id) { change ->
-                        change.consumePositionChange()
+    Canvas(
+        modifier = modifier
+            .fillMaxSize()
+            .pointerInput(Unit) {
+                forEachGesture {
+                    awaitPointerEventScope {
+                        val down = awaitFirstDown()
                         onAlphaChanged(
                             getAlphaFromPosition(
-                                change.position.x,
+                                down.position.x,
                                 this.size.width.toFloat()
                             ).coerceIn(0f, 1f)
                         )
+                        drag(down.id) { change ->
+                            change.consumePositionChange()
+                            onAlphaChanged(
+                                getAlphaFromPosition(
+                                    change.position.x,
+                                    this.size.width.toFloat()
+                                ).coerceIn(0f, 1f)
+                            )
+                        }
                     }
                 }
             }
-        }) {
+    ) {
 
         clipRect {
             drawCheckeredBackground()

color-picker/src/commonMain/kotlin/com/godaddy/android/colorpicker/AlphaBar.kt

@@ -5,14 +5,11 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.width
-import androidx.compose.material.TextField
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.ExperimentalGraphicsApi
 import androidx.compose.ui.unit.dp
 
 /**
@@ -39,7 +36,8 @@ fun ClassicColorPicker(
         val barThickness = 32.dp
         val paddingBetweenBars = 8.dp
         Column(modifier = Modifier.weight(0.8f)) {
-            SaturationValueArea(modifier = Modifier.weight(0.8f),
+            SaturationValueArea(
+                modifier = Modifier.weight(0.8f),
                 currentColor = colorPickerValueState.value,
                 onSaturationValueChanged = { saturation, value ->
                     colorPickerValueState.value =
@@ -49,7 +47,8 @@ fun ClassicColorPicker(
             )
             if (showAlphaBar) {
                 Spacer(modifier = Modifier.height(paddingBetweenBars))
-                AlphaBar(modifier = Modifier.height(barThickness),
+                AlphaBar(
+                    modifier = Modifier.height(barThickness),
                     currentColor = colorPickerValueState.value,
                     onAlphaChanged = { alpha ->
                         colorPickerValueState.value = colorPickerValueState.value.copy(alpha = alpha)
@@ -69,4 +68,3 @@ fun ClassicColorPicker(
         )
     }
 }
-

color-picker/src/commonMain/kotlin/com/godaddy/android/colorpicker/ClassicColorPicker.kt

@@ -1,6 +1,5 @@
 package com.godaddy.android.colorpicker
 
-
 /**
  * A representation of Color in Hue, Saturation and Value form.
  */
@@ -16,16 +15,16 @@ import com.godaddy.android.colorpicker.harmony.ColorHarmonyMode
  */
 data class HsvColor(
 
-    //from = 0.0, to = 360.0
+    // from = 0.0, to = 360.0
     val hue: Float,
 
-    //from = 0.0, to = 1.0
+    // from = 0.0, to = 1.0
     val saturation: Float,
 
-    //from = 0.0, to = 1.0
+    // from = 0.0, to = 1.0
     val value: Float,
 
-    //from = 0.0, to = 1.0
+    // from = 0.0, to = 1.0
     val alpha: Float
 ) {
 
@@ -111,7 +110,6 @@ data class HsvColor(
         }
     }
 
-
     companion object {
 
         val DEFAULT = HsvColor(360f, 1.0f, 1.0f, 1.0f)

color-picker/src/commonMain/kotlin/com/godaddy/android/colorpicker/HsvColor.kt

@@ -31,20 +31,21 @@ internal fun HueBar(
     val rainbowBrush = remember {
         Brush.verticalGradient(getRainbowColors())
     }
-    Canvas(modifier = modifier
-        .fillMaxSize()
-        .pointerInput(Unit) {
-            forEachGesture {
-                awaitPointerEventScope {
-                    val down = awaitFirstDown()
-                    onHueChanged(getHueFromPoint(down.position.y, size.height.toFloat()))
-                    drag(down.id) { change ->
-                        change.consumePositionChange()
-                        onHueChanged(getHueFromPoint(change.position.y, size.height.toFloat()))
+    Canvas(
+        modifier = modifier
+            .fillMaxSize()
+            .pointerInput(Unit) {
+                forEachGesture {
+                    awaitPointerEventScope {
+                        val down = awaitFirstDown()
+                        onHueChanged(getHueFromPoint(down.position.y, size.height.toFloat()))
+                        drag(down.id) { change ->
+                            change.consumePositionChange()
+                            onHueChanged(getHueFromPoint(change.position.y, size.height.toFloat()))
+                        }
                     }
                 }
             }
-        }
     ) {
         drawRect(rainbowBrush)
         drawRect(Color.Gray, style = Stroke(0.5.dp.toPx()))
@@ -54,7 +55,7 @@ internal fun HueBar(
     }
 }
 
-private fun getRainbowColors() : List<Color> {
+private fun getRainbowColors(): List<Color> {
     return listOf(
         Color(0xFFFF0040),
         Color(0xFFFF00FF),