Skip to content

perf(android): reduce java object creation #10129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NathanWalker merged 4 commits into from
Feb 21, 2023
Merged

perf(android): reduce java object creation #10129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e2b330c
perf(android): reduce java object creation for borders & background i…
triniwiz Dec 14, 2022
04e7ecd
Merge branch 'main' into perf/android
NathanWalker Dec 21, 2022
11544f8
Merge branch 'main' into perf/android
NathanWalker Feb 16, 2023
ae6ff0e
chore: merge
NathanWalker Feb 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified packages/core/platforms/android/widgets-release.aar
View file
Open in desktop
Binary file not shown.
140 changes: 105 additions & 35 deletions ...ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/BorderDrawable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import android.graphics.Shader;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.os.Build;

import androidx.annotation.NonNull;

Expand Down Expand Up @@ -276,6 +277,44 @@ public void refresh(int borderTopColor,
}
}


RectF backgroundBoundsF = new RectF();
Path backgroundPath = new Path();
RectF backgroundRect = new RectF();
Paint backgroundColorPaint = new Paint();
Path backgroundNoRepeatPath = new Path();
Paint backgroundImagePaint = new Paint();
Paint backgroundGradientPaint = new Paint();
Paint borderPaint = new Paint();
Path borderPath = new Path();
RectF borderOuterRect = new RectF();
RectF borderInnerRect = new RectF();

PointF lto = new PointF(); // left-top-outside
PointF lti = new PointF(); // left-top-inside

PointF rto = new PointF(); // right-top-outside
PointF rti = new PointF(); // right-top-outside

PointF rbo = new PointF(); // right-bottom-outside
PointF rbi = new PointF(); // right-bottom-inside

PointF lbo = new PointF(); // left-bottom-outside
PointF lbi = new PointF(); // left-bottom-inside


Paint topBorderPaint = new Paint();
Path topBorderPath = new Path();

Paint rightBorderPaint = new Paint();
Path rightBorderPath = new Path();

Paint bottomBorderPaint = new Paint();
Path bottomBorderPath = new Path();

Paint leftBorderPaint = new Paint();
Path leftBorderPath = new Path();

