- added an option to use custom back Button labels per step

Piotr Zawadzki · zawadz88 · commit 00790a8a6560 · 2017-01-16T09:51:56.000+01:00
diff --git a/material-stepper/src/main/java/com/stepstone/stepper/StepperLayout.java b/material-stepper/src/main/java/com/stepstone/stepper/StepperLayout.java
@@ -49,6 +49,7 @@
 import com.stepstone.stepper.type.StepperTypeFactory;
 import com.stepstone.stepper.util.AnimationUtil;
 import com.stepstone.stepper.util.TintUtil;
+import com.stepstone.stepper.viewmodel.StepViewModel;
 
 /**
  * Stepper widget implemented according to the <a href="https://www.google.com/design/spec/components/steppers.html">Material documentation</a>.<br>
@@ -531,19 +532,18 @@ private void onComplete(View completeButton) {
 
     private void onUpdate(int newStepPosition, boolean animate) {
         mPager.setCurrentItem(newStepPosition);
-        boolean isLast = isLastPosition(newStepPosition);
-        boolean isFirst = newStepPosition == 0;
+        final boolean isLast = isLastPosition(newStepPosition);
+        final boolean isFirst = newStepPosition == 0;
         AnimationUtil.fadeViewVisibility(mNextNavigationButton, isLast ? View.GONE : View.VISIBLE, animate);
         AnimationUtil.fadeViewVisibility(mCompleteNavigationButton, !isLast ? View.GONE : View.VISIBLE, animate);
         AnimationUtil.fadeViewVisibility(mBackNavigationButton, isFirst && !mShowBackButtonOnFirstStep ? View.GONE : View.VISIBLE, animate);
 
+        final StepViewModel viewModel = mStepAdapter.getViewModel(newStepPosition);
+
+        updateBackButtonText(viewModel);
+
         if (!isLast) {
-            CharSequence nextButtonTextForStep = mStepAdapter.getViewModel(newStepPosition).getNextButtonLabel();
-            if (nextButtonTextForStep == null) {
-                mNextNavigationButton.setText(mNextButtonText);
-            } else {
-                mNextNavigationButton.setText(nextButtonTextForStep);
-            }
+            updateNextButtonText(viewModel);
         }
 
         mStepperType.onStepSelected(newStepPosition);
@@ -553,4 +553,22 @@ private void onUpdate(int newStepPosition, boolean animate) {
             step.onSelected();
         }
     }
+
+    private void updateNextButtonText(@NonNull StepViewModel viewModel) {
+        CharSequence nextButtonTextForStep = viewModel.getNextButtonLabel();
+        if (nextButtonTextForStep == null) {
+            mNextNavigationButton.setText(mNextButtonText);
+        } else {
+            mNextNavigationButton.setText(nextButtonTextForStep);
+        }
+    }
+
+    private void updateBackButtonText(@NonNull StepViewModel viewModel) {
+        CharSequence backButtonTextForStep = viewModel.getBackButtonLabel();
+        if (backButtonTextForStep == null) {
+            mBackNavigationButton.setText(mBackButtonText);
+        } else {
+            mBackNavigationButton.setText(backButtonTextForStep);
+        }
+    }
 }
diff --git a/material-stepper/src/main/java/com/stepstone/stepper/viewmodel/StepViewModel.java b/material-stepper/src/main/java/com/stepstone/stepper/viewmodel/StepViewModel.java
@@ -94,7 +94,7 @@ public Builder setTitle(@StringRes int titleId) {
          *
          * @return This Builder object to allow for chaining of calls to set methods
          */
