Additional example (#74)

michaelhenry · web-flow · commit 890be5f57473 · 2019-12-04T11:50:27.000+09:00
update sample project
diff --git a/Example/Demo.xcodeproj/project.pbxproj b/Example/Demo.xcodeproj/project.pbxproj
@@ -7,6 +7,11 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		A68EAF90239634A000158120 /* ExampleListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A68EAF8F239634A000158120 /* ExampleListViewController.swift */; };
+		A68EAF922396361C00158120 /* BasicViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A68EAF912396361C00158120 /* BasicViewController.swift */; };
+		A68EAF9423963A9100158120 /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = A68EAF9323963A9100158120 /* Extensions.swift */; };
+		A68EAF9623963B3600158120 /* WithURLViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A68EAF9523963B3600158120 /* WithURLViewController.swift */; };
+		A6AB18E4239752C800BF0681 /* WithURLsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6AB18E3239752C800BF0681 /* WithURLsViewController.swift */; };
 		A6BC0BC8239139F8004A4E46 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6BC0BC7239139F8004A4E46 /* AppDelegate.swift */; };
 		A6BC0BD1239139F9004A4E46 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A6BC0BD0239139F9004A4E46 /* Assets.xcassets */; };
 		A6BC0BD4239139F9004A4E46 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A6BC0BD2239139F9004A4E46 /* LaunchScreen.storyboard */; };
@@ -20,6 +25,11 @@
 /* Begin PBXFileReference section */
 		10710A5B07A80798DED8269E /* Pods_Demo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Demo.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		20E424F2DB4A27D25989365C /* Pods-Demo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Demo.release.xcconfig"; path = "Target Support Files/Pods-Demo/Pods-Demo.release.xcconfig"; sourceTree = "<group>"; };
+		A68EAF8F239634A000158120 /* ExampleListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExampleListViewController.swift; sourceTree = "<group>"; };
+		A68EAF912396361C00158120 /* BasicViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BasicViewController.swift; sourceTree = "<group>"; };
+		A68EAF9323963A9100158120 /* Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Extensions.swift; sourceTree = "<group>"; };
+		A68EAF9523963B3600158120 /* WithURLViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WithURLViewController.swift; sourceTree = "<group>"; };
+		A6AB18E3239752C800BF0681 /* WithURLsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WithURLsViewController.swift; sourceTree = "<group>"; };
 		A6BC0BC4239139F8004A4E46 /* Demo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Demo.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		A6BC0BC7239139F8004A4E46 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		A6BC0BD0239139F9004A4E46 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -78,9 +88,14 @@
 				A6BC0BD2239139F9004A4E46 /* LaunchScreen.storyboard */,
 				A6BC0BD5239139F9004A4E46 /* Info.plist */,
 				A6BC0BDD23913C30004A4E46 /* GalleryFlowLayout.swift */,
-				A6BC0BDF23913C66004A4E46 /* GalleryViewController.swift */,
 				A6BC0BE123914239004A4E46 /* ThumbCell.swift */,
 				A6BC0BE723915420004A4E46 /* Data.swift */,
+				A68EAF9323963A9100158120 /* Extensions.swift */,
+				A68EAF8F239634A000158120 /* ExampleListViewController.swift */,
+				A68EAF912396361C00158120 /* BasicViewController.swift */,
+				A68EAF9523963B3600158120 /* WithURLViewController.swift */,
+				A6BC0BDF23913C66004A4E46 /* GalleryViewController.swift */,
+				A6AB18E3239752C800BF0681 /* WithURLsViewController.swift */,
 			);
 			path = Demo;
 			sourceTree = "<group>";
@@ -208,11 +223,16 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				A68EAF9623963B3600158120 /* WithURLViewController.swift in Sources */,
 				A6BC0BE023913C66004A4E46 /* GalleryViewController.swift in Sources */,
+				A6AB18E4239752C800BF0681 /* WithURLsViewController.swift in Sources */,
 				A6BC0BE823915420004A4E46 /* Data.swift in Sources */,
+				A68EAF9423963A9100158120 /* Extensions.swift in Sources */,
 				A6BC0BDE23913C30004A4E46 /* GalleryFlowLayout.swift in Sources */,
