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

Fix very long lines.

Browse Source
This commit is contained in:
Mikael Sand
2017-07-22 06:04:32 +03:00
parent 4e99f2e9e1
commit 2f80931f4d
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/src/main/java/com/horcrux/svg/TSpanShadowNode.java
+12 -6
View File
@@ -123,7 +123,9 @@ class TSpanShadowNode extends TextShadowNode {
if (textPath != null) { if (textPath != null) {
pm = new PathMeasure(textPath.getPath(), false); pm = new PathMeasure(textPath.getPath(), false);
distance = pm.getLength(); distance = pm.getLength();
offset = PropHelper.fromRelativeToFloat(textPath.getStartOffset(), distance, 0, mScale, getFontSizeFromContext()); double size = getFontSizeFromContext();
String startOffset = textPath.getStartOffset();
offset = PropHelper.fromRelativeToFloat(startOffset, distance, 0, mScale, size);
// String spacing = textPath.getSpacing(); // spacing = "auto | exact" // String spacing = textPath.getSpacing(); // spacing = "auto | exact"
String method = textPath.getMethod(); // method = "align | stretch" String method = textPath.getMethod(); // method = "align | stretch"
if ("stretch".equals(method)) { if ("stretch".equals(method)) {
@@ -207,7 +209,7 @@ class TSpanShadowNode extends TextShadowNode {
paint.setTextSize(fontSize); paint.setTextSize(fontSize);
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) { if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) {
paint.setLetterSpacing(letterSpacing / fontSize); // setLetterSpacing is only available from LOLLIPOP and on paint.setLetterSpacing(letterSpacing / fontSize);
} }
int decoration = getTextDecoration(); int decoration = getTextDecoration();
@@ -215,8 +217,10 @@ class TSpanShadowNode extends TextShadowNode {
paint.setUnderlineText(decoration == TEXT_DECORATION_UNDERLINE); paint.setUnderlineText(decoration == TEXT_DECORATION_UNDERLINE);
paint.setStrikeThruText(decoration == TEXT_DECORATION_LINE_THROUGH); paint.setStrikeThruText(decoration == TEXT_DECORATION_LINE_THROUGH);
boolean isBold = font.hasKey(PROP_FONT_WEIGHT) && "bold".equals(font.getString(PROP_FONT_WEIGHT)); boolean isBold = font.hasKey(PROP_FONT_WEIGHT) &&
boolean isItalic = font.hasKey(PROP_FONT_STYLE) && "italic".equals(font.getString(PROP_FONT_STYLE)); "bold".equals(font.getString(PROP_FONT_WEIGHT));
boolean isItalic = font.hasKey(PROP_FONT_STYLE) &&
"italic".equals(font.getString(PROP_FONT_STYLE));
int fontStyle; int fontStyle;
if (isBold && isItalic) { if (isBold && isItalic) {
@@ -233,10 +237,12 @@ class TSpanShadowNode extends TextShadowNode {
Typeface tf = null; Typeface tf = null;
try { try {
tf = Typeface.createFromAsset(a, "fonts/" + font.getString(PROP_FONT_FAMILY) + ".otf"); String path = "fonts/" + font.getString(PROP_FONT_FAMILY) + ".otf";
tf = Typeface.createFromAsset(a, path);
} catch (Exception ignored) { } catch (Exception ignored) {
try { try {
tf = Typeface.createFromAsset(a, "fonts/" + font.getString(PROP_FONT_FAMILY) + ".ttf"); String path = "fonts/" + font.getString(PROP_FONT_FAMILY) + ".ttf";
tf = Typeface.createFromAsset(a, path);
} catch (Exception ignored2) { } catch (Exception ignored2) {
try { try {
tf = Typeface.create(font.getString(PROP_FONT_FAMILY), fontStyle); tf = Typeface.create(font.getString(PROP_FONT_FAMILY), fontStyle);