Mastodon
/
pachli-android
mirror of https://github.com/pachli/pachli-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Apply suggestions for ProgressImageView (#942)

This commit is contained in:
Ivan Kupalov 2018-12-03 11:02:07 +01:00 committed by Konrad Pozniak
parent 5b196556e1
commit 19783c5aed
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/com/keylesspalace/tusky/view/ProgressImageView.java
View File

@ -92,8 +92,8 @@ public final class ProgressImageView extends AppCompatImageView {
super.onDraw(canvas); super.onDraw(canvas);
float angle = (progress / 100f) * 360 - 90; float angle = (progress / 100f) * 360 - 90;
float halfWidth = canvas.getWidth() / 2; float halfWidth = getWidth() / 2;
float halfHeight = canvas.getHeight() / 2; float halfHeight = getHeight() / 2;
progressRect.set(halfWidth * 0.75f, halfHeight * 0.75f, halfWidth * 1.25f, halfHeight * 1.25f); progressRect.set(halfWidth * 0.75f, halfHeight * 0.75f, halfWidth * 1.25f, halfHeight * 1.25f);
biggerRect.set(progressRect); biggerRect.set(progressRect);
int margin = 8; int margin = 8;
@ -108,15 +108,15 @@ public final class ProgressImageView extends AppCompatImageView {
int circleRadius = Utils.dpToPx(getContext(), 14); int circleRadius = Utils.dpToPx(getContext(), 14);
int circleMargin = Utils.dpToPx(getContext(), 14); int circleMargin = Utils.dpToPx(getContext(), 14);
int circleY = canvas.getHeight() - circleMargin - circleRadius / 2; int circleY = getHeight() - circleMargin - circleRadius / 2;
int circleX = canvas.getWidth() - circleMargin - circleRadius / 2; int circleX = getWidth() - circleMargin - circleRadius / 2;
canvas.drawCircle(circleX, circleY, circleRadius, markBgPaint); canvas.drawCircle(circleX, circleY, circleRadius, markBgPaint);
captionDrawable.setBounds(canvas.getWidth() - circleMargin - circleRadius, captionDrawable.setBounds(getWidth() - circleMargin - circleRadius,
canvas.getHeight() - circleMargin - circleRadius, getHeight() - circleMargin - circleRadius,
canvas.getWidth() - circleMargin, getWidth() - circleMargin,
canvas.getHeight() - circleMargin); getHeight() - circleMargin);
DrawableCompat.setTint(captionDrawable, Color.WHITE); DrawableCompat.setTint(captionDrawable, Color.WHITE);
captionDrawable.draw(canvas); captionDrawable.draw(canvas);
} }