Skip to content

Commit 39a1de3

Browse files
FlodCodingFlodCoding
committed
delete unused file
1 parent 45494ef commit 39a1de3

File tree

5 files changed

+40
-47
lines changed

5 files changed

+40
-47
lines changed

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
* 8、多次start和end 会出错 √
4242
* 9、设置完Drawable大小后，start后再次设置rootView大小失控,是因为原来是wrap_content √
4343
* 10、start和compete同时按Loading没有关 √
44+
* 11、loading完后设置loading大小好像是无效的
4445
*/
4546
@SuppressWarnings({"UnusedReturnValue,SameParameterValue", "unused"})
4647
public class LoadingButton extends DrawableTextView {
@@ -96,7 +97,7 @@ private void init(Context context, AttributeSet attrs) {
9697
enableShrink = array.getBoolean(R.styleable.LoadingButton_enableShrink, false);
9798
disableClickOnLoading = array.getBoolean(R.styleable.LoadingButton_disableClickOnLoading, false);
9899
mShrinkDuration = array.getInt(R.styleable.LoadingButton_shrinkDuration, 450);
99-
int loadingDrawableSize = array.getDimensionPixelSize(R.styleable.LoadingButton_loadingDrawableSize, (int) (enableShrink ? getTextSize() * 2 : getTextSize()));
100+
int loadingDrawableSize = array.getDimensionPixelSize(R.styleable.LoadingButton_loadingEndDrawableSize, (int) (enableShrink ? getTextSize() * 2 : getTextSize()));
100101
int loadingDrawableColor = array.getColor(R.styleable.LoadingButton_loadingDrawableColor, getTextColors().getDefaultColor());
101102
int loadingDrawablePosition = array.getInt(R.styleable.LoadingButton_loadingDrawablePosition, POSITION.START);
102103
int endCompleteDrawableResId = array.getResourceId(R.styleable.LoadingButton_endCompleteDrawable, -1);
@@ -439,7 +440,7 @@ public LoadingButton setEnableShrink(boolean enable) {
439440
* 收缩后的尺寸（正方形）
440441
*/
441442
public int getShrinkSize() {
442-
return Math.max(Math.min(mRootViewSizeSaved[0], mRootViewSizeSaved[1]), getLoadingDrawableSize());
443+
return Math.max(Math.min(mRootViewSizeSaved[0], mRootViewSizeSaved[1]), getLoadingEndDrawableSize());
443444
}
444445

445446
/**
@@ -499,7 +500,7 @@ public LoadingButton setLoadingPosition(@POSITION int position) {
499500
mEnableTextInCenterSaved = enableTextInCenter;
500501
setDrawable(mLoadingPosition, null, 0, 0);
501502
mLoadingPosition = position;
502-
setDrawable(position, getLoadingDrawable(), getLoadingDrawableSize(), getLoadingDrawableSize());
503+
setDrawable(position, getLoadingDrawable(), getLoadingEndDrawableSize(), getLoadingEndDrawableSize());
503504
return this;
504505
}
505506

@@ -515,7 +516,7 @@ public LoadingButton setLoadingEndDrawableSize(@Px int size) {
515516
}
516517

517518

518-
public int getLoadingDrawableSize() {
519+
public int getLoadingEndDrawableSize() {
519520
return mLoadingSize;
520521
}
521522

@@ -845,7 +846,7 @@ private void draw(Canvas canvas) {
845846
canvas.translate(offsets[0], offsets[1]);
846847
mCirclePath.reset();
847848
mCirclePath.addCircle(mBounds.centerX(), mBounds.centerY(),
848-
((getLoadingDrawableSize() >> 1) * 1.5f) * animValue, Path.Direction.CW);
849+
((getLoadingEndDrawableSize() >> 1) * 1.5f) * animValue, Path.Direction.CW);
849850
canvas.clipPath(mCirclePath);
850851
canvas.drawBitmap(targetBitMap, null, mBounds, mPaint);
851852
canvas.restore();
@@ -926,7 +927,7 @@ public interface OnLoadingListener {
926927

927928
void onRestoring();
928929

929-
void onEndDrawableAppear(boolean isSuccess, EndDrawable endDrawable);
930+
void onEndDrawableAppear(boolean isComplete, EndDrawable endDrawable);
930931

931932
void onCompleted();
932933

‎Loadingbutton/src/main/res/values/attrs.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<attr name="enableShrink" format="boolean" />
1818
<attr name="disableClickOnLoading" format="boolean" />
1919
<attr name="shrinkDuration" format="integer" />
20-
<attr name="loadingDrawableSize" format="dimension" />
20+
<attr name="loadingEndDrawableSize" format="dimension" />
2121
<attr name="loadingDrawableColor" format="color" />
2222
<attr name="loadingDrawablePosition" format="enum">
2323
<enum name="Start" value="0" />

‎app/src/main/java/com/flod/loadingbutton/app/MainActivity.java‎

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ private void resetView() {
184184
swDisableClickOnLoading.setChecked(true);
185185
tvShrinkDuration.setText("500ms");
186186
tvLoadingDrawableColor.setText("TextColor");
187+
tvLoadingDrawableColor.setBackground(null);
187188
tvLoadingPosition.setText("START");
188189
imEndCompleteDrawableIcon.setImageResource(R.drawable.ic_successful);
189190
imEndFailDrawableIcon.setImageResource(R.drawable.ic_fail);
@@ -211,39 +212,39 @@ private void initLoadingButton() {
211212
.setCompleteDrawable(R.drawable.ic_successful)
212213
.setFailDrawable(R.drawable.ic_fail)
213214
.setEndDrawableKeepDuration(900)
214-
.setLoadingEndDrawableSize((int) (loadingBtn.getTextSize() * 2));
215+
.setLoadingEndDrawableSize((int) (loadingBtn.getTextSize() * 2))
216+
.setOnLoadingListener(new LoadingButton.OnLoadingListenerAdapter() {
217+
@Override
218+
public void onCanceled() {
219+
Toast.makeText(getApplicationContext(), "onCanceled", Toast.LENGTH_SHORT).show();
220+
}
215221

216-
loadingBtn.setOnLoadingListener(new LoadingButton.OnLoadingListenerAdapter() {
217-
@Override
218-
public void onCanceled() {
219-
Toast.makeText(getApplicationContext(), "onCanceled", Toast.LENGTH_SHORT).show();
220-
}
222+
@Override
223+
public void onFailed() {
224+
Toast.makeText(getApplicationContext(), "onFailed", Toast.LENGTH_SHORT).show();
225+
loadingBtn.setText("Submit");
226+
}
221227

222-
@Override
223-
public void onFailed() {
224-
Toast.makeText(getApplicationContext(), "onFailed", Toast.LENGTH_SHORT).show();
225-
loadingBtn.setText("Submit");
226-
}
228+
@Override
229+
public void onCompleted() {
230+
Toast.makeText(getApplicationContext(), "onCompleted", Toast.LENGTH_SHORT).show();
231+
}
227232

228-
@Override
229-
public void onCompleted() {
230-
Toast.makeText(getApplicationContext(), "onCompleted", Toast.LENGTH_SHORT).show();
231-
}
233+
@Override
234+
public void onLoadingStart() {
235+
loadingBtn.setText(loadingText);
236+
}
232237

233-
@Override
234-
public void onLoadingStart() {
235-
loadingBtn.setText(loadingText);
236-
}
238+
@Override
239+
public void onEndDrawableAppear(boolean isSuccess, LoadingButton.EndDrawable endDrawable) {
240+
if (isSuccess) {
241+
loadingBtn.setText(completeText);
242+
} else {
243+
loadingBtn.setText(failText);
244+
}
245+
}
246+
});
237247

238-
@Override
239-
public void onEndDrawableAppear(boolean isSuccess, LoadingButton.EndDrawable endDrawable) {
240-
if (isSuccess) {
241-
loadingBtn.setText(completeText);
242-
} else {
243-
loadingBtn.setText(failText);
244-
}
245-
}
246-
});
247248
}
248249

249250

@@ -360,7 +361,7 @@ public void onClick(DialogInterface dialog, int which) {
360361
break;
361362
}
362363
case R.id.tvLoadingEndDrawableSize: {
363-
showSeekBarDialog("SetLoadingEndDrawableSize", 250, loadingBtn.getLoadingDrawableSize(), false,
364+
showSeekBarDialog("SetLoadingEndDrawableSize", 250, loadingBtn.getLoadingEndDrawableSize(), false,
364365
new DialogInterface.OnClickListener() {
365366
@Override
366367
public void onClick(DialogInterface dialog, int which) {

‎app/src/main/res/drawable/ic_check_circle.xml‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎app/src/main/res/layout/activity_main.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
android:orientation="vertical"
1212
android:padding="15dp"
1313
tools:context=".app.MainActivity"
14-
tools:ignore="HardcodedText,ContentDescription">
14+
tools:ignore="HardcodedText,ContentDescription,UnusedAttribute">
1515

1616
<com.flod.loadingbutton.LoadingButton
1717
android:id="@+id/loadingBtn"
@@ -31,7 +31,7 @@
3131
app:endCompleteDrawable="@drawable/ic_successful"
3232
app:endFailDrawable="@drawable/ic_fail"
3333
app:loadingDrawablePosition="Start"
34-
tools:ignore="HardcodedText" />
34+
app/>
3535

3636
<RelativeLayout
3737
android:layout_width="match_parent"

0 commit comments

Comments
 (0)