@Override
public void draw(Canvas canvas) {
Rect bounds = this.getBounds();
Expand All @@ -287,7 +326,7 @@ public void draw(Canvas canvas) {
return;
}

RectF backgroundBoundsF = new RectF(bounds.left, bounds.top, bounds.right, bounds.bottom);
backgroundBoundsF.set(bounds.left, bounds.top, bounds.right, bounds.bottom);

float topBackoffAntialias = calculateBackoffAntialias(this.borderTopColor, this.borderTopWidth);
float rightBackoffAntialias = calculateBackoffAntialias(this.borderRightColor, this.borderRightWidth);
Expand All @@ -301,18 +340,18 @@ public void draw(Canvas canvas) {
Math.max(0, borderBottomLeftRadius + leftBackoffAntialias), Math.max(0, borderBottomLeftRadius + bottomBackoffAntialias)
};

Path backgroundPath = new Path();
RectF backgroundRect = new RectF(
leftBackoffAntialias,
backgroundPath.reset();

backgroundRect.set(leftBackoffAntialias,
topBackoffAntialias,
width - rightBackoffAntialias,
height - bottomBackoffAntialias
);
height - bottomBackoffAntialias);

backgroundPath.addRoundRect(backgroundRect, backgroundRadii, Path.Direction.CW);

// draw background
if (this.backgroundColor != 0) {
Paint backgroundColorPaint = new Paint();
backgroundColorPaint.reset();
backgroundColorPaint.setStyle(Paint.Style.FILL);
backgroundColorPaint.setColor(this.backgroundColor);
backgroundColorPaint.setAntiAlias(true);
Expand All @@ -337,7 +376,9 @@ public void draw(Canvas canvas) {
}
transform.postTranslate(params.posX, params.posY);

Paint backgroundImagePaint = new Paint();

backgroundImagePaint.reset();

BitmapShader shader = new BitmapShader(
this.backgroundBitmap,
params.repeatX ? Shader.TileMode.REPEAT : Shader.TileMode.CLAMP,
Expand All @@ -358,7 +399,7 @@ public void draw(Canvas canvas) {
} else {
boolean supportsPathOp = android.os.Build.VERSION.SDK_INT >= 19;
if (supportsPathOp) {
Path backgroundNoRepeatPath = new Path();
backgroundNoRepeatPath.reset();
backgroundNoRepeatPath.addRect(params.posX, params.posY, params.posX + imageWidth, params.posY + imageHeight, Path.Direction.CCW);
intersect(backgroundNoRepeatPath, backgroundPath);
canvas.drawPath(backgroundNoRepeatPath, backgroundImagePaint);
Expand All @@ -374,7 +415,9 @@ public void draw(Canvas canvas) {

if (this.backgroundGradient != null) {
LinearGradientDefinition def = this.backgroundGradient;
Paint backgroundGradientPaint = new Paint();

backgroundGradientPaint.reset();

LinearGradient shader = new LinearGradient(
def.getStartX() * width, def.getStartY() * height,
def.getEndX() * width, def.getEndY() * height,
Expand All @@ -394,7 +437,7 @@ public void draw(Canvas canvas) {
if (this.clipPath != null && !this.clipPath.isEmpty()) {
float borderWidth = this.getUniformBorderWidth();
if (borderWidth > 0) {
Paint borderPaint = new Paint();
borderPaint.reset();
borderPaint.setColor(this.getUniformBorderColor());
borderPaint.setStyle(Paint.Style.STROKE);
borderPaint.setStrokeWidth(borderWidth);
Expand All @@ -405,13 +448,15 @@ public void draw(Canvas canvas) {
} else if (this.hasUniformBorderColor()) {
// iOS and browsers use black when no color is specified.
if (borderLeftWidth > 0 || borderTopWidth > 0 || borderRightWidth > 0 || borderBottomWidth > 0) {
Paint borderPaint = new Paint();
borderPaint.reset();
borderPaint.setColor(this.getUniformBorderColor());
borderPaint.setStyle(Paint.Style.FILL);
borderPaint.setAntiAlias(true);
Path borderPath = new Path();

RectF borderOuterRect = new RectF(0, 0, width, height);
borderPath.reset();

borderOuterRect.set(0, 0, width, height);

float[] borderOuterRadii = {
borderTopLeftRadius, borderTopLeftRadius,
borderTopRightRadius, borderTopRightRadius,
Expand All @@ -420,7 +465,7 @@ public void draw(Canvas canvas) {
};
borderPath.addRoundRect(borderOuterRect, borderOuterRadii, Path.Direction.CW);

RectF borderInnerRect = new RectF(
borderInnerRect.set(
borderLeftWidth,
borderTopWidth,
width - borderRightWidth,
Expand Down Expand Up @@ -453,23 +498,25 @@ public void draw(Canvas canvas) {
// +---------------------+
//lbo rbo

PointF lto = new PointF(0, 0); // left-top-outside
PointF lti = new PointF(left, top); // left-top-inside
lto.set(0, 0); // left-top-outside
lti.set(left, top); // left-top-inside

rto.set(bounds.right, 0); // right-top-outside
rti.set(bounds.right - right, top); // right-top-outside

PointF rto = new PointF(bounds.right, 0); // right-top-outside
PointF rti = new PointF(bounds.right - right, top); // right-top-outside
rbo.set(bounds.right, bounds.bottom); // right-bottom-outside
rbi.set(bounds.right - right, bounds.bottom - bottom); // right-bottom-inside

PointF rbo = new PointF(bounds.right, bounds.bottom); // right-bottom-outside
PointF rbi = new PointF(bounds.right - right, bounds.bottom - bottom); // right-bottom-inside
lbo.set(0, bounds.bottom); // left-bottom-outside
lbi.set(left, bounds.bottom - bottom); // left-bottom-inside

PointF lbo = new PointF(0, bounds.bottom); // left-bottom-outside
PointF lbi = new PointF(left, bounds.bottom - bottom); // left-bottom-inside

if (this.borderTopWidth > 0) {
Paint topBorderPaint = new Paint();
topBorderPaint.reset();
topBorderPaint.setColor(this.borderTopColor);
topBorderPaint.setAntiAlias(true);
Path topBorderPath = new Path();

topBorderPath.reset();
topBorderPath.setFillType(Path.FillType.EVEN_ODD);
topBorderPath.moveTo(lto.x, lto.y);
topBorderPath.lineTo(rto.x, rto.y);
Expand All @@ -480,10 +527,12 @@ public void draw(Canvas canvas) {
}

if (this.borderRightWidth > 0) {
Paint rightBorderPaint = new Paint();

rightBorderPaint.reset();
rightBorderPaint.setColor(this.borderRightColor);
rightBorderPaint.setAntiAlias(true);
Path rightBorderPath = new Path();

rightBorderPath.reset();
rightBorderPath.setFillType(Path.FillType.EVEN_ODD);
rightBorderPath.moveTo(rto.x, rto.y);
rightBorderPath.lineTo(rbo.x, rbo.y);
Expand All @@ -494,10 +543,12 @@ public void draw(Canvas canvas) {
}

if (this.borderBottomWidth > 0) {
Paint bottomBorderPaint = new Paint();

bottomBorderPaint.reset();
bottomBorderPaint.setColor(this.borderBottomColor);
bottomBorderPaint.setAntiAlias(true);
Path bottomBorderPath = new Path();

bottomBorderPath.reset();
bottomBorderPath.setFillType(Path.FillType.EVEN_ODD);
bottomBorderPath.moveTo(rbo.x, rbo.y);
bottomBorderPath.lineTo(lbo.x, lbo.y);
Expand All @@ -508,10 +559,11 @@ public void draw(Canvas canvas) {
}

if (this.borderLeftWidth > 0) {
Paint leftBorderPaint = new Paint();
leftBorderPaint.reset();
leftBorderPaint.setColor(this.borderLeftColor);
leftBorderPaint.setAntiAlias(true);
Path leftBorderPath = new Path();

leftBorderPath.reset();
leftBorderPath.setFillType(Path.FillType.EVEN_ODD);
leftBorderPath.moveTo(lbo.x, lbo.y);
leftBorderPath.lineTo(lto.x, lto.y);
Expand Down Expand Up @@ -606,7 +658,12 @@ private static void drawClipPath(String clipPath, Canvas canvas, Paint paint, Re
top = cY - rY;
right = (rX * 2) + left;
bottom = (rY * 2) + top;
canvas.drawOval(new RectF(left, top, right, bottom), paint);

if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
canvas.drawOval(left, top, right, bottom, paint);
} else {
canvas.drawOval(new RectF(left, top, right, bottom), paint);
}
break;
case "polygon":
Path path = new Path();
Expand Down Expand Up @@ -832,18 +889,31 @@ public Drawable getDrawable() {
return drawable;
}


private final Path outlineBackgroundPath = new Path();
private final RectF outlineRectF = new RectF();

@Override
public void getOutline(@NonNull Outline outline) {
if (android.os.Build.VERSION.SDK_INT >= 21) {
Path backgroundPath = new Path();
outlineBackgroundPath.reset();
float[] backgroundRadii = {
Math.max(0, borderTopLeftRadius), Math.max(0, borderTopLeftRadius),
Math.max(0, borderTopRightRadius), Math.max(0, borderTopRightRadius),
Math.max(0, borderBottomRightRadius), Math.max(0, borderBottomRightRadius),
Math.max(0, borderBottomLeftRadius), Math.max(0, borderBottomLeftRadius)
};
backgroundPath.addRoundRect(new RectF(getBounds()), backgroundRadii, Path.Direction.CW);
outline.setConvexPath(backgroundPath);
outlineRectF.setEmpty();
outlineRectF.set(getBounds());
backgroundPath.addRoundRect(outlineRectF, backgroundRadii, Path.Direction.CW);

if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
// see setConvexPath notes
outline.setPath(backgroundPath);
} else {
outline.setConvexPath(backgroundPath);
}

} else {
throw new IllegalStateException("Method supported on API 21 or higher");
}
Expand Down
Loading