Merge pull request #155 from hyperoslo/fix/image_download

Allow custom download

Author: onmyway133

README.md

@@ -6,8 +6,6 @@
 [![Platform](https://img.shields.io/cocoapods/p/Lightbox.svg?style=flat)](http://cocoadocs.org/docsets/Lightbox)
 ![Swift](https://img.shields.io/badge/%20in-swift%204.0-orange.svg)
 
-[Demo](https://appetize.io/app/wfgwc2uvg82m9pzbt17p4rrgh4?device=iphone5s&scale=75&orientation=portrait&osVersion=9.3)
-
 <img src="https://raw.githubusercontent.com/hyperoslo/Lightbox/master/Images/Icon.png" alt="Lightbox Icon" align="right" />
 
 **Lightbox** is a convenient and easy to use image viewer for your iOS app,
@@ -17,10 +15,11 @@ packed with all the features you expect:
 - [x] Video support.
 - [x] Double-tap to zoom.
 - [x] Image caption.
-- [x] Dynamic background.
+- [x] Dynamic background based on [Hue](https://github.com/hyperoslo/Hue)
+- [x] Remote image loading and caching based on [Imaginary](https://github.com/hyperoslo/Imaginary)
 - [x] Interactive transition animations.
 - [x] Powerful configuration.
-- [x] Demo project.
+- [x] [Live Demo](https://appetize.io/app/wfgwc2uvg82m9pzbt17p4rrgh4?device=iphone5s&scale=75&orientation=portrait&osVersion=9.3)
 
 <div align="center">
 <img src="Images/demo.png" height="500">
@@ -111,9 +110,7 @@ extension ViewController: LightboxControllerDismissalDelegate: class {
 
 ### Image loading
 
-By default images are loaded using `sendAsynchronousRequest` method of
-`NSURLConnection`. But it's easy to change this behavior using **Lightbox**
-configuration.
+By default images are loaded using [Imagary](https://github.com/hyperoslo/Imaginary) for reliable loading and caching. But it's easy to change this behavior using **LightboxConfig**
 
 ```swift
 LightboxConfig.loadImage = {
@@ -124,7 +121,7 @@ LightboxConfig.loadImage = {
 
 ### Video
 
-**Lightbox** has video support out of the box. Configure video by using `videoURL`:
+**Lightbox** can show and plays video using default `AVPlayerViewController`. Showning video by using `videoURL`:
 
 ```swift
 LightboxImage(
@@ -162,7 +159,7 @@ LightboxConfig.DeleteButton.image = UIImage(named: ImageList.Lightbox.deleteButt
 LightboxConfig.DeleteButton.textAttributes = TextAttributes.Lightbox.deleteButton
 LightboxConfig.DeleteButton.text = "Delete"
 
-LightboxConfig.InfoLabel.ellipsisText = "ShowMore"
+LightboxConfig.InfoLabel.ellipsisText = "Show more"
 ```
 
 ## Installation

Source/LightboxConfig.swift

@@ -2,6 +2,7 @@ import UIKit
 import Hue
 import AVKit
 import AVFoundation
+import Imaginary
 
 public class LightboxConfig {
   /// Whether to show status bar while Lightbox is presented
@@ -17,6 +18,21 @@ public class LightboxConfig {
     }
   }
 
+  /// How to load image onto UIImageView
+  public static var loadImage: (UIImageView, URL, ((UIImage?) -> Void)?) -> Void =
+    { (imageView, imageURL , completion) in
+
+    // Use Imaginary by default
+    imageView.setImage(url: imageURL, placeholder: nil, completion: { result in
+      switch result {
+      case .value(let image):
+        completion?(image)
+      case .error:
+        completion?(nil)
+      }
+    })
+  }
+
   /// Indicator is used to show while image is being fetched
   public static var makeLoadingIndicator: () -> UIView = {
     return LoadingIndicator()

Source/LightboxImage.swift

@@ -22,19 +22,12 @@ open class LightboxImage {
     self.videoURL = videoURL
   }
 
-  open func addImageTo(_ imageView: UIImageView, completion: ((_ image: UIImage?) -> Void)? = nil) {
+  open func addImageTo(_ imageView: UIImageView, completion: ((UIImage?) -> Void)? = nil) {
     if let image = image {
       imageView.image = image
       completion?(image)
     } else if let imageURL = imageURL {
-      imageView.setImage(url: imageURL, placeholder: nil, completion: { result in
-        switch result {
-        case .value(let image):
-          completion?(image)
-        case .error:
-          completion?(nil)
-        }
-      })
+      LightboxConfig.loadImage(imageView, imageURL, completion)
     }
   }
 }