From ea17841eb5d1806eb1476ecd15566a3a0928fccc Mon Sep 17 00:00:00 2001 From: Mikael Sand Date: Sat, 22 Jul 2017 17:19:09 +0300 Subject: [PATCH] Simplify manual kerning logic. --- android/src/main/java/com/horcrux/svg/GlyphContext.java | 3 --- android/src/main/java/com/horcrux/svg/TSpanShadowNode.java | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/android/src/main/java/com/horcrux/svg/GlyphContext.java b/android/src/main/java/com/horcrux/svg/GlyphContext.java index a7e6e73d..b952f81d 100644 --- a/android/src/main/java/com/horcrux/svg/GlyphContext.java +++ b/android/src/main/java/com/horcrux/svg/GlyphContext.java @@ -27,7 +27,6 @@ class GlyphContext { private static final String FONT_WEIGHT = "fontWeight"; private static final String FONT_FAMILY = "fontFamily"; private static final String LETTER_SPACING = "letterSpacing"; - private static final String IS_KERNING_VALUE_SET = "isKerningValueSet"; // Unique input attribute lists (only added if node sets a value) private final ArrayList mXsContext = new ArrayList<>(); @@ -355,7 +354,6 @@ class GlyphContext { ReadableMap getFont() { WritableMap map = Arguments.createMap(); - map.putBoolean(IS_KERNING_VALUE_SET, false); map.putDouble(FONT_SIZE, fontSize); boolean letterSpacingSet = false; @@ -395,7 +393,6 @@ class GlyphContext { if (!kerningSet && font.hasKey(KERNING)) { String kerningString = font.getString(KERNING); float kerning = Float.valueOf(kerningString); - map.putBoolean(IS_KERNING_VALUE_SET, true); map.putDouble(KERNING, kerning); kerningSet = true; } diff --git a/android/src/main/java/com/horcrux/svg/TSpanShadowNode.java b/android/src/main/java/com/horcrux/svg/TSpanShadowNode.java index d4e4aa44..db1cc261 100644 --- a/android/src/main/java/com/horcrux/svg/TSpanShadowNode.java +++ b/android/src/main/java/com/horcrux/svg/TSpanShadowNode.java @@ -49,7 +49,6 @@ class TSpanShadowNode extends TextShadowNode { private static final String PROP_FONT_WEIGHT = "fontWeight"; private static final String PROP_FONT_FAMILY = "fontFamily"; private static final String PROP_LETTER_SPACING = "letterSpacing"; - private static final String PROP_IS_KERNING_VALUE_SET = "isKerningValueSet"; private Path mCache; private @Nullable String mContent; @@ -161,7 +160,7 @@ class TSpanShadowNode extends TextShadowNode { boolean autoKerning = true; float kerning = DEFAULT_KERNING; - if (font.getBoolean(PROP_IS_KERNING_VALUE_SET)) { + if (font.hasKey(PROP_KERNING)) { kerning = (float) (font.getDouble(PROP_KERNING) * mScale); autoKerning = false; }