Add support for avares and resm #1

AvaloniaUtils · Jun 18, 2022 · cde9b1b · cde9b1b
1 parent 64bc399
commit cde9b1b
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 13 deletions.
diff --git a/AsyncImageLoader.Avalonia.Demo/App.axaml.cs b/AsyncImageLoader.Avalonia.Demo/App.axaml.cs
@@ -15,6 +15,7 @@ public override void OnFrameworkInitializationCompleted() {
                 desktop.MainWindow = new MainWindow {
                     DataContext = new MainWindowViewModel(),
                 };
+                desktop.MainWindow.AttachDevTools();
             }
 
             base.OnFrameworkInitializationCompleted();

diff --git a/AsyncImageLoader.Avalonia.Demo/Assets/cat4.jpg b/AsyncImageLoader.Avalonia.Demo/Assets/cat4.jpg
diff --git a/AsyncImageLoader.Avalonia.Demo/Assets/cat5.jpg b/AsyncImageLoader.Avalonia.Demo/Assets/cat5.jpg
diff --git a/AsyncImageLoader.Avalonia.Demo/Assets/cat6.jpg b/AsyncImageLoader.Avalonia.Demo/Assets/cat6.jpg
diff --git a/AsyncImageLoader.Avalonia.Demo/Assets/cat7.jpg b/AsyncImageLoader.Avalonia.Demo/Assets/cat7.jpg
diff --git a/AsyncImageLoader.Avalonia.Demo/AsyncImageLoader.Avalonia.Demo.csproj b/AsyncImageLoader.Avalonia.Demo/AsyncImageLoader.Avalonia.Demo.csproj
@@ -6,17 +6,23 @@
     </PropertyGroup>
     <ItemGroup>
         <Folder Include="Models\" />
-        <AvaloniaResource Include="Assets\**" />
+        <AvaloniaResource Include="Assets/avalonia-logo.ico" />
         <None Remove=".gitignore" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="0.10.10" />
-        <PackageReference Include="Avalonia.Desktop" Version="0.10.10" />
+        <PackageReference Include="Avalonia" Version="0.10.15" />
+        <PackageReference Include="Avalonia.Desktop" Version="0.10.15" />
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="0.10.10" />
-        <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.10" />
+        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="0.10.15" />
+        <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.15" />
     </ItemGroup>
     <ItemGroup>
       <ProjectReference Include="..\AsyncImageLoader.Avalonia\AsyncImageLoader.Avalonia.csproj" />
     </ItemGroup>
+    <ItemGroup>
+        <AvaloniaResource Include="Assets/cat4.jpg" />
+        <AvaloniaResource Include="Assets/cat5.jpg" />
+        <EmbeddedResource Include="Assets/cat6.jpg" />
+        <EmbeddedResource Include="Assets/cat7.jpg" />
+    </ItemGroup>
 </Project>
diff --git a/AsyncImageLoader.Avalonia.Demo/Views/MainWindow.axaml b/AsyncImageLoader.Avalonia.Demo/Views/MainWindow.axaml
@@ -8,14 +8,38 @@
         x:Class="AsyncImageLoader.Avalonia.Demo.Views.MainWindow"
         Icon="/Assets/avalonia-logo.ico"
         Title="AsyncImageLoader.Avalonia.Demo">
-
+    <Window.Styles>
+        <Style Selector="Image">
+            <Setter Property="Width" Value="400"></Setter>
+        </Style>
+        <Style Selector="StackPanel">
+            <Setter Property="HorizontalAlignment" Value="Center"></Setter>
+        </Style>
+    </Window.Styles>
     <Design.DataContext>
         <vm:MainWindowViewModel/>
     </Design.DataContext>
