Use the same frame on iOS and Android

cashapp · Oct 22, 2024 · 41ddcd2 · 41ddcd2
1 parent 9b96641
commit 41ddcd2
Show file tree

Hide file tree

Showing 41 changed files with 80 additions and 95 deletions.
diff --git a/redwood-layout-view/src/test/kotlin/app/cash/redwood/layout/view/ViewBoxTest.kt b/redwood-layout-view/src/test/kotlin/app/cash/redwood/layout/view/ViewBoxTest.kt
@@ -17,7 +17,6 @@ package app.cash.redwood.layout.view
 
 import android.graphics.drawable.ColorDrawable
 import android.view.View
-import android.widget.FrameLayout
 import app.cash.burst.Burst
 import app.cash.paparazzi.DeviceConfig
 import app.cash.paparazzi.Paparazzi
@@ -51,19 +50,5 @@ class ViewBoxTest(
     }
   }
 
-  override fun snapshotter(widget: View): Snapshotter {
-    // Allow children to wrap.
-    val container = object : FrameLayout(paparazzi.context) {
-      override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
-        super.onMeasure(
-          MeasureSpec.makeMeasureSpec(MeasureSpec.getSize(widthMeasureSpec), MeasureSpec.AT_MOST),
-          MeasureSpec.makeMeasureSpec(MeasureSpec.getSize(heightMeasureSpec), MeasureSpec.AT_MOST),
-        )
-      }
-    }.apply {
-      addView(widget)
-    }
-
-    return ViewSnapshotter(paparazzi, container)
-  }
+  override fun snapshotter(widget: View): Snapshotter = ViewSnapshotter(paparazzi, widget)
 }
