zoriya/react-native-svg
1
0
Fork 0
mirror of https://github.com/zoriya/react-native-svg.git synced 2026-06-04 15:44:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor: simplify applyTextPropertiesToPaint

Browse Source
This commit is contained in:
Mikael Sand
2017-07-22 16:00:19 +03:00
parent 0620cb2295
commit d855b9605f
2 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/src/main/java/com/horcrux/svg/GlyphContext.java
+1 -1
View File
@@ -103,9 +103,9 @@ class GlyphContext {
mXsContext.add(mXs);
mYsContext.add(mYs);
mRsContext.add(mRs);
mdXsContext.add(mdXs);
mdYsContext.add(mdYs);
mRsContext.add(mRs);
mXIndices.add(mXIndex);
mYIndices.add(mYIndex);
android/src/main/java/com/horcrux/svg/TSpanShadowNode.java
+22 -19
View File
@@ -162,8 +162,8 @@ class TSpanShadowNode extends TextShadowNode {
boolean autoKerning = true;
float kerning = DEFAULT_KERNING;
if (font.getBoolean(PROP_IS_KERNING_VALUE_SET)) {
autoKerning = false;
kerning = (float) (font.getDouble(PROP_KERNING) * mScale);
autoKerning = false;
}
for (int index = 0; index < length; index++) {
@@ -217,27 +217,25 @@ class TSpanShadowNode extends TextShadowNode {
}
private void applyTextPropertiesToPaint(Paint paint, ReadableMap font) {
paint.setTextAlign(Paint.Align.LEFT);
AssetManager assetManager = getThemedContext().getResources().getAssets();
float fontSize = (float) font.getDouble(PROP_FONT_SIZE) * mScale;
float letterSpacing = font.hasKey(PROP_LETTER_SPACING) ?
(float) font.getDouble(PROP_LETTER_SPACING) * mScale
: DEFAULT_LETTER_SPACING;
paint.setTextSize(fontSize);
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) {
paint.setLetterSpacing(letterSpacing / fontSize);
}
boolean isBold = font.hasKey(PROP_FONT_WEIGHT) &&
BOLD.equals(font.getString(PROP_FONT_WEIGHT));
boolean isItalic = font.hasKey(PROP_FONT_STYLE) &&
ITALIC.equals(font.getString(PROP_FONT_STYLE));
int decoration = getTextDecoration();
paint.setUnderlineText(decoration == TEXT_DECORATION_UNDERLINE);
paint.setStrikeThruText(decoration == TEXT_DECORATION_LINE_THROUGH);
boolean underlineText = decoration == TEXT_DECORATION_UNDERLINE;
boolean isBold = font.hasKey(PROP_FONT_WEIGHT) &&
BOLD.equals(font.getString(PROP_FONT_WEIGHT));
boolean isItalic = font.hasKey(PROP_FONT_STYLE) &&
ITALIC.equals(font.getString(PROP_FONT_STYLE));
boolean strikeThruText = decoration == TEXT_DECORATION_LINE_THROUGH;
int fontStyle;
if (isBold && isItalic) {
@@ -250,26 +248,31 @@ class TSpanShadowNode extends TextShadowNode {
fontStyle = Typeface.NORMAL;
}
AssetManager a = getThemedContext().getResources().getAssets();
Typeface tf = null;
Typeface typeface = null;
try {
String path = FONTS + font.getString(PROP_FONT_FAMILY) + OTF;
tf = Typeface.createFromAsset(a, path);
typeface = Typeface.createFromAsset(assetManager, path);
} catch (Exception ignored) {
try {
String path = FONTS + font.getString(PROP_FONT_FAMILY) + TTF;
tf = Typeface.createFromAsset(a, path);
typeface = Typeface.createFromAsset(assetManager, path);
} catch (Exception ignored2) {
try {
tf = Typeface.create(font.getString(PROP_FONT_FAMILY), fontStyle);
typeface = Typeface.create(font.getString(PROP_FONT_FAMILY), fontStyle);
} catch (Exception ignored3) {
}
}
}
// NB: if the font family is null / unsupported, the default one will be used
paint.setTypeface(tf);
paint.setTypeface(typeface);
paint.setTextSize(fontSize);
paint.setTextAlign(Paint.Align.LEFT);
paint.setUnderlineText(underlineText);
paint.setStrikeThruText(strikeThruText);
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) {
paint.setLetterSpacing(letterSpacing / fontSize);
}
}
private void setupTextPath() {