Skip to content

Commit c20f41f

Browse files
committed
基本完成,加了一些注释
1 parent 14e5fb0 commit c20f41f

File tree

2 files changed

+4
-13
lines changed

2 files changed

+4
-13
lines changed

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

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ interface STATE {
5757
private int mDrawablePaddingSaved;
5858
private CharSequence mTextSaved;
5959
private boolean mEnableTextInCenterSaved;
60-
private boolean mViewEnableSaved;
6160
private int[] mRootViewSizeSaved = new int[]{0, 0};
6261

6362
private boolean disableClickOnLoading; //Loading中禁用点击
@@ -225,7 +224,6 @@ else if (isFail)
225224
private void saveStatus() {
226225
mTextSaved = getText();
227226
mDrawablesSaved = copyDrawables(true);
228-
mViewEnableSaved = isEnabled();
229227
mDrawablePaddingSaved = getCompoundDrawablePadding();
230228
mEnableTextInCenterSaved = isEnableTextInCenter();
231229
}
@@ -242,7 +240,7 @@ private void restoreStatus() {
242240
getLayoutParams().height = mRootViewSizeSaved[1];
243241
requestLayout();
244242
if (disableClickOnLoading) {
245-
super.setEnabled(mViewEnableSaved);
243+
super.setEnabled(true);
246244
}
247245

248246
addOnLayoutChangeListener(new OnLayoutChangeListener() {
@@ -608,12 +606,6 @@ public void setText(CharSequence text, BufferType type) {
608606
super.setText(text, type);
609607
}
610608

611-
@Override
612-
public void setEnabled(boolean enabled) {
613-
super.setEnabled(enabled);
614-
mViewEnableSaved = enabled;
615-
616-
}
617609

618610
@Override
619611
protected void onLayout(boolean changed, int left, int top, int right, int bottom) {

app/src/main/java/com/flod/hardloadingbutton/MainActivity.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -172,9 +172,7 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
172172
loadingBtn.setDisableClickOnLoading(isChecked);
173173
}
174174
});
175-
176-
177-
loadingBtn.setFailDrawable(null);
175+
178176
}
179177

180178
private void resetView() {
@@ -202,8 +200,9 @@ private void resetView() {
202200
private void initLoadingButton() {
203201
loadingBtn.setOnClickListener(this);
204202
loadingBtn.cancel();
205-
203+
loadingBtn.getLayoutParams().height = ViewGroup.LayoutParams.WRAP_CONTENT;
206204
loadingBtn.setEnableShrink(true)
205+
.setDisableClickOnLoading(true)
207206
.setShrinkDuration(450)
208207
.setLoadingColor(loadingBtn.getTextColors().getDefaultColor())
209208
.setLoadingStrokeWidth((int) (loadingBtn.getTextSize() * 0.14f))

0 commit comments

Comments
 (0)