Merge pull request #12 from afunc233/avalonia11

replace all IBitmap to Bitmap
AvaloniaUtils · May 27, 2023 · 3253f74 · 3253f74
2 parents 77b9133 + 43c8296
commit 3253f74
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/AsyncImageLoader.Avalonia.Demo/Services/LongLoader.cs b/AsyncImageLoader.Avalonia.Demo/Services/LongLoader.cs
@@ -5,7 +5,7 @@
 namespace AsyncImageLoader.Avalonia.Demo.Services {
     public class LongLoader : BaseWebImageLoader {
         public static LongLoader Instance { get; } = new LongLoader();
-        protected override async Task<IBitmap?> LoadAsync(string url) {
+        protected override async Task<Bitmap?> LoadAsync(string url) {
             await Task.Delay(1000);
             return await base.LoadAsync(url);
         }

diff --git a/AsyncImageLoader.Avalonia/AdvancedImage.axaml.cs b/AsyncImageLoader.Avalonia/AdvancedImage.axaml.cs
@@ -182,7 +182,7 @@ private async void UpdateImage(string? source, IAsyncImageLoader? loader)
             IsLoading = true;
             CurrentImage = null;
 
-            IBitmap? bitmap = null;
+            Bitmap? bitmap = null;
             if (source != null)
             {
                 // Hack to support relative URI

diff --git a/AsyncImageLoader.Avalonia/IAsyncImageLoader.cs b/AsyncImageLoader.Avalonia/IAsyncImageLoader.cs
@@ -11,6 +11,6 @@ public interface IAsyncImageLoader : IDisposable
         /// </summary>
         /// <param name="url">Target url</param>
         /// <returns>Bitmap</returns>
-        public Task<IBitmap?> ProvideImageAsync(string url);
+        public Task<Bitmap?> ProvideImageAsync(string url);
     }
 }
diff --git a/AsyncImageLoader.Avalonia/Loaders/BaseWebImageLoader.cs b/AsyncImageLoader.Avalonia/Loaders/BaseWebImageLoader.cs
@@ -44,7 +44,7 @@ public BaseWebImageLoader(HttpClient httpClient, bool disposeHttpClient)
         protected HttpClient HttpClient { get; }
 
         /// <inheritdoc />
-        public virtual Task<IBitmap?> ProvideImageAsync(string url)
+        public virtual Task<Bitmap?> ProvideImageAsync(string url)
         {
             return LoadAsync(url);
         }
@@ -60,7 +60,7 @@ public void Dispose()
         /// </summary>
         /// <param name="url">Target url</param>
         /// <returns>Bitmap</returns>
-        protected virtual async Task<IBitmap?> LoadAsync(string url)
+        protected virtual async Task<Bitmap?> LoadAsync(string url)
         {
             var internalOrCachedBitmap = await LoadFromInternalAsync(url) ?? await LoadFromGlobalCache(url);
             if (internalOrCachedBitmap != null) return internalOrCachedBitmap;

diff --git a/AsyncImageLoader.Avalonia/Loaders/RamCachedWebImageLoader.cs b/AsyncImageLoader.Avalonia/Loaders/RamCachedWebImageLoader.cs
@@ -11,7 +11,7 @@ namespace AsyncImageLoader.Loaders
     /// </summary>
     public class RamCachedWebImageLoader : BaseWebImageLoader
     {
-        private readonly ConcurrentDictionary<string, Task<IBitmap?>> _memoryCache = new();
+        private readonly ConcurrentDictionary<string, Task<Bitmap?>> _memoryCache = new();
 
         /// <inheritdoc />
         public RamCachedWebImageLoader()
@@ -25,7 +25,7 @@ public RamCachedWebImageLoader(HttpClient httpClient, bool disposeHttpClient) :
         }
 
         /// <inheritdoc />
-        public override async Task<IBitmap?> ProvideImageAsync(string url)
+        public override async Task<Bitmap?> ProvideImageAsync(string url)
         {
             var bitmap = await _memoryCache.GetOrAdd(url, LoadAsync);
             // If load failed - remove from cache and return