Merge pull request #78 from hansemannn/ios-2.0.0

refactor: move SDWebImage to 5.4.1

ios/Cartfile

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

ios/Classes/AvImageviewImageView.h

@@ -7,8 +7,7 @@
  * Copyright (c) 2009-2016 by Appcelerator, Inc. All Rights Reserved.
  */
 
-#import "SDWebImage/FLAnimatedImageView+WebCache.h"
-#import "SDWebImage/UIImageView+WebCache.h"
+#import <SDWebImage/SDWebImage.h>
 #import "TiUIView.h"
 
 @interface AvImageviewImageView : TiUIView {
@@ -22,16 +21,19 @@
   CGFloat autoHeight;
   CGFloat autoWidth;
 
-  FLAnimatedImageView *imageView;
+  SDAnimatedImageView *imageView;
   UIActivityIndicatorView *activityIndicator;
 
   NSString *placeholderImagePath;
   NSString *brokenLinkImagePath;
 
   NSDictionary *requestHeader;
-  SDWebImageOptions handleCookies;
   id imageObject;
   BOOL configurationComplete;
+
+  // Options
+  BOOL useCookies;
+  BOOL avoidDecodeImage;
 }
 
 - (void)setWidth_:(id)width;

ios/Classes/AvImageviewImageView.m