diff --git a/...pp.cash.redwood.layout.view_ViewBoxTest_RTL_testChildren_Wrap_Center_Center.png b/...pp.cash.redwood.layout.view_ViewBoxTest_RTL_testChildren_Wrap_Center_Center.png
diff --git a/...s/app.cash.redwood.layout.view_ViewBoxTest_RTL_testChildren_Wrap_Center_End.png b/...s/app.cash.redwood.layout.view_ViewBoxTest_RTL_testChildren_Wrap_Center_End.png
diff --git a/...app.cash.redwood.layout.view_ViewBoxTest_RTL_testChildren_Wrap_Center_Start.png b/...app.cash.redwood.layout.view_ViewBoxTest_RTL_testChildren_Wrap_Center_Start.png
diff --git a/...p.cash.redwood.layout.view_ViewBoxTest_RTL_testChildren_Wrap_Center_Stretch.png b/...p.cash.redwood.layout.view_ViewBoxTest_RTL_testChildren_Wrap_Center_Stretch.png
diff --git a/...s/app.cash.redwood.layout.view_ViewBoxTest_RTL_testChildren_Wrap_End_Center.png b/...s/app.cash.redwood.layout.view_ViewBoxTest_RTL_testChildren_Wrap_End_Center.png
diff --git a/...ages/app.cash.redwood.layout.view_ViewBoxTest_RTL_testChildren_Wrap_End_End.png b/...ages/app.cash.redwood.layout.view_ViewBoxTest_RTL_testChildren_Wrap_End_End.png
diff --git a/...es/app.cash.redwood.layout.view_ViewBoxTest_RTL_testChildren_Wrap_End_Start.png b/...es/app.cash.redwood.layout.view_ViewBoxTest_RTL_testChildren_Wrap_End_Start.png
diff --git a/.../app.cash.redwood.layout.view_ViewBoxTest_RTL_testChildren_Wrap_End_Stretch.png b/.../app.cash.redwood.layout.view_ViewBoxTest_RTL_testChildren_Wrap_End_Stretch.png
diff --git a/...app.cash.redwood.layout.view_ViewBoxTest_RTL_testChildren_Wrap_Start_Center.png b/...app.cash.redwood.layout.view_ViewBoxTest_RTL_testChildren_Wrap_Start_Center.png
diff --git a/...es/app.cash.redwood.layout.view_ViewBoxTest_RTL_testChildren_Wrap_Start_End.png b/...es/app.cash.redwood.layout.view_ViewBoxTest_RTL_testChildren_Wrap_Start_End.png
diff --git a/.../app.cash.redwood.layout.view_ViewBoxTest_RTL_testChildren_Wrap_Start_Start.png b/.../app.cash.redwood.layout.view_ViewBoxTest_RTL_testChildren_Wrap_Start_Start.png
diff --git a/...pp.cash.redwood.layout.view_ViewBoxTest_RTL_testChildren_Wrap_Start_Stretch.png b/...pp.cash.redwood.layout.view_ViewBoxTest_RTL_testChildren_Wrap_Start_Stretch.png
diff --git a/...p.cash.redwood.layout.view_ViewBoxTest_RTL_testChildren_Wrap_Stretch_Center.png b/...p.cash.redwood.layout.view_ViewBoxTest_RTL_testChildren_Wrap_Stretch_Center.png
diff --git a/.../app.cash.redwood.layout.view_ViewBoxTest_RTL_testChildren_Wrap_Stretch_End.png b/.../app.cash.redwood.layout.view_ViewBoxTest_RTL_testChildren_Wrap_Stretch_End.png
diff --git a/...pp.cash.redwood.layout.view_ViewBoxTest_RTL_testChildren_Wrap_Stretch_Start.png b/...pp.cash.redwood.layout.view_ViewBoxTest_RTL_testChildren_Wrap_Stretch_Start.png
diff --git a/....cash.redwood.layout.view_ViewBoxTest_RTL_testChildren_Wrap_Stretch_Stretch.png b/....cash.redwood.layout.view_ViewBoxTest_RTL_testChildren_Wrap_Stretch_Stretch.png
diff --git a/...hots/images/app.cash.redwood.layout.view_ViewBoxTest_RTL_testEmpty_Defaults.png b/...hots/images/app.cash.redwood.layout.view_ViewBoxTest_RTL_testEmpty_Defaults.png
diff --git a/...napshots/images/app.cash.redwood.layout.view_ViewBoxTest_RTL_testEmpty_Wrap.png b/...napshots/images/app.cash.redwood.layout.view_ViewBoxTest_RTL_testEmpty_Wrap.png
diff --git a/...es/app.cash.redwood.layout.view_ViewBoxTest_RTL_testLayoutAfterDetach_after.png b/...es/app.cash.redwood.layout.view_ViewBoxTest_RTL_testLayoutAfterDetach_after.png
diff --git a/...s/app.cash.redwood.layout.view_ViewBoxTest_RTL_testLayoutAfterDetach_before.png b/...s/app.cash.redwood.layout.view_ViewBoxTest_RTL_testLayoutAfterDetach_before.png
diff --git a/...es/app.cash.redwood.layout.view_ViewBoxTest_testChildren_Wrap_Center_Center.png b/...es/app.cash.redwood.layout.view_ViewBoxTest_testChildren_Wrap_Center_Center.png
diff --git a/...mages/app.cash.redwood.layout.view_ViewBoxTest_testChildren_Wrap_Center_End.png b/...mages/app.cash.redwood.layout.view_ViewBoxTest_testChildren_Wrap_Center_End.png
diff --git a/...ges/app.cash.redwood.layout.view_ViewBoxTest_testChildren_Wrap_Center_Start.png b/...ges/app.cash.redwood.layout.view_ViewBoxTest_testChildren_Wrap_Center_Start.png
diff --git a/...s/app.cash.redwood.layout.view_ViewBoxTest_testChildren_Wrap_Center_Stretch.png b/...s/app.cash.redwood.layout.view_ViewBoxTest_testChildren_Wrap_Center_Stretch.png
diff --git a/...mages/app.cash.redwood.layout.view_ViewBoxTest_testChildren_Wrap_End_Center.png b/...mages/app.cash.redwood.layout.view_ViewBoxTest_testChildren_Wrap_End_Center.png
diff --git a/...s/images/app.cash.redwood.layout.view_ViewBoxTest_testChildren_Wrap_End_End.png b/...s/images/app.cash.redwood.layout.view_ViewBoxTest_testChildren_Wrap_End_End.png
diff --git a/...images/app.cash.redwood.layout.view_ViewBoxTest_testChildren_Wrap_End_Start.png b/...images/app.cash.redwood.layout.view_ViewBoxTest_testChildren_Wrap_End_Start.png
diff --git a/...ages/app.cash.redwood.layout.view_ViewBoxTest_testChildren_Wrap_End_Stretch.png b/...ages/app.cash.redwood.layout.view_ViewBoxTest_testChildren_Wrap_End_Stretch.png
diff --git a/...ges/app.cash.redwood.layout.view_ViewBoxTest_testChildren_Wrap_Start_Center.png b/...ges/app.cash.redwood.layout.view_ViewBoxTest_testChildren_Wrap_Start_Center.png
diff --git a/...images/app.cash.redwood.layout.view_ViewBoxTest_testChildren_Wrap_Start_End.png b/...images/app.cash.redwood.layout.view_ViewBoxTest_testChildren_Wrap_Start_End.png
diff --git a/...ages/app.cash.redwood.layout.view_ViewBoxTest_testChildren_Wrap_Start_Start.png b/...ages/app.cash.redwood.layout.view_ViewBoxTest_testChildren_Wrap_Start_Start.png
diff --git a/...es/app.cash.redwood.layout.view_ViewBoxTest_testChildren_Wrap_Start_Stretch.png b/...es/app.cash.redwood.layout.view_ViewBoxTest_testChildren_Wrap_Start_Stretch.png
diff --git a/...s/app.cash.redwood.layout.view_ViewBoxTest_testChildren_Wrap_Stretch_Center.png b/...s/app.cash.redwood.layout.view_ViewBoxTest_testChildren_Wrap_Stretch_Center.png
diff --git a/...ages/app.cash.redwood.layout.view_ViewBoxTest_testChildren_Wrap_Stretch_End.png b/...ages/app.cash.redwood.layout.view_ViewBoxTest_testChildren_Wrap_Stretch_End.png
diff --git a/...es/app.cash.redwood.layout.view_ViewBoxTest_testChildren_Wrap_Stretch_Start.png b/...es/app.cash.redwood.layout.view_ViewBoxTest_testChildren_Wrap_Stretch_Start.png
diff --git a/.../app.cash.redwood.layout.view_ViewBoxTest_testChildren_Wrap_Stretch_Stretch.png b/.../app.cash.redwood.layout.view_ViewBoxTest_testChildren_Wrap_Stretch_Stretch.png
diff --git a/...napshots/images/app.cash.redwood.layout.view_ViewBoxTest_testEmpty_Defaults.png b/...napshots/images/app.cash.redwood.layout.view_ViewBoxTest_testEmpty_Defaults.png
diff --git a/...st/snapshots/images/app.cash.redwood.layout.view_ViewBoxTest_testEmpty_Wrap.png b/...st/snapshots/images/app.cash.redwood.layout.view_ViewBoxTest_testEmpty_Wrap.png
diff --git a/...images/app.cash.redwood.layout.view_ViewBoxTest_testLayoutAfterDetach_after.png b/...images/app.cash.redwood.layout.view_ViewBoxTest_testLayoutAfterDetach_after.png
diff --git a/...mages/app.cash.redwood.layout.view_ViewBoxTest_testLayoutAfterDetach_before.png b/...mages/app.cash.redwood.layout.view_ViewBoxTest_testLayoutAfterDetach_before.png