Unify code styles

ComposeGears · Jul 23, 2024 · dafc372 · dafc372
1 parent 8560894
commit dafc372
Show file tree

Hide file tree

Showing 10 changed files with 77 additions and 73 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -13,8 +13,6 @@ allprojects {
     extensions.configure<SpotlessExtension> {
         kotlin {
             target("src/**/*.kt")
-            // Sources copied from AndroidX Compose
-            targetExclude("src/main/kotlin/androidx/**")
             ktlint(rootProject.libs.ktlint.get().version)
                 .customRuleSets(
                     listOf(

diff --git a/components/androidx-compose/.editorconfig b/components/androidx-compose/.editorconfig
@@ -0,0 +1,3 @@
+[*.kt]
+# Disable ktlint rules that conflict with the AndroidX code style.
+ktlint_standard_property-naming = disabled
diff --git a/...androidx-compose/src/main/kotlin/androidx/compose/material/icons/generator/GraphicUnit.kt b/...androidx-compose/src/main/kotlin/androidx/compose/material/icons/generator/GraphicUnit.kt
@@ -21,4 +21,4 @@ internal fun rawAsGraphicUnit(raw: String): GraphicUnit {
         isStrokeDp -> Dp(raw.removeSuffix("dp").toFloat())
         else -> Pixel(raw.toFloat())
     }
-}
+}
diff --git a/.../androidx-compose/src/main/kotlin/androidx/compose/material/icons/generator/IconParser.kt b/.../androidx-compose/src/main/kotlin/androidx/compose/material/icons/generator/IconParser.kt
@@ -64,7 +64,7 @@ class IconParser(private val icon: Icon) {
                         PATH -> {
                             val pathData = parser.getAttributeValue(
                                 null,
-                                PATH_DATA
+                                PATH_DATA,
                             )
                             val fillAlpha = parser.getValueAsFloat(FILL_ALPHA)
                             val strokeAlpha = parser.getValueAsFloat(STROKE_ALPHA)
@@ -108,7 +108,7 @@ class IconParser(private val icon: Icon) {
                                 strokeLineJoin = strokeJoin ?: StrokeJoin.Miter,
                                 strokeLineMiter = strokeMiterLimit ?: 4.0f,
                                 fillType = fillType,
-                                nodes = PathParser.parsePathString(pathData)
+                                nodes = PathParser.parsePathString(pathData),
                             )
                             if (currentGroup != null) {
                                 currentGroup.paths.add(path)
@@ -122,7 +122,8 @@ class IconParser(private val icon: Icon) {
                             currentGroup = group
                             nodes.add(group)
                         }
-                        CLIP_PATH -> { /* TODO: b/147418351 - parse clipping paths */
+                        CLIP_PATH -> {
+                            /* TODO: b/147418351 - parse clipping paths */
                         }
                         GRADIENT -> {
                             val gradient = when (parser.getAttributeValue(null, TYPE)) {
@@ -135,7 +136,7 @@ class IconParser(private val icon: Icon) {
                                         startY = startY,
                                         startX = startX,
                                         endX = endX,
-                                        endY = endY
+                                        endY = endY,
                                     )
                                 }
                                 RADIAL -> {
@@ -145,7 +146,7 @@ class IconParser(private val icon: Icon) {
                                     Fill.RadialGradient(
                                         gradientRadius = gradientRadius,
                                         centerX = centerX,
-                                        centerY = centerY
+                                        centerY = centerY,
                                     )
                                 }
                                 else -> null
@@ -184,7 +185,7 @@ class IconParser(private val icon: Icon) {
             height,
             viewportWidth,
             viewportHeight,
-            nodes
+            nodes,
         )
     }
 }
@@ -216,8 +217,11 @@ private fun String.toHexColor(): String {
     return removePrefix("#")
         .let {
             if (hexRegex.matches(it)) {
-                if (it.length > 6) it
-                else "FF$it"
+                if (it.length > 6) {
+                    it
+                } else {
+                    "FF$it"
+                }
             } else {
                 "FF000000"
             }

diff --git a/...oidx-compose/src/main/kotlin/androidx/compose/material/icons/generator/vector/FillType.kt b/...oidx-compose/src/main/kotlin/androidx/compose/material/icons/generator/vector/FillType.kt
@@ -24,5 +24,5 @@ package androidx.compose.material.icons.generator.vector
  */
 enum class FillType {
     NonZero,
-    EvenOdd
+    EvenOdd,
 }