From c370f228c382c669bb76487c5168226a04b3e6ab Mon Sep 17 00:00:00 2001 From: Mikael Sand Date: Sun, 6 Jan 2019 17:56:03 +0200 Subject: [PATCH] (android) Fix numeric font size handling. --- .../main/java/com/horcrux/svg/FontData.java | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/android/src/main/java/com/horcrux/svg/FontData.java b/android/src/main/java/com/horcrux/svg/FontData.java index 088c7b38..81869ee6 100644 --- a/android/src/main/java/com/horcrux/svg/FontData.java +++ b/android/src/main/java/com/horcrux/svg/FontData.java @@ -1,6 +1,7 @@ package com.horcrux.svg; import com.facebook.react.bridge.ReadableMap; +import com.facebook.react.bridge.ReadableType; import static com.facebook.react.uimanager.ViewProps.FONT_FAMILY; import static com.facebook.react.uimanager.ViewProps.FONT_SIZE; @@ -75,14 +76,19 @@ class FontData { double parentFontSize = parent.fontSize; if (font.hasKey(FONT_SIZE)) { - String string = font.getString(FONT_SIZE); - fontSize = PropHelper.fromRelative( - string, - parentFontSize, - 0, - 1, - parentFontSize - ); + ReadableType fontSizeType = font.getType(FONT_SIZE); + if (fontSizeType == ReadableType.Number) { + fontSize = font.getDouble(FONT_SIZE); + } else { + String string = font.getString(FONT_SIZE); + fontSize = PropHelper.fromRelative( + string, + parentFontSize, + 0, + 1, + parentFontSize + ); + } } else { fontSize = parentFontSize; }