-        public Builder setTitle(@Nullable String title) {
+        public Builder setTitle(@Nullable CharSequence title) {
             this.title = title;
             return this;
         }
@@ -114,7 +114,7 @@ public Builder setNextButtonLabel(@StringRes int nextButtonLabelId) {
          *
          * @return This Builder object to allow for chaining of calls to set methods
          */
-        public Builder setNextButtonLabel(@Nullable String nextButtonLabel) {
+        public Builder setNextButtonLabel(@Nullable CharSequence nextButtonLabel) {
             this.nextButtonLabel = nextButtonLabel;
             return this;
         }
@@ -134,7 +134,7 @@ public Builder setBackButtonLabel(@StringRes int backButtonLabelId) {
          *
          * @return This Builder object to allow for chaining of calls to set methods
          */
-        public Builder setBackButtonLabel(@Nullable String backButtonLabel) {
+        public Builder setBackButtonLabel(@Nullable CharSequence backButtonLabel) {
             this.backButtonLabel = backButtonLabel;
             return this;
         }
diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
@@ -27,7 +27,7 @@
         <activity android:name=".CombinationActivity" />
         <activity android:name=".CustomPageTransformerActivity" />
         <activity android:name=".DelayedTransitionStepperActivity" />
-        <activity android:name=".DifferentNextButtonStepperActivity" />
+        <activity android:name=".CustomNavigationButtonsStepperActivity" />
         <activity android:name=".ReturnButtonActivity" />
         <activity android:name=".NoFragmentsActivity"/>
     </application>
diff --git a/sample/src/main/java/com/stepstone/stepper/sample/CustomNavigationButtonsStepperActivity.java b/sample/src/main/java/com/stepstone/stepper/sample/CustomNavigationButtonsStepperActivity.java
@@ -20,9 +20,9 @@
 import android.support.v7.app.AppCompatActivity;
 
 import com.stepstone.stepper.StepperLayout;
-import com.stepstone.stepper.sample.adapter.NextButtonsSampleFragmentStepAdapter;
+import com.stepstone.stepper.sample.adapter.CustomButtonsSampleFragmentStepAdapter;
 
-public class DifferentNextButtonStepperActivity extends AppCompatActivity {
+public class CustomNavigationButtonsStepperActivity extends AppCompatActivity {
 
     private static final String CURRENT_STEP_POSITION_KEY = "position";
 
@@ -36,7 +36,7 @@ protected void onCreate(Bundle savedInstanceState) {
         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 NextButtonsSampleFragmentStepAdapter(getSupportFragmentManager(), this), startingStepPosition);
+        mStepperLayout.setAdapter(new CustomButtonsSampleFragmentStepAdapter(getSupportFragmentManager(), this), startingStepPosition);
 
     }
 
diff --git a/sample/src/main/java/com/stepstone/stepper/sample/MainActivity.java b/sample/src/main/java/com/stepstone/stepper/sample/MainActivity.java
@@ -83,9 +83,9 @@ public void onDelayedTransition(View view) {
         startActivity(new Intent(this, DelayedTransitionStepperActivity.class));
     }
 
-    @OnClick(R.id.differentNextButtons)
+    @OnClick(R.id.differentNavigationButtons)
     public void onDifferentNextButtons(View view) {
-        startActivity(new Intent(this, DifferentNextButtonStepperActivity.class));
+        startActivity(new Intent(this, CustomNavigationButtonsStepperActivity.class));
     }
 
     @OnClick(R.id.showReturnButtonOnFirstStep)
diff --git a/sample/src/main/java/com/stepstone/stepper/sample/adapter/CustomButtonsSampleFragmentStepAdapter.java b/sample/src/main/java/com/stepstone/stepper/sample/adapter/CustomButtonsSampleFragmentStepAdapter.java
@@ -11,9 +11,9 @@
 import com.stepstone.stepper.sample.step.fragment.StepFragmentSample;
 import com.stepstone.stepper.viewmodel.StepViewModel;
 
-public class NextButtonsSampleFragmentStepAdapter extends AbstractFragmentStepAdapter {
+public class CustomButtonsSampleFragmentStepAdapter extends AbstractFragmentStepAdapter {
 
-    public NextButtonsSampleFragmentStepAdapter(@NonNull FragmentManager fm, @NonNull Context context) {
+    public CustomButtonsSampleFragmentStepAdapter(@NonNull FragmentManager fm, @NonNull Context context) {
         super(fm, context);
     }
 
@@ -43,10 +43,17 @@ public StepViewModel getViewModel(@IntRange(from = 0) int position) {
                 .setTitle(R.string.tab_title);
         switch (position) {
             case 0:
-                builder.setNextButtonLabel(R.string.ms_next);
+                builder
+                        .setNextButtonLabel("This way")
+                        .setBackButtonLabel("Go to first");
                 break;
             case 1:
-                builder.setNextButtonLabel(R.string.go_to_summary);
+                builder
+                        .setNextButtonLabel(R.string.go_to_summary)
+                        .setBackButtonLabel("Go to first");
+                break;
+            case 2:
+                builder.setBackButtonLabel("Go back");
                 break;
             default:
                 throw new IllegalArgumentException("Unsupported position: " + position);
diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml
@@ -77,10 +77,10 @@
             android:text="@string/delayed_transition" />
 
         <Button
-            android:id="@+id/differentNextButtons"
+            android:id="@+id/differentNavigationButtons"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/different_next_buttons" />
+            android:text="@string/different_navigation_buttons" />
 
         <Button
             android:id="@+id/showReturnButtonOnFirstStep"
diff --git a/sample/src/main/res/values/strings.xml b/sample/src/main/res/values/strings.xml
@@ -10,7 +10,7 @@
     <string name="combination">Dots in portrait, tabs in landscape</string>
     <string name="custom_page_transformer">Custom PageTransformer</string>
     <string name="delayed_transition">Delayed transition</string>
-    <string name="different_next_buttons">Different next buttons</string>
+    <string name="different_navigation_buttons">Different navigation buttons</string>
     <string name="show_back_button">Show Back button on first step</string>
     <string name="no_fragments">No Fragment Stepper</string>
 

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ public Builder setTitle(@StringRes int titleId) {`
`94`	`94`	`*`
`95`	`95`	`* @return This Builder object to allow for chaining of calls to set methods`
`96`	`96`	`*/`
`97`		`- public Builder setTitle(@Nullable String title) {`
	`97`	`+ public Builder setTitle(@Nullable CharSequence title) {`
`98`	`98`	`this.title = title;`
`99`	`99`	`return this;`
`100`	`100`	`}`
`@@ -114,7 +114,7 @@ public Builder setNextButtonLabel(@StringRes int nextButtonLabelId) {`
`114`	`114`	`*`
`115`	`115`	`* @return This Builder object to allow for chaining of calls to set methods`
`116`	`116`	`*/`
`117`		`- public Builder setNextButtonLabel(@Nullable String nextButtonLabel) {`
	`117`	`+ public Builder setNextButtonLabel(@Nullable CharSequence nextButtonLabel) {`
`118`	`118`	`this.nextButtonLabel = nextButtonLabel;`
`119`	`119`	`return this;`
`120`	`120`	`}`
`@@ -134,7 +134,7 @@ public Builder setBackButtonLabel(@StringRes int backButtonLabelId) {`
`134`	`134`	`*`
`135`	`135`	`* @return This Builder object to allow for chaining of calls to set methods`
`136`	`136`	`*/`
`137`		`- public Builder setBackButtonLabel(@Nullable String backButtonLabel) {`
	`137`	`+ public Builder setBackButtonLabel(@Nullable CharSequence backButtonLabel) {`
`138`	`138`	`this.backButtonLabel = backButtonLabel;`
`139`	`139`	`return this;`
`140`	`140`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,9 +83,9 @@ public void onDelayedTransition(View view) {`
`83`	`83`	`startActivity(new Intent(this, DelayedTransitionStepperActivity.class));`
`84`	`84`	`}`
`85`	`85`
`86`		`- @OnClick(R.id.differentNextButtons)`
	`86`	`+ @OnClick(R.id.differentNavigationButtons)`
`87`	`87`	`public void onDifferentNextButtons(View view) {`
`88`		`- startActivity(new Intent(this, DifferentNextButtonStepperActivity.class));`
	`88`	`+ startActivity(new Intent(this, CustomNavigationButtonsStepperActivity.class));`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`@OnClick(R.id.showReturnButtonOnFirstStep)`