Skip to content

Commit 5425da3

Browse files
committed
add OnLoadingListener.onEndDrawableAppearDone
1 parent 0264d37 commit 5425da3

File tree

3 files changed

+12
-7
lines changed

3 files changed

+12
-7
lines changed

Loadingbutton/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ android {
88
minSdkVersion 17
99
targetSdkVersion 28
1010
versionCode 100
11-
versionName "1.0.0-alpha5"
11+
versionName "1.0.0-alpha6"
1212

1313
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1414

Loadingbutton/src/main/java/com/flod/loadingbutton/LoadingButton.java

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
* 9、设置完Drawable大小后,start后再次设置rootView大小失控,是因为原来是wrap_content √
4545
* 10、start和compete同时按Loading没有关 √
4646
* 11、loading完后设置loading大小好像是无效的
47-
* 12、如果是没有EndDrawable但是有文字,那是否也要停留一段时间呢?
4847
*/
4948
@SuppressWarnings({"UnusedReturnValue,SameParameterValue", "unused"})
5049
public class LoadingButton extends DrawableTextView {
@@ -709,6 +708,9 @@ public void onAnimationEnd(Animator animation) {
709708
if (isShowing) {
710709
postDelayed(mRunnable, mKeepDuration);
711710
}
711+
if (mOnLoadingListener != null) {
712+
mOnLoadingListener.onEndDrawableAppearDone(!isFail);
713+
}
712714
}
713715
});
714716
}
@@ -739,10 +741,6 @@ private void show(boolean isFail) {
739741
mAppearAnimator.start();
740742
isShowing = true;
741743

742-
/* //if mFailBitmap or mCompleteBitmap is null cancel appearAnim
743-
if ((isFail && mFailBitmap == null) || (!isFail && mCompleteBitmap == null)) {
744-
cancel(true);
745-
}*/
746744
}
747745

748746
/**
@@ -939,6 +937,8 @@ public interface OnLoadingListener {
939937

940938
void onEndDrawableAppear(boolean isComplete, EndDrawable endDrawable);
941939

940+
void onEndDrawableAppearDone(boolean isComplete);
941+
942942
void onCompleted();
943943

944944
void onFailed();
@@ -971,6 +971,11 @@ public void onEndDrawableAppear(boolean isComplete, EndDrawable endDrawable) {
971971

972972
}
973973

974+
@Override
975+
public void onEndDrawableAppearDone(boolean isComplete) {
976+
977+
}
978+
974979
@Override
975980
public void onRestoring() {
976981

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
dependencies {
2525
//Androidx
26-
implementation 'com.github.FlodCoding:LoadingButton:1.0.0-alpha5'
26+
implementation 'com.github.FlodCoding:LoadingButton:1.0.0-alpha6'
2727

2828
//Support-appcompat
2929
implementation 'com.github.FlodCoding:LoadingButton:1.0.0-alpha4-support'

0 commit comments

Comments
 (0)