Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

【pref】解决进度条到达末端百分比位置不变，但百分比值仍在变化的情况 #79

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

【pref】解决进度条到达末端百分比位置不变，但百分比值仍在变化的情况 #79

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions library/src/main/java/com/daimajia/numberprogressbar/NumberProgressBar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,11 @@ public class NumberProgressBar extends View {
*/
private String mPrefix = "";

/**
* The max drawTextWith
*/
private float mMaxDrawTextWidth;


private final int default_text_color = Color.rgb(66, 145, 241);
private final int default_reached_color = Color.rgb(66, 145, 241);
Expand Down Expand Up @@ -266,6 +271,8 @@ private void initializePainters() {
mTextPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
mTextPaint.setColor(mTextColor);
mTextPaint.setTextSize(mTextSize);

mMaxDrawTextWidth = mTextPaint.measureText(mPrefix + "100" + mSuffix);
}


Expand Down Expand Up @@ -294,7 +301,8 @@ private void calculateDrawRectF() {
mDrawReachedBar = true;
mReachedRectF.left = getPaddingLeft();
mReachedRectF.top = getHeight() / 2.0f - mReachedBarHeight / 2.0f;
mReachedRectF.right = (getWidth() - getPaddingLeft() - getPaddingRight()) / (getMax() * 1.0f) * getProgress() - mOffset + getPaddingLeft();
mReachedRectF.right = (getWidth() - getPaddingLeft() - getPaddingRight() - mDrawTextWidth)
/ (getMax() * 1.0f) * getProgress() - mOffset + getPaddingLeft();
mReachedRectF.bottom = getHeight() / 2.0f + mReachedBarHeight / 2.0f;
mDrawTextStart = (mReachedRectF.right + mOffset);
}
Expand All @@ -307,13 +315,13 @@ private void calculateDrawRectF() {
}

float unreachedBarStart = mDrawTextStart + mDrawTextWidth + mOffset;
if (unreachedBarStart >= getWidth() - getPaddingRight()) {
if (unreachedBarStart >= getWidth() - getPaddingRight() - mMaxDrawTextWidth) {
mDrawUnreachedBar = false;
} else {
mDrawUnreachedBar = true;
mUnreachedRectF.left = unreachedBarStart;
mUnreachedRectF.right = getWidth() - getPaddingRight();
mUnreachedRectF.top = getHeight() / 2.0f + -mUnreachedBarHeight / 2.0f;
mUnreachedRectF.right = getWidth() - getPaddingRight() - mMaxDrawTextWidth;
mUnreachedRectF.top = getHeight() / 2.0f - mUnreachedBarHeight / 2.0f;
mUnreachedRectF.bottom = getHeight() / 2.0f + mUnreachedBarHeight / 2.0f;
}
}
Expand Down