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

fix[BaseCountdown]: getTextBounds of rect.width() will clip text #131

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix[BaseCountdown]: getTextBounds of rect.width() will clip text #131

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1bdae9
fix[BaseCountdown]: getTextBounds of rect.width() will clip text
kHRYSTAL Nov 12, 2019
c3ab94d
fix[BaseCountdown]: getTextBounds of rect.width() will clip text
kHRYSTAL Nov 12, 2019
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
42 changes: 28 additions & 14 deletions library/src/main/java/cn/iwgang/countdownview/BaseCountdown.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ public void initialize() {
// pick one of two (minute and second)
// if (!isShowMinute && !isShowSecond) isShowSecond = true;
if (!isShowSecond) isShowMillisecond = false;

initTimeTextBaseInfo();
}

Expand Down Expand Up @@ -367,7 +366,7 @@ private void initSuffixMargin() {
mSuffixSecondRightMargin = 0;
}

if (isShowMillisecond && mSuffixMillisecondTextWidth > 0) {
if (isShowMillisecond && mSuffixMillisecondTextWidth > 0) {
if (mSuffixMillisecondLeftMargin < 0) {
if (!isSuffixLRMarginNull) {
mSuffixMillisecondLeftMargin = mSuffixLRMargin;
Expand All @@ -389,11 +388,25 @@ protected void initTimeTextBaseInfo() {
// initialize time text width and height
Rect rect = new Rect();
mTimeTextPaint.getTextBounds("00", 0, 2, rect);
mTimeTextWidth = rect.width();
// NOTICE: rect.width() will clip text
mTimeTextWidth = getTextWidth(mTimeTextPaint, "00");
mTimeTextHeight = rect.height();
mTimeTextBottom = rect.bottom;
}

private int getTextWidth(Paint paint, String str) {
int iRet = 0;
if (str != null && str.length() > 0) {
int len = str.length();
float[] widths = new float[len];
paint.getTextWidths(str, widths);
for (int j = 0; j < len; j++) {
iRet += (int) Math.ceil(widths[j]);
}
}
return iRet;
}

private void initTimeTextBaseline(int viewHeight, int viewPaddingTop, int viewPaddingBottom) {
if (viewPaddingTop == viewPaddingBottom) {
// center
Expand Down Expand Up @@ -499,6 +512,7 @@ private float getDayAndHourContentWidth() {

/**
* get all view width
*
* @return all view width
*/
public int getAllContentWidth() {
Expand Down Expand Up @@ -526,7 +540,7 @@ public int getAllContentHeight() {

public void onMeasure(View v, int viewWidth, int viewHeight, int allContentWidth, int allContentHeight) {
initTimeTextBaseline(viewHeight, v.getPaddingTop(), v.getPaddingBottom());
mLeftPaddingSize = v.getPaddingLeft() == v.getPaddingRight() ? (viewWidth - allContentWidth) / 2 : v.getPaddingLeft();
mLeftPaddingSize = v.getPaddingLeft() == v.getPaddingRight() ? (viewWidth - allContentWidth) / 2 : v.getPaddingLeft();
}

public void onDraw(Canvas canvas) {
Expand Down Expand Up @@ -568,7 +582,7 @@ public void onDraw(Canvas canvas) {

if (isShowMinute) {
// draw minute text
canvas.drawText(Utils.formatNum(mMinute), mMinuteLeft + mTimeTextWidth / 2 , mTimeTextBaseline, mTimeTextPaint);
canvas.drawText(Utils.formatNum(mMinute), mMinuteLeft + mTimeTextWidth / 2, mTimeTextBaseline, mTimeTextPaint);
if (mSuffixMinuteTextWidth > 0) {
// draw minute suffix
canvas.drawText(mSuffixMinute, mMinuteLeft + mTimeTextWidth + mSuffixMinuteLeftMargin, mSuffixMinuteTextBaseline, mSuffixTextPaint);
Expand Down Expand Up @@ -602,7 +616,7 @@ public void onDraw(Canvas canvas) {
}
}

public boolean refTimeShow(boolean isShowDay, boolean isShowHour, boolean isShowMinute, boolean isShowSecond, boolean isShowMillisecond) {
public boolean refTimeShow(boolean isShowDay, boolean isShowHour, boolean isShowMinute, boolean isShowSecond, boolean isShowMillisecond) {
if (!isShowSecond) isShowMillisecond = false;

boolean isModCountdownInterval = false;
Expand Down Expand Up @@ -824,17 +838,17 @@ public boolean setSuffix(String suffixDay, String suffixHour, String suffixMinut
public void setSuffixLRMargin(float suffixLRMargin) {
mSuffixLRMargin = Utils.dp2px(mContext, suffixLRMargin);
setSuffixMargin(mSuffixDayLeftMargin, mSuffixDayLeftMargin,
mSuffixDayLeftMargin, mSuffixDayLeftMargin,
mSuffixDayLeftMargin, mSuffixDayLeftMargin,
mSuffixDayLeftMargin, mSuffixDayLeftMargin,
mSuffixDayLeftMargin);
mSuffixDayLeftMargin, mSuffixDayLeftMargin,
mSuffixDayLeftMargin, mSuffixDayLeftMargin,
mSuffixDayLeftMargin, mSuffixDayLeftMargin,
mSuffixDayLeftMargin);
}

public boolean setSuffixMargin(Float suffixDayMarginL, Float suffixDayMarginR,
Float suffixHourMarginL, Float suffixHourMarginR,
Float suffixMinuteMarginL, Float suffixMinuteMarginR,
Float suffixSecondMarginL, Float suffixSecondMarginR,
Float suffixMillisecondMarginL) {
Float suffixHourMarginL, Float suffixHourMarginR,
Float suffixMinuteMarginL, Float suffixMinuteMarginR,
Float suffixSecondMarginL, Float suffixSecondMarginR,
Float suffixMillisecondMarginL) {
boolean isRef = false;

if (null != suffixDayMarginL) {
Expand Down