Bump to 2.1.0

Allow custom download

.slather.yml

@@ -1,4 +0,0 @@
-ci_service: travis_ci
-coverage_service: coveralls
-xcodeproj: Tests/Tests.xcodeproj
-source_directory: Source

.swift-version

@@ -1 +1 @@
-3.0
+4.0

.travis.yml

@@ -1,13 +0,0 @@
-osx_image: xcode8.3
-language: swift
-
-before_install:
-- brew update
-- if brew outdated | grep -qx carthage; then brew upgrade carthage; fi
-- travis_wait 35 carthage bootstrap --platform iOS
-
-script:
-- xcodebuild clean build -project Lightbox.xcodeproj -scheme "Lightbox-iOS" -sdk iphonesimulator
-
-notifications:
-  email: false

Cartfile

@@ -1 +1,2 @@
-github "hyperoslo/Hue" ~> 2.0
+github "hyperoslo/Hue" ~> 3.0
+github "hyperoslo/Imaginary" ~> 3.0

Cartfile.resolved

@@ -1 +1,3 @@
-github "hyperoslo/Hue" "f82ffc7dd55d093d3acc6ce5b3d36ca259091fdd"
+github "hyperoslo/Cache" "4.1.2"
+github "hyperoslo/Hue" "3.0.0"
+github "hyperoslo/Imaginary" "3.0.2"

Example/DemoLightbox/DemoLightbox.xcodeproj/project.pbxproj

@@ -11,20 +11,20 @@
 		29B4A42F1C43A4320060ED52 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29B4A42E1C43A4320060ED52 /* ViewController.swift */; };
 		29B4A4341C43A4320060ED52 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 29B4A4331C43A4320060ED52 /* Assets.xcassets */; };
 		29B4A4371C43A4320060ED52 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 29B4A4351C43A4320060ED52 /* LaunchScreen.storyboard */; };
-		7193005DD460E198432D8F06 /* Pods_DemoLightbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0977FB7C36F459186E043753 /* Pods_DemoLightbox.framework */; };
+		B89E57B7A21C44D762123511 /* Pods_DemoLightbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EE4E898FD95F4D90F624B067 /* Pods_DemoLightbox.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		0977FB7C36F459186E043753 /* Pods_DemoLightbox.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_DemoLightbox.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		064155DBC618EBACF5C257C6 /* Pods-DemoLightbox.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-DemoLightbox.release.xcconfig"; path = "Pods/Target Support Files/Pods-DemoLightbox/Pods-DemoLightbox.release.xcconfig"; sourceTree = "<group>"; };
 		29B4A4291C43A4320060ED52 /* DemoLightbox.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = DemoLightbox.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		29B4A42C1C43A4320060ED52 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		29B4A42E1C43A4320060ED52 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
 		29B4A4331C43A4320060ED52 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		29B4A4361C43A4320060ED52 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		29B4A4381C43A4320060ED52 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		5B9CE7F93A06A0459BF452D8 /* Pods-DemoLightbox.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-DemoLightbox.release.xcconfig"; path = "Pods/Target Support Files/Pods-DemoLightbox/Pods-DemoLightbox.release.xcconfig"; sourceTree = "<group>"; };
-		C37FDBF69CDC2A95E0E105A7 /* Pods-DemoLightbox.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-DemoLightbox.debug.xcconfig"; path = "Pods/Target Support Files/Pods-DemoLightbox/Pods-DemoLightbox.debug.xcconfig"; sourceTree = "<group>"; };
+		6096248776155BE47C0A196A /* Pods-DemoLightbox.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-DemoLightbox.debug.xcconfig"; path = "Pods/Target Support Files/Pods-DemoLightbox/Pods-DemoLightbox.debug.xcconfig"; sourceTree = "<group>"; };
 		DAE713340DA5D2F2EF13EA8D /* Pods.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		EE4E898FD95F4D90F624B067 /* Pods_DemoLightbox.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_DemoLightbox.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -32,20 +32,29 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				7193005DD460E198432D8F06 /* Pods_DemoLightbox.framework in Frameworks */,
+				B89E57B7A21C44D762123511 /* Pods_DemoLightbox.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		0C8887567644E86396B8D885 /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				6096248776155BE47C0A196A /* Pods-DemoLightbox.debug.xcconfig */,
+				064155DBC618EBACF5C257C6 /* Pods-DemoLightbox.release.xcconfig */,
+			);
+			name = Pods;
+			sourceTree = "<group>";
+		};
 		29B4A4201C43A4320060ED52 = {
 			isa = PBXGroup;
 			children = (
 				29B4A42B1C43A4320060ED52 /* DemoLightbox */,
 				29B4A42A1C43A4320060ED52 /* Products */,
 				B1B2B3DADEEC7FD14D4A9FF8 /* Frameworks */,
-				80F119CA8153119A6934480D /* Pods */,
+				0C8887567644E86396B8D885 /* Pods */,
 			);
 			sourceTree = "<group>";
 		};
@@ -69,20 +78,11 @@
 			path = DemoLightbox;
 			sourceTree = "<group>";
 		};
-		80F119CA8153119A6934480D /* Pods */ = {
-			isa = PBXGroup;
-			children = (
-				C37FDBF69CDC2A95E0E105A7 /* Pods-DemoLightbox.debug.xcconfig */,
-				5B9CE7F93A06A0459BF452D8 /* Pods-DemoLightbox.release.xcconfig */,
-			);
-			name = Pods;
-			sourceTree = "<group>";
-		};
 		B1B2B3DADEEC7FD14D4A9FF8 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
 				DAE713340DA5D2F2EF13EA8D /* Pods.framework */,
