Add support for Color

README.md

@@ -209,7 +209,7 @@ Apart from that if you want to controll range / legnth / size of the values bein
 - Only classes already annotated with `@Dowel` can be annotated with `@DowelList`
 - All of the properties listed in the primary constructor of class annotated with `@Dowel` can only be of the following types:
   - Primitives (`Int`, `Long`, `Float`, `Double`, `Char`, `Boolean`, `String`)
-  - `androidx.compose.runtime.State`
+  - `androidx.compose.runtime.State`, `androidx.compose.ui.graphics.Color`
   - `kotlinx.coroutines.flow.Flow`
   - Functional types (high-order functions, lambdas)
   - `@Dowel` classes (`@Dowel` classes can be nested. A `@Dowel` annotated class can have properties of the type of classes which are again annotated with `@Dowel`)

app/src/main/java/com/jayasuryat/dowel/sample/ui/home/HomeScreen.kt

@@ -41,7 +41,7 @@ fun HomeScreen(
 
             items(
                 items = people,
-                key = { person -> person.name },
+                key = { person -> person.id },
             ) { person ->
 
                 ItemPerson(

app/src/main/java/com/jayasuryat/dowel/sample/ui/home/ItemPerson.kt

@@ -73,7 +73,7 @@ internal fun ItemPerson(
                     .padding(8.dp)
                     .size(40.dp)
                     .clip(CircleShape)
-                    .background(color = Color.Gray.copy(alpha = 0.8f)),
+                    .background(color = person.color),
                 painter = painterResource(id = person.avatar),
                 contentDescription = "Person avatar",
             )

app/src/main/java/com/jayasuryat/dowel/sample/ui/home/model/Person.kt

@@ -18,6 +18,7 @@ package com.jayasuryat.dowel.sample.ui.home.model
 import androidx.annotation.DrawableRes
 import androidx.annotation.Size
 import androidx.compose.runtime.State
+import androidx.compose.ui.graphics.Color
 import com.jayasuryat.dowel.annotation.Dowel
 import com.jayasuryat.dowel.annotation.DowelList
 import com.jayasuryat.dowel.sample.R
@@ -31,6 +32,7 @@ import kotlinx.coroutines.flow.Flow
 @DowelList(count = 5)
 @Dowel(count = 30)
 data class Person(
+    val id: Long,
     @Size(value = 5) val name: String,
     @Size(value = 300) val bio: String?,
     @DrawableRes val avatar: Int = R.drawable.ic_launcher_foreground,
@@ -54,4 +56,5 @@ data class Person(
     val title: Char,
     @Size(value = 1) val interests: List<Float>,
     val onClick: suspend (a: Person, b: Int) -> Unit,
+    val color: Color = Color(0xFFe5efab),
 )

dowel-processor/src/main/java/com/jayasuryat/dowel/processor/Names.kt

@@ -22,11 +22,6 @@ import com.squareup.kotlinpoet.ksp.toClassName
 
 internal object Names {
 
-    val previewParamProvider: ClassName = ClassName(
-        packageName = "androidx.compose.ui.tooling.preview",
-        "PreviewParameterProvider"
-    )
-
     val intRangeName: ClassName = ClassName(
         packageName = "androidx.annotation",
         "IntRange"
@@ -42,11 +37,6 @@ internal object Names {
         "Size"
     )
 
-    val stateName: ClassName = ClassName(
-        packageName = "androidx.compose.runtime",
-        "State"
-    )
-
     val flowName: ClassName = ClassName(
         packageName = "kotlinx.coroutines.flow",
         "Flow"
@@ -56,6 +46,21 @@ internal object Names {
 
     val sequenceName: ClassName = Sequence::class.asTypeName()
 
+    val previewParamProvider: ClassName = ClassName(
+        packageName = "androidx.compose.ui.tooling.preview",
+        "PreviewParameterProvider"
+    )
+
+    val stateName: ClassName = ClassName(
+        packageName = "androidx.compose.runtime",
+        "State"
+    )
+
+    val colorName: ClassName = ClassName(
+        packageName = "androidx.compose.ui.graphics",
+        "Color"
+    )
+
     const val dowelClassNameSuffix: String = "PreviewParamProvider"
     const val dowelListClassNameSuffix: String = "ListPreviewParamProvider"
 }

dowel-processor/src/main/java/com/jayasuryat/dowel/processor/generator/DowelGenerator.kt

@@ -255,9 +255,6 @@ internal class DowelGenerator(
                 is ClassRepresentation.ParameterSpec.UnsupportedNullableSpec,
                 -> emptyList()
 
-                is ClassRepresentation.ParameterSpec.StateSpec ->
-                    spec.elementSpec.getAllSupportingProvidersRecursively()
-
                 is ClassRepresentation.ParameterSpec.ListSpec ->
                     spec.elementSpec.getAllSupportingProvidersRecursively()
 
@@ -284,6 +281,11 @@ internal class DowelGenerator(
                 is DowelSpec -> listOf(spec)
 
                 is PreDefinedProviderSpec -> listOf(spec)
+
+                is ClassRepresentation.ParameterSpec.StateSpec ->
+                    spec.elementSpec.getAllSupportingProvidersRecursively()
+
+                is ClassRepresentation.ParameterSpec.ColorSpec -> emptyList()
             }
 
             return specs

dowel-processor/src/main/java/com/jayasuryat/dowel/processor/generator/ObjectConstructor.kt

@@ -15,6 +15,7 @@
  */
 package com.jayasuryat.dowel.processor.generator
 
+import com.jayasuryat.dowel.processor.Names
 import com.jayasuryat.dowel.processor.StringSource
 import com.jayasuryat.dowel.processor.model.ClassRepresentation
 import com.jayasuryat.dowel.processor.model.ClassRepresentation.ParameterSpec.*
@@ -83,7 +84,6 @@ internal class ObjectConstructor {
             is BooleanSpec -> spec.getBoolAssigner()
             is StringSpec -> spec.getStringAssigner()
 
-            is StateSpec -> spec.getStateAssigner() // This would be a recursive call
             is ListSpec -> spec.getListAssigner() // This would be a recursive call
             is SetSpec -> spec.getSetAssigner() // This would be a recursive call
             is MapSpec -> spec.getMapAssigner() // This would be a recursive call
@@ -100,6 +100,10 @@ internal class ObjectConstructor {
 
             is NoArgsConstructorSpec -> spec.getNoArgsConstructorAssigner()
 
+            // Compose types
+            is StateSpec -> spec.getStateAssigner() // This would be a recursive call
+            is ColorSpec -> spec.getColorAssigner()
+
             is UnsupportedNullableSpec -> spec.getUnsupportedNullableAssigner()
         }
 
@@ -178,16 +182,6 @@ internal class ObjectConstructor {
         return buildCodeBlock { add("%S", value) }
     }
 
-    private fun StateSpec.getStateAssigner(): CodeBlock {
-
-        val spec = this
-
-        return buildCodeBlock {
-            val mutableStateOf = MemberName("androidx.compose.runtime", "mutableStateOf")
-            add("%M(%L)", mutableStateOf, spec.elementSpec.getAssigner())
-        }
-    }
-
     private fun ListSpec.getListAssigner(): CodeBlock {
 
         val spec = this
@@ -365,6 +359,27 @@ internal class ObjectConstructor {
         }
     }
 
+    private fun StateSpec.getStateAssigner(): CodeBlock {
+
+        val spec = this
+
+        return buildCodeBlock {
+            val mutableStateOf = MemberName("androidx.compose.runtime", "mutableStateOf")
+            add("%M(%L)", mutableStateOf, spec.elementSpec.getAssigner())
+        }
+    }
+
+    @Suppress("unused")
+    private fun ColorSpec.getColorAssigner(): CodeBlock {
+
+        return buildCodeBlock {
+            val member = MemberName(Names.colorName.packageName, Names.colorName.simpleName)
+            val colorValue = Random.nextInt(0xffffff + 1)
+            val hexColor = String.format("0xFF%06x", colorValue)
+            add("%M($hexColor)", member)
+        }
+    }
+
     @Suppress("unused")
     private fun UnsupportedNullableSpec.getUnsupportedNullableAssigner(): CodeBlock {
         return buildCodeBlock { add("null") }

dowel-processor/src/main/java/com/jayasuryat/dowel/processor/model/ClassRepresentation.kt

@@ -81,10 +81,6 @@ internal data class ClassRepresentation(
         ) : ParameterSpec
         // endregion
 
-        data class StateSpec(
-            val elementSpec: ParameterSpec,
-        ) : ParameterSpec
-
         data class ListSpec(
             val size: Size,
             val elementSpec: ParameterSpec,
@@ -162,6 +158,13 @@ internal data class ClassRepresentation(
             val classDeclarations: KSClassDeclaration,
         ) : ParameterSpec
 
+        // Compose types
+        data class StateSpec(
+            val elementSpec: ParameterSpec,
+        ) : ParameterSpec
+
+        object ColorSpec : ParameterSpec
+
         /**
          * Types which are not directly supported by Dowel for code generation, but are nullable
          */

dowel-processor/src/main/java/com/jayasuryat/dowel/processor/model/ClassRepresentationMapper.kt

@@ -84,10 +84,6 @@ internal class ClassRepresentationMapper(
         val ksName = resolver.getKSNameFromString(Map::class.qualifiedName!!)
         resolver.getClassDeclarationByName(ksName)!!.asStarProjectedType()
     }
-    private val stateDeclaration: KSType by unsafeLazy {
-        val ksName = resolver.getKSNameFromString(Names.stateName.canonicalName)
-        resolver.getClassDeclarationByName(ksName)?.asStarProjectedType() ?: builtIns.nothingType
-    }
     private val flowDeclaration: KSType by unsafeLazy {
         val ksName = resolver.getKSNameFromString(Names.flowName.canonicalName)
         resolver.getClassDeclarationByName(ksName)?.asStarProjectedType() ?: builtIns.nothingType
@@ -96,6 +92,14 @@ internal class ClassRepresentationMapper(
         val ksName = resolver.getKSNameFromString(Pair::class.qualifiedName!!)
         resolver.getClassDeclarationByName(ksName)!!.asStarProjectedType()
     }
+    private val stateDeclaration: KSType by unsafeLazy {
+        val ksName = resolver.getKSNameFromString(Names.stateName.canonicalName)
+        resolver.getClassDeclarationByName(ksName)?.asStarProjectedType() ?: builtIns.nothingType
+    }
+    private val colorDeclaration: KSType by unsafeLazy {
+        val ksName = resolver.getKSNameFromString(Names.colorName.canonicalName)
+        resolver.getClassDeclarationByName(ksName)?.asStarProjectedType() ?: builtIns.nothingType
+    }
     // endregion
 
     fun map(
@@ -173,9 +177,6 @@ internal class ClassRepresentationMapper(
             propType.isAssignableFrom(builtIns.booleanType) -> getBooleanSpec().right()
             propType.isAssignableFrom(builtIns.stringType) -> getStringSpec(annotations).right()
 
-            // State
-            stateDeclaration.isAssignableFrom(propType) -> propType.getStateSpec()
-
             // List
             listDeclaration.isAssignableFrom(propType) -> propType.getListSpec(annotations)
 
@@ -217,6 +218,13 @@ internal class ClassRepresentationMapper(
             propTypeDeclaration.hasNoArgsConstructor() ->
                 propTypeDeclaration.getNoArgsConstructorSpec().right()
 
+            // Compose types
+            // State
+            stateDeclaration.isAssignableFrom(propType) -> propType.getStateSpec()
+
+            // Color
+            colorDeclaration.isAssignableFrom(propType) -> ColorSpec.right()
+
             // Unsupported types which are nullable
             propType.isMarkedNullable -> getUnsupportedNullableSpec().right()
 
@@ -332,23 +340,6 @@ internal class ClassRepresentationMapper(
         )
     }
 
-    private fun KSType.getStateSpec(): MaybeSpec<StateSpec> {
-
-        require(this.arguments.size == 1) { "State must have have exactly one type argument. Current size = ${this.arguments.size}" }
-        val arg = this.arguments.first()
-
-        val resolvedType = arg.type!!.resolve()
-        val spec = resolvedType.getSpec(
-            annotations = arg.annotations.toList(),
-        )
-
-        return either {
-            StateSpec(
-                elementSpec = spec.bind(),
-            )
-        }
-    }
-
     private fun KSType.getListSpec(
         annotations: List<KSAnnotation>,
     ): MaybeSpec<ListSpec> {
@@ -574,6 +565,23 @@ internal class ClassRepresentationMapper(
         )
     }
 
+    private fun KSType.getStateSpec(): MaybeSpec<StateSpec> {
+
+        require(this.arguments.size == 1) { "State must have have exactly one type argument. Current size = ${this.arguments.size}" }
+        val arg = this.arguments.first()
+
+        val resolvedType = arg.type!!.resolve()
+        val spec = resolvedType.getSpec(
+            annotations = arg.annotations.toList(),
+        )
+
+        return either {
+            StateSpec(
+                elementSpec = spec.bind(),
+            )
+        }
+    }
+
     private fun getUnsupportedNullableSpec(): UnsupportedNullableSpec = UnsupportedNullableSpec
 
     private fun KSDeclaration.isDowelClass(): Boolean {

dowel-processor/src/test/java/com/jayasuryat/dowel/processor/DowelWholeEnchiladaProcessingTest.kt

@@ -83,6 +83,20 @@ internal class DowelWholeEnchiladaProcessingTest {
         SourceFile.kotlin(name = "SnapshotState.kt", contents = source)
     }
 
+    private val ColorStub: SourceFile by lazy {
+        val source = """
+            package androidx.compose.ui.graphics
+
+            class Color(val value: ULong)
+
+            @Suppress("TestFunctionName")
+            fun Color(color: Long): Color {
+               return Color(value = (color.toULong() and 0xffffffffUL) shl 32)
+            }
+        """.trimIndent()
+        SourceFile.kotlin(name = "Color.kt", contents = source)
+    }
+
     private val VehicleSource: SourceFile by lazy {
         val source = """
             package dowel.vehicle
@@ -191,6 +205,7 @@ internal class DowelWholeEnchiladaProcessingTest {
             import dowel.vehicle.Vehicle
             import dowel.static.info.SomeStaticInfo
             import dowel.location.Location
+            import androidx.compose.ui.graphics.Color
 
             @Dowel(count = 30)
             internal data class Person(
@@ -207,6 +222,7 @@ internal class DowelWholeEnchiladaProcessingTest {
                 val liveLocation: Flow<Location?>,
                 val latLon: Pair<Long, Long>,
                 val info: SomeStaticInfo,
+                val bannerColor : Color,
                 @Size(value = 2) val locations: List<Location>,
                 @Size(value = 3) val uniqueLocations: Set<Location>,
                 val isExpanded: State<Boolean>,
@@ -241,6 +257,7 @@ internal class DowelWholeEnchiladaProcessingTest {
             StatusSource,
             StaticInfoSource,
             LocationSource,
+            ColorStub,
             /*AmbiguityLocationSource*/
         )