-    <UniformGrid>
-        <Image asyncImageLoader:ImageLoader.Source="https://github.com/AvaloniaUtils/AsyncImageLoader.Avalonia/raw/master/AsyncImageLoader.Avalonia.Demo/Assets/cat0.jpg" />
-        <Image asyncImageLoader:ImageLoader.Source="https://github.com/AvaloniaUtils/AsyncImageLoader.Avalonia/raw/master/AsyncImageLoader.Avalonia.Demo/Assets/cat1.jpg" />
-        <Image asyncImageLoader:ImageLoader.Source="https://github.com/AvaloniaUtils/AsyncImageLoader.Avalonia/raw/master/AsyncImageLoader.Avalonia.Demo/Assets/cat2.jpg" />
-        <Image asyncImageLoader:ImageLoader.Source="https://github.com/AvaloniaUtils/AsyncImageLoader.Avalonia/raw/master/AsyncImageLoader.Avalonia.Demo/Assets/cat3.jpg" />
-    </UniformGrid>
+    <ScrollViewer>
+        <StackPanel Orientation="Vertical">
+            <TextBlock TextAlignment="Center">Images from Internet</TextBlock>
+            <StackPanel Orientation="Horizontal">
+                <Image asyncImageLoader:ImageLoader.Source="https://github.com/AvaloniaUtils/AsyncImageLoader.Avalonia/raw/master/AsyncImageLoader.Avalonia.Demo/Assets/cat0.jpg" />
+                <Image asyncImageLoader:ImageLoader.Source="https://github.com/AvaloniaUtils/AsyncImageLoader.Avalonia/raw/master/AsyncImageLoader.Avalonia.Demo/Assets/cat1.jpg" />
+            </StackPanel>
+            <StackPanel Orientation="Horizontal">
+                <Image asyncImageLoader:ImageLoader.Source="https://github.com/AvaloniaUtils/AsyncImageLoader.Avalonia/raw/master/AsyncImageLoader.Avalonia.Demo/Assets/cat2.jpg" />
+                <Image asyncImageLoader:ImageLoader.Source="https://github.com/AvaloniaUtils/AsyncImageLoader.Avalonia/raw/master/AsyncImageLoader.Avalonia.Demo/Assets/cat3.jpg" />
+            </StackPanel>
+            <TextBlock TextAlignment="Center">Images from Assets (AvaloniaResource)</TextBlock>
+            <StackPanel Orientation="Horizontal">
+                <Image asyncImageLoader:ImageLoader.Source="avares://AsyncImageLoader.Avalonia.Demo/Assets/cat4.jpg" />
+                <Image asyncImageLoader:ImageLoader.Source="avares://AsyncImageLoader.Avalonia.Demo/Assets/cat5.jpg" />
+            </StackPanel>
+            <TextBlock TextAlignment="Center">Images from manifest resources (EmbeddedResource)</TextBlock>
+            <StackPanel Orientation="Horizontal">
+                <Image asyncImageLoader:ImageLoader.Source="resm:AsyncImageLoader.Avalonia.Demo.Assets.cat6.jpg" />
+                <Image asyncImageLoader:ImageLoader.Source="resm:AsyncImageLoader.Avalonia.Demo.Assets.cat7.jpg" />
+            </StackPanel>
+        </StackPanel>
+    </ScrollViewer>
 </Window>
diff --git a/...lonia/Loaders/BaseCachedWebImageLoader.cs → ...er.Avalonia/Loaders/BaseWebImageLoader.cs b/...lonia/Loaders/BaseCachedWebImageLoader.cs → ...er.Avalonia/Loaders/BaseWebImageLoader.cs
@@ -2,7 +2,9 @@
 using System.IO;
 using System.Net.Http;
 using System.Threading.Tasks;
+using Avalonia;
 using Avalonia.Media.Imaging;
+using Avalonia.Platform;
 
 namespace AsyncImageLoader.Loaders {
     /// <summary>
@@ -65,7 +67,15 @@ public BaseWebImageLoader(HttpClient httpClient, bool disposeHttpClient) {
         /// <returns>Bitmap</returns>
         protected virtual Task<Bitmap?> LoadFromInternalAsync(string url) {
             try {
-                return Task.FromResult(new Bitmap(url))!;
+                var uri = url.StartsWith("/")
+                    ? new Uri(url, UriKind.Relative)
+                    : new Uri(url, UriKind.RelativeOrAbsolute);
+
+                if(uri.IsAbsoluteUri && uri.IsFile)
+                    return Task.FromResult(new Bitmap(uri.LocalPath))!;
+
+                var assets = AvaloniaLocator.Current.GetService<IAssetLoader>();
+                return Task.FromResult(new Bitmap(assets.Open(uri)))!;
             }
             catch (Exception) {
                 return Task.FromResult<Bitmap?>(null);