- Updated Android Support Library to 25.1.1

- Added an option to proceed to the next step/complete programmatically (issue #53)

Author: Piotr Zawadzki

README.md

@@ -13,7 +13,7 @@ Quoting the [documentation](https://www.google.com/design/spec/components/steppe
 
 ## Download (from JCenter)
 ```groovy
-compile 'com.stepstone.stepper:material-stepper:2.2.0'
+compile 'com.stepstone.stepper:material-stepper:2.3.0'
 ```
 
 ## Supported steppers

build.gradle

@@ -23,7 +23,7 @@ configure(allprojects) {
         androidTargetSdkVersion             = 25
         androidCompileSdkVersion            = 25
         androidBuildToolsVersion            = "25.0.2"
-        androidSupportLibraryVersion        = "25.1.0"
+        androidSupportLibraryVersion        = "25.1.1"
 
         /* Sample only */
         butterknifeVersion                  = "7.0.1"

gradle.properties

@@ -19,4 +19,4 @@
 
 POM_GROUP_ID=com.stepstone.stepper
 POM_ARTIFACT_ID=material-stepper
-POM_VERSION=2.2.0
+POM_VERSION=2.3.0

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

@@ -237,7 +237,7 @@ public void onClick(View v) {
     private OnClickListener mOnCompleteClickListener = new OnClickListener() {
         @Override
         public void onClick(View v) {
-            onComplete(v);
+            onComplete();
         }
     };
 
@@ -325,6 +325,23 @@ public void onTabClicked(int position) {
         }
     }
 
+    /**
+     * This is an equivalent of clicking the Next/Complete button from the bottom navigation.
+     * Unlike {@link #setCurrentStepPosition(int)} this actually verifies the step.
+     */
+    public void proceed() {
+        if (isLastPosition(mCurrentStepPosition)) {
+            onComplete();
+        } else {
+            onNext();
+        }
+    }
+
+    /**
+     * Sets the current step to the one at the provided index.
+     * This does not verify the current step.
+     * @param currentStepPosition new current step position
+     */
     public void setCurrentStepPosition(int currentStepPosition) {
         this.mCurrentStepPosition = currentStepPosition;
         onUpdate(currentStepPosition, true);
@@ -593,13 +610,13 @@ private void onError(@NonNull VerificationError verificationError) {
         mListener.onError(verificationError);
     }
 
-    private void onComplete(View completeButton) {
+    private void onComplete() {
         Step step = findCurrentStep();
         if (verifyCurrentStep(step)) {
             return;
         }
         mStepperType.setErrorStep(mCurrentStepPosition, false);
-        mListener.onCompleted(completeButton);
+        mListener.onCompleted(mCompleteNavigationButton);
     }
 
     private void onUpdate(int newStepPosition, boolean animate) {

sample/src/main/AndroidManifest.xml

@@ -33,6 +33,8 @@
         <activity android:name=".CustomNavigationButtonsStepperActivity" />
         <activity android:name=".ReturnButtonActivity" />
         <activity android:name=".NoFragmentsActivity" />
+        <activity android:name=".ProceedProgrammaticallyActivity"
+            android:windowSoftInputMode="stateVisible"/>
         <activity
             android:name=".CustomStepperLayoutThemeActivity"
             android:theme="@style/AppThemeDark" />

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

@@ -113,6 +113,11 @@ public void onNoFrag(View view){
         startActivity(new Intent(this, NoFragmentsActivity.class));
     }
 
+    @OnClick(R.id.proceedProgrammatically)
+    public void onProceedProgrammatically(View view){
+        startActivity(new Intent(this, ProceedProgrammaticallyActivity.class));
+    }
+
     @OnClick(R.id.customStepperLayoutTheme)
     public void onCustomStepperLayoutThemeWithTabs(View view){
         startActivity(new Intent(this, CustomStepperLayoutThemeActivity.class));

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

@@ -0,0 +1,23 @@
+/*
+Copyright 2016 StepStone Services
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+ */
+
+package com.stepstone.stepper.sample;
+
+public interface OnProceedListener {
+
+    void onProceed();
+
+}

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

@@ -0,0 +1,83 @@
+/*
+Copyright 2017 StepStone Services
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+ */
+
+package com.stepstone.stepper.sample;
+
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+import android.widget.Toast;
+
+import com.stepstone.stepper.StepperLayout;
+import com.stepstone.stepper.VerificationError;
+import com.stepstone.stepper.sample.adapter.FormFragmentStepAdapter;
+
+public class ProceedProgrammaticallyActivity extends AppCompatActivity implements StepperLayout.StepperListener, OnProceedListener {
+
+    private static final String CURRENT_STEP_POSITION_KEY = "position";
+
+    private StepperLayout mStepperLayout;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setTitle("Stepper sample");
+
+        setContentView(R.layout.activity_default_dots);
+        mStepperLayout = (StepperLayout) findViewById(R.id.stepperLayout);
+        int startingStepPosition = savedInstanceState != null ? savedInstanceState.getInt(CURRENT_STEP_POSITION_KEY) : 0;
+        mStepperLayout.setAdapter(new FormFragmentStepAdapter(getSupportFragmentManager(), this), startingStepPosition);
+        mStepperLayout.setListener(this);
+    }
+
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        outState.putInt(CURRENT_STEP_POSITION_KEY, mStepperLayout.getCurrentStepPosition());
+        super.onSaveInstanceState(outState);
+    }
+
+    @Override
+    public void onBackPressed() {
+        final int currentStepPosition = mStepperLayout.getCurrentStepPosition();
+        if (currentStepPosition > 0) {
+            mStepperLayout.setCurrentStepPosition(currentStepPosition - 1);
+        } else {
+            finish();
+        }
+    }
+
+    @Override
+    public void onCompleted(View completeButton) {
+        Toast.makeText(this, "onCompleted!", Toast.LENGTH_SHORT).show();
+    }
+
+    @Override
+    public void onError(VerificationError verificationError) {
+    }
+
+    @Override
+    public void onStepSelected(int newStepPosition) {
+    }
+
+    @Override
+    public void onReturn() {
+    }
+
+    @Override
+    public void onProceed() {
+        mStepperLayout.proceed();
+    }
+}

sample/src/main/java/com/stepstone/stepper/sample/adapter/FormFragmentStepAdapter.java

@@ -0,0 +1,26 @@
+package com.stepstone.stepper.sample.adapter;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.support.v4.app.FragmentManager;
+
+import com.stepstone.stepper.Step;
+import com.stepstone.stepper.adapter.AbstractFragmentStepAdapter;
+import com.stepstone.stepper.sample.step.fragment.FormStepFragment;
+
+public class FormFragmentStepAdapter extends AbstractFragmentStepAdapter {
+
+    public FormFragmentStepAdapter(@NonNull FragmentManager fm, @NonNull Context context) {
+        super(fm, context);
+    }
+
+    @Override
+    public Step createStep(int position) {
+        return FormStepFragment.newInstance();
+    }
+
+    @Override
+    public int getCount() {
+        return 3;
+    }
+}

sample/src/main/java/com/stepstone/stepper/sample/step/fragment/FormStepFragment.java

@@ -0,0 +1,94 @@
+/*
+Copyright 2017 StepStone Services
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+ */
+
+package com.stepstone.stepper.sample.step.fragment;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.text.TextUtils;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.animation.AnimationUtils;
+import android.view.inputmethod.EditorInfo;
+import android.widget.EditText;
+import android.widget.TextView;
+
+import com.stepstone.stepper.Step;
+import com.stepstone.stepper.VerificationError;
+import com.stepstone.stepper.sample.OnProceedListener;
+import com.stepstone.stepper.sample.R;
+
+import butterknife.Bind;
+import butterknife.ButterKnife;
+import butterknife.OnEditorAction;
+
+public class FormStepFragment extends Fragment implements Step {
+
+    public static FormStepFragment newInstance() {
+        FormStepFragment fragment = new FormStepFragment();
+        return fragment;
+    }
+
+    @Bind(R.id.editText)
+    EditText editText;
+
+    @Nullable
+    private OnProceedListener onProceedListener;
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        if (context instanceof OnProceedListener) {
+            onProceedListener = (OnProceedListener) context;
+        }
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_form_step, container, false);
+        ButterKnife.bind(this, view);
+        return view;
+    }
+
+    @Override
+    public VerificationError verifyStep() {
+        return TextUtils.isEmpty(editText.getText().toString())
+                ? new VerificationError("Password cannot be empty")
+                : null;
+    }
+
+    @Override
+    public void onSelected() {
+    }
+
+    @Override
+    public void onError(@NonNull VerificationError error) {
+        editText.startAnimation(AnimationUtils.loadAnimation(getActivity(), R.anim.shake_error));
+    }
+
+    @OnEditorAction(R.id.editText)
+    public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+        if (actionId == EditorInfo.IME_ACTION_DONE && onProceedListener != null) {
+            onProceedListener.onProceed();
+        }
+        return true;
+    }
+}