chore(ios): update SDWwebImage to version 5.8.0

.gitignore

@@ -4,6 +4,7 @@ ios/dist
 ios/build
 ios/Carthage
 ios/Cartfile.resolved
+ios/run.command
 ios/imageview-ios.xcodeproj/project.xcworkspace/xcuserdata/*.xcuserdatad
 ios/imageview-ios.xcodeproj/project.xcworkspace/xcuserdata
 ios/imageview-ios.xcodeproj/xcuserdata

README.md

@@ -93,7 +93,7 @@ All [Titanium.UI.View](http://docs.appcelerator.com/platform/latest/#!/api/Titan
 | brokenLinkImage | Image to display when the image fetch goes in error | ✅ | ✅ | Must refers to a __local__ image |
 | loadingIndicator | Enable or disable the activity indicator when the download is in progress | ✅ | ✅ | `true` by default |
 | loadingIndicatorColor | Changes the loading indicator color | ✅ | ✅ | |
-| requestHeader | An object used to define extra http request header fields | ✅ | ✅ | |
+| requestHeaders | An object used to define extra http request header fields | ✅ | ✅ | |
 | timeout | Sets timeout for requests, in milliseconds | ✅ | ✅ | |
 | handleCookies | Enables cookie handling for remote images | ✅ | ✅ | |
 | shouldCacheImagesInMemory | Activates in-memory cache mechanism | ✅ | ✅| `true` by default |

ios/Cartfile

@@ -1 +1 @@
-github "SDWebImage/SDWebImage" ~> 5.4.1
+github "SDWebImage/SDWebImage" ~> 5.8.0

ios/Classes/AvImageviewImageView.m

@@ -218,7 +218,6 @@ - (UIImage *)loadLocalImage:(NSString *)imagePath {
 
     // Load the image from the application assets
     NSString *fileNamePath = [[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent:imagePath];
-    ;
     image = [UIImage imageWithContentsOfFile:fileNamePath];
 
     if (image != nil)

ios/manifest

@@ -2,7 +2,7 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 2.0.1
+version: 2.0.2
 apiversion: 2
 architectures: armv7 arm64 i386 x86_64
 description: andreavitale-imageview

ios/module.xcconfig

@@ -7,7 +7,7 @@
 // http://developer.apple.com/mac/library/documentation/DeveloperTools/Conceptual/XcodeBuildSystem/400-Build_Configurations/build_configs.html
 //
 
-CURRENT_MODULE_VERSION="1.5.1"
+CURRENT_MODULE_VERSION="1.5.2"
 FRAMEWORK_SEARCH_PATHS=$(SRCROOT)/../../modules/iphone/av.imageview/$(CURRENT_MODULE_VERSION)/platform
 
 //OTHER_LDFLAGS=$(inherited)

ios/platform/SDWebImage.framework/Headers/NSData+ImageContentType.h

@@ -23,6 +23,8 @@ static const SDImageFormat SDImageFormatTIFF      = 3;
 static const SDImageFormat SDImageFormatWebP      = 4;
 static const SDImageFormat SDImageFormatHEIC      = 5;
 static const SDImageFormat SDImageFormatHEIF      = 6;
+static const SDImageFormat SDImageFormatPDF       = 7;
+static const SDImageFormat SDImageFormatSVG       = 8;
 
 /**
  NSData category about the image content type and UTI.
@@ -43,6 +45,7 @@ static const SDImageFormat SDImageFormatHEIF      = 6;
  *
  *  @param format Format as SDImageFormat
  *  @return The UTType as CFStringRef
+ *  @note For unknown format, `kUTTypeImage` abstract type will return
  */
 + (nonnull CFStringRef)sd_UTTypeFromImageFormat:(SDImageFormat)format CF_RETURNS_NOT_RETAINED NS_SWIFT_NAME(sd_UTType(from:));
 
@@ -51,6 +54,7 @@ static const SDImageFormat SDImageFormatHEIF      = 6;
  *
  *  @param uttype The UTType as CFStringRef
  *  @return The Format as SDImageFormat
