Merge pull request #8 from google/fix_spacing_with_padding

Fix the issue the layout is broken when justify_content is set to either of  space_between or space_around.

flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxAndroidTest.java

@@ -568,6 +568,42 @@ public class FlexboxAndroidTest {
                 textView3.getLeft() - textView2.getRight() <= space + 1);
     }
 
+    @Test
+    @FlakyTest(tolerance = TOLERANCE)
+    public void testJustifyContent_spaceBetween_withPadding() throws Throwable {
+        final FlexboxTestActivity activity = mActivityRule.getActivity();
+        final int padding = 40;
+        mActivityRule.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                activity.setContentView(R.layout.activity_justify_content_test);
+                FlexboxLayout flexboxLayout = (FlexboxLayout) activity
+                        .findViewById(R.id.flexbox_layout);
+                flexboxLayout.setJustifyContent(FlexboxLayout.JUSTIFY_CONTENT_SPACE_BETWEEN);
+                flexboxLayout.setPadding(padding, padding, padding, padding);
+            }
+        });
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync();
+
+        FlexboxLayout flexboxLayout = (FlexboxLayout) activity.findViewById(R.id.flexbox_layout);
+
+        assertThat(flexboxLayout.getJustifyContent(),
+                is(FlexboxLayout.JUSTIFY_CONTENT_SPACE_BETWEEN));
+
+        TextView textView1 = (TextView) activity.findViewById(R.id.text1);
+        TextView textView2 = (TextView) activity.findViewById(R.id.text2);
+        TextView textView3 = (TextView) activity.findViewById(R.id.text3);
+        int space = flexboxLayout.getWidth() - textView1.getWidth() - textView2.getWidth() -
+                textView3.getWidth() - padding * 2;
+        space = space / 2;
+        assertThat(textView1.getLeft(), is(padding));
+        assertThat(flexboxLayout.getRight() - textView3.getRight(), is(padding));
+        assertTrue(space - 1 <= textView2.getLeft() - textView1.getRight() &&
+                textView2.getLeft() - textView1.getRight() <= space + 1);
+        assertTrue(space - 1 <= textView3.getLeft() - textView2.getRight() &&
+                textView3.getLeft() - textView2.getRight() <= space + 1);
+    }
+
     @Test
     @FlakyTest(tolerance = TOLERANCE)
     public void testJustifyContent_spaceAround() throws Throwable {
@@ -606,6 +642,46 @@ public class FlexboxAndroidTest {
                 flexboxLayout.getRight() - textView3.getRight() <= space + 1);
     }
 
+    @Test
+    @FlakyTest(tolerance = TOLERANCE)
+    public void testJustifyContent_spaceAround_withPadding() throws Throwable {
+        final FlexboxTestActivity activity = mActivityRule.getActivity();
+        final int padding = 40;
+        mActivityRule.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                activity.setContentView(R.layout.activity_justify_content_test);
+                FlexboxLayout flexboxLayout = (FlexboxLayout) activity
+                        .findViewById(R.id.flexbox_layout);
+                flexboxLayout.setJustifyContent(FlexboxLayout.JUSTIFY_CONTENT_SPACE_AROUND);
+                flexboxLayout.setPadding(padding, padding, padding, padding);
+            }
+        });
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync();
+
+        FlexboxLayout flexboxLayout = (FlexboxLayout) activity.findViewById(R.id.flexbox_layout);
+
+        assertThat(flexboxLayout.getJustifyContent(),
+                is(FlexboxLayout.JUSTIFY_CONTENT_SPACE_AROUND));
+
+        TextView textView1 = (TextView) activity.findViewById(R.id.text1);
+        TextView textView2 = (TextView) activity.findViewById(R.id.text2);
+        TextView textView3 = (TextView) activity.findViewById(R.id.text3);
+        int space = flexboxLayout.getWidth() - textView1.getWidth() - textView2.getWidth() -
+                textView3.getWidth() - padding * 2;
+        space = space / 6; // Divide by the number of children * 2
+        assertTrue(space - 1 <= textView1.getLeft() - padding
+                && textView1.getLeft() - padding <= space + 1);
+        int spaceLowerBound = space * 2 - 1;
+        int spaceUpperBound = space * 2 + 1;
+        assertTrue(spaceLowerBound <= textView2.getLeft() - textView1.getRight() &&
+                textView2.getLeft() - textView1.getRight() <= spaceUpperBound);
+        assertTrue(spaceLowerBound <= textView3.getLeft() - textView2.getRight() &&
+                textView3.getLeft() - textView2.getRight() <= spaceUpperBound);
+        assertTrue(space - 1 <= flexboxLayout.getRight() - textView3.getRight() - padding &&
+                flexboxLayout.getRight() - textView3.getRight() - padding <= space + 1);
+    }
+
     @Test
     @FlakyTest(tolerance = TOLERANCE)
     public void testJustifyContent_flexStart_flexDirection_column() throws Throwable {
@@ -727,6 +803,45 @@ public class FlexboxAndroidTest {
                 textView3.getTop() - textView2.getBottom() <= space + 1);
     }
 
+    @Test
+    @FlakyTest(tolerance = TOLERANCE)
+    public void testJustifyContent_spaceBetween_flexDirection_column_withPadding()
+            throws Throwable {
+        final FlexboxTestActivity activity = mActivityRule.getActivity();
+        final int padding = 40;
+        mActivityRule.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                activity.setContentView(R.layout.activity_justify_content_test);
+                FlexboxLayout flexboxLayout = (FlexboxLayout) activity
+                        .findViewById(R.id.flexbox_layout);
+                flexboxLayout.setJustifyContent(FlexboxLayout.JUSTIFY_CONTENT_SPACE_BETWEEN);
+                flexboxLayout.setFlexDirection(FlexboxLayout.FLEX_DIRECTION_COLUMN);
+                flexboxLayout.setPadding(padding, padding, padding, padding);
+            }
+        });
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync();
+
+        FlexboxLayout flexboxLayout = (FlexboxLayout) activity.findViewById(R.id.flexbox_layout);
+
+        assertThat(flexboxLayout.getJustifyContent(),
+                is(FlexboxLayout.JUSTIFY_CONTENT_SPACE_BETWEEN));
+        assertThat(flexboxLayout.getFlexDirection(), is(FlexboxLayout.FLEX_DIRECTION_COLUMN));
+
+        TextView textView1 = (TextView) activity.findViewById(R.id.text1);
+        TextView textView2 = (TextView) activity.findViewById(R.id.text2);
+        TextView textView3 = (TextView) activity.findViewById(R.id.text3);
+        int space = flexboxLayout.getHeight() - textView1.getHeight() - textView2.getHeight() -
+                textView3.getHeight() - padding * 2;
+        space = space / 2;
+        assertThat(textView1.getTop(), is(padding));
+        assertThat(flexboxLayout.getBottom() - textView3.getBottom(), is(padding));
+        assertTrue(space - 1 <= textView2.getTop() - textView1.getBottom() &&
+                textView2.getTop() - textView1.getBottom() <= space + 1);
+        assertTrue(space - 1 <= textView3.getTop() - textView2.getBottom() &&
+                textView3.getTop() - textView2.getBottom() <= space + 1);
+    }
+
     @Test
     @FlakyTest(tolerance = TOLERANCE)
     public void testJustifyContent_spaceAround_flexDirection_column() throws Throwable {
@@ -767,6 +882,48 @@ public class FlexboxAndroidTest {
                 flexboxLayout.getBottom() - textView3.getBottom() <= space + 1);
     }
 
+    @Test
+    @FlakyTest(tolerance = TOLERANCE)
+    public void testJustifyContent_spaceAround_flexDirection_column_withPadding() throws Throwable {
+        final FlexboxTestActivity activity = mActivityRule.getActivity();
+        final int padding = 40;
+        mActivityRule.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                activity.setContentView(R.layout.activity_justify_content_test);
+                FlexboxLayout flexboxLayout = (FlexboxLayout) activity
+                        .findViewById(R.id.flexbox_layout);
+                flexboxLayout.setJustifyContent(FlexboxLayout.JUSTIFY_CONTENT_SPACE_AROUND);
+                flexboxLayout.setFlexDirection(FlexboxLayout.FLEX_DIRECTION_COLUMN);
+                flexboxLayout.setPadding(padding, padding, padding, padding);
+            }
+        });
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync();
+
+        FlexboxLayout flexboxLayout = (FlexboxLayout) activity.findViewById(R.id.flexbox_layout);
+
+        assertThat(flexboxLayout.getJustifyContent(),
+                is(FlexboxLayout.JUSTIFY_CONTENT_SPACE_AROUND));
+        assertThat(flexboxLayout.getFlexDirection(), is(FlexboxLayout.FLEX_DIRECTION_COLUMN));
+
+        TextView textView1 = (TextView) activity.findViewById(R.id.text1);
+        TextView textView2 = (TextView) activity.findViewById(R.id.text2);
+        TextView textView3 = (TextView) activity.findViewById(R.id.text3);
+        float space = flexboxLayout.getHeight() - textView1.getHeight() - textView2.getHeight() -
+                textView3.getHeight() - padding * 2;
+        space = space / 6; // Divide by the number of children * 2
+        assertTrue(space - 1 <= textView1.getTop() - padding
+                && textView1.getTop() - padding <= space + 1);
+        float spaceLowerBound = space * 2 - 1;
+        float spaceUpperBound = space * 2 + 1;
+        assertTrue(spaceLowerBound <= textView2.getTop() - textView1.getBottom() &&
+                textView2.getTop() - textView1.getBottom() <= spaceUpperBound);
+        assertTrue(spaceLowerBound <= textView3.getTop() - textView2.getBottom() &&
+                textView3.getTop() - textView2.getBottom() <= spaceUpperBound);
+        assertTrue(space - 1 <= flexboxLayout.getBottom() - textView3.getBottom() - padding &&
+                flexboxLayout.getBottom() - textView3.getBottom() - padding <= space + 1);
+    }
+
     @Test
     @FlakyTest(tolerance = TOLERANCE)
     public void testFlexGrow_withExactParentLength() throws Throwable {
@@ -967,6 +1124,30 @@ public class FlexboxAndroidTest {
         onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)));
     }
 
