Skip to content

Commit e8054dc

Browse files
committed
fix: android crash on 7.0
1 parent 79a8767 commit e8054dc

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

src/canvas.android.ts

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -456,20 +456,19 @@ export class StaticLayout {
456456
text = text + '';
457457
}
458458
if (getSDK() >=24) {
459-
this._native = android.text.StaticLayout.Builder.obtain(
459+
let builder = android.text.StaticLayout.Builder.obtain(
460460
text,
461461
0,
462462
typeof text.length === 'function' ? text.length() : text.length,
463463
paint instanceof android.text.TextPaint ? paint : new android.text.TextPaint(paint),
464464
width
465465
)
466-
.setAlignment(align)
467-
.setBreakStrategy(android.text.Layout.BREAK_STRATEGY_SIMPLE)
468-
.setJustificationMode(android.text.Layout.JUSTIFICATION_MODE_NONE)
469-
// .setUseLineSpacingFromFallbacks(true)
470466
.setLineSpacing(spacingadd, spacingmult)
471-
.setIncludePad(includepad)
472-
.build();
467+
.setIncludePad(includepad);
468+
if (getSDK() >=26) {
469+
builder = builder.setJustificationMode(android.text.Layout.JUSTIFICATION_MODE_NONE);
470+
}
471+
this._native = builder.build();
473472
} else {
474473
this._native = new android.text.StaticLayout(text, paint instanceof android.text.TextPaint ? paint : new android.text.TextPaint(paint), width, align, spacingmult, spacingadd, includepad);
475474
}

0 commit comments

Comments
 (0)