fix(android): faster StaticLayout

Author: farfromrefug

Diff for: plugin/platforms/android/java/com/akylas/canvas/StaticLayout.java

@@ -0,0 +1,33 @@
+package com.akylas.canvas;
+
+import android.os.Build;
+import android.graphics.Typeface;
+import android.graphics.Paint;
+import android.text.TextPaint;
+import android.text.Layout;
+import java.lang.CharSequence;
+
+public class StaticLayout {
+
+    public static android.text.StaticLayout createStaticLayout(CharSequence source, TextPaint paint, int width,
+            Layout.Alignment align, float spacingmult, float spacingadd, boolean includepad) {
+
+        if (Build.VERSION.SDK_INT >= 24) {
+            android.text.StaticLayout.Builder builder = android.text.StaticLayout.Builder
+                    .obtain(source, 0, source.length(), paint, width)
+                    .setBreakStrategy(android.text.Layout.BREAK_STRATEGY_SIMPLE).setAlignment(align)
+                    .setLineSpacing(spacingadd, spacingmult).setIncludePad(includepad);
+            if (Build.VERSION.SDK_INT >= 26) {
+                builder = builder.setJustificationMode(android.text.Layout.JUSTIFICATION_MODE_NONE);
+            }
+            return builder.build();
+        } else {
+            return new android.text.StaticLayout(source, paint, width, align, spacingmult, spacingadd, includepad);
+        }
+    }
+
+    public static android.text.StaticLayout createStaticLayout(CharSequence source, Paint paint, int width,
+            Layout.Alignment align, float spacingmult, float spacingadd, boolean includepad) {
+        return createStaticLayout(source, new TextPaint(paint), width, align, spacingmult, spacingadd, includepad);
+    }
+}

Diff for: src/canvas.android.ts

@@ -476,29 +476,14 @@ export class StaticLayout {
         return this._native;
     }
     constructor(text: any, paint: android.graphics.Paint, width: number, align = LayoutAlignment.ALIGN_NORMAL, spacingmult = 1, spacingadd = 0, includepad = true) {
-        paint = paint['_native'] ? (paint as any).getNative() : paint;
-        if (!(text instanceof java.lang.CharSequence) && !(typeof text === 'string')) {
+        paint = (paint as any).getNative ? (paint as any).getNative() : paint;
+
+        if (typeof text === 'boolean' || typeof text === 'number') {
+            // in case it is a number or a boolean
             text = text + '';
         }
-        if (getSDK() >=24) {
-            let builder = android.text.StaticLayout.Builder.obtain(
-                text,
-                0,
-                typeof text.length === 'function' ? text.length() : text.length,
-                paint instanceof android.text.TextPaint ? paint : new android.text.TextPaint(paint),
-                width
-            )
-                .setBreakStrategy(android.text.Layout.BREAK_STRATEGY_SIMPLE)
-                .setAlignment(align)
-                .setLineSpacing(spacingadd, spacingmult)
-                .setIncludePad(includepad);
-            if (getSDK() >=26) {
-                builder = builder.setJustificationMode(android.text.Layout.JUSTIFICATION_MODE_NONE);
-            }
-            this._native = builder.build();
-        } else {
-            this._native = new android.text.StaticLayout(text, paint instanceof android.text.TextPaint ? paint : new android.text.TextPaint(paint), width, align, spacingmult, spacingadd, includepad);
-        }
+        this._native = com.akylas.canvas.StaticLayout.createStaticLayout(text, paint, width, align, spacingmult, spacingadd, includepad);
+
         return new Proxy(this, this);
     }
     get(target, name, receiver) {