Add feature flag for new resource loading mechanism

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

@@ -215,6 +215,40 @@ class PaparazziPluginTest {
     assertThat(result.output).contains("Objects still linked from the DelegateManager:")
   }
 
+  @Test
+  fun flagNewResourceLoadingIsOff() {
+    val fixtureRoot = File("src/test/projects/flag-new-resource-loading-off")
+
+    val result = gradleRunner
+      .withArguments("testDebug", "--stacktrace")
+      .runFixture(fixtureRoot) { build() }
+
+    assertThat(result.task(":preparePaparazziDebugResources")).isNotNull()
+    assertThat(result.task(":testDebugUnitTest")).isNotNull()
+
+    val snapshotsDir = File(fixtureRoot, "build/reports/paparazzi/images")
+    val snapshots = snapshotsDir.listFiles()
+    assertThat(snapshots!!).hasLength(1)
+
+    val snapshotImage = snapshots[0]
+    val goldenImage = File(fixtureRoot, "src/test/resources/launch.png")
+    assertThat(snapshotImage).isSimilarTo(goldenImage).withDefaultThreshold()
+  }
+
+  @Test
+  fun flagNewResourceLoadingIsOn() {
+    val fixtureRoot = File("src/test/projects/flag-new-resource-loading-on")
+
+    val result = gradleRunner
+      .withArguments("testDebug", "--stacktrace")
+      .forwardOutput()
+      .runFixture(fixtureRoot) { buildAndFail() }
+
+    assertThat(result.output).contains(
+      "An operation is not implemented: New resource loading coming soon"
+    )
+  }
+
   @Test
   fun cacheable() {
     val fixtureRoot = File("src/test/projects/cacheable")

paparazzi/paparazzi-gradle-plugin/src/test/projects/flag-new-resource-loading-off/build.gradle

@@ -0,0 +1,22 @@
+plugins {
+  id 'com.android.library'
+  id 'kotlin-android'
+  id 'app.cash.paparazzi'
+}
+
+repositories {
+  maven {
+    url "file://${projectDir.absolutePath}/../../../../../build/localMaven"
+  }
+  mavenCentral()
+  //mavenLocal()
+  google()
+}
+
+android {
+  namespace 'app.cash.paparazzi.plugin.test'
+  compileSdk libs.versions.compileSdk.get() as int
+  defaultConfig {
+    minSdk libs.versions.minSdk.get() as int
+  }
+}

paparazzi/paparazzi-gradle-plugin/src/test/projects/flag-new-resource-loading-off/src/main/res/layout/launch.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:gravity="center"
+    android:background="@color/launchBackground"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    >
+
+  <ImageView
+      android:layout_width="200dp"
+      android:layout_height="200dp"
+      android:src="@drawable/camera"
+      />
+
+  <TextView
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:gravity="center"
+      android:textColor="@color/cameraBody"
+      android:text="paparazzi"
+      android:textSize="70dp"
+      android:textFontWeight="100"
+      />
+
+</LinearLayout>

paparazzi/paparazzi-gradle-plugin/src/test/projects/flag-new-resource-loading-off/src/main/res/values/colors.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <color name="launchBackground">#dcdccc</color>
+  <color name="cameraBody">#332F21</color>
+</resources>

paparazzi/paparazzi-gradle-plugin/src/test/projects/flag-new-resource-loading-off/src/test/java/app/cash/paparazzi/plugin/test/LaunchViewTest.kt

@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2019 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 LaunchViewTest {
+  @get:Rule
+  val paparazzi = Paparazzi()
+
+  @Test
+  fun testViews() {
+    val launch = paparazzi.inflate<LinearLayout>(R.layout.launch)
+    paparazzi.snapshot(launch, "launch")
+  }
+}

paparazzi/paparazzi-gradle-plugin/src/test/projects/flag-new-resource-loading-on/build.gradle

@@ -0,0 +1,28 @@
+plugins {
+  id 'com.android.library'
+  id 'kotlin-android'
+  id 'app.cash.paparazzi'
+}
+
+repositories {
+  maven {
+    url "file://${projectDir.absolutePath}/../../../../../build/localMaven"
+  }
+  mavenCentral()
+  //mavenLocal()
+  google()
+}
+
+android {
+  namespace 'app.cash.paparazzi.plugin.test'
+  compileSdk libs.versions.compileSdk.get() as int
+  defaultConfig {
+    minSdk libs.versions.minSdk.get() as int
+  }
+}
+
+tasks.withType(Test).configureEach {
+  testLogging {
+    exceptionFormat 'FULL'
+  }
+}

paparazzi/paparazzi-gradle-plugin/src/test/projects/flag-new-resource-loading-on/gradle.properties

@@ -0,0 +1,2 @@
+android.useAndroidX=true
+app.cash.paparazzi.new.resource.loading=true

paparazzi/paparazzi-gradle-plugin/src/test/projects/flag-new-resource-loading-on/src/main/res/layout/launch.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:gravity="center"
+    android:background="@color/launchBackground"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    >
+
+  <ImageView
+      android:layout_width="200dp"
+      android:layout_height="200dp"
+      android:src="@drawable/camera"
+      />
+
+  <TextView
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:gravity="center"
+      android:textColor="@color/cameraBody"
+      android:text="paparazzi"
+      android:textSize="70dp"
+      android:textFontWeight="100"
+      />
+
+</LinearLayout>

paparazzi/paparazzi-gradle-plugin/src/test/projects/flag-new-resource-loading-on/src/main/res/values/colors.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <color name="launchBackground">#dcdccc</color>
+  <color name="cameraBody">#332F21</color>
+</resources>

paparazzi/paparazzi-gradle-plugin/src/test/projects/flag-new-resource-loading-on/src/test/java/app/cash/paparazzi/plugin/test/LaunchViewTest.kt

@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2019 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 LaunchViewTest {
+  @get:Rule
+  val paparazzi = Paparazzi()
+
+  @Test
+  fun testViews() {
+    val launch = paparazzi.inflate<LinearLayout>(R.layout.launch)
+    paparazzi.snapshot(launch, "launch")
+  }
+}

paparazzi/paparazzi/src/main/java/app/cash/paparazzi/Flags.kt

@@ -2,4 +2,5 @@ package app.cash.paparazzi
 
 object Flags {
   const val DEBUG_LINKED_OBJECTS = "app.cash.paparazzi.debug.linked.objects"
+  const val NEW_RESOURCE_LOADING = "app.cash.paparazzi.new.resource.loading"
 }

paparazzi/paparazzi/src/main/java/app/cash/paparazzi/internal/Renderer.kt

@@ -42,17 +42,28 @@ internal class Renderer(
   /** Initialize the bridge and the resource maps. */
   fun prepare(): SessionParamsBuilder {
     val platformDataResDir = File("${environment.platformDir}/data/res")
-    val frameworkResources = FrameworkResources(FolderWrapper(platformDataResDir)).apply {
-      loadResources()
-      loadPublicResources(logger)
+
+    val useNewResourceLoading = System.getProperty(Flags.NEW_RESOURCE_LOADING).toBoolean()
+
+    val frameworkResources = if (!useNewResourceLoading) {
+      FrameworkResources(FolderWrapper(platformDataResDir))
+        .apply {
+          loadResources()
+          loadPublicResources(logger)
+        }
+    } else {
+      TODO("New resource loading coming soon")
     }
 
-    val projectResources = object : ResourceRepository(FolderWrapper(environment.resDir), false) {
-      override fun createResourceItem(name: String): ResourceItem {
-        return ResourceItem(name)
-      }
+    val projectResources = if (!useNewResourceLoading) {
+      object : ResourceRepository(FolderWrapper(environment.resDir), false) {
+        override fun createResourceItem(name: String): ResourceItem {
+          return ResourceItem(name)
+        }
+      }.apply { loadResources() }
+    } else {
+      TODO("New resource loading coming soon")
     }
-    projectResources.loadResources()
 
     sessionParamsBuilder = SessionParamsBuilder(
       layoutlibCallback = layoutlibCallback,