Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add italic

Browse source
This commit is contained in:
Victor Shcherb 2015-08-30 22:17:12 +02:00
parent 9d80f6b730
commit 46a2a28336
2 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
OsmAnd-java/src/net/osmand/render/RenderingRuleStorageProperties.java
View file

@ -19,6 +19,9 @@ public class RenderingRuleStorageProperties {
public static final String TEST = "test";
public static final String DISABLE = "disable";
public static final String TEXT_ITALIC = "textItalic";
public static final String TEXT_BOLD= "textBold";
public static final String TEXT_LENGTH = "textLength";
public static final String NAME_TAG = "nameTag";
public static final String NAME_TAG2 = "nameTag2";
@ -59,7 +62,6 @@ public class RenderingRuleStorageProperties {
public static final String COLOR_0 = "color_0";
public static final String COLOR__1 = "color__1";
public static final String COLOR__2 = "color__2";
public static final String TEXT_BOLD = "textBold";
public static final String TEXT_ORDER = "textOrder";
public static final String ICON_ORDER = "iconOrder";
public static final String ICON_VISIBLE_SIZE = "iconVisibleSize";
@ -134,6 +136,7 @@ public class RenderingRuleStorageProperties {
public RenderingRuleProperty R_COLOR__1;
public RenderingRuleProperty R_COLOR__2;
public RenderingRuleProperty R_TEXT_BOLD;
public RenderingRuleProperty R_TEXT_ITALIC;
public RenderingRuleProperty R_TEXT_ORDER;
public RenderingRuleProperty R_ICON_ORDER;
public RenderingRuleProperty R_TEXT_MIN_DISTANCE;
@ -231,6 +234,7 @@ public class RenderingRuleStorageProperties {
R_TEXT_COLOR = registerRuleInternal(RenderingRuleProperty.createOutputColorProperty(TEXT_COLOR));
R_TEXT_BOLD = registerRuleInternal(RenderingRuleProperty.createOutputBooleanProperty(TEXT_BOLD));
R_TEXT_ITALIC = registerRuleInternal(RenderingRuleProperty.createOutputBooleanProperty(TEXT_ITALIC));
R_TEXT_ON_PATH = registerRuleInternal(RenderingRuleProperty.createOutputBooleanProperty(TEXT_ON_PATH));
// point

23
OsmAnd/src/net/osmand/plus/render/TextRenderer.java
View file

@ -36,6 +36,10 @@ public class TextRenderer {
private Paint paintText;
private final Context context;
private Paint paintIcon;
private Typeface defaultTypeface;
private Typeface boldItalicTypeface;
private Typeface italicTypeface;
private Typeface boldTypeface;
static class TextDrawInfo {
@ -56,6 +60,7 @@ public class TextRenderer {
int textShadow = 0;
int textWrap = 0;
boolean bold = false;
boolean italic = false;
String shieldRes = null;
String shieldResIcon = null;
int textOrder = 100;
@ -78,6 +83,7 @@ public class TextRenderer {
}
textWrap = (int) rc.getComplexValue(render, render.ALL.R_TEXT_WRAP_WIDTH);
bold = render.getIntPropertyValue(render.ALL.R_TEXT_BOLD, 0) > 0;
italic = render.getIntPropertyValue(render.ALL.R_TEXT_ITALIC, 0) > 0;
minDistance = rc.getComplexValue(render, render.ALL.R_TEXT_MIN_DISTANCE);
if (render.isSpecified(render.ALL.R_TEXT_SHIELD)) {
shieldRes = render.getStringPropertyValue(render.ALL.R_TEXT_SHIELD);
@ -96,11 +102,16 @@ public class TextRenderer {
paintText.setStrokeWidth(1);
paintText.setColor(Color.BLACK);
paintText.setTextAlign(Align.CENTER);
paintText.setTypeface(Typeface.create("Droid Serif", Typeface.NORMAL)); //$NON-NLS-1$
defaultTypeface = Typeface.create("Droid Serif", Typeface.NORMAL);
boldItalicTypeface = Typeface.create("Droid Serif", Typeface.BOLD_ITALIC);
italicTypeface = Typeface.create("Droid Serif", Typeface.ITALIC);
boldTypeface = Typeface.create("Droid Serif", Typeface.BOLD);
paintText.setTypeface(defaultTypeface); //$NON-NLS-1$
paintText.setAntiAlias(true);
paintIcon = new Paint();
paintIcon.setStyle(Style.STROKE);
}
public Paint getPaintText() {
@ -232,7 +243,17 @@ public class TextRenderer {
// sest text size before finding intersection (it is used there)
float textSize = text.textSize * rc.textScale ;
paintText.setTextSize(textSize);
if(text.bold && text.italic) {
paintText.setTypeface(boldItalicTypeface);
} else if(text.bold) {
paintText.setTypeface(boldTypeface);
} else if(text.italic) {
paintText.setTypeface(italicTypeface);
} else {
paintText.setTypeface(defaultTypeface);
}
paintText.setFakeBoldText(text.bold);
paintText.setColor(text.textColor);
// align center y
text.centerY += (-paintText.ascent());