Hard-coded StepperLayout's orientation to VERTICAL (issue #124)

Author: Piotr Zawadzki

material-stepper/src/main/java/com/stepstone/stepper/StepperLayout.java

@@ -34,6 +34,7 @@
 import android.support.v4.content.res.ResourcesCompat;
 import android.support.v4.view.ViewPager;
 import android.support.v7.view.ContextThemeWrapper;
+import android.support.v7.widget.LinearLayoutCompat;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
@@ -285,6 +286,12 @@ public StepperLayout(Context context, AttributeSet attrs, int defStyleAttr) {
         init(attrs, defStyleAttr);
     }
 
+    @Override
+    public final void setOrientation(@LinearLayoutCompat.OrientationMode int orientation) {
+        //only vertical orientation is supported
+        super.setOrientation(VERTICAL);
+    }
+
     public void setListener(@NonNull StepperListener listener) {
         this.mListener = listener;
     }
@@ -591,6 +598,9 @@ private void init(AttributeSet attrs, @AttrRes int defStyleAttr) {
         contextThemeWrapper.setTheme(mStepperLayoutTheme);
 
         LayoutInflater.from(contextThemeWrapper).inflate(R.layout.ms_stepper_layout, this, true);
+
+        setOrientation(VERTICAL);
+
         bindViews();
 
         mPager.setOnTouchListener(new View.OnTouchListener() {

material-stepper/src/main/res/layout/ms_stepper_layout.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
+    tools:orientation="vertical"
     tools:layout_height="match_parent"
     tools:layout_width="match_parent"
     tools:parentTag="LinearLayout"

material-stepper/src/test/java/com/stepstone/stepper/StepperLayoutSanityTest.java

@@ -7,6 +7,7 @@
 import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.FragmentManager;
 import android.util.AttributeSet;
+import android.widget.LinearLayout;
 
 import com.stepstone.stepper.adapter.AbstractFragmentStepAdapter;
 import com.stepstone.stepper.test.runner.StepperRobolectricTestRunner;
@@ -18,6 +19,7 @@
 import org.robolectric.Robolectric;
 
 import static com.stepstone.stepper.test.assertion.StepperLayoutAssert.assertThat;
+import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.mock;
 
 
@@ -31,6 +33,8 @@ public class StepperLayoutSanityTest {
     private static final String TYPE_DOTS = "dots";
     private static final String TYPE_TABS = "tabs";
 
+    private static final String ORIENTATION_HORIZONTAL = "horizontal";
+
     FragmentActivity activity;
 
     @Before
@@ -131,6 +135,38 @@ public void should_show_tabs_when_adapter_is_set_for_tabs_type() {
                 .hasDottedProgressBarHidden();
     }
 
+    @Test
+    public void should_ignore_horizontal_orientation_if_provided_from_attributes() {
+        //given
+        AttributeSet attributeSet = Robolectric.buildAttributeSet()
+                .addAttribute(R.attr.ms_stepperType, TYPE_DOTS)
+                .addAttribute(android.R.attr.orientation, ORIENTATION_HORIZONTAL)
+                .build();
+
+        //when
+        StepperLayout stepperLayout = new StepperLayout(activity, attributeSet);
+
+        //then
+        assertVerticalOrientationUsed(stepperLayout);
+    }
+
+    @Test
+    public void should_ignore_horizontal_orientation_if_provided_programmatically() {
+        //given
+        AttributeSet attributeSet = createAttributeSetWithStepperType(TYPE_DOTS);
+        StepperLayout stepperLayout = new StepperLayout(activity, attributeSet);
+
+        //when
+        stepperLayout.setOrientation(LinearLayout.HORIZONTAL);
+
+        //then
+        assertVerticalOrientationUsed(stepperLayout);
+    }
+
+    private void assertVerticalOrientationUsed(StepperLayout stepperLayout) {
+        assertEquals("Invalid orientation", stepperLayout.getOrientation(), LinearLayout.VERTICAL);
+    }
+
     private void whenAdapterIsSet(StepperLayout stepperLayout) {
         stepperLayout.setAdapter(new DummyStepAdapter(activity.getSupportFragmentManager(), activity));
     }

sample/src/main/res/layout-land/activity_combination.xml

@@ -4,5 +4,4 @@
     android:id="@+id/stepperLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
     app:ms_stepperType="tabs" />

sample/src/main/res/layout/activity_combination.xml

@@ -4,5 +4,4 @@
     android:id="@+id/stepperLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
     app:ms_stepperType="dots" />

sample/src/main/res/layout/activity_custom_navigation_buttons.xml

@@ -4,6 +4,5 @@
     android:id="@+id/stepperLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
     app:ms_showBackButtonOnFirstStep="true"
     app:ms_stepperType="dots"/>

sample/src/main/res/layout/activity_custom_stepper_layout_theme.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.stepstone.stepper.StepperLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/stepperLayout"
-    android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent" />

sample/src/main/res/layout/activity_default_dots.xml

@@ -4,5 +4,4 @@
     android:id="@+id/stepperLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
     app:ms_stepperType="dots"/>

sample/src/main/res/layout/activity_default_progress_bar.xml

@@ -4,5 +4,4 @@
     android:id="@+id/stepperLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
     app:ms_stepperType="progress_bar" />

sample/src/main/res/layout/activity_default_tabs.xml

@@ -4,5 +4,4 @@
     android:id="@+id/stepperLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
     app:ms_stepperType="tabs" />