-				0977FB7C36F459186E043753 /* Pods_DemoLightbox.framework */,
+				EE4E898FD95F4D90F624B067 /* Pods_DemoLightbox.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -94,12 +94,12 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 29B4A43B1C43A4320060ED52 /* Build configuration list for PBXNativeTarget "DemoLightbox" */;
 			buildPhases = (
-				2CF277B8821F7CE6E2730C9C /* [CP] Check Pods Manifest.lock */,
+				4DE126F6B5D0C8D6C0E7D848 /* [CP] Check Pods Manifest.lock */,
 				29B4A4251C43A4320060ED52 /* Sources */,
 				29B4A4261C43A4320060ED52 /* Frameworks */,
 				29B4A4271C43A4320060ED52 /* Resources */,
-				831C9CD301B03A92F6320AEE /* [CP] Embed Pods Frameworks */,
-				3BCDC27EE322C46C109D231B /* [CP] Copy Pods Resources */,
+				F162948C45248BBD677112BF /* [CP] Embed Pods Frameworks */,
+				D1AB0C213924D367899FA1A2 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -117,7 +117,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0720;
-				LastUpgradeCheck = 0800;
+				LastUpgradeCheck = 0900;
 				ORGANIZATIONNAME = "Hyper Interaktiv AS";
 				TargetAttributes = {
 					29B4A4281C43A4320060ED52 = {
@@ -158,7 +158,7 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		2CF277B8821F7CE6E2730C9C /* [CP] Check Pods Manifest.lock */ = {
+		4DE126F6B5D0C8D6C0E7D848 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -176,7 +176,7 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		3BCDC27EE322C46C109D231B /* [CP] Copy Pods Resources */ = {
+		D1AB0C213924D367899FA1A2 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -191,20 +191,26 @@
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-DemoLightbox/Pods-DemoLightbox-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		831C9CD301B03A92F6320AEE /* [CP] Embed Pods Frameworks */ = {
+		F162948C45248BBD677112BF /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 				"${SRCROOT}/Pods/Target Support Files/Pods-DemoLightbox/Pods-DemoLightbox-frameworks.sh",
+				"${BUILT_PRODUCTS_DIR}/Cache/Cache.framework",
 				"${BUILT_PRODUCTS_DIR}/Hue/Hue.framework",
+				"${BUILT_PRODUCTS_DIR}/Imaginary/Imaginary.framework",
 				"${BUILT_PRODUCTS_DIR}/Lightbox/Lightbox.framework",
+				"${BUILT_PRODUCTS_DIR}/SwiftHash/SwiftHash.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Cache.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Hue.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Imaginary.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Lightbox.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftHash.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -245,14 +251,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -280,7 +292,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -292,14 +304,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -320,14 +338,14 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
 		};
 		29B4A43C1C43A4320060ED52 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = C37FDBF69CDC2A95E0E105A7 /* Pods-DemoLightbox.debug.xcconfig */;
+			baseConfigurationReference = 6096248776155BE47C0A196A /* Pods-DemoLightbox.debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
@@ -336,13 +354,13 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = no.hyper.DemoLightbox;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
 		};
 		29B4A43D1C43A4320060ED52 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 5B9CE7F93A06A0459BF452D8 /* Pods-DemoLightbox.release.xcconfig */;
+			baseConfigurationReference = 064155DBC618EBACF5C257C6 /* Pods-DemoLightbox.release.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
@@ -351,7 +369,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = no.hyper.DemoLightbox;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
 		};

Example/DemoLightbox/DemoLightbox/ViewController.swift

@@ -13,11 +13,11 @@ class ViewController: UIViewController {
     button.autoresizingMask = [.flexibleTopMargin, .flexibleLeftMargin, .flexibleRightMargin, .flexibleBottomMargin]
     
     return button
-    }()
+  }()
   
   override func viewDidLoad() {
     super.viewDidLoad()
-    
+
     view.autoresizingMask = [.flexibleTopMargin, .flexibleLeftMargin, .flexibleRightMargin, .flexibleBottomMargin]
     view.backgroundColor = UIColor.white
     view.addSubview(showButton)
@@ -25,21 +25,21 @@ class ViewController: UIViewController {
   
   // MARK: - Action methods
   
-  func showLightbox() {
+  @objc func showLightbox() {
     let images = [
       LightboxImage(imageURL: URL(string: "https://cdn.arstechnica.net/2011/10/05/iphone4s_sample_apple-4e8c706-intro.jpg")!),
       LightboxImage(
         image: UIImage(named: "photo1")!,
-        text: "Some very long lorem ipsum text. Some very long lorem ipsum text. Some very long lorem ipsum text. Some very long lorem ipsum text"
+        text: "Photography is the science, art, application and practice of creating durable images by recording light or other electromagnetic radiation, either electronically by means of an image sensor, or chemically by means of a light-sensitive material such as photographic film"
       ),
       LightboxImage(
         image: UIImage(named: "photo2")!,
-        text: "",
+        text: "Emoji 😍 (/ɪˈmoʊdʒi/; singular emoji, plural emoji or emojis;[4] from the Japanese 絵文字えもじ, pronounced [emodʑi]) are ideograms and smileys used in electronic messages and web pages. Emoji are used much like emoticons and exist in various genres, including facial expressions, common objects, places and types of weather 🌅☔️💦, and animals 🐶🐱",
         videoURL: URL(string: "https://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4")
       ),
       LightboxImage(
         image: UIImage(named: "photo3")!,
-        text: "Some very long lorem ipsum text."
+        text: "A lightbox is a translucent surface illuminated from behind, used for situations where a shape laid upon the surface needs to be seen with high contrast."
       )
     ]
     

Example/DemoLightbox/Podfile

@@ -1,7 +1,6 @@
-platform :ios, '8.0'
+platform :ios, '9.0'
 
-use_frameworks!
-inhibit_all_warnings!
-
-pod 'Lightbox', path: '../../'
-target 'DemoLightbox'
+target 'DemoLightbox' do
+  use_frameworks!
+	pod 'Lightbox', path: '../../'
+end

Example/DemoLightbox/Podfile.lock

@@ -1,7 +1,13 @@
 PODS:
-  - Hue (2.0.1)
-  - Lightbox (1.0.0):
-    - Hue (~> 2.0)
+  - Cache (4.0.2):
+    - SwiftHash (~> 2.0.0)
+  - Hue (3.0.0)
+  - Imaginary (3.0.0):
+    - Cache (~> 4.0)
+  - Lightbox (2.0.0):
+    - Hue (~> 3.0)
+    - Imaginary (~> 3.0)
+  - SwiftHash (2.0.0)
 
 DEPENDENCIES:
   - Lightbox (from `../../`)
@@ -11,9 +17,12 @@ EXTERNAL SOURCES:
     :path: ../../
 
 SPEC CHECKSUMS:
-  Hue: 354caec055fdc9d38b5ef33ca2e7224721843baf
-  Lightbox: d15b5e265e505009932fa447f27b5262b8b1b604
+  Cache: 363b6899cee63c82ccbd291e64a6c202abc17a88
+  Hue: b8fe1e43eef13631331eebecb2198b68e2622f95
+  Imaginary: 2765d293d425cbed3b07fa11642554cbaebe913d
+  Lightbox: f7f1cc942d81e84d85095531208f5fe1bfd9c639
+  SwiftHash: d2e09b13495447178cdfb8e46e54a5c46f15f5a9
 
-PODFILE CHECKSUM: cd88b68c201e5c39cef62070056649eaee91c71b
+PODFILE CHECKSUM: 408ae3477507a1d4b7ff06ffb3f162eda443424f
 
 COCOAPODS: 1.3.1

Lightbox.podspec

@@ -1,19 +1,20 @@
 Pod::Spec.new do |s|
   s.name             = "Lightbox"
   s.summary          = "A a convenient and easy to use image viewer for your iOS app, packed with all the features you expect"
-  s.version          = "1.1.0"
+  s.version          = "2.1.0"
   s.homepage         = "https://github.com/hyperoslo/Lightbox"
   s.license          = 'MIT'
   s.author           = { "Hyper Interaktiv AS" => "ios@hyper.no" }
   s.source           = { :git => "https://github.com/hyperoslo/Lightbox.git", :tag => s.version.to_s }
   s.social_media_url = 'https://twitter.com/hyperoslo'
-  s.platform     = :ios, '8.0'
+  s.platform     = :ios, '9.0'
   s.requires_arc = true
   s.source_files = 'Source/**/*'
   s.ios.resource = 'Resources/Lightbox.bundle'
 
   s.frameworks = 'UIKit', 'AVFoundation', 'AVKit'
-  s.dependency 'Hue', '~> 2.0'
+  s.dependency 'Hue', '~> 3.0'
+  s.dependency 'Imaginary', '~> 3.0'
 
-  s.pod_target_xcconfig = { 'SWIFT_VERSION' => '3.0' }
+  s.pod_target_xcconfig = { 'SWIFT_VERSION' => '4.0' }
 end

Lightbox.xcodeproj/project.pbxproj

@@ -8,6 +8,7 @@
 
 /* Begin PBXBuildFile section */
 		D22006741DFB4D9700E92898 /* Lightbox.bundle in Resources */ = {isa = PBXBuildFile; fileRef = D22006731DFB4D9700E92898 /* Lightbox.bundle */; };
+		D2A58F5E1F7943A30064F14E /* Imaginary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2A58F5D1F7943A30064F14E /* Imaginary.framework */; };
 		D2D71BBC1D54DA77006AB907 /* AssetManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2D71BBB1D54DA77006AB907 /* AssetManager.swift */; };
 		D5026B3C1C5BF3FD003BC1A3 /* LightboxImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5026B3B1C5BF3FD003BC1A3 /* LightboxImage.swift */; };
 		D523B0BD1C43AA8B001AD1EC /* LightboxConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = D523B0B61C43AA8A001AD1EC /* LightboxConfig.swift */; };
@@ -25,6 +26,7 @@
 
 /* Begin PBXFileReference section */
 		D22006731DFB4D9700E92898 /* Lightbox.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = Lightbox.bundle; sourceTree = "<group>"; };
+		D2A58F5D1F7943A30064F14E /* Imaginary.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Imaginary.framework; path = Carthage/Build/iOS/Imaginary.framework; sourceTree = "<group>"; };
 		D2D71BBB1D54DA77006AB907 /* AssetManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AssetManager.swift; sourceTree = "<group>"; };
 		D5026B3B1C5BF3FD003BC1A3 /* LightboxImage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LightboxImage.swift; sourceTree = "<group>"; };
 		D523B0A91C43AA2A001AD1EC /* Lightbox.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Lightbox.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -47,6 +49,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				D2A58F5E1F7943A30064F14E /* Imaginary.framework in Frameworks */,
 				D54DFCC21C5AAAF100ADEA0E /* Hue.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -62,6 +65,14 @@
 			path = Resources;
 			sourceTree = "<group>";
 		};
+		D2A58F5C1F7943A30064F14E /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				D2A58F5D1F7943A30064F14E /* Imaginary.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
 		D523B09F1C43AA2A001AD1EC = {
 			isa = PBXGroup;
 			children = (
@@ -70,6 +81,7 @@
 				D523B0B41C43AA8A001AD1EC /* Source */,
 				D523B0AB1C43AA2A001AD1EC /* Lightbox */,
 				D523B0AA1C43AA2A001AD1EC /* Products */,
+				D2A58F5C1F7943A30064F14E /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -163,12 +175,12 @@
 		D523B0A01C43AA2A001AD1EC /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0800;
+				LastUpgradeCheck = 0900;
 				ORGANIZATIONNAME = "Hyper Interaktiv AS";
 				TargetAttributes = {
 					D523B0A81C43AA2A001AD1EC = {
 						CreatedOnToolsVersion = 7.2;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 0900;
 					};
 				};
 			};