+ *  @note For unknown type, `SDImageFormatUndefined` will return
  */
 + (SDImageFormat)sd_imageFormatFromUTType:(nonnull CFStringRef)uttype;
 

ios/platform/SDWebImage.framework/Headers/NSImage+Compatibility.h

@@ -19,6 +19,10 @@
 The underlying Core Graphics image object. This will actually use `CGImageForProposedRect` with the image size.
  */
 @property (nonatomic, readonly, nullable) CGImageRef CGImage;
+/**
+ The underlying Core Image data. This will actually use `bestRepresentationForRect` with the image size to find the `NSCIImageRep`.
+ */
+@property (nonatomic, readonly, nullable) CIImage *CIImage;
 /**
  The scale factor of the image. This wil actually use `bestRepresentationForRect` with image size and pixel size to calculate the scale factor. If failed, use the default value 1.0. Should be greater than or equal to 1.0.
  */
@@ -38,6 +42,16 @@ The underlying Core Graphics image object. This will actually use `CGImageForPro
  */
 - (nonnull instancetype)initWithCGImage:(nonnull CGImageRef)cgImage scale:(CGFloat)scale orientation:(CGImagePropertyOrientation)orientation;
 
+/**
+ Initializes and returns an image object with the specified Core Image object. The representation is `NSCIImageRep`.
+ 
+ @param ciImage A Core Image image object
+ @param scale The image scale factor
+ @param orientation The orientation of the image data
+ @return The image object
+ */
+- (nonnull instancetype)initWithCIImage:(nonnull CIImage *)ciImage scale:(CGFloat)scale orientation:(CGImagePropertyOrientation)orientation;
+
 /**
  Returns an image object with the scale factor. The representation is created from the image data.
  @note The difference between these this and `initWithData:` is that `initWithData:` will always use `backingScaleFactor` as scale factor.

ios/platform/SDWebImage.framework/Headers/SDAnimatedImage.h

@@ -72,6 +72,7 @@
 
 // This class override these methods from UIImage(NSImage), and it supports NSSecureCoding.
 // You should use these methods to create a new animated image. Use other methods just call super instead.
+// Pay attention, when the animated image frame count <= 1, all the `SDAnimatedImageProvider` protocol methods will return nil or 0 value, you'd better check the frame count before usage and keep fallback.
 + (nullable instancetype)imageNamed:(nonnull NSString *)name; // Cache in memory, no Asset Catalog support
 #if __has_include(<UIKit/UITraitCollection.h>)
 + (nullable instancetype)imageNamed:(nonnull NSString *)name inBundle:(nullable NSBundle *)bundle compatibleWithTraitCollection:(nullable UITraitCollection *)traitCollection; // Cache in memory, no Asset Catalog support

ios/platform/SDWebImage.framework/Headers/SDAnimatedImageView.h

@@ -81,6 +81,13 @@
  */
 @property (nonatomic, assign) BOOL resetFrameIndexWhenStopped;
 
+/**
+ If the image has more than one frame, set this value to `YES` will automatically
+ play/stop the animation when the view become visible/invisible.
+ Default is YES.
+ */
+@property (nonatomic, assign) BOOL autoPlayAnimatedImage;
+
 /**
  You can specify a runloop mode to let it rendering.
  Default is NSRunLoopCommonModes on multi-core device, NSDefaultRunLoopMode on single-core device

ios/platform/SDWebImage.framework/Headers/SDGraphicsImageRenderer.h

@@ -0,0 +1,73 @@
+/*
+* This file is part of the SDWebImage package.
+* (c) Olivier Poitrey <[email protected]>
+*
+* For the full copyright and license information, please view the LICENSE
+* file that was distributed with this source code.
+*/
+
+#import "SDWebImageCompat.h"
+
+/**
+ These following class are provided to use `UIGraphicsImageRenderer` with polyfill, which allows write cross-platform(AppKit/UIKit) code and avoid runtime version check.
+ Compared to `UIGraphicsBeginImageContext`, `UIGraphicsImageRenderer` use dynamic bitmap from your draw code to generate CGContext, not always use ARGB8888, which is more performant on RAM usage.
+ Which means, if you draw CGImage/CIImage which contains grayscale only, the underlaying bitmap context use grayscale, it's managed by system and not a fixed type. (actually, the `kCGContextTypeAutomatic`)
+ For usage, See more in Apple's documentation: https://developer.apple.com/documentation/uikit/uigraphicsimagerenderer
+ For UIKit on iOS/tvOS 10+, these method just use the same `UIGraphicsImageRenderer` API.
+ For others (macOS/watchOS or iOS/tvOS 10-), these method use the `SDImageGraphics.h` to implements the same behavior (but without dynamic bitmap support)
+*/
+
+typedef void (^SDGraphicsImageDrawingActions)(CGContextRef _Nonnull context);
+typedef NS_ENUM(NSInteger, SDGraphicsImageRendererFormatRange) {
+    SDGraphicsImageRendererFormatRangeUnspecified = -1,
+    SDGraphicsImageRendererFormatRangeAutomatic = 0,
+    SDGraphicsImageRendererFormatRangeExtended,
+    SDGraphicsImageRendererFormatRangeStandard
+};
+
+/// A set of drawing attributes that represent the configuration of an image renderer context.
+@interface SDGraphicsImageRendererFormat : NSObject
+
+/// The display scale of the image renderer context.
+/// The default value is equal to the scale of the main screen.
+@property (nonatomic) CGFloat scale;
+
+/// A Boolean value indicating whether the underlying Core Graphics context has an alpha channel.
+/// The default value is NO.
+@property (nonatomic) BOOL opaque;
+
+/// Specifying whether the bitmap context should use extended color.
+/// For iOS 12+, the value is from system `preferredRange` property
+/// For iOS 10-11, the value is from system `prefersExtendedRange` property
+/// For iOS 9-, the value is `.standard`
+@property (nonatomic) SDGraphicsImageRendererFormatRange preferredRange;
+
+/// Init the default format. See each properties's default value.
+- (nonnull instancetype)init;
+
+/// Returns a new format best suited for the main screen’s current configuration.
++ (nonnull instancetype)preferredFormat;
+
+@end
+
+/// A graphics renderer for creating Core Graphics-backed images.
+@interface SDGraphicsImageRenderer : NSObject
+
+/// Creates an image renderer for drawing images of a given size.
+/// @param size The size of images output from the renderer, specified in points.
+/// @return An initialized image renderer.
+- (nonnull instancetype)initWithSize:(CGSize)size;
+
+/// Creates a new image renderer with a given size and format.
+/// @param size The size of images output from the renderer, specified in points.
+/// @param format A SDGraphicsImageRendererFormat object that encapsulates the format used to create the renderer context.
+/// @return An initialized image renderer.
+- (nonnull instancetype)initWithSize:(CGSize)size format:(nonnull SDGraphicsImageRendererFormat *)format;
+
+/// Creates an image by following a set of drawing instructions.
+/// @param actions A SDGraphicsImageDrawingActions block that, when invoked by the renderer, executes a set of drawing instructions to create the output image.
+/// @note You should not retain or use the context outside the block, it's non-escaping.
+/// @return A UIImage object created by the supplied drawing actions.
+- (nonnull UIImage *)imageWithActions:(nonnull NS_NOESCAPE SDGraphicsImageDrawingActions)actions;
+
+@end

ios/platform/SDWebImage.framework/Headers/SDImageCache.h

@@ -162,6 +162,7 @@ typedef NS_OPTIONS(NSUInteger, SDImageCacheOptions) {
  * @param key             The unique image cache key, usually it's image absolute URL
  * @param toDisk          Store the image to disk cache if YES. If NO, the completion block is called synchronously
  * @param completionBlock A block executed after the operation is finished
+ * @note If no image data is provided and encode to disk, we will try to detect the image format (using either `sd_imageFormat` or `SDAnimatedImage` protocol method) and animation status, to choose the best matched format, including GIF, JPEG or PNG.
  */
 - (void)storeImage:(nullable UIImage *)image
             forKey:(nullable NSString *)key
@@ -178,6 +179,7 @@ typedef NS_OPTIONS(NSUInteger, SDImageCacheOptions) {
  * @param key             The unique image cache key, usually it's image absolute URL
  * @param toDisk          Store the image to disk cache if YES. If NO, the completion block is called synchronously
  * @param completionBlock A block executed after the operation is finished
+ * @note If no image data is provided and encode to disk, we will try to detect the image format (using either `sd_imageFormat` or `SDAnimatedImage` protocol method) and animation status, to choose the best matched format, including GIF, JPEG or PNG.
  */
 - (void)storeImage:(nullable UIImage *)image
          imageData:(nullable NSData *)imageData
@@ -225,18 +227,26 @@ typedef NS_OPTIONS(NSUInteger, SDImageCacheOptions) {
 #pragma mark - Query and Retrieve Ops
 
 /**
- * Asynchronously queries the cache with operation and call the completion when done.
- *  Query the image data for the given key synchronously.
+ * Synchronously query the image data for the given key in disk cache. You can decode the image data to image after loaded.
  *
  *  @param key The unique key used to store the wanted image
  *  @return The image data for the given key, or nil if not found.
  */
 - (nullable NSData *)diskImageDataForKey:(nullable NSString *)key;
 
 /**
- * Operation that queries the cache asynchronously and call the completion when done.
+ * Asynchronously query the image data for the given key in disk cache. You can decode the image data to image after loaded.
  *
- * @param key       The unique key used to store the wanted image
+ *  @param key The unique key used to store the wanted image
+ *  @param completionBlock the block to be executed when the query is done.
+ *  @note the completion block will be always executed on the main queue
+ */
+- (void)diskImageDataQueryForKey:(nullable NSString *)key completion:(nullable SDImageCacheQueryDataCompletionBlock)completionBlock;
+
+/**
+ * Asynchronously queries the cache with operation and call the completion when done.
+ *
+ * @param key       The unique key used to store the wanted image. If you want transformed or thumbnail image, calculate the key with `SDTransformedKeyForKey`, `SDThumbnailedKeyForKey`, or generate the cache key from url with `cacheKeyForURL:context:`.
  * @param doneBlock The completion block. Will not get called if the operation is cancelled
  *
  * @return a NSOperation instance containing the cache op
@@ -246,7 +256,7 @@ typedef NS_OPTIONS(NSUInteger, SDImageCacheOptions) {
 /**
  * Asynchronously queries the cache with operation and call the completion when done.
  *
- * @param key       The unique key used to store the wanted image
+ * @param key       The unique key used to store the wanted image. If you want transformed or thumbnail image, calculate the key with `SDTransformedKeyForKey`, `SDThumbnailedKeyForKey`, or generate the cache key from url with `cacheKeyForURL:context:`.
  * @param options   A mask to specify options to use for this cache query
  * @param doneBlock The completion block. Will not get called if the operation is cancelled
  *
@@ -257,7 +267,7 @@ typedef NS_OPTIONS(NSUInteger, SDImageCacheOptions) {
 /**
  * Asynchronously queries the cache with operation and call the completion when done.
  *
- * @param key       The unique key used to store the wanted image
+ * @param key       The unique key used to store the wanted image. If you want transformed or thumbnail image, calculate the key with `SDTransformedKeyForKey`, `SDThumbnailedKeyForKey`, or generate the cache key from url with `cacheKeyForURL:context:`.
  * @param options   A mask to specify options to use for this cache query
  * @param context   A context contains different options to perform specify changes or processes, see `SDWebImageContextOption`. This hold the extra objects which `options` enum can not hold.
  * @param doneBlock The completion block. Will not get called if the operation is cancelled
@@ -266,6 +276,19 @@ typedef NS_OPTIONS(NSUInteger, SDImageCacheOptions) {
  */
 - (nullable NSOperation *)queryCacheOperationForKey:(nullable NSString *)key options:(SDImageCacheOptions)options context:(nullable SDWebImageContext *)context done:(nullable SDImageCacheQueryCompletionBlock)doneBlock;
 
+/**
+ * Asynchronously queries the cache with operation and call the completion when done.
+ *
+ * @param key       The unique key used to store the wanted image. If you want transformed or thumbnail image, calculate the key with `SDTransformedKeyForKey`, `SDThumbnailedKeyForKey`, or generate the cache key from url with `cacheKeyForURL:context:`.
+ * @param options   A mask to specify options to use for this cache query
+ * @param context   A context contains different options to perform specify changes or processes, see `SDWebImageContextOption`. This hold the extra objects which `options` enum can not hold.
+ * @param queryCacheType Specify where to query the cache from. By default we use `.all`, which means both memory cache and disk cache. You can choose to query memory only or disk only as well. Pass `.none` is invalid and callback with nil immediatelly.
+ * @param doneBlock The completion block. Will not get called if the operation is cancelled
+ *
+ * @return a NSOperation instance containing the cache op
+ */
+- (nullable NSOperation *)queryCacheOperationForKey:(nullable NSString *)key options:(SDImageCacheOptions)options context:(nullable SDWebImageContext *)context cacheType:(SDImageCacheType)queryCacheType done:(nullable SDImageCacheQueryCompletionBlock)doneBlock;
+
 /**
  * Synchronously query the memory cache.
  *
@@ -282,6 +305,16 @@ typedef NS_OPTIONS(NSUInteger, SDImageCacheOptions) {
  */
 - (nullable UIImage *)imageFromDiskCacheForKey:(nullable NSString *)key;
 
+/**
+ * Synchronously query the disk cache. With the options and context which may effect the image generation. (Such as transformer, animated image, thumbnail, etc)
+ *
+ * @param key The unique key used to store the image
+ * @param options   A mask to specify options to use for this cache query
+ * @param context   A context contains different options to perform specify changes or processes, see `SDWebImageContextOption`. This hold the extra objects which `options` enum can not hold.
+ * @return The image for the given key, or nil if not found.
+ */
+- (nullable UIImage *)imageFromDiskCacheForKey:(nullable NSString *)key options:(SDImageCacheOptions)options context:(nullable SDWebImageContext *)context;
+
 /**
  * Synchronously query the cache (memory and or disk) after checking the memory cache.
  *
@@ -290,6 +323,16 @@ typedef NS_OPTIONS(NSUInteger, SDImageCacheOptions) {
  */
 - (nullable UIImage *)imageFromCacheForKey:(nullable NSString *)key;
 
+/**
+ * Synchronously query the cache (memory and or disk) after checking the memory cache. With the options and context which may effect the image generation. (Such as transformer, animated image, thumbnail, etc)
+ *
+ * @param key The unique key used to store the image
+ * @param options   A mask to specify options to use for this cache query
+ * @param context   A context contains different options to perform specify changes or processes, see `SDWebImageContextOption`. This hold the extra objects which `options` enum can not hold.
+ * @return The image for the given key, or nil if not found.
+ */
+- (nullable UIImage *)imageFromCacheForKey:(nullable NSString *)key options:(SDImageCacheOptions)options context:(nullable SDWebImageContext *)context;;
+
 #pragma mark - Remove Ops
 
 /**

ios/platform/SDWebImage.framework/Headers/SDImageCacheConfig.h

@@ -12,13 +12,21 @@
 /// Image Cache Expire Type
 typedef NS_ENUM(NSUInteger, SDImageCacheConfigExpireType) {
     /**
-     * When the image is accessed it will update this value
+     * When the image cache is accessed it will update this value
      */
     SDImageCacheConfigExpireTypeAccessDate,
     /**
-     * The image was obtained from the disk cache (Default)
+     * When the image cache is created or modified it will update this value (Default)
      */
-    SDImageCacheConfigExpireTypeModificationDate
+    SDImageCacheConfigExpireTypeModificationDate,
+    /**
+     * When the image cache is created it will update this value
+     */
+    SDImageCacheConfigExpireTypeCreationDate,
+    /**
+     * When the image cache is created, modified, renamed, file attribute updated (like permission, xattr)  it will update this value
+     */
+    SDImageCacheConfigExpireTypeChangeDate,
 };
 
 /**