Skip to content
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

[android] use Java primitive boolean for UriImageSource #22040

Merged
merged 1 commit into from
Apr 27, 2024
Merged

[android] use Java primitive boolean for UriImageSource #22040

Show file tree
Hide file tree
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
10 changes: 5 additions & 5 deletions src/Core/AndroidNative/maui/src/main/java/com/microsoft/maui/PlatformInterop.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ static PorterDuff.Mode getPorterMode(int mode) {
}
}

private static void prepare(RequestBuilder<Drawable> builder, Target<Drawable> target, Boolean cachingEnabled, ImageLoaderCallback callback) {
private static void prepare(RequestBuilder<Drawable> builder, Target<Drawable> target, boolean cachingEnabled, ImageLoaderCallback callback) {
// A special value to work around https://github.com/dotnet/maui/issues/6783 where targets
// are actually re-used if all the variables are the same.
// Adding this "error image" that will always load a null image makes each request unique,
Expand All @@ -311,12 +311,12 @@ private static void prepare(RequestBuilder<Drawable> builder, Target<Drawable> t
.into(target);
}

private static void loadInto(RequestBuilder<Drawable> builder, ImageView imageView, Boolean cachingEnabled, ImageLoaderCallback callback) {
private static void loadInto(RequestBuilder<Drawable> builder, ImageView imageView, boolean cachingEnabled, ImageLoaderCallback callback) {
MauiCustomViewTarget target = new MauiCustomViewTarget(imageView, callback);
prepare(builder, target, cachingEnabled, callback);
}

private static void load(RequestBuilder<Drawable> builder, Context context, Boolean cachingEnabled, ImageLoaderCallback callback) {
private static void load(RequestBuilder<Drawable> builder, Context context, boolean cachingEnabled, ImageLoaderCallback callback) {
MauiCustomTarget target = new MauiCustomTarget(context, callback);
prepare(builder, target, cachingEnabled, callback);
}
Expand All @@ -328,7 +328,7 @@ public static void loadImageFromFile(ImageView imageView, String file, ImageLoad
loadInto(builder, imageView, true, callback);
}

public static void loadImageFromUri(ImageView imageView, String uri, Boolean cachingEnabled, ImageLoaderCallback callback) {
public static void loadImageFromUri(ImageView imageView, String uri, boolean cachingEnabled, ImageLoaderCallback callback) {
Uri androidUri = Uri.parse(uri);
if (androidUri == null) {
callback.onComplete(false, null, null);
Expand Down Expand Up @@ -363,7 +363,7 @@ public static void loadImageFromFile(Context context, String file, ImageLoaderCa
load(builder, context, true, callback);
}

public static void loadImageFromUri(Context context, String uri, Boolean cachingEnabled, ImageLoaderCallback callback) {
public static void loadImageFromUri(Context context, String uri, boolean cachingEnabled, ImageLoaderCallback callback) {
Uri androidUri = Uri.parse(uri);
if (androidUri == null) {
callback.onComplete(false, null, null);
Expand Down
10 changes: 2 additions & 8 deletions src/Core/src/ImageSources/UriImageSourceService/UriImageSourceService.Android.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,7 @@ public partial class UriImageSourceService
{
var callback = new ImageLoaderCallback();

var cachingEnabled = uriImageSource.CachingEnabled
? Java.Lang.Boolean.True
: Java.Lang.Boolean.False;
PlatformInterop.LoadImageFromUri(imageView, uriImageSource.Uri.OriginalString, cachingEnabled, callback);
PlatformInterop.LoadImageFromUri(imageView, uriImageSource.Uri.OriginalString, uriImageSource.CachingEnabled, callback);

return callback.Result;
}
Expand All @@ -45,10 +42,7 @@ public partial class UriImageSourceService
{
var drawableCallback = new ImageLoaderResultCallback();

var cachingEnabled = uriImageSource.CachingEnabled
? Java.Lang.Boolean.True
: Java.Lang.Boolean.False;
PlatformInterop.LoadImageFromUri(context, uriImageSource.Uri.OriginalString, cachingEnabled, drawableCallback);
PlatformInterop.LoadImageFromUri(context, uriImageSource.Uri.OriginalString, uriImageSource.CachingEnabled, drawableCallback);

return drawableCallback.Result;
}
Expand Down
Binary file modified src/Core/src/maui.aar
View file
Open in desktop
Binary file not shown.
Loading