@@ -221,6 +233,8 @@
 			);
 			inputPaths = (
 				"$(SRCROOT)/Carthage/Build/iOS/Hue.framework",
+				"$(SRCROOT)/Carthage/Build/iOS/Imaginary.framework",
+				"$(SRCROOT)/Carthage/Build/iOS/Cache.framework",
 			);
 			name = "Copy frameworks with Carthage";
 			outputPaths = (
@@ -262,14 +276,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -293,12 +313,12 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -313,14 +333,20 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -338,11 +364,11 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -364,12 +390,11 @@
 				);
 				INFOPLIST_FILE = Lightbox/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = no.hyper.Lightbox;
 				PRODUCT_NAME = Lightbox;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -387,12 +412,11 @@
 				);
 				INFOPLIST_FILE = Lightbox/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = no.hyper.Lightbox;
 				PRODUCT_NAME = Lightbox;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};

Lightbox.xcodeproj/xcshareddata/xcschemes/Lightbox-iOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0900"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -36,6 +37,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

README.md

@@ -1,13 +1,10 @@
 # Lightbox
 
-[![Version](https://img.shields.io/cocoapods/v/Lightbox.svg?style=flat)](http://cocoadocs.org/docsets/Lightbox)
-[![CI Status](http://img.shields.io/travis/hyperoslo/Lightbox.svg?style=flat)](https://travis-ci.org/hyperoslo/Lightbox)
+[![CI Status](https://circleci.com/gh/hyperoslo/Lightbox.png)](https://circleci.com/gh/hyperoslo/Lightbox)
 [![Carthage Compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
 [![License](https://img.shields.io/cocoapods/l/Lightbox.svg?style=flat)](http://cocoadocs.org/docsets/Lightbox)
 [![Platform](https://img.shields.io/cocoapods/p/Lightbox.svg?style=flat)](http://cocoadocs.org/docsets/Lightbox)
-![Swift](https://img.shields.io/badge/%20in-swift%203.0-orange.svg)
-
-[Demo](https://appetize.io/app/wfgwc2uvg82m9pzbt17p4rrgh4?device=iphone5s&scale=75&orientation=portrait&osVersion=9.3)
+![Swift](https://img.shields.io/badge/%20in-swift%204.0-orange.svg)
 
 <img src="https://raw.githubusercontent.com/hyperoslo/Lightbox/master/Images/Icon.png" alt="Lightbox Icon" align="right" />
 
@@ -18,10 +15,16 @@ 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">
+<img src="Images/demo2.png" height="500">
+</div>
 
 ## Table of Contents
 
@@ -107,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 = {
@@ -120,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(
@@ -158,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/AssetManager.swift

@@ -1,5 +1,6 @@
 import UIKit
 
+/// Used to load assets from Lightbox bundle
 class AssetManager {
 
   static func image(_ named: String) -> UIImage? {

Source/Library/LightboxTransition.swift

@@ -28,14 +28,6 @@ class LightboxTransition: UIPercentDrivenInteractiveTransition {
   func transition(_ show: Bool) {
     guard let controller = lightboxController else { return }
 
-    controller.headerView.transform = show
-      ? CGAffineTransform.identity
-      : CGAffineTransform(translationX: 0, y: -200)
-
-    controller.footerView.transform = show
-      ? CGAffineTransform.identity
-      : CGAffineTransform(translationX: 0, y: 250)
-
     if interactive {
       controller.view.backgroundColor = UIColor.black.withAlphaComponent(show ? 1 : 0)
     } else {
@@ -45,7 +37,7 @@ class LightboxTransition: UIPercentDrivenInteractiveTransition {
 
   // MARK: - Pan gesture recognizer
 
-  func handlePanGesture(_ gesture: UIPanGestureRecognizer) {
+  @objc func handlePanGesture(_ gesture: UIPanGestureRecognizer) {
     let translation = gesture.translation(in: scrollView)
     let percentage = abs(translation.y) / UIScreen.main.bounds.height / 1.5
     let velocity = gesture.velocity(in: scrollView)

Source/LightboxConfig.swift

@@ -2,29 +2,14 @@ import UIKit
 import Hue
 import AVKit
 import AVFoundation
+import Imaginary
 
-open class LightboxConfig {
+public class LightboxConfig {
+  /// Whether to show status bar while Lightbox is presented
+  public static var hideStatusBar = true
 
-  public typealias LoadImageCompletion = (_ error: NSError?, _ image: UIImage?) -> Void
-
-  open static var hideStatusBar = true
-
-  open static var loadImage: (_ imageView: UIImageView, _ URL: URL, _ completion: LoadImageCompletion?) -> Void = {
-    imageView, URL, completion in
-    let imageRequest: URLRequest = URLRequest(url: URL)
-
-    NSURLConnection.sendAsynchronousRequest(imageRequest,
-      queue: OperationQueue.main,
-      completionHandler: { _, data, error in
-        if let data = data, let image = UIImage(data: data) {
-          imageView.image = image
-        }
-
-        completion?(error as NSError?, imageView.image)
-    })
-  }
-
-  open static var handleVideo: (_ from: UIViewController, _ videoURL: URL) -> Void = { from, videoURL in
+  /// Provide a closure to handle selected video
+  public static var handleVideo: (_ from: UIViewController, _ videoURL: URL) -> Void = { from, videoURL in
     let videoController = AVPlayerViewController()
     videoController.player = AVPlayer(url: videoURL)
 
@@ -33,18 +18,38 @@ open 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()
+  }
+
   public struct PageIndicator {
     public static var enabled = true
     public static var separatorColor = UIColor(hex: "3D4757")
 
-    public static var textAttributes = [
-      NSFontAttributeName: UIFont.systemFont(ofSize: 12),
-      NSForegroundColorAttributeName: UIColor(hex: "899AB8"),
-      NSParagraphStyleAttributeName: {
+    public static var textAttributes: [NSAttributedStringKey: Any] = [
+      .font: UIFont.systemFont(ofSize: 12),
+      .foregroundColor: UIColor(hex: "899AB8"),
+      .paragraphStyle: {
         var style = NSMutableParagraphStyle()
         style.alignment = .center
         return style
-        }()
+      }()
     ]
   }
 
@@ -54,14 +59,14 @@ open class LightboxConfig {
     public static var text = NSLocalizedString("Close", comment: "")
     public static var image: UIImage?
 
-    public static var textAttributes = [
-      NSFontAttributeName: UIFont.boldSystemFont(ofSize: 16),
-      NSForegroundColorAttributeName: UIColor.white,
-      NSParagraphStyleAttributeName: {
+    public static var textAttributes: [NSAttributedStringKey: Any] = [
+      .font: UIFont.boldSystemFont(ofSize: 16),
+      .foregroundColor: UIColor.white,
+      .paragraphStyle: {
         var style = NSMutableParagraphStyle()
         style.alignment = .center
         return style
-        }()
+      }()
     ]
   }
 
@@ -71,14 +76,14 @@ open class LightboxConfig {
     public static var text = NSLocalizedString("Delete", comment: "")
     public static var image: UIImage?
 
-    public static var textAttributes = [
-      NSFontAttributeName: UIFont.boldSystemFont(ofSize: 16),
-      NSForegroundColorAttributeName: UIColor(hex: "FA2F5B"),
-      NSParagraphStyleAttributeName: {
+    public static var textAttributes: [NSAttributedStringKey: Any] = [
+      .font: UIFont.boldSystemFont(ofSize: 16),
+      .foregroundColor: UIColor(hex: "FA2F5B"),
+      .paragraphStyle: {
         var style = NSMutableParagraphStyle()
         style.alignment = .center
         return style
-        }()
+      }()
     ]
   }
 
@@ -88,9 +93,9 @@ open class LightboxConfig {
     public static var ellipsisText = NSLocalizedString("Show more", comment: "")
     public static var ellipsisColor = UIColor(hex: "899AB9")
 
-    public static var textAttributes = [
-      NSFontAttributeName: UIFont.systemFont(ofSize: 12),
-      NSForegroundColorAttributeName: UIColor(hex: "DBDBDB")
+    public static var textAttributes: [NSAttributedStringKey: Any] = [
+      .font: UIFont.systemFont(ofSize: 12),
+      .foregroundColor: UIColor(hex: "DBDBDB")
     ]
   }
 
@@ -98,8 +103,4 @@ open class LightboxConfig {
     public static var minimumScale: CGFloat = 1.0
     public static var maximumScale: CGFloat = 3.0
   }
-
-  public struct LoadingIndicator {
-    public static var configure: ((UIActivityIndicatorView) -> Void)?
-  }
 }

Source/LightboxController.swift

@@ -22,15 +22,13 @@ open class LightboxController: UIViewController {
 
   lazy var scrollView: UIScrollView = { [unowned self] in
     let scrollView = UIScrollView()
-    scrollView.frame = self.screenBounds
     scrollView.isPagingEnabled = false
     scrollView.delegate = self
-    scrollView.isUserInteractionEnabled = true
     scrollView.showsHorizontalScrollIndicator = false
     scrollView.decelerationRate = UIScrollViewDecelerationRateFast
 
     return scrollView
-    }()
+  }()
 
   lazy var overlayTapGestureRecognizer: UITapGestureRecognizer = { [unowned self] in
     let gesture = UITapGestureRecognizer()
@@ -61,14 +59,14 @@ open class LightboxController: UIViewController {
     view.delegate = self
 
     return view
-    }()
+  }()
 
   open fileprivate(set) lazy var footerView: FooterView = { [unowned self] in
     let view = FooterView()
     view.delegate = self
 
     return view
-    }()
+  }()
 
   open fileprivate(set) lazy var overlayView: UIView = { [unowned self] in
     let view = UIView(frame: CGRect.zero)
@@ -79,11 +77,7 @@ open class LightboxController: UIViewController {
     view.alpha = 0
 
     return view
-    }()
-
-  var screenBounds: CGRect {
-    return UIApplication.shared.delegate?.window??.bounds ?? .zero
-  }
+  }()
 
   // MARK: - Properties
 
@@ -194,6 +188,25 @@ open class LightboxController: UIViewController {
     }
   }
 
+  open override func viewDidLayoutSubviews() {
+    super.viewDidLayoutSubviews()
+
+    scrollView.frame = view.bounds
+    footerView.frame = CGRect(
+      x: 0,
+      y: view.bounds.height - footerView.frame.height,
+      width: view.bounds.width,
+      height: 100
+    )
+
+    headerView.frame = CGRect(
+      x: 0,
+      y: 16,
+      width: view.bounds.width,
+      height: 100
+    )
+  }
+
   open override var prefersStatusBarHidden: Bool {
     return LightboxConfig.hideStatusBar
   }
@@ -252,7 +265,7 @@ open class LightboxController: UIViewController {
 
   // MARK: - Actions
 
-  func overlayViewDidTap(_ tapGestureRecognizer: UITapGestureRecognizer) {
+  @objc func overlayViewDidTap(_ tapGestureRecognizer: UITapGestureRecognizer) {
     footerView.expand(false)
   }
 
@@ -275,18 +288,8 @@ open class LightboxController: UIViewController {
       }
     }
 
-    let bounds = scrollView.bounds
-    let headerViewHeight = headerView.closeButton.frame.height > headerView.deleteButton.frame.height
-      ? headerView.closeButton.frame.height
-      : headerView.deleteButton.frame.height
-
-    headerView.frame = CGRect(x: 0, y: 16, width: bounds.width, height: headerViewHeight)
-    footerView.frame = CGRect(x: 0, y: 0, width: bounds.width, height: 70)
-
     [headerView, footerView].forEach { ($0 as AnyObject).configureLayout() }
 
-    footerView.frame.origin.y = bounds.height - footerView.frame.height
-
     overlayView.frame = scrollView.frame
     overlayView.resizeGradientLayer()
   }
@@ -332,7 +335,7 @@ extension LightboxController: UIScrollViewDelegate {
     }
 
     targetContentOffset.pointee.x = x
-    currentPage = Int(x / screenBounds.width)
+    currentPage = Int(x / view.bounds.width)
   }
 }
 
@@ -398,7 +401,7 @@ extension LightboxController: HeaderViewDelegate {
 
     DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 0.5) {
       self.configureLayout()
-      self.currentPage = Int(self.scrollView.contentOffset.x / self.screenBounds.width)
+      self.currentPage = Int(self.scrollView.contentOffset.x / self.view.bounds.width)
       deleteButton.isEnabled = true
     }
   }
@@ -416,8 +419,6 @@ extension LightboxController: HeaderViewDelegate {
 extension LightboxController: FooterViewDelegate {
 
   public func footerView(_ footerView: FooterView, didExpand expanded: Bool) {
-    footerView.frame.origin.y = screenBounds.height - footerView.frame.height
-
     UIView.animate(withDuration: 0.25, animations: {
       self.overlayView.alpha = expanded ? 1.0 : 0.0
       self.headerView.deleteButton.alpha = expanded ? 0.0 : 1.0

Source/LightboxImage.swift

@@ -1,4 +1,5 @@
 import UIKit
+import Imaginary
 
 open class LightboxImage {
 
@@ -21,15 +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 {
-      LightboxConfig.loadImage(imageView, imageURL) { [weak self] _, image in
-        self?.image = image
-        completion?(image)
-      }
+      LightboxConfig.loadImage(imageView, imageURL, completion)
     }
   }
 }

Source/Views/FooterView.swift

@@ -16,7 +16,7 @@ open class FooterView: UIView {
     label.delegate = self
 
     return label
-    }()
+  }()
 
   open fileprivate(set) lazy var pageLabel: UILabel = { [unowned self] in
     let label = UILabel(frame: CGRect.zero)
@@ -24,7 +24,7 @@ open class FooterView: UIView {
     label.numberOfLines = 1
 
     return label
-    }()
+  }()
 
   open fileprivate(set) lazy var separatorView: UIView = { [unowned self] in
     let view = UILabel(frame: CGRect.zero)
@@ -32,7 +32,7 @@ open class FooterView: UIView {
     view.backgroundColor = LightboxConfig.PageIndicator.separatorColor
 
     return view
-    }()
+  }()
 
   let gradientColors = [UIColor(hex: "040404").alpha(0.1), UIColor(hex: "040404")]
   open weak var delegate: FooterViewDelegate?
@@ -76,17 +76,29 @@ open class FooterView: UIView {
     }
   }
 
-  // MARK: - Layout
+  open override func layoutSubviews() {
+    super.layoutSubviews()
 
-  fileprivate func resetFrames() {
-    frame.size.height = infoLabel.frame.height + 40 + 0.5
+    do {
+      let bottomPadding: CGFloat
+      if #available(iOS 11, *) {
+        bottomPadding = safeAreaInsets.bottom
+      } else {
+        bottomPadding = 0
+      }
 
-    pageLabel.frame.origin = CGPoint(
-      x: (frame.width - pageLabel.frame.width) / 2,
-      y: frame.height - pageLabel.frame.height - 2)
+      pageLabel.frame.origin = CGPoint(
+        x: (frame.width - pageLabel.frame.width) / 2,
+        y: frame.height - pageLabel.frame.height - 2 - bottomPadding
+      )
+    }
 
-    separatorView.frame = CGRect(x: 0, y: pageLabel.frame.minY - 2.5,
-      width: frame.width, height: 0.5)
+    separatorView.frame = CGRect(
+      x: 0,
+      y: pageLabel.frame.minY - 2.5,
+      width: frame.width,
+      height: 0.5
+    )
 
     infoLabel.frame.origin.y = separatorView.frame.minY - infoLabel.frame.height - 15
 
@@ -98,7 +110,7 @@ open class FooterView: UIView {
 
 extension FooterView: LayoutConfigurable {
 
-  public func configureLayout() {
+  @objc public func configureLayout() {
     infoLabel.frame = CGRect(x: 17, y: 0, width: frame.width - 17 * 2, height: 35)
     infoLabel.configureLayout()
   }
@@ -107,7 +119,6 @@ extension FooterView: LayoutConfigurable {
 extension FooterView: InfoLabelDelegate {
 
   public func infoLabel(_ infoLabel: InfoLabel, didExpand expanded: Bool) {
-    resetFrames()
     _ = (expanded || infoLabel.fullText.isEmpty) ? removeGradientLayer() : addGradientLayer(gradientColors)
     delegate?.footerView(self, didExpand: expanded)
   }

Source/Views/HeaderView.swift

@@ -6,13 +6,6 @@ protocol HeaderViewDelegate: class {
 }
 
 open class HeaderView: UIView {
-
-  var centerTextStyle: NSMutableParagraphStyle = {
-    var style = NSMutableParagraphStyle()
-    style.alignment = .center
-    return style
-  }()
-
   open fileprivate(set) lazy var closeButton: UIButton = { [unowned self] in
     let title = NSAttributedString(
       string: LightboxConfig.CloseButton.text,
@@ -38,7 +31,7 @@ open class HeaderView: UIView {
     button.isHidden = !LightboxConfig.CloseButton.enabled
 
     return button
-    }()
+  }()
 
   open fileprivate(set) lazy var deleteButton: UIButton = { [unowned self] in
     let title = NSAttributedString(
@@ -65,7 +58,7 @@ open class HeaderView: UIView {
     button.isHidden = !LightboxConfig.DeleteButton.enabled
 
     return button
-    }()
+  }()
 
   weak var delegate: HeaderViewDelegate?
 
@@ -85,11 +78,11 @@ open class HeaderView: UIView {
 
   // MARK: - Actions
 
-  func deleteButtonDidPress(_ button: UIButton) {
+  @objc func deleteButtonDidPress(_ button: UIButton) {
     delegate?.headerView(self, didPressDeleteButton: button)
   }
 
-  func closeButtonDidPress(_ button: UIButton) {
+  @objc func closeButtonDidPress(_ button: UIButton) {
     delegate?.headerView(self, didPressCloseButton: button)
   }
 }
@@ -98,10 +91,23 @@ open class HeaderView: UIView {
 
 extension HeaderView: LayoutConfigurable {
 
-  public func configureLayout() {
-    closeButton.frame.origin = CGPoint(
-      x: bounds.width - closeButton.frame.width - 17, y: 0)
+  @objc public func configureLayout() {
+    let topPadding: CGFloat
 
-    deleteButton.frame.origin = CGPoint(x: 17, y: 0)
+    if #available(iOS 11, *) {
+      topPadding = safeAreaInsets.top
+    } else {
+      topPadding = 0
+    }
+
+    closeButton.frame.origin = CGPoint(
+      x: bounds.width - closeButton.frame.width - 17,
+      y: topPadding
+    )
+    
+    deleteButton.frame.origin = CGPoint(
+      x: 17,
+      y: topPadding
+    )
   }
 }

Source/Views/InfoLabel.swift

@@ -48,19 +48,20 @@ open class InfoLabel: UILabel {
       return truncatedText
     }
 
+    // Perform quick "rough cut"
     while numberOfLines(truncatedText) > numberOfVisibleLines * 2 {
-        truncatedText = String(truncatedText.characters.prefix(truncatedText.characters.count / 2))
+        truncatedText = String(truncatedText.prefix(truncatedText.count / 2))
     }
 
+    // Capture the endIndex of truncatedText before appending ellipsis
+    var truncatedTextCursor = truncatedText.endIndex
+
     truncatedText += ellipsis
 
-    let start = truncatedText.characters.index(truncatedText.endIndex, offsetBy: -(ellipsis.characters.count + 1))
-    let end = truncatedText.characters.index(truncatedText.endIndex, offsetBy: -ellipsis.characters.count)
-    var range = start..<end
-
+    // Remove characters ahead of ellipsis until the text is the right number of lines
     while numberOfLines(truncatedText) > numberOfVisibleLines {
-      truncatedText.removeSubrange(range)
-      range = truncatedText.index(range.lowerBound, offsetBy: -1)..<truncatedText.index(range.upperBound, offsetBy: -1)
+        truncatedTextCursor = truncatedText.index(before: truncatedTextCursor)
+        truncatedText.remove(at: truncatedTextCursor)
     }
 
     return truncatedText
@@ -85,7 +86,7 @@ open class InfoLabel: UILabel {
 
   // MARK: - Actions
 
-  func labelDidTap(_ tapGestureRecognizer: UITapGestureRecognizer) {
+  @objc func labelDidTap(_ tapGestureRecognizer: UITapGestureRecognizer) {
     shortText = truncatedText
     expanded ? collapse() : expand()
   }
@@ -105,13 +106,13 @@ open class InfoLabel: UILabel {
   }
 
   fileprivate func updateText(_ string: String) {
-    let attributedString = NSMutableAttributedString(string: string,
-      attributes: LightboxConfig.InfoLabel.textAttributes)
+    let textAttributes = LightboxConfig.InfoLabel.textAttributes
+    let attributedString = NSMutableAttributedString(string: string, attributes: textAttributes)
 
-    if string.range(of: ellipsis) != nil {
-      let range = (string as NSString).range(of: ellipsis)
-      attributedString.addAttribute(NSForegroundColorAttributeName,
-        value: LightboxConfig.InfoLabel.ellipsisColor, range: range)
+    if let range = string.range(of: ellipsis) {
+        let ellipsisColor = LightboxConfig.InfoLabel.ellipsisColor
+        let ellipsisRange = NSRange(range, in: string)
+        attributedString.addAttribute(.foregroundColor, value: ellipsisColor, range: ellipsisRange)
     }
 
     attributedText = attributedString
@@ -123,12 +124,12 @@ open class InfoLabel: UILabel {
     return string.boundingRect(
       with: CGSize(width: bounds.size.width, height: CGFloat.greatestFiniteMagnitude),
       options: [.usesLineFragmentOrigin, .usesFontLeading],
-      attributes: [NSFontAttributeName: font],
+      attributes: [NSAttributedStringKey.font: font],
       context: nil).height
   }
 
   fileprivate func numberOfLines(_ string: String) -> Int {
-    let lineHeight = "A".size(attributes: [NSFontAttributeName: font]).height
+    let lineHeight = "A".size(withAttributes: [NSAttributedStringKey.font: font]).height
     let totalHeight = heightForString(string)
 
     return Int(totalHeight / lineHeight)
@@ -139,7 +140,7 @@ open class InfoLabel: UILabel {
 
 extension InfoLabel: LayoutConfigurable {
 
-  public func configureLayout() {
+  @objc public func configureLayout() {
     shortText = truncatedText
     expanded ? expand() : collapse()
   }

Source/Views/PageView.swift

@@ -33,7 +33,7 @@ class PageView: UIScrollView {
     return button
   }()
 
-  lazy var activityIndicator: LoadingIndicator = LoadingIndicator()
+  lazy var loadingIndicator: UIView = LightboxConfig.makeLoadingIndicator()
 
   var image: LightboxImage
   var contentFrame = CGRect.zero
@@ -51,7 +51,7 @@ class PageView: UIScrollView {
 
     configure()
 
-    activityIndicator.alpha = 1
+    loadingIndicator.alpha = 1
     self.image.addImageTo(imageView) { [weak self] image in
       guard let strongSelf = self else {
         return
@@ -62,7 +62,7 @@ class PageView: UIScrollView {
       strongSelf.pageViewDelegate?.remoteImageDidLoad(image, imageView: strongSelf.imageView)
 
       UIView.animate(withDuration: 0.4) {
-        strongSelf.activityIndicator.alpha = 0
+        strongSelf.loadingIndicator.alpha = 0
       }
     }
   }
@@ -80,7 +80,7 @@ class PageView: UIScrollView {
       addSubview(playButton)
     }
 
-    addSubview(activityIndicator)
+    addSubview(loadingIndicator)
 
     delegate = self
     isMultipleTouchEnabled = true
@@ -102,7 +102,7 @@ class PageView: UIScrollView {
 
   // MARK: - Recognizers
 
-  func scrollViewDoubleTapped(_ recognizer: UITapGestureRecognizer) {
+  @objc func scrollViewDoubleTapped(_ recognizer: UITapGestureRecognizer) {
     let pointInView = recognizer.location(in: imageView)
     let newZoomScale = zoomScale > minimumZoomScale
       ? minimumZoomScale
@@ -118,7 +118,7 @@ class PageView: UIScrollView {
     zoom(to: rectToZoomTo, animated: true)
   }
 
-  func viewTapped(_ recognizer: UITapGestureRecognizer) {
+  @objc func viewTapped(_ recognizer: UITapGestureRecognizer) {
     pageViewDelegate?.pageViewDidTouch(self)
   }
 
@@ -127,7 +127,7 @@ class PageView: UIScrollView {
   override func layoutSubviews() {
     super.layoutSubviews()
 
-    activityIndicator.center = imageView.center
+    loadingIndicator.center = imageView.center
     playButton.center = imageView.center
   }
 
@@ -177,28 +177,18 @@ class PageView: UIScrollView {
 
   // MARK: - Action
 
-  func playButtonTouched(_ button: UIButton) {
+  @objc func playButtonTouched(_ button: UIButton) {
     guard let videoURL = image.videoURL else { return }
 
     pageViewDelegate?.pageView(self, didTouchPlayButton: videoURL as URL)
   }
-
-  // MARK: - Controls
-
-  func makeActivityIndicator() -> UIActivityIndicatorView {
-    let view = UIActivityIndicatorView(activityIndicatorStyle: .white)
-    LightboxConfig.LoadingIndicator.configure?(view)
-    view.startAnimating()
-
-    return view
-  }
 }
 
 // MARK: - LayoutConfigurable
 
 extension PageView: LayoutConfigurable {
 
-  func configureLayout() {
+  @objc func configureLayout() {
     contentFrame = frame
     contentSize = frame.size
     imageView.frame = frame

circle.yml

@@ -0,0 +1,12 @@
+machine:
+  xcode:
+    version: "9.0"
+
+dependencies:
+  override:
+    - rm -rf Carthage
+    - carthage update
+
+test:
+  override:
+    - set -o pipefail && xcodebuild -project Lightbox.xcodeproj -scheme "Lightbox-iOS" -sdk iphonesimulator clean build