diff --git a/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_columnWithMarginAndDifferentAlignments[LTR].png b/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_layoutWithMarginAndDifferentAlignments[LTR,Column].png similarity index 100% rename from redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_columnWithMarginAndDifferentAlignments[LTR].png rename to redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_layoutWithMarginAndDifferentAlignments[LTR,Column].png diff --git a/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_layoutWithMarginAndDifferentAlignments[LTR,Row].png b/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_layoutWithMarginAndDifferentAlignments[LTR,Row].png new file mode 100644 index 0000000000..f7822b6c9e --- /dev/null +++ b/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_layoutWithMarginAndDifferentAlignments[LTR,Row].png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3a0f4c2d00ba58380cf8016e740165a3d31821e27013ae33a32d6e5d994f5ff5 +size 10878 diff --git a/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_columnWithMarginAndDifferentAlignments[RTL].png b/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_layoutWithMarginAndDifferentAlignments[RTL,Column].png similarity index 100% rename from redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_columnWithMarginAndDifferentAlignments[RTL].png rename to redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_layoutWithMarginAndDifferentAlignments[RTL,Column].png diff --git a/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_layoutWithMarginAndDifferentAlignments[RTL,Row].png b/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_layoutWithMarginAndDifferentAlignments[RTL,Row].png new file mode 100644 index 0000000000..691ca8f2b0 --- /dev/null +++ b/redwood-layout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiFlexContainerTest_layoutWithMarginAndDifferentAlignments[RTL,Row].png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2158a68e61ed66519edfda06e83047efa861a138caed19a2e79297e787120dfc +size 11090 diff --git a/redwood-layout-shared-test/src/main/kotlin/app/cash/redwood/layout/AbstractFlexContainerTest.kt b/redwood-layout-shared-test/src/main/kotlin/app/cash/redwood/layout/AbstractFlexContainerTest.kt index 25578dea66..f4a1f2782b 100644 --- a/redwood-layout-shared-test/src/main/kotlin/app/cash/redwood/layout/AbstractFlexContainerTest.kt +++ b/redwood-layout-shared-test/src/main/kotlin/app/cash/redwood/layout/AbstractFlexContainerTest.kt @@ -76,8 +76,12 @@ abstract class AbstractFlexContainerTest { verifySnapshot(container) } - @Test fun columnWithMarginAndDifferentAlignments() { - val container = flexContainer(FlexDirection.Column) + @Test fun layoutWithMarginAndDifferentAlignments( + @TestParameter flexDirectionEnum: FlexDirectionEnum, + ) { + assumeTrue(flexDirectionEnum in listOf(FlexDirectionEnum.Row, FlexDirectionEnum.Column)) + val flexDirection = flexDirectionEnum.toFlexDirection() + val container = flexContainer(flexDirection) container.margin(Margin(start = 5.dp, end = 10.dp, top = 20.dp, bottom = 20.dp)) movies.forEachIndexed { index, movie -> val modifier = when (index % 4) { diff --git a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_columnWithMarginAndDifferentAlignments[LTR].png b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_layoutWithMarginAndDifferentAlignments[LTR,Column].png similarity index 100% rename from redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_columnWithMarginAndDifferentAlignments[LTR].png rename to redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_layoutWithMarginAndDifferentAlignments[LTR,Column].png diff --git a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_layoutWithMarginAndDifferentAlignments[LTR,Row].png b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_layoutWithMarginAndDifferentAlignments[LTR,Row].png new file mode 100644 index 0000000000..aaaa6ab220 --- /dev/null +++ b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_layoutWithMarginAndDifferentAlignments[LTR,Row].png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:564e93c2ad01e6ba9e10da619e3964b61540d65a7d27541cadee94ce9b439473 +size 10349 diff --git a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_columnWithMarginAndDifferentAlignments[RTL].png b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_layoutWithMarginAndDifferentAlignments[RTL,Column].png similarity index 100% rename from redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_columnWithMarginAndDifferentAlignments[RTL].png rename to redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_layoutWithMarginAndDifferentAlignments[RTL,Column].png diff --git a/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_layoutWithMarginAndDifferentAlignments[RTL,Row].png b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_layoutWithMarginAndDifferentAlignments[RTL,Row].png new file mode 100644 index 0000000000..8b014d2b54 --- /dev/null +++ b/redwood-layout-view/src/test/snapshots/images/app.cash.redwood.layout.view_ViewFlexContainerTest_layoutWithMarginAndDifferentAlignments[RTL,Row].png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:565a1ed2acbb8094dcdd0c616301d4b591db7bae3dbc60319cc92a97b8a0ee2b +size 10561 diff --git a/redwood-lazylayout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiLazyListTest_columnWithMarginAndDifferentAlignments[LTR].png b/redwood-lazylayout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiLazyListTest_layoutWithMarginAndDifferentAlignments[LTR,Column].png similarity index 100% rename from redwood-lazylayout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiLazyListTest_columnWithMarginAndDifferentAlignments[LTR].png rename to redwood-lazylayout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiLazyListTest_layoutWithMarginAndDifferentAlignments[LTR,Column].png diff --git a/redwood-lazylayout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiLazyListTest_layoutWithMarginAndDifferentAlignments[LTR,Row].png b/redwood-lazylayout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiLazyListTest_layoutWithMarginAndDifferentAlignments[LTR,Row].png new file mode 100644 index 0000000000..cb84e951a6 --- /dev/null +++ b/redwood-lazylayout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiLazyListTest_layoutWithMarginAndDifferentAlignments[LTR,Row].png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:05809ac0a76252786fab551366b6d52c9112689e1d37785de65d83fbe81f2083 +size 10277 diff --git a/redwood-lazylayout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiLazyListTest_columnWithMarginAndDifferentAlignments[RTL].png b/redwood-lazylayout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiLazyListTest_layoutWithMarginAndDifferentAlignments[RTL,Column].png similarity index 100% rename from redwood-lazylayout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiLazyListTest_columnWithMarginAndDifferentAlignments[RTL].png rename to redwood-lazylayout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiLazyListTest_layoutWithMarginAndDifferentAlignments[RTL,Column].png diff --git a/redwood-lazylayout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiLazyListTest_layoutWithMarginAndDifferentAlignments[RTL,Row].png b/redwood-lazylayout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiLazyListTest_layoutWithMarginAndDifferentAlignments[RTL,Row].png new file mode 100644 index 0000000000..01a49c94fd --- /dev/null +++ b/redwood-lazylayout-composeui/src/test/snapshots/images/app.cash.redwood.layout.composeui_ComposeUiLazyListTest_layoutWithMarginAndDifferentAlignments[RTL,Row].png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5ba94594e669ae30e24bf5e4e38d8705dc42e22e18dec709e4fb65cd39bbf99d +size 10392 diff --git a/redwood-lazylayout-view/src/test/snapshots/images/app.cash.redwood.lazylayout.view_ViewLazyListTest_columnWithMarginAndDifferentAlignments[LTR].png b/redwood-lazylayout-view/src/test/snapshots/images/app.cash.redwood.lazylayout.view_ViewLazyListTest_layoutWithMarginAndDifferentAlignments[LTR,Column].png similarity index 100% rename from redwood-lazylayout-view/src/test/snapshots/images/app.cash.redwood.lazylayout.view_ViewLazyListTest_columnWithMarginAndDifferentAlignments[LTR].png rename to redwood-lazylayout-view/src/test/snapshots/images/app.cash.redwood.lazylayout.view_ViewLazyListTest_layoutWithMarginAndDifferentAlignments[LTR,Column].png diff --git a/redwood-lazylayout-view/src/test/snapshots/images/app.cash.redwood.lazylayout.view_ViewLazyListTest_layoutWithMarginAndDifferentAlignments[LTR,Row].png b/redwood-lazylayout-view/src/test/snapshots/images/app.cash.redwood.lazylayout.view_ViewLazyListTest_layoutWithMarginAndDifferentAlignments[LTR,Row].png new file mode 100644 index 0000000000..be6f384516 --- /dev/null +++ b/redwood-lazylayout-view/src/test/snapshots/images/app.cash.redwood.lazylayout.view_ViewLazyListTest_layoutWithMarginAndDifferentAlignments[LTR,Row].png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1c7b0da9aaa45dc090baebd8184c257247feba85cbc87267b5567492a63bc08e +size 10103 diff --git a/redwood-lazylayout-view/src/test/snapshots/images/app.cash.redwood.lazylayout.view_ViewLazyListTest_columnWithMarginAndDifferentAlignments[RTL].png b/redwood-lazylayout-view/src/test/snapshots/images/app.cash.redwood.lazylayout.view_ViewLazyListTest_layoutWithMarginAndDifferentAlignments[RTL,Column].png similarity index 100% rename from redwood-lazylayout-view/src/test/snapshots/images/app.cash.redwood.lazylayout.view_ViewLazyListTest_columnWithMarginAndDifferentAlignments[RTL].png rename to redwood-lazylayout-view/src/test/snapshots/images/app.cash.redwood.lazylayout.view_ViewLazyListTest_layoutWithMarginAndDifferentAlignments[RTL,Column].png diff --git a/redwood-lazylayout-view/src/test/snapshots/images/app.cash.redwood.lazylayout.view_ViewLazyListTest_layoutWithMarginAndDifferentAlignments[RTL,Row].png b/redwood-lazylayout-view/src/test/snapshots/images/app.cash.redwood.lazylayout.view_ViewLazyListTest_layoutWithMarginAndDifferentAlignments[RTL,Row].png new file mode 100644 index 0000000000..5d4a1f2c0e --- /dev/null +++ b/redwood-lazylayout-view/src/test/snapshots/images/app.cash.redwood.lazylayout.view_ViewLazyListTest_layoutWithMarginAndDifferentAlignments[RTL,Row].png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e148ad28db1df892e3f844fd0334ed2a2013386bafcf279d959abc13e95f0241 +size 10129