-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Generate functions to find resources by a string ID. (#5068)
The PR adds a generation special properties with maps a string ID to the resource for each type of resources: ```kotlin val Res.allDrawableResources: Map<String, DrawableResource> val Res.allStringResources: Map<String, StringResource> val Res.allStringArrayResources: Map<String, StringArrayResource> val Res.allPluralStringResources: Map<String, PluralStringResource> val Res.allFontResources: Map<String, FontResource> ``` <!-- Optional --> Fixes #4880 Fixes https://youtrack.jetbrains.com/issue/CMP-1607 ## Testing I checked it in the sample project but this should be tested by QA (KMP and JVM only projects) ## Release Notes ### Features - Resources - Now the gradle plugin generates resources map to find a resource by a string ID
- Loading branch information
Showing
31 changed files
with
1,218 additions
and
352 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
116 changes: 116 additions & 0 deletions
116
...compose/src/main/kotlin/org/jetbrains/compose/resources/GenerateResourceCollectorsTask.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,116 @@ | ||
| package org.jetbrains.compose.resources | ||
|
|
||
| import org.gradle.api.file.ConfigurableFileCollection | ||
| import org.gradle.api.file.DirectoryProperty | ||
| import org.gradle.api.provider.Property | ||
| import org.gradle.api.tasks.Input | ||
| import org.gradle.api.tasks.InputFiles | ||
| import org.gradle.api.tasks.OutputDirectory | ||
| import org.gradle.api.tasks.PathSensitive | ||
| import org.gradle.api.tasks.PathSensitivity | ||
| import org.jetbrains.compose.internal.IdeaImportTask | ||
| import org.jetbrains.compose.internal.utils.uppercaseFirstChar | ||
|
|
||
| internal abstract class GenerateExpectResourceCollectorsTask : IdeaImportTask() { | ||
| @get:Input | ||
| abstract val packageName: Property<String> | ||
|
|
||
| @get:Input | ||
| abstract val shouldGenerateCode: Property<Boolean> | ||
|
|
||
| @get:Input | ||
| abstract val makeAccessorsPublic: Property<Boolean> | ||
|
|
||
| @get:OutputDirectory | ||
| abstract val codeDir: DirectoryProperty | ||
|
|
||
| override fun safeAction() { | ||
| val kotlinDir = codeDir.get().asFile | ||
|
|
||
| logger.info("Clean directory $kotlinDir") | ||
| kotlinDir.deleteRecursively() | ||
| kotlinDir.mkdirs() | ||
|
|
||
| if (shouldGenerateCode.get()) { | ||
| logger.info("Generate expect ResourceCollectors for $kotlinDir") | ||
|
|
||
| val pkgName = packageName.get() | ||
| val isPublic = makeAccessorsPublic.get() | ||
| val spec = getExpectResourceCollectorsFileSpec(pkgName, "ExpectResourceCollectors", isPublic) | ||
| spec.writeTo(kotlinDir) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| internal abstract class GenerateActualResourceCollectorsTask : IdeaImportTask() { | ||
| @get:Input | ||
| abstract val packageName: Property<String> | ||
|
|
||
| @get:Input | ||
| abstract val shouldGenerateCode: Property<Boolean> | ||
|
|
||
| @get:Input | ||
| abstract val makeAccessorsPublic: Property<Boolean> | ||
|
|
||
| @get:Input | ||
| abstract val useActualModifier: Property<Boolean> | ||
|
|
||
| @get:InputFiles | ||
| @get:PathSensitive(PathSensitivity.RELATIVE) | ||
| abstract val resourceAccessorDirs: ConfigurableFileCollection | ||
|
|
||
| @get:OutputDirectory | ||
| abstract val codeDir: DirectoryProperty | ||
|
|
||
| override fun safeAction() { | ||
| val kotlinDir = codeDir.get().asFile | ||
| val inputDirs = resourceAccessorDirs.files | ||
|
|
||
| logger.info("Clean directory $kotlinDir") | ||
| kotlinDir.deleteRecursively() | ||
| kotlinDir.mkdirs() | ||
|
|
||
| val inputFiles = inputDirs.flatMap { dir -> | ||
| dir.walkTopDown().filter { !it.isHidden && it.isFile && it.extension == "kt" }.toList() | ||
| } | ||
|
|
||
| if (shouldGenerateCode.get()) { | ||
| logger.info("Generate actual ResourceCollectors for $kotlinDir") | ||
| val funNames = inputFiles.mapNotNull { inputFile -> | ||
| if (inputFile.nameWithoutExtension.contains('.')) { | ||
| val (fileName, suffix) = inputFile.nameWithoutExtension.split('.') | ||
| val type = ResourceType.values().firstOrNull { fileName.startsWith(it.accessorName, true) } | ||
| val name = "_collect${suffix.uppercaseFirstChar()}${fileName}Resources" | ||
|
|
||
| if (type == null) { | ||
| logger.warn("Unknown resources type: `$inputFile`") | ||
| null | ||
| } else if (!inputFile.readText().contains(name)) { | ||
| logger.warn("A function '$name' is not found in the `$inputFile` file!") | ||
| null | ||
| } else { | ||
| logger.info("Found collector function: `$name`") | ||
| type to name | ||
| } | ||
| } else { | ||
| logger.warn("Unknown file name: `$inputFile`") | ||
| null | ||
| } | ||
| }.groupBy({ it.first }, { it.second }) | ||
|
|
||
| val pkgName = packageName.get() | ||
| val isPublic = makeAccessorsPublic.get() | ||
| val useActual = useActualModifier.get() | ||
| val spec = getActualResourceCollectorsFileSpec( | ||
| pkgName, | ||
| "ActualResourceCollectors", | ||
| isPublic, | ||
| useActual, | ||
| funNames | ||
| ) | ||
| spec.writeTo(kotlinDir) | ||
| } else { | ||
| logger.info("Generation ResourceCollectors for $kotlinDir is disabled") | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.