+    @Test
+    @FlakyTest(tolerance = TOLERANCE)
+    public void testAlignContent_spaceBetween_withPadding() throws Throwable {
+        final FlexboxTestActivity activity = mActivityRule.getActivity();
+        mActivityRule.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                activity.setContentView(R.layout.activity_align_content_test);
+                FlexboxLayout flexboxLayout = (FlexboxLayout) activity
+                        .findViewById(R.id.flexbox_layout);
+                flexboxLayout.setAlignContent(FlexboxLayout.ALIGN_CONTENT_SPACE_BETWEEN);
+            }
+        });
+        FlexboxLayout flexboxLayout = (FlexboxLayout) activity.findViewById(R.id.flexbox_layout);
+
+        assertThat(flexboxLayout.getAlignContent(), is(FlexboxLayout.ALIGN_CONTENT_SPACE_BETWEEN));
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)));
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)));
+        onView(withId(R.id.text2)).check(isRightOf(withId(R.id.text1)));
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)));
+        onView(withId(R.id.text3)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)));
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)));
+    }
+
     @Test
     @FlakyTest(tolerance = TOLERANCE)
     public void testAlignContent_spaceAround() throws Throwable {

flexbox/src/main/java/com/google/android/flexbox/FlexboxLayout.java

@@ -335,6 +335,7 @@ public class FlexboxLayout extends ViewGroup {
 
                     flexLine = new FlexLine();
                     flexLine.itemCount = 1;
+                    flexLine.mainSize = paddingStart;
                     largestHeightInRow = child.getMeasuredHeight() + lp.topMargin + lp.bottomMargin;
                 } else {
                     flexLine.itemCount++;
@@ -474,6 +475,7 @@ public class FlexboxLayout extends ViewGroup {
 
                 flexLine = new FlexLine();
                 flexLine.itemCount = 1;
+                flexLine.mainSize = paddingTop;
                 largestWidthInColumn = child.getMeasuredWidth() + lp.leftMargin
                         + lp.rightMargin;
             } else {
@@ -1204,8 +1206,8 @@ public class FlexboxLayout extends ViewGroup {
                     break;
                 case JUSTIFY_CONTENT_SPACE_AROUND:
                     if (flexLine.itemCount != 0) {
-                        spaceBetweenItem = (right - left - paddingLeft - paddingRight
-                                - flexLine.mainSize) / (float) flexLine.itemCount;
+                        spaceBetweenItem = (right - left - flexLine.mainSize)
+                                / (float) flexLine.itemCount;
                     }
                     childLeft = left + paddingLeft + spaceBetweenItem / 2f;
                     childRight = right - paddingRight - spaceBetweenItem / 2f;
@@ -1214,8 +1216,7 @@ public class FlexboxLayout extends ViewGroup {
                     childLeft = left + paddingLeft;
                     float denominator = flexLine.itemCount != 1 ? flexLine.itemCount - 1 : 1f;
                     spaceBetweenItem =
-                            (right - left - paddingLeft - paddingRight - flexLine.mainSize)
-                                    / denominator;
+                            (right - left - flexLine.mainSize) / denominator;
                     childRight = right - paddingRight;
                     break;
                 default:
@@ -1405,8 +1406,8 @@ public class FlexboxLayout extends ViewGroup {
                     break;
                 case JUSTIFY_CONTENT_SPACE_AROUND:
                     if (flexLine.itemCount != 0) {
-                        spaceBetweenItem = (height - paddingTop - paddingBottom
-                                - flexLine.mainSize) / (float) flexLine.itemCount;
+                        spaceBetweenItem = (height - flexLine.mainSize)
+                                / (float) flexLine.itemCount;
                     }
                     childTop = paddingTop + spaceBetweenItem / 2f;
                     childBottom = height - paddingBottom - spaceBetweenItem / 2f;
@@ -1414,8 +1415,7 @@ public class FlexboxLayout extends ViewGroup {
                 case JUSTIFY_CONTENT_SPACE_BETWEEN:
                     childTop = paddingTop;
                     float denominator = flexLine.itemCount != 1 ? flexLine.itemCount - 1 : 1f;
-                    spaceBetweenItem = (height - paddingTop - paddingBottom
-                            - flexLine.mainSize) / denominator;
+                    spaceBetweenItem = (height - flexLine.mainSize) / denominator;
                     childBottom = height - paddingBottom;
                     break;
                 default: