Skip to content

Add support for text multiline #105

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

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

Add support for text multiline #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
03c30d6
add of multi-line text support
newarifrh Jun 6, 2020
4600c5b
fix height text for multiline
Jun 6, 2020
1d1bfd0
fix position center for text multiline
Jun 6, 2020
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
26 changes: 24 additions & 2 deletions CircleProgressView/src/main/java/at/grabner/circleprogress/CircleProgressView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1790,8 +1790,30 @@ private void drawTextWithUnit(Canvas canvas) {
canvas.drawRect(mActualTextBounds, rectPaint);

}

canvas.drawText(text, mActualTextBounds.left - (mTextPaint.getTextSize() * 0.02f), mActualTextBounds.bottom, mTextPaint);

if(text.contains("\n")){
String[] texts = text.split("\n");
float height = mActualTextBounds.bottom;
for (String txt : texts){
mTextPaint.setTextSize(mTextSize);
mActualTextBounds = calcTextBounds(txt, mTextPaint, mCircleBounds); //center text in circle
canvas.drawText(
txt,
mActualTextBounds.left - mTextPaint.getTextSize() * 0.02f,
height-40,
mTextPaint
);

height += mTextPaint.getTextSize();
}
} else {
canvas.drawText(
text,
mActualTextBounds.left - mTextPaint.getTextSize() * 0.02f,
mActualTextBounds.bottom,
mTextPaint
);
}

if (mShowUnit) {

Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Tue Sep 13 15:53:10 CEST 2016
#Sat Jun 06 17:10:50 ICT 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip