Fix named accessor code generator

DevSrSouza · Sep 15, 2024 · 0dc8f21 · 0dc8f21
1 parent b58cb3c
commit 0dc8f21
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 }
 
 group = "br.com.devsrsouza"
-version = "0.10.0"
+version = "0.11.0-SNAPSHOT"
 
 repositories {
     mavenCentral()

diff --git a/src/main/kotlin/androidx/compose/material/icons/generator/AllIconAccessorGenerator.kt b/src/main/kotlin/androidx/compose/material/icons/generator/AllIconAccessorGenerator.kt
@@ -70,16 +70,24 @@ class AllIconAccessorGenerator(
         // preventing that a asset has the name List and conflict with Kotlin List import
         fileSpec.addAliasedImport(map, "____KtMap")
 
+        val allAssetsNamedPropertyName = "${allAssetsPropertyName}Named"
+
         val allIconsType = map.parameterizedBy(STRING, ClassNames.ImageVector)
-        val allIconsBackingProperty = backingPropertySpec("__${allAssetsPropertyName}Named", allIconsType)
+        val allIconsBackingProperty = backingPropertySpec("__$allAssetsNamedPropertyName", allIconsType)
 
-        val allIconsParametersFromGroups = childGroups.map { "%M.${allAssetsPropertyName}Named.mapKeys { \"\${%M.groupName}.\${it.key}\"}" }
+        val allIconsParametersFromGroups = childGroups.map { "%M.$allAssetsNamedPropertyName.mapKeys { \"\${%M.groupName}.\${it.key}\"}" }
 
-        val allIconsParameters = iconProperties.map { "${it.simpleName.lowercase()} to %M" }
+        // adding import to `AllAssetsNamed`
+        childGroups.forEach {
+            fileSpec.addImport(it.groupPackage, allAssetsNamedPropertyName)
+            fileSpec.addImport(it.groupPackage, "groupName")
+        }
+
+        val allIconsParameters = iconProperties.map { "\"${it.simpleName.lowercase()}\" to %M" }
         val parameters = allIconsParameters.joinToString(prefix = "(", postfix = ")")
         val childGroupsParameters = allIconsParametersFromGroups.joinToString(" + ")
 
-        val allIconProperty = PropertySpec.builder(allAssetsPropertyName, allIconsType)
+        val allIconProperty = PropertySpec.builder(allAssetsNamedPropertyName, allIconsType)
             .receiver(accessClass)
             .getter(FunSpec.getterBuilder().withBackingProperty(allIconsBackingProperty) {
                 addStatement(

diff --git a/src/test/kotlin/Main.kt b/src/test/kotlin/Main.kt
@@ -13,7 +13,9 @@ fun main() {
         vectorsDirectory = iconTest,
         iconNameTransformer = { name, group ->
             name.removeSuffix(group, ignoreCase = true)
-        }
+        },
+        generatePreview = true,
+        generateStringAccessor = true,
     )
 }