Merge remote-tracking branch 'origin/develop'

Author: michaelstonis

AuroraControls.TestApp/GridImagePage.xaml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="AuroraControls.TestApp.GridImagePage">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="auto" />
+            <RowDefinition Height="*" />
+            <RowDefinition Height="auto" />
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="auto" />
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="auto" />
+        </Grid.ColumnDefinitions>
+        <Image x:Name="img" Grid.Row="0" Grid.Column="0" Aspect="Center" BackgroundColor="Fuchsia" />
+        <ImageButton x:Name="imgBtn" Grid.Row="2" Grid.Column="2" Aspect="Center" BackgroundColor="Chartreuse" />
+    </Grid>
+</ContentPage>

AuroraControls.TestApp/GridImagePage.xaml.cs

@@ -0,0 +1,14 @@
+using Microsoft.Maui.Controls;
+
+namespace AuroraControls.TestApp;
+
+public partial class GridImagePage : ContentPage
+{
+    public GridImagePage()
+    {
+        InitializeComponent();
+
+        img.SetSvgIcon("dollar_sign.svg", 74);
+        imgBtn.SetSvgIcon("dollar_sign.svg", 74);
+    }
+}

AuroraControls.TestApp/MainPage.cs

@@ -104,7 +104,7 @@ public MainPage(ILogger<TestRxViewModel> logger)
                         Children =
                         {
                             new Button { BackgroundColor = Colors.Fuchsia, }
-                                .SetSvgIcon("splatoon.svg", 40, colorOverride: Colors.White),
+                                .SetSvgIcon("dollar_sign.svg", 75, colorOverride: Colors.White),
 
                             new Button { Text = "View Image Processing", }
                                 .BindClicked(async () => await this.Navigation.PushAsync(new ImageProcessing()))
@@ -173,6 +173,10 @@ await this.Navigation.PushAsync(new StepIndicatorTestPage())),
                                 .BindClicked(async () =>
                                     await this.Navigation.PushAsync(new ConfettiViewTestPage())),
 
+                            new Button { Text = "Grid Image Page", }
+                                .BindClicked(async () =>
+                                    await this.Navigation.PushAsync(new GridImagePage())),
+
                             new ToggleBox
                             {
                                 ToggledBackgroundColor = Colors.Fuchsia,

AuroraControls.TestApp/Resources/SVG/dollar_sign.svg

@@ -3,6 +3,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Android.Content;
+using Android.Graphics;
 using Android.Graphics.Drawables;
 using Android.Widget;
 using Bumptech.Glide;
@@ -11,12 +12,13 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Maui.Controls.PlatformConfiguration;
 using Microsoft.Maui.Platform;
+using Path = System.IO.Path;
 
 namespace AuroraControls;
 
 internal partial class NoCacheFileImageSourceService
 {
-    public override Task<IImageSourceServiceResult?> LoadDrawableAsync(IImageSource imageSource, ImageView imageView,
+    public override async Task<IImageSourceServiceResult?> LoadDrawableAsync(IImageSource imageSource, ImageView imageView,
         CancellationToken cancellationToken = default)
     {
         var fileImageSource = (INoCacheFileImageSource)imageSource;
@@ -33,14 +35,15 @@ internal partial class NoCacheFileImageSourceService
                     if (id > 0)
                     {
                         imageView.SetImageResource(id);
-                        return Task.FromResult<IImageSourceServiceResult?>(new ImageSourceServiceLoadResult());
+                        return new ImageSourceServiceLoadResult();
                     }
                 }
 
-                using var pathDrawable = Drawable.CreateFromPath(file);
+                using var pathBitmap = await BitmapFactory.DecodeFileAsync(file);
+                using var pathDrawable = new BitmapDrawable(Platform.AppContext.Resources, pathBitmap);
                 imageView.SetImageDrawable(pathDrawable);
 
-                return Task.FromResult<IImageSourceServiceResult?>(new ImageSourceServiceLoadResult());
+                return new ImageSourceServiceLoadResult();
             }
             catch (Exception ex)
             {
@@ -49,10 +52,10 @@ internal partial class NoCacheFileImageSourceService
             }
         }
 
-        return Task.FromResult<IImageSourceServiceResult?>(null);
+        return null;
     }
 
-    public override Task<IImageSourceServiceResult<Drawable>?> GetDrawableAsync(IImageSource imageSource, Context context,
+    public override async Task<IImageSourceServiceResult<Drawable>?> GetDrawableAsync(IImageSource imageSource, Context context,
         CancellationToken cancellationToken = default)
     {
         var fileImageSource = (INoCacheFileImageSource)imageSource;
@@ -70,13 +73,14 @@ internal partial class NoCacheFileImageSourceService
                         var d = context?.GetDrawable(id);
                         if (d is not null)
                         {
-                            return Task.FromResult<IImageSourceServiceResult<Drawable>?>(new ImageSourceServiceResult(d));
+                            return new ImageSourceServiceResult(d);
                         }
                     }
                 }
 
-                var pathDrawable = Drawable.CreateFromPath(file);
-                return Task.FromResult<IImageSourceServiceResult<Drawable>?>(new ImageSourceServiceResult(pathDrawable));
+                var pathBitmap = await BitmapFactory.DecodeFileAsync(file);
+                var pathDrawable = new BitmapDrawable(Platform.AppContext.Resources, pathBitmap);
+                return new ImageSourceServiceResult(pathDrawable);
             }
             catch (Exception ex)
             {
@@ -85,7 +89,7 @@ internal partial class NoCacheFileImageSourceService
             }
         }
 
-        return Task.FromResult<IImageSourceServiceResult<Drawable>?>(null);
+        return null;
     }
 }