diff --git a/android/src/main/java/com/horcrux/svg/RenderableShadowNode.java b/android/src/main/java/com/horcrux/svg/RenderableShadowNode.java index a7ba2e96..99242f51 100644 --- a/android/src/main/java/com/horcrux/svg/RenderableShadowNode.java +++ b/android/src/main/java/com/horcrux/svg/RenderableShadowNode.java @@ -204,10 +204,8 @@ abstract public class RenderableShadowNode extends VirtualNode { opacity *= mOpacity; if (opacity > MIN_OPACITY_FOR_DRAW) { - if (mPath == null) { - mPath = getPath(canvas, paint); - mPath.setFillType(mFillRule); - } + mPath = getPath(canvas, paint); + mPath.setFillType(mFillRule); clip(canvas, paint); if (setupFillPaint(paint, opacity * mFillOpacity, null)) { diff --git a/android/src/main/java/com/horcrux/svg/SvgViewShadowNode.java b/android/src/main/java/com/horcrux/svg/SvgViewShadowNode.java index 2b5a7e5b..e9f274a5 100644 --- a/android/src/main/java/com/horcrux/svg/SvgViewShadowNode.java +++ b/android/src/main/java/com/horcrux/svg/SvgViewShadowNode.java @@ -66,7 +66,6 @@ public class SvgViewShadowNode extends LayoutShadowNode { mCanvas = new Canvas(bitmap); drawChildren(mCanvas); - mCanvas = null; return bitmap; } @@ -75,8 +74,6 @@ public class SvgViewShadowNode extends LayoutShadowNode { } private void drawChildren(Canvas canvas) { - canvas.getClipBounds(); - canvas.drawColor(Color.TRANSPARENT, PorterDuff.Mode.CLEAR); Paint paint = new Paint(); for (int i = 0; i < getChildCount(); i++) { diff --git a/android/src/main/java/com/horcrux/svg/TSpanShadowNode.java b/android/src/main/java/com/horcrux/svg/TSpanShadowNode.java index 9a96a675..6a9ddc8e 100644 --- a/android/src/main/java/com/horcrux/svg/TSpanShadowNode.java +++ b/android/src/main/java/com/horcrux/svg/TSpanShadowNode.java @@ -92,7 +92,6 @@ public class TSpanShadowNode extends TextShadowNode { private Path getLinePath(String line, Paint paint, Path path) { float[] widths = new float[line.length()]; paint.getTextWidths(line, widths); - float glyphPosition = 0f; for (int index = 0; index < line.length(); index++) { @@ -133,9 +132,6 @@ public class TSpanShadowNode extends TextShadowNode { return path; } - @TargetApi(Build.VERSION_CODES.JELLY_BEAN) - - private void applyTextPropertiesToPaint(Paint paint) { ReadableMap font = getFontFromContext(); diff --git a/lib/extract/extractText.js b/lib/extract/extractText.js index 90eedcb1..55b0f639 100644 --- a/lib/extract/extractText.js +++ b/lib/extract/extractText.js @@ -105,8 +105,8 @@ export default function(props, container) { } } else if (Children.count(children) > 1) { children = Children.map(children, child => { - if (typeof child === 'string') { - return {child}; + if (typeof child === 'string' || typeof child === 'number') { + return {child.toString()}; } else { return child; }