Merge release/v1.4.0 into master

3sidedcube · Apr 4, 2020 · 8242721 · 8242721
2 parents 57f4fd1 + cc97f18
commit 8242721
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/ThunderTable.xcodeproj/project.pbxproj b/ThunderTable.xcodeproj/project.pbxproj
@@ -591,6 +591,7 @@
 				INFOPLIST_FILE = ThunderTableDemo/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.2;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				MARKETING_VERSION = 1.4.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.3sidedcube.ThunderTableDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -613,6 +614,7 @@
 				INFOPLIST_FILE = ThunderTableDemo/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.2;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				MARKETING_VERSION = 1.4.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.3sidedcube.ThunderTableDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -752,7 +754,7 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MARKETING_VERSION = 1.3.7;
+				MARKETING_VERSION = 1.4.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.threesidedcube.ThunderTable;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -777,7 +779,7 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MARKETING_VERSION = 1.3.7;
+				MARKETING_VERSION = 1.4.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.threesidedcube.ThunderTable;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;

diff --git a/ThunderTable/ImageView.swift b/ThunderTable/ImageView.swift
@@ -130,8 +130,9 @@ public extension UIImageView {
     /// - parameter withPlaceholder: The image to use as a placeholder for the loading image (Optional)
     /// - parameter imageSize:       The size of the final image which will be loaded from the URL
     /// - parameter animated:        Whether the loading image should animate in when retrieved
+    /// - parameter callCompletionForIntermediaryLoads: Whether `completion` should be called for intermediary image loads
     /// - parameter completion:      A closure which will be called upon the completed load of the image.
-    func set(imageURLS: [URL]?, withPlaceholder: UIImage?, imageSize: CGSize = CGSize.zero, animated: Bool = false, completion: ImageViewSetImageURLCompletion?) {
+    func set(imageURLS: [URL]?, withPlaceholder: UIImage?, imageSize: CGSize = CGSize.zero, animated: Bool = false, callCompletionForIntermediaryLoads: Bool = false, completion: ImageViewSetImageURLCompletion?) {
 
         finalSize = imageSize
         cancelCurrentRequestOperations()
@@ -200,6 +201,10 @@ public extension UIImageView {
                     welf.imageURLS = nil
                     welf.completion?(image, error)
                     welf.completion = nil
+
+                } else if callCompletionForIntermediaryLoads {
+
+                    welf.completion?(image, error)
                 }
             })
         })

diff --git a/ThunderTableDemo/Info.plist b/ThunderTableDemo/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>