Skip to content

[android] improve performance of StrokeExtensions #24267

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
PureWeen merged 1 commit into from
Aug 16, 2024
Merged

[android] improve performance of StrokeExtensions #24267

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
65 changes: 34 additions & 31 deletions src/Core/src/Platform/Android/StrokeExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,21 @@ public static class StrokeExtensions
public static void UpdateBorderStroke(this AView platformView, IBorderStroke border)
{
// Always set the drawable first
platformView.UpdateMauiDrawable(border);
MauiDrawable? mauiDrawable = null;
platformView.UpdateMauiDrawable(border, ref mauiDrawable);

var borderShape = border.Shape;
MauiDrawable? mauiDrawable = platformView.Background as MauiDrawable;

if (mauiDrawable == null && borderShape == null)
if (mauiDrawable is null)
return;
if (border.Shape is null)
return;

mauiDrawable?.SetBorderBrush(border.Stroke);
mauiDrawable?.SetBorderWidth(border.StrokeThickness);
platformView.UpdateStrokeDashPattern(border);
platformView.UpdateStrokeDashOffset(border);
mauiDrawable?.SetBorderMiterLimit(border.StrokeMiterLimit);
mauiDrawable?.SetBorderLineCap(border.StrokeLineCap);
mauiDrawable?.SetBorderLineJoin(border.StrokeLineJoin);

mauiDrawable.SetBorderBrush(border.Stroke);
mauiDrawable.SetBorderWidth(border.StrokeThickness);
platformView.UpdateStrokeDashPattern(border, mauiDrawable);
platformView.UpdateStrokeDashOffset(border, mauiDrawable);
mauiDrawable.SetBorderMiterLimit(border.StrokeMiterLimit);
mauiDrawable.SetBorderLineCap(border.StrokeLineCap);
mauiDrawable.SetBorderLineJoin(border.StrokeLineJoin);
}

public static void UpdateStrokeShape(this AView platformView, IBorderStroke border)
Expand All @@ -34,7 +33,7 @@ public static void UpdateStrokeShape(this AView platformView, IBorderStroke bord
if (mauiDrawable == null && borderShape == null)
return;

platformView.UpdateMauiDrawable(border);
platformView.UpdateMauiDrawable(border, ref mauiDrawable);
}

public static void UpdateStroke(this AView platformView, IBorderStroke border)
Expand All @@ -45,7 +44,7 @@ public static void UpdateStroke(this AView platformView, IBorderStroke border)
if (mauiDrawable == null && stroke.IsNullOrEmpty())
return;

platformView.UpdateMauiDrawable(border);
platformView.UpdateMauiDrawable(border, ref mauiDrawable);
mauiDrawable?.SetBorderBrush(border.Stroke);
}

Expand All @@ -60,29 +59,34 @@ public static void UpdateStrokeThickness(this AView platformView, IBorderStroke
mauiDrawable?.SetBorderWidth(border.StrokeThickness);
}

public static void UpdateStrokeDashPattern(this AView platformView, IBorderStroke border)
public static void UpdateStrokeDashPattern(this AView platformView, IBorderStroke border) =>
UpdateStrokeDashPattern(platformView, border, platformView.Background as MauiDrawable);

internal static void UpdateStrokeDashPattern(this AView platformView, IBorderStroke border, MauiDrawable? mauiDrawable)
{
var strokeDashPattern = border.StrokeDashPattern;
MauiDrawable? mauiDrawable = platformView.Background as MauiDrawable;
if (mauiDrawable is null)
return;

var strokeDashPattern = border.StrokeDashPattern;
bool hasBorder = border.Shape != null && border.Stroke != null;

if (mauiDrawable == null && !hasBorder && (strokeDashPattern == null || strokeDashPattern.Length == 0))
if (!hasBorder && (strokeDashPattern == null || strokeDashPattern.Length == 0))
return;

mauiDrawable?.SetBorderDash(border.StrokeDashPattern, border.StrokeDashOffset);
mauiDrawable.SetBorderDash(strokeDashPattern, border.StrokeDashOffset);
}

public static void UpdateStrokeDashOffset(this AView platformView, IBorderStroke border)
{
MauiDrawable? mauiDrawable = platformView.Background as MauiDrawable;
public static void UpdateStrokeDashOffset(this AView platformView, IBorderStroke border) =>
UpdateStrokeDashOffset(platformView, border, platformView.Background as MauiDrawable);

internal static void UpdateStrokeDashOffset(this AView platformView, IBorderStroke border, MauiDrawable? mauiDrawable)
{
if (mauiDrawable is null)
return;
bool hasBorder = border.Shape != null && border.Stroke != null;

if (mauiDrawable == null && !hasBorder)
if (!hasBorder)
return;

mauiDrawable?.SetBorderDash(border.StrokeDashPattern, border.StrokeDashOffset);
mauiDrawable.SetBorderDash(border.StrokeDashPattern, border.StrokeDashOffset);
}

public static void UpdateStrokeMiterLimit(this AView platformView, IBorderStroke border)
Expand Down Expand Up @@ -127,16 +131,15 @@ public static void InvalidateBorderStrokeBounds(this AView platformView)
mauiDrawable.InvalidateBorderBounds();
}

internal static void UpdateMauiDrawable(this AView platformView, IBorderStroke border)
internal static void UpdateMauiDrawable(this AView platformView, IBorderStroke border, ref MauiDrawable? mauiDrawable)
{
bool hasBorder = border.Shape != null;

if (!hasBorder)
return;

MauiDrawable? mauiDrawable = platformView.Background as MauiDrawable;

if (mauiDrawable == null)
mauiDrawable ??= platformView.Background as MauiDrawable;
if (mauiDrawable is null)
{
mauiDrawable = new MauiDrawable(platformView.Context);

Expand Down