@@ -26,7 +26,7 @@ - (void)initializeState {
   [super initializeState];
 
   if (self) {
-    imageView = [[FLAnimatedImageView alloc] initWithFrame:[self bounds]];
+    imageView = [[SDAnimatedImageView alloc] initWithFrame:[self bounds]];
     imageView.clipsToBounds = YES;
 
     activityIndicator = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleGray];
@@ -116,7 +116,7 @@ - (void)displayImage:(id)imageObj {
     return;
   }
 
-  [imageView sd_cancelCurrentAnimationImagesLoad];
+  [SDWebImagePrefetcher.sharedImagePrefetcher cancelPrefetching];
 
   if ([imageObj isKindOfClass:[NSString class]]) {
     //fix downloading the image if url contains spaces or none ASCII characters
@@ -135,6 +135,9 @@ - (void)displayImage:(id)imageObj {
 
       [activityIndicator startAnimating];
     }
+
+    // Set options
+    SDWebImageOptions imageOptions = [self configureImageOptions];
 
     if ([imageUrl.scheme isEqualToString:@"http"] || [imageUrl.scheme isEqualToString:@"https"]) {
       NSString *userAgent = [[TiApp app] userAgent];
@@ -148,7 +151,7 @@ - (void)displayImage:(id)imageObj {
 
       [imageView sd_setImageWithURL:imageUrl
                    placeholderImage:placeholderImage
-                            options:handleCookies
+                            options:imageOptions
                           completed:^(UIImage *image, NSError *error, SDImageCacheType cacheType, NSURL *url) {
                             self->autoWidth = image.size.width;
                             self->autoHeight = image.size.height;
@@ -251,6 +254,21 @@ - (void)fadeImage:(SDImageCacheType)cacheType {
   }
 }
 
+- (SDWebImageOptions)configureImageOptions
+{
+  SDWebImageOptions imageOptions = 0;
+
+  if (useCookies) {
+    imageOptions |= SDWebImageHandleCookies;
+  }
+
+  if (avoidDecodeImage) {
+    imageOptions |= SDImageCacheAvoidDecodeImage;
+  }
+
+  return imageOptions;
+}
+
 #pragma mark Public setter methods
 
 - (void)setWidth_:(id)width_ {
@@ -305,15 +323,16 @@ - (void)setRequestHeader_:(id)args {
 }
 
 - (void)setHandleCookies_:(id)args {
-  BOOL useCookies = [TiUtils boolValue:args];
-  if (useCookies) {
-    handleCookies = SDWebImageHandleCookies;
-  }
+  useCookies = [TiUtils boolValue:args];
+}
+
+- (void)setAvoidDecodeImage_:(id)args {
+  avoidDecodeImage = [TiUtils boolValue:args];
 }
 
 - (void)setTimeout_:(id)args {
   NSTimeInterval timeout = [TiUtils doubleValue:args def:5000] / 1000;
-  [[SDWebImageDownloader sharedDownloader] setDownloadTimeout:timeout];
+  SDWebImageDownloaderConfig.defaultDownloaderConfig.downloadTimeout = timeout;
 }
 
 #pragma mark utility methodds

ios/Classes/AvImageviewModule.m

@@ -8,7 +8,7 @@
  */
 
 #import "AvImageviewModule.h"
-#import "SDWebImage/UIImageView+WebCache.h"
+#import <SDWebImage/SDWebImage.h>
 #import "TiBase.h"
 #import "TiHost.h"
 #import "TiUtils.h"
@@ -25,13 +25,6 @@ - (NSString *)moduleId {
   return @"av.imageview";
 }
 
-#pragma mark Lifecycle
-
-- (void)startup {
-  [super startup];
-  DebugLog(@"[DEBUG] %@ loaded", self);
-}
-
 #pragma Public APIs
 
 - (void)setShouldCacheImagesInMemory:(id)shouldCacheImagesInMemory {
@@ -40,18 +33,17 @@ - (void)setShouldCacheImagesInMemory:(id)shouldCacheImagesInMemory {
 }
 
 - (void)setShouldDecompressImages:(id)shouldDecompressImages {
-  ENSURE_SINGLE_ARG(shouldDecompressImages, NSNumber);
-  [SDImageCache sharedImageCache].config.shouldDecompressImages = [TiUtils boolValue:shouldDecompressImages];
+  NSLog(@"[ERROR] The \"shouldDecompressImages\" property was removed in AV.ImageView iOS 2.0.0 in favor of the per-image option \"avoidDecodeImage\"!");
 }
 
 - (void)setMaxCacheSize:(id)maxCacheSize {
   ENSURE_SINGLE_ARG(maxCacheSize, NSNumber);
-  [SDImageCache sharedImageCache].config.maxCacheSize = [TiUtils intValue:maxCacheSize];
+  [SDImageCache sharedImageCache].config.maxDiskSize = [TiUtils intValue:maxCacheSize];
 }
 
 - (void)setMaxCacheAge:(id)maxCacheAge {
   ENSURE_SINGLE_ARG(maxCacheAge, NSNumber);
-  [SDImageCache sharedImageCache].config.maxCacheAge = [TiUtils intValue:maxCacheAge];
+  [SDImageCache sharedImageCache].config.maxDiskAge = [TiUtils intValue:maxCacheAge];
 }
 
 MAKE_SYSTEM_PROP(CONTENT_MODE_SCALE_TO_FIT, UIViewContentModeScaleToFill)

ios/Classes/AvImageviewModuleAssets.m

@@ -3,16 +3,20 @@
  */
 #import "AvImageviewModuleAssets.h"
 
-extern NSData *filterDataInRange(NSData *thedata, NSRange range);
+extern NSData* filterDataInRange(NSData* thedata, NSRange range);
 
 @implementation AvImageviewModuleAssets
 
-- (NSData *)moduleAsset {
+- (NSData *)moduleAsset
+{
+
 
   return nil;
 }
 
-- (NSData *)resolveModuleAsset:(NSString *)path {
+- (NSData *)resolveModuleAsset:(NSString *)path
+{
+
 
   return nil;
 }

ios/imageview-ios.xcodeproj/project.pbxproj

@@ -171,17 +171,15 @@
 		0867D690FE84028FC02AAC07 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1010;
+				LastUpgradeCheck = 1130;
 			};
 			buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "imageview-ios" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 1;
 			knownRegions = (
-				English,
-				Japanese,
-				French,
-				German,
+				Base,
+				en,
 			);
 			mainGroup = 0867D691FE84028FC02AAC07 /* imageview-ios */;
 			productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
@@ -237,6 +235,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 24DD6D1B1134B66800162E58 /* titanium.xcconfig */;
 			buildSettings = {
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
@@ -287,6 +286,7 @@
 			baseConfigurationReference = 24DD6D1B1134B66800162E58 /* titanium.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				DSTROOT = /tmp/AvImageview.dst;
@@ -373,6 +373,7 @@
 				GCC_WARN_UNUSED_VALUE = NO;
 				GCC_WARN_UNUSED_VARIABLE = NO;
 				INSTALL_PATH = /usr/local/lib;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0.0;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = (
 					"-DDEBUG",
@@ -434,7 +435,7 @@
 				GCC_WARN_UNUSED_VALUE = NO;
 				GCC_WARN_UNUSED_VARIABLE = NO;
 				INSTALL_PATH = /usr/local/lib;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0.0;
 				OTHER_CFLAGS = "-DTI_POST_1_2";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = AvImageview;

ios/manifest

@@ -2,7 +2,7 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 1.5.2
+version: 2.0.0
 apiversion: 2
 architectures: armv7 arm64 i386 x86_64
 description: andreavitale-imageview
@@ -15,4 +15,4 @@ name: andreavitale-imageview
 moduleid: av.imageview
 guid: ddffa9fa-4366-40f0-9031-d32000a82138
 platform: iphone
-minsdk: 5.2.0.GA
+minsdk: 8.0.0