+				A68EAF90239634A000158120 /* ExampleListViewController.swift in Sources */,
 				A6BC0BE223914239004A4E46 /* ThumbCell.swift in Sources */,
 				A6BC0BC8239139F8004A4E46 /* AppDelegate.swift in Sources */,
+				A68EAF922396361C00158120 /* BasicViewController.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/Example/Demo/AppDelegate.swift b/Example/Demo/AppDelegate.swift
@@ -1,11 +1,3 @@
-//
-//  AppDelegate.swift
-//  Demo
-//
-//  Created by Michael Henry Pantaleon on 2019/11/29.
-//  Copyright © 2019 Michael Henry Pantaleon. All rights reserved.
-//
-
 import UIKit
 
 @UIApplicationMain
@@ -16,8 +8,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         window = UIWindow(frame: UIScreen.main.bounds)
         
-        let galleryVC = GalleryViewController()
-        window?.rootViewController = UINavigationController(rootViewController: galleryVC)
+        let exampleListVC = ExampleListViewController()
+        window?.rootViewController = UINavigationController(rootViewController: exampleListVC)
         window?.makeKeyAndVisible()
         return true
     }
diff --git a/Example/Demo/BasicViewController.swift b/Example/Demo/BasicViewController.swift
@@ -0,0 +1,31 @@
+import UIKit
+import MHFacebookImageViewer
+
+class BasicViewController:UIViewController {
+    
+    lazy var imageView:UIImageView = {
+        let iv = UIImageView()
+        iv.image = Data.images[0].resize(targetSize: .thumbnail)
+        
+        // Setup Image Viewer
+        iv.setupImageViewer()
+        return iv
+    }()
+    
+    override func loadView() {
+        super.loadView()
+        view = UIView()
+        view.backgroundColor = .white
+        view.addSubview(imageView)
+        imageView.translatesAutoresizingMaskIntoConstraints = false
+        imageView.topAnchor.constraint(equalTo: view.layoutMarginsGuide.topAnchor, constant: 20).isActive = true
+        imageView.leftAnchor.constraint(equalTo: view.leftAnchor, constant: 20).isActive = true
+        imageView.widthAnchor.constraint(equalToConstant: 100).isActive = true
+        imageView.heightAnchor.constraint(equalToConstant: 100).isActive = true
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+
+    }
+}
diff --git a/Example/Demo/Data.swift b/Example/Demo/Data.swift
@@ -1,36 +1,17 @@
 import UIKit
 
 struct Data {
-    static let images:[UIImage] = [
-        UIImage(named: "cat1")!,
-        UIImage(named: "cat2")!,
-        UIImage(named: "cat3")!,
-        UIImage(named: "cat4")!,
-        UIImage(named: "cat5")!,
-        UIImage(named: "cat1")!,
-        UIImage(named: "cat2")!,
-        UIImage(named: "cat3")!,
-        UIImage(named: "cat4")!,
-        UIImage(named: "cat5")!,
-        UIImage(named: "cat1")!,
-        UIImage(named: "cat2")!,
-        UIImage(named: "cat3")!,
-        UIImage(named: "cat4")!,
-        UIImage(named: "cat5")!,
-        UIImage(named: "cat1")!,
-        UIImage(named: "cat2")!,
-        UIImage(named: "cat3")!,
-        UIImage(named: "cat4")!,
-        UIImage(named: "cat5")!,
-        UIImage(named: "cat1")!,
-        UIImage(named: "cat2")!,
-        UIImage(named: "cat3")!,
-        UIImage(named: "cat4")!,
-        UIImage(named: "cat5")!,
-        UIImage(named: "cat1")!,
-        UIImage(named: "cat2")!,
-        UIImage(named: "cat3")!,
-        UIImage(named: "cat4")!,
-        UIImage(named: "cat5")!,
+    
+    static let imageNames:[String] = [
+        "cat1",
+        "cat2",
+        "cat3",
+        "cat4",
+        "cat5"
     ]
+    
+    static let images:[UIImage] = Self.imageNames.compactMap { UIImage(named: $0)! }
+    
+    static let imageUrls:[URL] = Self.imageNames.compactMap {
+        URL(string: "https://raw.githubusercontent.com/michaelhenry/MHFacebookImageViewer/master/Example/Demo/Assets.xcassets/\($0).imageset/\($0).jpg")! }
 }
diff --git a/Example/Demo/ExampleListViewController.swift b/Example/Demo/ExampleListViewController.swift
@@ -0,0 +1,72 @@
+import UIKit
+
+enum ExampleType:CaseIterable, CustomStringConvertible {
+    
+    case basic
+    case withURL
+    case withUIImages
+    case withURLs
+    
+    var description: String {
+        switch self {
+            case .basic:
+                return "Basic"
+            case .withURL:
+                return "With URL"
+            case .withUIImages:
+                return "With [UIImage]"
+            case .withURLs:
+                return "With [URL]"
+        }
+    }
+    
+    var viewController:UIViewController {
+        switch self {
+            case .basic:
+                return BasicViewController()
+            case .withURL:
+                return WithURLViewController()
+            case .withUIImages:
+                return WithImagesViewController()
+            case .withURLs:
+                return WithURLsViewController()
+        }
+    }
+}
+
+class ExampleListViewController:UITableViewController {
+    
+    var items:[ExampleType] = ExampleType.allCases
+    
+    override func numberOfSections(in tableView: UITableView) -> Int {
+        return 1
+    }
+    
+    override func tableView(
+        _ tableView: UITableView, numberOfRowsInSection section: Int)
+        -> Int {
+        return items.count
+    }
+    
+    override func tableView(
+        _ tableView: UITableView,
+        cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        
+        let itemReuseId = "item_reuse_identifier"
+        var cell = tableView.dequeueReusableCell(withIdentifier: itemReuseId)
+        if cell == nil {
+            cell = UITableViewCell(style: .default, reuseIdentifier: itemReuseId)
+        }
+        cell?.textLabel?.text = items[indexPath.row].description
+        return cell!
+    }
+    
+    
+    override func tableView(
+        _ tableView: UITableView,
+        didSelectRowAt indexPath: IndexPath) {
+        
+        navigationController?.pushViewController(
+            items[indexPath.row].viewController, animated: true)
+    }
+}
diff --git a/Example/Demo/Extensions.swift b/Example/Demo/Extensions.swift
@@ -0,0 +1,34 @@
+import UIKit
+
+extension UIImage {
+    func resize(targetSize: CGSize) -> UIImage {
+        
+        let widthRatio  = targetSize.width  / size.width
+        let heightRatio = targetSize.height / size.height
+        
+        var newSize: CGSize
+        if widthRatio > heightRatio {
+            newSize = CGSize(width: size.width * heightRatio, height: size.height * heightRatio)
+        } else {
+            newSize = CGSize(width: size.width * widthRatio,  height: size.height * widthRatio)
+        }
+        
+        let rect = CGRect(x: 0, y: 0, width: newSize.width, height: newSize.height)
+        
+        UIGraphicsBeginImageContextWithOptions(newSize, false, 0)
+        draw(in: rect)
+        let newImage = UIGraphicsGetImageFromCurrentImageContext()
+        UIGraphicsEndImageContext()
+        
+        return newImage!
+    }
+    
+    func scale(by scale: CGFloat) -> UIImage? {
+        let scaledSize = CGSize(width: size.width * scale, height: size.height * scale)
+        return resize(targetSize: scaledSize)
+    }
+}
+
+extension CGSize {
+    static let thumbnail:CGSize = CGSize(width: 50, height:50)
+}
diff --git a/Example/Demo/GalleryViewController.swift b/Example/Demo/GalleryViewController.swift
@@ -1,7 +1,7 @@
 import UIKit
 import MHFacebookImageViewer
 
-class GalleryViewController:UIViewController {
+class WithImagesViewController:UIViewController {
 
     var images:[UIImage] = Data.images
     
@@ -56,12 +56,14 @@ class GalleryViewController:UIViewController {
         }
     }
     
-    override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
+    override func viewWillTransition(
+        to size: CGSize,
+        with coordinator: UIViewControllerTransitionCoordinator) {
         updateLayout(size)
     }
 }
 
-extension GalleryViewController:UICollectionViewDataSource {
+extension WithImagesViewController:UICollectionViewDataSource {
     
     func numberOfSections(in collectionView: UICollectionView) -> Int {
         return 1
@@ -73,16 +75,20 @@ extension GalleryViewController:UICollectionViewDataSource {
         return images.count
     }
     
-    func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
+    func collectionView(
+        _ collectionView: UICollectionView,
+        cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
+        
         let cell:ThumbCell = collectionView
             .dequeueReusableCell(withReuseIdentifier: ThumbCell.reuseIdentifier,
                                  for: indexPath) as! ThumbCell
         cell.imageView.image = images[indexPath.item]
         
-        // Setup Image Viewer
+        // Setup Image Viewer with [UIImage]
         cell.imageView.setupImageViewer(
             images: images,
             initialIndex: indexPath.item)
+        
         return cell
     }
 }
diff --git a/Example/Demo/WithURLViewController.swift b/Example/Demo/WithURLViewController.swift
@@ -0,0 +1,36 @@
+import UIKit
+import MHFacebookImageViewer
+import SDWebImage
+
+class WithURLViewController:UIViewController {
+    
+    lazy var imageView:UIImageView = {
+        let iv = UIImageView()
+        
+        // Set an image with low resolution.
+        iv.image = Data.images[0].resize(targetSize: .thumbnail)
+        
+        // Setup Image Viewer With URL
+        iv.setupImageViewer(url: Data.imageUrls[0])
+        return iv
+    }()
+    
+    override func loadView() {
+        super.loadView()
+        view = UIView()
+        view.backgroundColor = .white
+        view.addSubview(imageView)
+        imageView.translatesAutoresizingMaskIntoConstraints = false
+        imageView.topAnchor.constraint(equalTo: view.layoutMarginsGuide.topAnchor, constant: 20).isActive = true
+        imageView.leftAnchor.constraint(equalTo: view.leftAnchor, constant: 20).isActive = true
+        imageView.widthAnchor.constraint(equalToConstant: 100).isActive = true
+        imageView.heightAnchor.constraint(equalToConstant: 100).isActive = true
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        // for debugging purposes, just clear the download images
+        SDImageCache.shared.clear(with: .all, completion: nil)
+    }
+}
diff --git a/Example/Demo/WithURLsViewController.swift b/Example/Demo/WithURLsViewController.swift
diff --git a/Sources/UIImageView_Extensions.swift b/Sources/UIImageView_Extensions.swift

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`import UIKit`
`2`	`2`	`import MHFacebookImageViewer`
`3`	`3`
`4`		`-class GalleryViewController:UIViewController {`
	`4`	`+class WithImagesViewController:UIViewController {`
`5`	`5`
`6`	`6`	`var images:[UIImage] = Data.images`
`7`	`7`
`@@ -56,12 +56,14 @@ class GalleryViewController:UIViewController {`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`
`59`		`- override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {`
	`59`	`+ override func viewWillTransition(`
	`60`	`+ to size: CGSize,`
	`61`	`+ with coordinator: UIViewControllerTransitionCoordinator) {`
`60`	`62`	`updateLayout(size)`
`61`	`63`	`}`
`62`	`64`	`}`
`63`	`65`
`64`		`-extension GalleryViewController:UICollectionViewDataSource {`
	`66`	`+extension WithImagesViewController:UICollectionViewDataSource {`
`65`	`67`
`66`	`68`	`func numberOfSections(in collectionView: UICollectionView) -> Int {`
`67`	`69`	`return 1`
`@@ -73,16 +75,20 @@ extension GalleryViewController:UICollectionViewDataSource {`
`73`	`75`	`return images.count`
`74`	`76`	`}`
`75`	`77`
`76`		`- func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {`
	`78`	`+ func collectionView(`
	`79`	`+ _ collectionView: UICollectionView,`
	`80`	`+ cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {`
	`81`	`+`
`77`	`82`	`let cell:ThumbCell = collectionView`
`78`	`83`	`.dequeueReusableCell(withReuseIdentifier: ThumbCell.reuseIdentifier,`
`79`	`84`	`for: indexPath) as! ThumbCell`
`80`	`85`	`cell.imageView.image = images[indexPath.item]`
`81`	`86`
`82`		`- // Setup Image Viewer`
	`87`	`+ // Setup Image Viewer with [UIImage]`
`83`	`88`	`cell.imageView.setupImageViewer(`
`84`	`89`	`images: images,`
`85`	`90`	`initialIndex: indexPath.item)`
	`91`	`+`
`86`	`92`	`return cell`
`87`	`93`	`}`
`88`	`94`	`}`