StepView: New attribute "step_summary_done"

Signed-off-by: Fung <[email protected]>
fython · Aug 17, 2017 · e1e3281 · e1e3281
1 parent f21bd30
commit e1e3281
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 7 deletions.
diff --git a/...in/java/moe/feng/common/stepperview/demo/fragment/VerticalStepperAdapterDemoFragment.java b/...in/java/moe/feng/common/stepperview/demo/fragment/VerticalStepperAdapterDemoFragment.java
@@ -40,9 +40,9 @@ public void onViewCreated(View view, Bundle savedInstanceState) {
 	public @Nullable String getSummary(int index) {
 		switch (index) {
 			case 0:
-				return "Summarized if needed";
+				return "Summarized if needed" + (mVerticalStepperView.getCurrentStep() > index ? "; isDone!" : "");
 			case 2:
-				return "Last step";
+				return "Last step" + (mVerticalStepperView.getCurrentStep() > index ? "; isDone!" : "");
 			default:
 				return null;
 		}

diff --git a/demo/src/main/res/layout/fragment_vertical_stepper.xml b/demo/src/main/res/layout/fragment_vertical_stepper.xml
@@ -19,6 +19,7 @@
 				app:step_index="1"
 				app:step_title="Step 1"
 				app:step_summary="Summarized if needed"
+				app:step_summary_done="Summarized if needed. Done"
 				app:step_state="selected">
 
 			<LinearLayout
@@ -121,6 +122,7 @@
 				app:step_index="3"
 				app:step_title="Step 3"
 				app:step_summary="Last step"
+				app:step_summary_done="Last step. Done"
 				app:step_is_last="true">
 
 			<LinearLayout

diff --git a/library/src/main/java/moe/feng/common/stepperview/VerticalStepperItemView.java b/library/src/main/java/moe/feng/common/stepperview/VerticalStepperItemView.java
@@ -43,7 +43,7 @@ public class VerticalStepperItemView extends FrameLayout {
 	/**
 	 * Step state
 	 */
-	private String mTitle, mSummary;
+	private String mTitle, mSummary, mSummaryFinished = null;
 	private int mIndex = 1;
 	private boolean isLastStep = false;
 	private int mState = STATE_NORMAL;
@@ -87,6 +87,7 @@ public VerticalStepperItemView(Context context, AttributeSet attrs, int defStyle
 
 			mTitle = a.getString(R.styleable.VerticalStepperItemView_step_title);
 			mSummary = a.getString(R.styleable.VerticalStepperItemView_step_summary);
+			mSummaryFinished = a.getString(R.styleable.VerticalStepperItemView_step_summary_done);
 			mIndex = a.getInt(R.styleable.VerticalStepperItemView_step_index, 1);
 			mState = a.getInt(R.styleable.VerticalStepperItemView_step_state, STATE_NORMAL);
 			isLastStep = a.getBoolean(R.styleable.VerticalStepperItemView_step_is_last, false);
@@ -105,7 +106,7 @@ public VerticalStepperItemView(Context context, AttributeSet attrs, int defStyle
 		}
 
 		setTitle(mTitle);
-		setSummary(mSummary);
+		updateSummaryView();
 		setIndex(mIndex);
 		setState(mState);
 		setIsLastStep(isLastStep);
@@ -263,6 +264,7 @@ public synchronized void setState(@State int state) {
 		mState = state;
 
 		updateMarginBottom();
+		updateSummaryView();
 	}
 
 	/**
@@ -343,8 +345,7 @@ public void setErrorText(@StringRes int errorTextRes) {
 	 */
 	public void setSummary(@Nullable String summary) {
 		mSummary = summary;
-		mSummaryText.setText(mErrorText != null ? mErrorText : summary);
-		mSummaryText.setVisibility(mState != STATE_SELECTED && !TextUtils.isEmpty(mSummaryText.getText()) ? View.VISIBLE : View.GONE);
+		updateSummaryView();
 	}
 
 	/**
@@ -365,6 +366,46 @@ public String getSummary() {
 		return mSummary;
 	}
 
+	/**
+	 * Set finished summary for this step.
+	 * If you set a null value, it will hide the summary view or show default summary.
+	 *
+	 * @param summary The summary should be set or null
+	 */
+	public void setSummaryFinished(@Nullable String summary) {
+		mSummaryFinished = summary;
+		updateSummaryView();
+	}
+
+	/**
+	 * Set summary for this step.
+	 *
+	 * @param summaryRes The summary resource should be set
+	 */
+	public void setSummaryFinished(@StringRes int summaryRes) {
+		setSummaryFinished(getResources().getString(summaryRes));
+	}
+
+	/**
+	 * Get the summary of this step
+	 *
+	 * @return The summary of this step
+	 */
+	public String getSummaryFinished() {
+		return mSummaryFinished;
+	}
+
+	/**
+	 * Update summary view
+	 */
+	private void updateSummaryView() {
+		mSummaryText.setText(
+				mErrorText != null ? mErrorText
+						: (mSummaryFinished != null && mState == STATE_DONE) ? mSummaryFinished : mSummary
+		);
+		mSummaryText.setVisibility(mState != STATE_SELECTED && !TextUtils.isEmpty(mSummaryText.getText()) ? View.VISIBLE : View.GONE);
+	}
+
 	/**
 	 * Set index for this step
 	 *
@@ -691,6 +732,7 @@ public Parcelable onSaveInstanceState() {
 		ItemViewState state = new ItemViewState(super.onSaveInstanceState());
 		state.title = mTitle;
 		state.summary = mSummary;
+		state.summaryFinished = mSummaryFinished;
 		state.index = mIndex;
 		state.isLastStep = isLastStep;
 		state.state = mState;
@@ -713,6 +755,7 @@ public void onRestoreInstanceState(Parcelable state) {
 			super.onRestoreInstanceState(viewState.getSuperState());
 			setTitle(viewState.title);
 			setSummary(viewState.summary);
+			setSummaryFinished(viewState.summaryFinished);
 			setIndex(viewState.index);
 			setIsLastStep(viewState.isLastStep);
 			setState(viewState.state);
@@ -732,7 +775,7 @@ protected static class ItemViewState extends BaseSavedState {
 
 		private static final String STATE = VerticalStepperItemView.class.getSimpleName() + ".STATE";
 
-		String title, summary;
+		String title, summary, summaryFinished;
 		int index = 1;
 		boolean isLastStep = false;
 		int state = STATE_NORMAL;

diff --git a/library/src/main/res/values/attrs.xml b/library/src/main/res/values/attrs.xml
@@ -23,6 +23,7 @@
 		<attr name="step_index" format="integer"/>
 		<attr name="step_title" format="string"/>
 		<attr name="step_summary" format="string"/>
+		<attr name="step_summary_done" format="string"/>
 		<attr name="step_is_last" format="boolean"/>
 		<attr name="step_state" format="enum">
 			<enum name="normal" value="0"/>