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

(android) Fix numeric font size handling.

Browse Source
This commit is contained in:
Mikael Sand
2019-01-06 17:56:03 +02:00
parent 63991dbb4f
commit c370f228c3
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/src/main/java/com/horcrux/svg/FontData.java
+14 -8
View File
@@ -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;
}