Fixes Issue About Generated Strings Rendering (cashapp#1307)

Co-authored-by: John Rodriguez <john.rodriguez@gmail.com>
freeletics · Feb 28, 2024 · 5439780 · 5439780
1 parent 7276226
commit 5439780
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 5 deletions.
diff --git a/paparazzi-gradle-plugin/src/main/java/app/cash/paparazzi/gradle/PaparazziPlugin.kt b/paparazzi-gradle-plugin/src/main/java/app/cash/paparazzi/gradle/PaparazziPlugin.kt
@@ -26,6 +26,7 @@ import com.android.build.gradle.internal.api.TestedVariant
 import com.android.build.gradle.internal.dsl.BaseAppModuleExtension
 import com.android.build.gradle.internal.dsl.DynamicFeatureExtension
 import com.android.build.gradle.internal.publishing.AndroidArtifacts.ArtifactType
+import com.android.build.gradle.tasks.GenerateResValues
 import org.gradle.api.DefaultTask
 import org.gradle.api.DomainObjectSet
 import org.gradle.api.Plugin
@@ -140,7 +141,12 @@ public class PaparazziPlugin : Plugin<Project> {
         task.nonTransitiveRClassEnabled.set(nonTransitiveRClassEnabled)
         task.targetSdkVersion.set(android.targetSdkVersion())
         task.compileSdkVersion.set(android.compileSdkVersion())
-        task.projectResourceDirs.set(project.provider { localResourceDirs.relativize(projectDirectory) })
+        task.projectResourceDirs.set(
+          project.provider {
+            val generateResValuesDirs = project.tasks.withType(GenerateResValues::class.java).filter { it.variantName == variant.name }.map { it.resOutputDir }
+            localResourceDirs.relativize(projectDirectory) + generateResValuesDirs.map(projectDirectory::relativize)
+          }
+        )
         task.moduleResourceDirs.set(project.provider { moduleResourceDirs.relativize(projectDirectory) })
         task.aarExplodedDirs.from(aarExplodedDirs)
         task.projectAssetDirs.set(project.provider { localAssetDirs.plus(moduleAssetDirs).relativize(projectDirectory) })

diff --git a/paparazzi-gradle-plugin/src/test/java/app/cash/paparazzi/gradle/PaparazziPluginTest.kt b/paparazzi-gradle-plugin/src/test/java/app/cash/paparazzi/gradle/PaparazziPluginTest.kt
@@ -759,7 +759,7 @@ class PaparazziPluginTest {
       "app.cash.paparazzi.plugin.test.module1",
       "app.cash.paparazzi.plugin.test.module2"
     )
-    assertThat(config.projectResourceDirs).containsExactly("src/main/res", "src/debug/res")
+    assertThat(config.projectResourceDirs).containsExactly("src/main/res", "src/debug/res", "build/generated/res/resValues/debug")
     assertThat(config.moduleResourceDirs).containsExactly(
       "../module1/build/intermediates/packaged_res/debug",
       "../module2/build/intermediates/packaged_res/debug"
@@ -790,7 +790,7 @@ class PaparazziPluginTest {
       "app.cash.paparazzi.plugin.test.module1",
       "app.cash.paparazzi.plugin.test.module2"
     )
-    assertThat(config.projectResourceDirs).containsExactly("src/main/res", "src/debug/res")
+    assertThat(config.projectResourceDirs).containsExactly("src/main/res", "src/debug/res", "build/generated/res/resValues/debug")
     assertThat(config.moduleResourceDirs).containsExactly(
       "../module1/build/intermediates/packaged_res/debug",
       "../module2/build/intermediates/packaged_res/debug"
@@ -831,7 +831,7 @@ class PaparazziPluginTest {
     val resourcesFile = File(fixtureRoot, "build/intermediates/paparazzi/debug/resources.json")
 
     var config = resourcesFile.loadConfig()
-    assertThat(config.projectResourceDirs).containsExactly("src/main/res", "src/debug/res")
+    assertThat(config.projectResourceDirs).containsExactly("src/main/res", "src/debug/res", "build/generated/res/resValues/debug")
 
     buildDir.deleteRecursively()
 
@@ -853,7 +853,7 @@ class PaparazziPluginTest {
     }
 
     config = resourcesFile.loadConfig()
-    assertThat(config.projectResourceDirs).containsExactly("src/main/res", "src/debug/res")
+    assertThat(config.projectResourceDirs).containsExactly("src/main/res", "src/debug/res", "build/generated/res/resValues/debug")
   }
 
   @Test

diff --git a/sample/build.gradle b/sample/build.gradle
@@ -9,6 +9,7 @@ android {
   compileSdk libs.versions.compileSdk.get() as int
   defaultConfig {
     minSdk libs.versions.minSdk.get() as int
+    resValue("string", "generated_string_name", "Generated Test String")
   }
   compileOptions {
     sourceCompatibility = libs.versions.javaTarget.get()

diff --git a/sample/src/main/java/app/cash/paparazzi/sample/ResourcesDemo.kt b/sample/src/main/java/app/cash/paparazzi/sample/ResourcesDemo.kt
@@ -124,5 +124,9 @@ fun ResourcesDemo() {
       resources.getStringArray(R.array.string_array_name).joinToString(),
       color = Color.Black
     )
+    Text(
+      resources.getString(R.string.generated_string_name),
+      color = Color.Black
+    )
   }
 }
diff --git a/sample/src/main/java/app/cash/paparazzi/sample/ResourcesDemoView.kt b/sample/src/main/java/app/cash/paparazzi/sample/ResourcesDemoView.kt
@@ -59,6 +59,7 @@ class ResourcesDemoView(context: Context) : LinearLayout(context) {
     )
     addTextView(resources.getText(R.string.string_name_html_unescaped))
     addTextView(resources.getStringArray(R.array.string_array_name).joinToString())
+    addTextView(resources.getText(R.string.generated_string_name))
   }
 
   private fun LinearLayout.addImageView(@DrawableRes drawableRes: Int) {