Added examples, polymorphed the error structure and cleared error state onCompleted

Author: leonardo2204

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

@@ -353,8 +353,9 @@ public void setShowErrorStateOnBack(boolean mShowErrorStateOnBack) {
      */
     public void setShowErrorState(boolean mShowErrorState) {
         this.mShowErrorState = mShowErrorState;
-      
-     /**
+    }
+
+    /**
      * Set the number of steps that should be retained to either side of the
      * current step in the view hierarchy in an idle state. Steps beyond this
      * limit will be recreated from the adapter when needed.
@@ -546,8 +547,8 @@ private void onNext() {
         }
 
         //if moving forward and got no errors, set hasError to false, so we can have the tab with the check mark.
-        if(mShowErrorState && mStepperType instanceof TabsStepperType)
-            mTabsContainer.setErrorStep(mCurrentStepPosition, false);
+        if(mShowErrorState)
+            mStepperType.setErrorStep(mCurrentStepPosition, false);
 
         OnNextClickedCallback onNextClickedCallback = new OnNextClickedCallback();
         if (step instanceof BlockingStep) {
@@ -572,8 +573,8 @@ private void onError(@NonNull VerificationError verificationError) {
             step.onError(verificationError);
 
             //if moving forward and got errors, set hasError to true, showing the error drawable.
-            if(mShowErrorState && mStepperType instanceof TabsStepperType)
-                mTabsContainer.setErrorStep(mCurrentStepPosition, true);
+            if(mShowErrorState)
+                mStepperType.setErrorStep(mCurrentStepPosition, true);
 
         }
         mListener.onError(verificationError);
@@ -584,6 +585,7 @@ private void onComplete(View completeButton) {
         if (verifyCurrentStep(step)) {
             return;
         }
+        mStepperType.setErrorStep(mCurrentStepPosition, false);
         mListener.onCompleted(completeButton);
     }
 
@@ -604,10 +606,7 @@ private void onUpdate(int newStepPosition, boolean animate) {
         }
 
         //needs to be here in case user for any reason decide to change whether or not to show errors when going back.
-        if(mStepperType instanceof TabsStepperType) {
-            mTabsContainer.setShowErrorStateOnBack(mShowErrorStateOnBack);
-        }
-
+        mStepperType.showErrorStateOnBack(mShowErrorStateOnBack);
         mStepperType.onStepSelected(newStepPosition);
         mListener.onStepSelected(newStepPosition);
         Step step = mStepAdapter.findStep(mPager, newStepPosition);

material-stepper/src/main/java/com/stepstone/stepper/internal/StepTab.java

@@ -124,13 +124,19 @@ public void updateState(final boolean done, final boolean showErrorOnBack, final
      * Update the error state of this tab. If it has error, show the error drawable.
      * @param hasError whether the tab has errors or not.
      */
-    public void updateErrorState(boolean hasError) {
+    public void updateErrorState(boolean done, boolean hasError) {
         if(hasError) {
             mStepDoneIndicator.setVisibility(View.GONE);
             mStepNumber.setVisibility(View.GONE);
             mStepErrorIndicator.setVisibility(VISIBLE);
             mStepErrorIndicator.setColorFilter(mErrorColor);
             mStepTitle.setTextColor(mErrorColor);
+        } else if(done) {
+            mStepDoneIndicator.setVisibility(View.VISIBLE);
+            mStepErrorIndicator.setVisibility(GONE);
+            colorViewBackground(mStepDoneIndicator, true);
+
+            mStepTitle.setTextColor(ContextCompat.getColor(getContext(), R.color.ms_black));
         }
 
         this.hasError = hasError;

material-stepper/src/main/java/com/stepstone/stepper/internal/TabsContainer.java

@@ -186,7 +186,7 @@ public void setErrorStep(int stepPosition, boolean hasError){
             return;
 
         StepTab childTab = (StepTab) mTabsInnerContainer.getChildAt(stepPosition);
-        childTab.updateErrorState(hasError);
+        childTab.updateErrorState(mStepTitles.size() - 1 == stepPosition ,hasError);
     }
 
     private View createStepTab(final int position, @Nullable CharSequence title) {

material-stepper/src/main/java/com/stepstone/stepper/type/AbstractStepperType.java

@@ -54,6 +54,19 @@ public AbstractStepperType(StepperLayout stepperLayout) {
      */
     public abstract void onStepSelected(int newStepPosition);
 
+    /**
+     * Called to set whether the stepPosition has an error or not, changing it's appearance.
+     * @param stepPosition the step to set the error
+     * @param hasError whether it has error or not
+     */
+    public void setErrorStep(int stepPosition, boolean hasError){ }
+
+    /**
+     * Called to set whether navigating backwards should keep the error state.
+     * @param mShowErrorStateOnBack
+     */
+    public void showErrorStateOnBack(boolean mShowErrorStateOnBack){ }
+
     /**
      * Called when {@link StepperLayout}'s adapter gets changed
      * @param stepAdapter new stepper adapter

material-stepper/src/main/java/com/stepstone/stepper/type/TabsStepperType.java

@@ -54,6 +54,22 @@ public void onStepSelected(int newStepPosition) {
         mTabsContainer.setCurrentStep(newStepPosition);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setErrorStep(int stepPosition, boolean hasError) {
+        mTabsContainer.setErrorStep(stepPosition, hasError);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void showErrorStateOnBack(boolean mShowErrorStateOnBack) {
+        mTabsContainer.setShowErrorStateOnBack(mShowErrorStateOnBack);
+    }
+
     /**
      * {@inheritDoc}
      */

sample/src/main/AndroidManifest.xml

@@ -25,6 +25,8 @@
         <activity android:name=".DefaultTabsActivity" />
         <activity android:name=".StyledTabsActivity" />
         <activity android:name=".ShowErrorOnBackTabActivity"/>
+        <activity android:name=".ShowErrorTabActivity" />
+        <activity android:name=".ShowErrorCustomColorTabActivity" />
         <activity android:name=".CombinationActivity" />
         <activity android:name=".CustomPageTransformerActivity" />
         <activity android:name=".DelayedTransitionStepperActivity" />

sample/src/main/java/com/stepstone/stepper/sample/MainActivity.java

@@ -68,6 +68,16 @@ public void onStyledTabs(View view) {
         startActivity(new Intent(this, StyledTabsActivity.class));
     }
 
+    @OnClick(R.id.errorTabs)
+    public void onErrorTabs(View view) {
+        startActivity(new Intent(this, ShowErrorTabActivity.class));
+    }
+
+    @OnClick(R.id.errorColorTabs)
+    public void onCustomColorErrorTabs(View view) {
+        startActivity(new Intent(this, ShowErrorCustomColorTabActivity.class));
+    }
+
     @OnClick(R.id.errorOnBackTabs)
     public void onErrorOnBackTabs(View view) {
         startActivity(new Intent(this, ShowErrorOnBackTabActivity.class));

sample/src/main/java/com/stepstone/stepper/sample/ShowErrorCustomColorTabActivity.java

@@ -0,0 +1,12 @@
+package com.stepstone.stepper.sample;
+
+/**
+ * Created by leonardo on 1/16/17.
+ */
+
+public class ShowErrorCustomColorTabActivity extends AbstractStepperActivity {
+    @Override
+    protected int getLayoutResId() {
+        return R.layout.activity_error_custom_color_tabs;
+    }
+}

sample/src/main/java/com/stepstone/stepper/sample/ShowErrorOnBackTabActivity.java

@@ -11,6 +11,7 @@ public class ShowErrorOnBackTabActivity extends AbstractStepperActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        mStepperLayout.setShowErrorState(true);
         mStepperLayout.setShowErrorStateOnBack(true);
     }
 

sample/src/main/java/com/stepstone/stepper/sample/ShowErrorTabActivity.java

@@ -0,0 +1,13 @@
+package com.stepstone.stepper.sample;
+
+/**
+ * Created by leonardo on 1/16/17.
+ */
+
+public class ShowErrorTabActivity extends AbstractStepperActivity {
+
+    @Override
+    protected int getLayoutResId() {
+        return R.layout.activity_error_tabs;
+    }
+}

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.stepstone.stepper.StepperLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/stepperLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    app:ms_stepperType="tabs"
+    app:ms_showErrorState="true"
+    app:ms_errorColor="@color/colorButton"/>

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

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.stepstone.stepper.StepperLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/stepperLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    app:ms_stepperType="tabs"
+    app:ms_showErrorState="true" />

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

@@ -58,6 +58,18 @@
             android:layout_height="wrap_content"
             android:text="@string/styled_tabs" />
 
+        <Button
+            android:id="@+id/errorTabs"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/error_tabs" />
+
+        <Button
+            android:id="@+id/errorColorTabs"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/error_color_tabs" />
+
         <Button
             android:id="@+id/errorOnBackTabs"
             android:layout_width="wrap_content"

sample/src/main/res/values/strings.xml

@@ -7,6 +7,8 @@
     <string name="styled_progress_bar">Styled progress bar</string>
     <string name="default_tabs">Default tabs</string>
     <string name="styled_tabs">Styled tabs</string>
+    <string name="error_tabs">Show errors on tabs</string>
+    <string name="error_color_tabs">Custom color error tabs</string>
     <string name="error_back_tabs">Keep error back tabs</string>
     <string name="combination">Dots in portrait, tabs in landscape</string>
     <string name="custom_page_transformer">Custom PageTransformer</string>