diff --git a/Additions/ImageLoader.cs b/Additions/ImageLoader.cs index fcb6dff..4875227 100644 --- a/Additions/ImageLoader.cs +++ b/Additions/ImageLoader.cs @@ -1,28 +1,22 @@ using System; using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Text; +using System.Drawing; +using System.Globalization; +using System.Threading; +using System.Threading.Tasks; -using Android.App; -using Android.Content; -using Android.OS; -using Android.Runtime; +using Android.Graphics.Drawables; using Android.Views; using Android.Widget; -using System.Threading.Tasks; -using Android.Graphics; -using System.Threading; -using System.Drawing; -using Com.Nostra13.Universalimageloader.Core.Listener; -using System.Globalization; -using Com.Nostra13.Universalimageloader.Core.Imageaware; -using Android.Graphics.Drawables; using Com.Nostra13.Universalimageloader.Core.Assist; +using Com.Nostra13.Universalimageloader.Core.Imageaware; +using Com.Nostra13.Universalimageloader.Core.Listener; + +using Bitmap = Android.Graphics.Bitmap; namespace Com.Nostra13.Universalimageloader.Core { - public partial class ImageLoader + public partial class ImageLoader { public Task LoadImageAsync(CancellationToken ct, string uri, ImageView imageView, Size? targetSize = null) { @@ -96,7 +90,7 @@ namespace Com.Nostra13.Universalimageloader.Core private static async Task InnerLoadImageAsync(CancellationToken ct, string uri, ImageView imageView, Size? targetSize, DisplayImageOptions options) { - TaskCompletionSource source = new TaskCompletionSource(); + TaskCompletionSource source = new TaskCompletionSource(); options = options ?? new DisplayImageOptions.Builder() @@ -215,7 +209,7 @@ namespace Com.Nostra13.Universalimageloader.Core private class ImageListener : Java.Lang.Object, IImageLoadingListener { - private TaskCompletionSource _source; + private TaskCompletionSource _source; public ImageListener(System.IntPtr ptr, Android.Runtime.JniHandleOwnership ownership) : base(ptr, ownership) @@ -225,7 +219,7 @@ namespace Com.Nostra13.Universalimageloader.Core _source = new TaskCompletionSource(); } - public ImageListener(TaskCompletionSource source) + public ImageListener(TaskCompletionSource source) { _source = source; } @@ -235,7 +229,7 @@ namespace Com.Nostra13.Universalimageloader.Core _source.TrySetCanceled(); } - public void OnLoadingComplete(string p0, Android.Views.View p1, Android.Graphics.Bitmap bitmap) + public void OnLoadingComplete(string p0, Android.Views.View p1, Bitmap bitmap) { if (!_source.Task.IsCanceled) { diff --git a/Additions/LinkedBlockingDeque.cs b/Additions/LinkedBlockingDeque.cs deleted file mode 100644 index 5f93126..0000000 --- a/Additions/LinkedBlockingDeque.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -using Android.App; -using Android.Content; -using Android.OS; -using Android.Runtime; -using Android.Views; -using Android.Widget; -using System.Collections; -using Android.Graphics; - - -namespace Com.Nostra13.Universalimageloader.Core.Assist.Deque -{ - partial class LinkedBlockingDeque - { - partial class DescendingItr - { - public override Java.Lang.Object Next() - { - return Next(); - } - }; - - partial class Itr - { - public override Java.Lang.Object Next() - { - return Next(); - } - } - } -} \ No newline at end of file diff --git a/Jars/universal-image-loader-1.9.5.jar b/Jars/universal-image-loader-1.9.5.jar index 520dac3..1006d5b 100644 Binary files a/Jars/universal-image-loader-1.9.5.jar and b/Jars/universal-image-loader-1.9.5.jar differ diff --git a/UniversalImageLoader.csproj b/UniversalImageLoader.csproj index 5923c3e..4990e85 100644 --- a/UniversalImageLoader.csproj +++ b/UniversalImageLoader.csproj @@ -14,9 +14,9 @@ - monoandroid50 + MonoAndroid10.0 MonoAndroid - v5.0 + v10.0