Skip to content

Commit e1d95ca

Browse files
author
jyuesong
committed
update progress button
1 parent 14d764a commit e1d95ca

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Add it in your root build.gradle at the end of repositories:
1919
Step 2. Add the dependency
2020
2121
dependencies {
22-
compile 'com.github.jiang111:CProgressButton:v1.2.2'
22+
compile 'com.github.jiang111:CProgressButton:v1.2.3'
2323
}
2424
```
2525

pbutton/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ android {
88
defaultConfig {
99
minSdkVersion 15
1010
targetSdkVersion 25
11-
versionCode 5
12-
versionName "1.2.2"
11+
versionCode 6
12+
versionName "1.2.3"
1313

1414
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
1515

pbutton/src/main/java/com/jiang/android/pbutton/CProgressButton.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,13 @@ private void setState(STATE state, boolean anim) {
119119
} else if (mState == STATE.NORMAL) {
120120
morph2Normal();
121121
}
122+
} else {
123+
morphingCircle = morphingNormal = false;
124+
if (mState == STATE.PROGRESS) {
125+
setText("");
126+
} else if (mState == STATE.NORMAL) {
127+
setText(resultString);
128+
}
122129
}
123130

124131
}

0 commit comments

Comments
 (0)