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

Refactor FontData font-weight handling

Browse Source
This commit is contained in:
Mikael Sand
2019-07-20 00:55:14 +03:00
parent 0a94b1ee89
commit 08295b17ba
2 changed files with 13 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/src/main/java/com/horcrux/svg/FontData.java
+10 -33
View File
@@ -3,8 +3,6 @@ package com.horcrux.svg;
import com.facebook.react.bridge.ReadableMap; import com.facebook.react.bridge.ReadableMap;
import com.facebook.react.bridge.ReadableType; import com.facebook.react.bridge.ReadableType;
import java.util.EnumMap;
import static com.facebook.react.uimanager.ViewProps.FONT_FAMILY; import static com.facebook.react.uimanager.ViewProps.FONT_FAMILY;
import static com.facebook.react.uimanager.ViewProps.FONT_SIZE; import static com.facebook.react.uimanager.ViewProps.FONT_SIZE;
import static com.facebook.react.uimanager.ViewProps.FONT_STYLE; import static com.facebook.react.uimanager.ViewProps.FONT_STYLE;
@@ -33,39 +31,18 @@ class AbsoluteFontWeight {
return WEIGHTS[Math.round(absoluteFontWeight / 100f)]; return WEIGHTS[Math.round(absoluteFontWeight / 100f)];
} }
private static final EnumMap<FontWeight, Integer> fontWeightToInt; private static final int[] absoluteFontWeights = new int[]{
static { 400, 700, 100, 200, 300, 400, 500, 600, 700, 800, 900
fontWeightToInt = new EnumMap<>(FontWeight.class); };
fontWeightToInt.put(FontWeight.Normal, 400);
fontWeightToInt.put(FontWeight.Bold, 700);
fontWeightToInt.put(FontWeight.w100, 100);
fontWeightToInt.put(FontWeight.w200, 200);
fontWeightToInt.put(FontWeight.w300, 300);
fontWeightToInt.put(FontWeight.w400, 400);
fontWeightToInt.put(FontWeight.w500, 500);
fontWeightToInt.put(FontWeight.w600, 600);
fontWeightToInt.put(FontWeight.w700, 700);
fontWeightToInt.put(FontWeight.w800, 800);
fontWeightToInt.put(FontWeight.w900, 900);
}
static int from(FontWeight fontWeight) {
Integer w = fontWeightToInt.get(fontWeight);
if (w != null) {
return w;
} else {
throw new IllegalArgumentException();
}
}
// https://drafts.csswg.org/css-fonts-4/#relative-weights // https://drafts.csswg.org/css-fonts-4/#relative-weights
static int from(FontWeight fontWeight, int inherited) { static int from(FontWeight fontWeight, FontData parent) {
if (fontWeight == FontWeight.Bolder) { if (fontWeight == FontWeight.Bolder) {
return bolder(inherited); return bolder(parent.absoluteFontWeight);
} else if (fontWeight == FontWeight.Lighter) { } else if (fontWeight == FontWeight.Lighter) {
return lighter(inherited); return lighter(parent.absoluteFontWeight);
} else { } else {
return from(fontWeight); return absoluteFontWeights[fontWeight.ordinal()];
} }
} }
@@ -164,8 +141,8 @@ class FontData {
} }
private void setInheritedWeight(FontData parent) { private void setInheritedWeight(FontData parent) {
fontWeight = parent.fontWeight;
absoluteFontWeight = parent.absoluteFontWeight; absoluteFontWeight = parent.absoluteFontWeight;
fontWeight = parent.fontWeight;
} }
private void handleNumericWeight(FontData parent, double number) { private void handleNumericWeight(FontData parent, double number) {
@@ -205,8 +182,8 @@ class FontData {
} else { } else {
String string = font.getString(FONT_WEIGHT); String string = font.getString(FONT_WEIGHT);
if (FontWeight.hasEnum(string)) { if (FontWeight.hasEnum(string)) {
fontWeight = FontWeight.get(string); absoluteFontWeight = AbsoluteFontWeight.from(FontWeight.get(string), parent);
absoluteFontWeight = AbsoluteFontWeight.from(fontWeight, parent.absoluteFontWeight); fontWeight = AbsoluteFontWeight.nearestFontWeight(absoluteFontWeight);
} else if (string != null) { } else if (string != null) {
handleNumericWeight(parent, Double.parseDouble(string)); handleNumericWeight(parent, Double.parseDouble(string));
} else { } else {
ios/Text/RNSVGFontData.m
+3 -3
View File
@@ -53,8 +53,8 @@ RNSVGFontData *RNSVGFontData_Defaults;
} }
- (void)setInheritedWeight:(RNSVGFontData*) parent { - (void)setInheritedWeight:(RNSVGFontData*) parent {
fontWeight = parent->fontWeight;
absoluteFontWeight = parent->absoluteFontWeight; absoluteFontWeight = parent->absoluteFontWeight;
fontWeight = parent->fontWeight;
} }
RNSVGFontWeight nearestFontWeight(int absoluteFontWeight) { RNSVGFontWeight nearestFontWeight(int absoluteFontWeight) {
@@ -124,7 +124,7 @@ int lighter(int inherited) {
else { else {
data->fontSize = parentFontSize; data->fontSize = parentFontSize;
} }
if ([font objectForKey:FONT_WEIGHT]) { if ([font objectForKey:FONT_WEIGHT]) {
id fontWeight = [font objectForKey:FONT_WEIGHT]; id fontWeight = [font objectForKey:FONT_WEIGHT];
if ([fontWeight isKindOfClass:NSNumber.class]) { if ([fontWeight isKindOfClass:NSNumber.class]) {
@@ -144,7 +144,7 @@ int lighter(int inherited) {
} else { } else {
[data setInheritedWeight:parent]; [data setInheritedWeight:parent];
} }
data->fontData = [font objectForKey:FONT_DATA] ? [font objectForKey:FONT_DATA] : parent->fontData; data->fontData = [font objectForKey:FONT_DATA] ? [font objectForKey:FONT_DATA] : parent->fontData;
data->fontFamily = [font objectForKey:FONT_FAMILY] ? [font objectForKey:FONT_FAMILY] : parent->fontFamily; data->fontFamily = [font objectForKey:FONT_FAMILY] ? [font objectForKey:FONT_FAMILY] : parent->fontFamily;
NSString* style = [font objectForKey:FONT_STYLE]; NSString* style = [font objectForKey:FONT_STYLE];