Skip to content

Commit 7cf654e

Browse files
Piotr Zawadzkizawadz88
Piotr Zawadzki
authored andcommitted
* Fixed an issue where tab navigation should be disabled when using 'tabs' stepper feedback & disabled tab navigation attribute (issue #105).
* Updated Android Support Library to 25.3.1 * Updated library version to 3.2.1
1 parent 2706769 commit 7cf654e

File tree

5 files changed

+17
-10
lines changed

5 files changed

+17
-10
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Moreover, you can find there other examples, e.g. how to persist state on rotati
5656

5757
### Download (from JCenter)
5858
```groovy
59-
compile 'com.stepstone.stepper:material-stepper:3.2.0'
59+
compile 'com.stepstone.stepper:material-stepper:3.2.1'
6060
```
6161

6262
### Create layout in XML

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ configure(allprojects) {
2323
androidTargetSdkVersion = 25
2424
androidCompileSdkVersion = 25
2525
androidBuildToolsVersion = "25.0.2"
26-
androidSupportLibraryVersion = "25.2.0"
26+
androidSupportLibraryVersion = "25.3.1"
2727

2828
junitVersion = "4.12"
2929
mockitoVersion = "1.10.19"

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@
1919

2020
POM_GROUP_ID=com.stepstone.stepper
2121
POM_ARTIFACT_ID=material-stepper
22-
POM_VERSION=3.2.0
22+
POM_VERSION=3.2.1

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

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -539,20 +539,24 @@ public void updateErrorFlag(boolean hasError) {
539539
}
540540

541541
/**
542-
* Shows a progress indicator. This does not have to be a progress bar and it depends on chosen stepper feedback types.
542+
* Shows a progress indicator if not already shown. This does not have to be a progress bar and it depends on chosen stepper feedback types.
543543
* @param progressMessage optional progress message if supported by the selected types
544544
*/
545545
public void showProgress(@NonNull String progressMessage) {
546-
mInProgress = true;
547-
mStepperFeedbackType.showProgress(progressMessage);
546+
if (!mInProgress) {
547+
mStepperFeedbackType.showProgress(progressMessage);
548+
mInProgress = true;
549+
}
548550
}
549551

550552
/**
551-
* Hides the progress indicator.
553+
* Hides the progress indicator if visible.
552554
*/
553555
public void hideProgress() {
554-
mInProgress = false;
555-
mStepperFeedbackType.hideProgress();
556+
if (mInProgress) {
557+
mInProgress = false;
558+
mStepperFeedbackType.hideProgress();
559+
}
556560
}
557561

558562
/**

material-stepper/src/main/java/com/stepstone/stepper/internal/feedback/TabsStepperFeedbackType.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ public class TabsStepperFeedbackType implements StepperFeedbackType {
3838

3939
private final float mProgressMessageTranslationWhenHidden;
4040

41+
private boolean mTabNavigationEnabled;
42+
4143
private TextView mProgressMessageTextView;
4244

4345
private View mTabs;
@@ -54,6 +56,7 @@ public TabsStepperFeedbackType(@NonNull StepperLayout stepperLayout) {
5456

5557
@Override
5658
public void showProgress(@NonNull String progressMessage) {
59+
mTabNavigationEnabled = mStepperLayout.isTabNavigationEnabled();
5760
setTabNavigationEnabled(false);
5861
mProgressMessageTextView.setText(progressMessage);
5962
mProgressMessageTextView.animate()
@@ -70,7 +73,7 @@ public void showProgress(@NonNull String progressMessage) {
7073

7174
@Override
7275
public void hideProgress() {
73-
setTabNavigationEnabled(true);
76+
setTabNavigationEnabled(mTabNavigationEnabled);
7477

7578
mProgressMessageTextView.animate()
7679
.setStartDelay(0)

0 commit comments

Comments
 (0)