android · Temennigru · Nov 10, 2021 · Jan 25, 2022 · Jan 29, 2022 · Feb 4, 2022
diff --git a/TODO.md b/TODO.md
@@ -15,3 +15,7 @@ Capture:
 Flags:
 - ways to disable class count and resource count (--no-class-count on task)
 
+Generation
+- Fetch resource artifact from AGP to reference resources from other modules
+- Two-pass resource generation so menu resources can be generated with code references
+- Implement random raw resource generation. Also implement random java resource generation and asset generation.
diff --git a/code/codegen/src/main/kotlin/com/android/gradle/replicator/codegen/FieldModel.kt b/code/codegen/src/main/kotlin/com/android/gradle/replicator/codegen/FieldModel.kt
@@ -16,8 +16,6 @@
  */
 package com.android.gradle.replicator.codegen
 
-import kotlin.reflect.KClass
-
 data class FieldModel(
         val name: String,
         override val classModel: ClassModel<*>,

diff --git a/code/codegen/src/main/kotlin/com/android/gradle/replicator/codegen/GeneratorDriver.kt b/code/codegen/src/main/kotlin/com/android/gradle/replicator/codegen/GeneratorDriver.kt
@@ -16,6 +16,7 @@
  */
 package com.android.gradle.replicator.codegen
 
+import com.android.gradle.replicator.resourceModel.ResourceModel
 import java.io.File
 import java.lang.reflect.Modifier
 import java.net.URLClassLoader
@@ -39,20 +40,25 @@ class GeneratorDriver(
     /**
      * Generate a single class
      *
+     * @param moduleName the root package for the module (where the R class is located).
      * @param packageName the package name for the class to generate.
      * @param className the class name to generate.
      * @param printStream the [PrettyPrintStream] to use to generate the code.
      * @param listeners optional list of code generation listeners to further customize generated code.
      */
     override fun generateClass(
+            moduleName: String,
             packageName: String,
             className: String,
             printStream: PrettyPrintStream,
-            listeners: List<CodeGenerationListener>) {
+            listeners: List<CodeGenerationListener>,
+            resourceModel: ResourceModel) {
         SingleClassGenerator(
                 generator = generatorAllocator(printStream, listeners),
+                moduleName = moduleName,
                 packageName = packageName,
                 className = className,
+                resourceModel = resourceModel,
                 random = random,
                 apiClassPicker = apiImportClassPicker,
                 implClassPicker = implementationImportClassPicker,

diff --git a/code/codegen/src/main/kotlin/com/android/gradle/replicator/codegen/ImportClassPicker.kt b/code/codegen/src/main/kotlin/com/android/gradle/replicator/codegen/ImportClassPicker.kt
@@ -89,6 +89,16 @@ open class ImportClassPicker(
         return classModel
     }
 
+    /**
+     * find a specific class in the class loader by name.
+     *
+     * @param className the name of the class.
+     * @return the class or null if it could not be found.
+     */
+    fun getClassByName(className: String): ClassModel<*>? {
+        return isClassEligible(loadClass(className))
+    }
+
     /**
      * Loads a class from the classloader.
      *

diff --git a/code/codegen/src/main/kotlin/com/android/gradle/replicator/codegen/Main.kt b/code/codegen/src/main/kotlin/com/android/gradle/replicator/codegen/Main.kt
@@ -16,9 +16,19 @@
  */
 package com.android.gradle.replicator.codegen
 
+import com.android.gradle.replicator.model.AndroidResourcesInfo
+import com.android.gradle.replicator.model.FilesWithSizeMetadataInfo
+import com.android.gradle.replicator.model.internal.AndroidResourcesAdapter
+import com.android.gradle.replicator.model.internal.DefaultAndroidResourcesInfo
+import com.android.gradle.replicator.model.internal.DefaultFilesWithSizeMetadataInfo
+import com.android.gradle.replicator.model.internal.FilesWithSizeMetadataAdapter
 import com.android.gradle.replicator.parsing.ArgsParser
+import com.android.gradle.replicator.resourceModel.ResourceModel
+import com.android.gradle.replicator.resourceModel.ResourceModelAdapter
+import com.google.gson.stream.JsonReader
 import java.io.File
 import java.io.PrintStream
+import java.nio.file.Files
 
 fun main(args: Array<String>) {
     val main= Main()
@@ -34,6 +44,7 @@ class Main {
         val parser = ArgsParser()
 
         val pathToArgumentsFileOption = parser.option(longName = "argsFile", shortName = "i", argc = 1)
+        val resourceModelFileOption = parser.option(longName = "resModel", shortName = "rm", argc = 1)
         val outputFolderOption = parser.option(longName = "outputFolder", shortName = "o", argc = 1)
         val moduleOption = parser.option(longName = "module", shortName = "m", argc = 1)
         val implClasspathElementOption = parser.option(
@@ -61,11 +72,19 @@ class Main {
         parser.parseArgs(args)
 
         val parametersBuilder = CodeGenerationParameters.Builder()
-        val pathToArgumentsFile = pathToArgumentsFileOption.orNull?.first
-        if (pathToArgumentsFile!=null
-            && File(pathToArgumentsFile).exists()) {
-            parser.parsePropertyFile(File(pathToArgumentsFile))
+        val pathToArgumentsFile = pathToArgumentsFileOption.orNull?.asFile
+        if (pathToArgumentsFile != null
+            && pathToArgumentsFile.exists()) {
+            parser.parsePropertyFile(pathToArgumentsFile)
         }
+        val resourceModelFile = resourceModelFileOption.orNull?.asFile
+        val resourceModel =
+            if (resourceModelFile != null
+                && resourceModelFile.exists()) {
+                loadResourceModel(resourceModelFile)
+            } else {
+                ResourceModel()
+            }
         buildParameters(
                 parametersBuilder,
                 apiOption.orNull?.argv,
@@ -80,7 +99,7 @@ class Main {
         val kotlinGenerator: GeneratorType = GeneratorType.Kotlin
         val javaGenerator = GeneratorType.Java
 
-        val outputFolder = File(checkNotNull(outputFolderOption.orNull?.first))
+        val outputFolder = outputFolderOption.asFile
         outputFolder.deleteRecursively()
         outputFolder.mkdirs()
         println("Generating in $outputFolder")
@@ -94,6 +113,7 @@ class Main {
                     javaGenerator,
                     arguments,
                     moduleName,
+                    resourceModel,
                     outputFolder
             )
         }
@@ -103,6 +123,7 @@ class Main {
                     kotlinGenerator,
                     arguments,
                     moduleName,
+                    resourceModel,
                     outputFolder
             )
         }
@@ -113,6 +134,7 @@ class Main {
             generatorType: GeneratorType,
             parameters: CodeGenerationParameters,
             moduleName: String,
+            resourceModel: ResourceModel,
             outputFolder: File) {
         val generator = generatorType.initialize(parameters)
         repeat(numberOfSources) { count ->
@@ -124,14 +146,27 @@ class Main {
             println("Generating ${generatorType.name} source ${outputFile.absolutePath}")
             PrintStream(outputFile).use {
                 generator.generateClass(
+                        moduleName = "com.android.example.${moduleName}",
                         packageName = "com.android.example.${moduleName}",
                         className = className,
                         printStream = PrettyPrintStream(it),
-                        listeners = listOf())
+                        listeners = listOf(),
+                        resourceModel = resourceModel)
             }
         }
     }
 
+    // read generated android resource model
+    private fun loadResourceModel(resourceModelFile: File): ResourceModel {
+        var resourceModel: ResourceModel
+
+        with(JsonReader(Files.newBufferedReader(resourceModelFile.toPath()))) {
+            resourceModel = ResourceModelAdapter().read(this)
+        }
+
+        return resourceModel
+    }
+
     private fun buildParameters(
             parametersBuilder: CodeGenerationParameters.Builder,
             apiClasspath: List<String>?,

diff --git a/code/codegen/src/main/kotlin/com/android/gradle/replicator/codegen/SingleClassGenerator.kt b/code/codegen/src/main/kotlin/com/android/gradle/replicator/codegen/SingleClassGenerator.kt
@@ -16,6 +16,7 @@
  */
 package com.android.gradle.replicator.codegen
 
+import com.android.gradle.replicator.resourceModel.ResourceModel
 import java.lang.reflect.Modifier
 import kotlin.random.Random
 import kotlin.reflect.*
@@ -28,17 +29,21 @@ import kotlin.reflect.jvm.kotlinFunction
 class SingleClassGenerator(
         generator: ClassGenerator,
         private val params: ClassGenerationParameters,
+        private val moduleName: String,
         private val packageName: String,
         private val className: String,
         private val apiClassPicker: ImportClassPicker,
         private val implClassPicker: ImportClassPicker,
+        private val resourceModel: ResourceModel,
         private val random: Random
 ) {
 
     private val classGenerator = ModelBuilderClassGenerator(generator)
 
     private var currentBlockDepth: Int = 0;
 
+    private val rClassName = "$moduleName.R"
+
     /**
      * Generate a single class using the provided generation parameters.
      */
@@ -222,6 +227,10 @@ class SingleClassGenerator(
         }
     }
 
+    private fun addResourceReferenceAndMethodCall() {
+        // To be implemented
+    }
+
     private fun findMethodReturning(desiredReturnType: KType): MethodCall? {
         return findMethodReturning(classGenerator.getMethodParametersVariables(), desiredReturnType)
                 ?: findMethodReturning(classGenerator.getLocalVariables(), desiredReturnType)

diff --git a/code/codegen/src/main/kotlin/com/android/gradle/replicator/codegen/SourceGenerator.kt b/code/codegen/src/main/kotlin/com/android/gradle/replicator/codegen/SourceGenerator.kt
@@ -16,6 +16,8 @@
  */
 package com.android.gradle.replicator.codegen
 
+import com.android.gradle.replicator.resourceModel.ResourceModel
+
 /**
  * A SourceGenerator is capable of generating various types of source files for a particular language.
  *
@@ -24,15 +26,18 @@ package com.android.gradle.replicator.codegen
 interface SourceGenerator {
     /**
      * Generate a class
+     * @param moduleName the root package for the module (where the R class is located).
      * @param packageName the class package.
      * @param className the class name.
      * @param printStream the stream to write the source code to.
      * @param listeners listeners for code generation events.
      */
     fun generateClass(
+            moduleName: String,
             packageName: String,
             className: String,
             printStream: PrettyPrintStream,
-            listeners: List<CodeGenerationListener> = listOf()
+            listeners: List<CodeGenerationListener> = listOf(),
+            resourceModel: ResourceModel
     )
 }
diff --git a/code/codegen/src/main/kotlin/com/android/gradle/replicator/parsing/ArgsParser.kt b/code/codegen/src/main/kotlin/com/android/gradle/replicator/parsing/ArgsParser.kt
@@ -18,6 +18,8 @@ class ArgsParser {
             get() = argv[0]
         val orNull
             get() = if (isPresent) this else null
+        val asFile
+            get() = File(argv[0])
     }
 
     private val longNameOpts = mutableMapOf<String, Option>()

diff --git a/...codegen/src/main/kotlin/com/android/gradle/replicator/resgen/DrawableResourceGenerator.kt b/...codegen/src/main/kotlin/com/android/gradle/replicator/resgen/DrawableResourceGenerator.kt
@@ -19,12 +19,13 @@ package com.android.gradle.replicator.resgen
 import com.android.gradle.replicator.model.internal.filedata.AbstractAndroidResourceProperties
 import com.android.gradle.replicator.model.internal.filedata.DefaultAndroidResourceProperties
 import com.android.gradle.replicator.model.internal.filedata.ResourcePropertyType
-import com.android.gradle.replicator.resgen.resourceModel.ResourceData
+import com.android.gradle.replicator.resourceModel.ResourceData
 import com.android.gradle.replicator.resgen.util.FileTypes
 import com.android.gradle.replicator.resgen.util.VectorDrawableGenerator
 import com.android.gradle.replicator.resgen.util.copyResourceFile
 import com.android.gradle.replicator.resgen.util.getFileType
 import com.android.gradle.replicator.resgen.util.getResourceClosestToSize
+import com.android.gradle.replicator.resourceModel.ResourceTypes
 import com.google.common.annotations.VisibleForTesting
 import java.io.File
 
@@ -60,7 +61,7 @@ class DrawableResourceGenerator (params: ResourceGenerationParams): ResourceGene
                     params.resourceModel.resourceList.add(ResourceData(
                         pkg = "",
                         name = fileName,
-                        type = "drawable",
+                        type = ResourceTypes.DRAWABLE,
                         extension = properties.extension,
                         qualifiers = properties.splitQualifiers))
                 }
@@ -72,7 +73,7 @@ class DrawableResourceGenerator (params: ResourceGenerationParams): ResourceGene
                     params.resourceModel.resourceList.add(ResourceData(
                         pkg = "",
                         name = fileName,
-                        type = "drawable",
+                        type = ResourceTypes.DRAWABLE,
                         extension = properties.extension,
                         qualifiers = properties.splitQualifiers))
                 }

diff --git a/code/codegen/src/main/kotlin/com/android/gradle/replicator/resgen/FontResourceGenerator.kt b/code/codegen/src/main/kotlin/com/android/gradle/replicator/resgen/FontResourceGenerator.kt
@@ -3,10 +3,11 @@ package com.android.gradle.replicator.resgen
 import com.android.gradle.replicator.model.internal.filedata.AbstractAndroidResourceProperties
 import com.android.gradle.replicator.model.internal.filedata.DefaultAndroidResourceProperties
 import com.android.gradle.replicator.model.internal.filedata.ResourcePropertyType
-import com.android.gradle.replicator.resgen.resourceModel.ResourceData
+import com.android.gradle.replicator.resourceModel.ResourceData
 import com.android.gradle.replicator.resgen.util.copyResourceFile
 import com.android.gradle.replicator.resgen.util.getFileType
 import com.android.gradle.replicator.resgen.util.getResourceClosestToSize
+import com.android.gradle.replicator.resourceModel.ResourceTypes
 import java.io.File
 
 class FontResourceGenerator(params: ResourceGenerationParams): ResourceGenerator(params) {
@@ -40,7 +41,7 @@ class FontResourceGenerator(params: ResourceGenerationParams): ResourceGenerator
                 ResourceData(
                 pkg = "",
                 name = fileName,
-                type = "font",
+                type = ResourceTypes.FONT,
                 extension = properties.extension,
                 qualifiers = properties.splitQualifiers)
             )

diff --git a/code/codegen/src/main/kotlin/com/android/gradle/replicator/resgen/GeneratorDriver.kt b/code/codegen/src/main/kotlin/com/android/gradle/replicator/resgen/GeneratorDriver.kt
@@ -1,7 +1,7 @@
 package com.android.gradle.replicator.resgen
 
 import com.android.gradle.replicator.model.internal.filedata.AbstractAndroidResourceProperties
-import com.android.gradle.replicator.resgen.resourceModel.ResourceModel
+import com.android.gradle.replicator.resourceModel.ResourceModel
 import com.android.gradle.replicator.resgen.util.ResgenConstants
 import com.android.gradle.replicator.resgen.util.UniqueIdGenerator
 import java.io.File