Repro issue with font loading on Windows (#2074)

Author: geoff-powell

paparazzi-gradle-plugin/src/main/java/app/cash/paparazzi/gradle/instrumentation/ResourcesCompatVisitorFactory.kt

@@ -41,7 +41,10 @@ internal abstract class ResourcesCompatVisitorFactory : AsmClassVisitorFactory<I
     private class LoadFontVisitor(api: Int, delegate: MethodVisitor) : MethodVisitor(api, delegate) {
       override fun visitMethodInsn(opcode: Int, owner: String, name: String, descriptor: String, isInterface: Boolean) {
         if ("startsWith" == name) {
-          super.visitMethodInsn(opcode, owner, "contains", "(Ljava/lang/CharSequence;)Z", isInterface)
+          // Skip calls to `startsWith`, return true
+          super.visitInsn(Opcodes.POP) // Pop the arg being passed to `startsWith`, which is "res/"
+          super.visitInsn(Opcodes.POP) // Pop the receiver of `startsWith`, which is the font file path
+          super.visitLdcInsn(1) // Push `1` to the stack, as if `startsWith` returned true
         } else {
           super.visitMethodInsn(opcode, owner, name, descriptor, isInterface)
         }

paparazzi-gradle-plugin/src/test/java/app/cash/paparazzi/gradle/PaparazziPluginTest.kt

@@ -209,6 +209,16 @@ class PaparazziPluginTest {
     assertThat(snapshotsDir.exists()).isTrue()
   }
 
+  @Test
+  fun resourceMultiModule() {
+    val fixtureRoot = File("src/test/projects/resource-multi-module")
+
+    gradleRunner
+      .withArguments("verifyPaparazziDebug", "--stacktrace")
+      .forwardOutput()
+      .runFixture(fixtureRoot) { build() }
+  }
+
   @Test
   fun invalidChars() {
     val fixtureRoot = File("src/test/projects/invalid-chars")

paparazzi-gradle-plugin/src/test/projects/resource-multi-module/app/build.gradle

@@ -0,0 +1,32 @@
+plugins {
+  id 'com.android.application'
+  id 'kotlin-android'
+  id 'org.jetbrains.kotlin.plugin.compose'
+  id 'app.cash.paparazzi'
+}
+
+android {
+  namespace = 'app.cash.paparazzi.plugin.test'
+  compileSdk = libs.versions.compileSdk.get() as int
+  defaultConfig {
+    minSdk = libs.versions.minSdk.get() as int
+  }
+  compileOptions {
+    sourceCompatibility = libs.versions.javaTarget.get()
+    targetCompatibility = libs.versions.javaTarget.get()
+  }
+  kotlinOptions {
+    jvmTarget = libs.versions.javaTarget.get()
+  }
+  buildFeatures {
+    compose = true
+  }
+}
+
+dependencies {
+  implementation project(':typography')
+
+  implementation libs.composeUi.material
+  implementation libs.androidx.appcompat
+}
+

paparazzi-gradle-plugin/src/test/projects/resource-multi-module/app/src/main/AndroidManifest.xml

@@ -0,0 +1,17 @@
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<manifest package="app.cash.paparazzi.plugin.test">
+</manifest>

paparazzi-gradle-plugin/src/test/projects/resource-multi-module/app/src/main/java/app.cash.paparazzi.plugin.test/CustomFont.kt

@@ -0,0 +1,26 @@
+package app.cash.paparazzi.plugin.test
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.TextStyle
+import app.cash.paparazzi.plugin.typography.GreatVibes
+
+@Composable
+fun CustomFont() {
+  MaterialTheme {
+    Box(Modifier.fillMaxSize().background(color = Color.White)) {
+      Text(
+        text = "Hello, Paparazzi!",
+        style = TextStyle(
+          fontFamily = GreatVibes
+        )
+      )
+    }
+  }
+}

paparazzi-gradle-plugin/src/test/projects/resource-multi-module/app/src/test/java/app/cash/paparazzi/plugin/test/VerifyTest.kt

@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2020 Square, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package app.cash.paparazzi.plugin.test
+
+import android.widget.LinearLayout
+import app.cash.paparazzi.Paparazzi
+import org.junit.Rule
+import org.junit.Test
+
+class VerifyTest {
+  @get:Rule
+  val paparazzi = Paparazzi()
+
+  @Test
+  fun verify() {
+    paparazzi.snapshot {
+      CustomFont()
+    }
+  }
+}

paparazzi-gradle-plugin/src/test/projects/resource-multi-module/app/src/test/snapshots/images/app.cash.paparazzi.plugin.test_VerifyTest_verify.png

@@ -0,0 +1,4 @@
+apply from: '../test.settings.gradle'
+
+include ':app'
+include ':typography'

paparazzi-gradle-plugin/src/test/projects/resource-multi-module/settings.gradle

@@ -0,0 +1,28 @@
+plugins {
+  id 'com.android.library'
+  id 'kotlin-android'
+  id 'org.jetbrains.kotlin.plugin.compose'
+}
+
+android {
+  namespace = 'app.cash.paparazzi.plugin.typography'
+  compileSdk = libs.versions.compileSdk.get() as int
+  defaultConfig {
+    minSdk = libs.versions.minSdk.get() as int
+  }
+  compileOptions {
+    sourceCompatibility = libs.versions.javaTarget.get()
+    targetCompatibility = libs.versions.javaTarget.get()
+  }
+  kotlinOptions {
+    jvmTarget = libs.versions.javaTarget.get()
+  }
+  buildFeatures {
+    compose = true
+  }
+}
+
+dependencies {
+  implementation libs.composeUi.material
+  implementation libs.androidx.appcompat
+}

paparazzi-gradle-plugin/src/test/projects/resource-multi-module/typography/build.gradle

@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2020 Square, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package app.cash.paparazzi.plugin.typography
+
+import androidx.compose.ui.text.font.Font
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.font.FontWeight
+import app.cash.paparazzi.plugin.typography.R
+
+val GreatVibes = FontFamily(
+  Font(
+    resId = R.font.cashmarket_medium_normal,
+    weight = FontWeight.Normal,
+    FontStyle.Normal
+  )
+)