Adds cropping

Example/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - Sharaku (1.0.1)
+  - Sharaku (1.0.2)
 
 DEPENDENCIES:
   - Sharaku (from `../`)
@@ -9,8 +9,8 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  Sharaku: de44ee4ade4e6f4f1bcd0d86d9daaa88101c89b2
+  Sharaku: 9a0067b35337cecbdb0efb44f05680b3e46388e4
 
 PODFILE CHECKSUM: ef1eae032f35d1ec3a285bf6b0259e2f3f3aa7de
 
-COCOAPODS: 1.2.0.beta.3
+COCOAPODS: 1.2.0

Example/Sharaku.xcodeproj/project.pbxproj

@@ -215,12 +215,12 @@
 				TargetAttributes = {
 					607FACCF1AFB9204008FA782 = {
 						CreatedOnToolsVersion = 6.3.1;
-						DevelopmentTeam = 48RUGN3XS3;
+						DevelopmentTeam = 9DE4B762BF;
 						LastSwiftMigration = 0820;
 					};
 					607FACE41AFB9204008FA782 = {
 						CreatedOnToolsVersion = 6.3.1;
-						DevelopmentTeam = 48RUGN3XS3;
+						DevelopmentTeam = 9DE4B762BF;
 						LastSwiftMigration = 0820;
 						TestTargetID = 607FACCF1AFB9204008FA782;
 					};
@@ -443,7 +443,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -481,7 +481,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
@@ -493,8 +493,9 @@
 			baseConfigurationReference = E335AB8B6641B97B41E056F1 /* Pods-Sharaku_Example.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				DEVELOPMENT_TEAM = 48RUGN3XS3;
+				DEVELOPMENT_TEAM = 9DE4B762BF;
 				INFOPLIST_FILE = Sharaku/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
@@ -508,8 +509,9 @@
 			baseConfigurationReference = 792FD7528EB182F6B9C2A50F /* Pods-Sharaku_Example.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				DEVELOPMENT_TEAM = 48RUGN3XS3;
+				DEVELOPMENT_TEAM = 9DE4B762BF;
 				INFOPLIST_FILE = Sharaku/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
@@ -522,7 +524,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 655D612BB2C22B50F6C183AC /* Pods-Sharaku_Tests.debug.xcconfig */;
 			buildSettings = {
-				DEVELOPMENT_TEAM = 48RUGN3XS3;
+				DEVELOPMENT_TEAM = 9DE4B762BF;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
 					"$(inherited)",
@@ -543,7 +545,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = C975C2F8E6ECB3EE8B22CDCA /* Pods-Sharaku_Tests.release.xcconfig */;
 			buildSettings = {
-				DEVELOPMENT_TEAM = 48RUGN3XS3;
+				DEVELOPMENT_TEAM = 9DE4B762BF;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
 					"$(inherited)",

Example/Sharaku/Images.xcassets/sample.imageset/Contents.json

@@ -4,6 +4,14 @@
       "idiom" : "universal",
       "filename" : "sample.jpg",
       "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

Example/Sharaku/ViewController.swift

@@ -18,25 +18,13 @@ class ViewController: UIViewController {
         // Do any additional setup after loading the view, typically from a nib.
     }
 
-    override func didReceiveMemoryWarning() {
-        super.didReceiveMemoryWarning()
-        // Dispose of any resources that can be recreated.
-    }
-
     @IBAction func sharakuButtonTapped(_ sender: Any) {
         let image = UIImage(named: "sample")
-        let vc = SHViewController(image: image!)
-        vc.delegate = self
+        let vc = ContainerViewController(image: image!)
         present(vc, animated: true, completion: nil)
-    }
-}
-
-extension ViewController: SHViewControllerDelegate {
-    func shViewControllerImageDidFilter(image: UIImage) {
-        imageView.image = image
-        showSharokuButton.isHidden = true
-    }
 
-    func shViewControllerDidCancel() {
+        vc.didFinishWithImage = { [weak self] image in
+            self?.imageView.image = image
+        }
     }
 }

Sharaku.podspec

@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
   s.author           = { 'makomori' => '[email protected]' }
   s.source           = { :git => 'https://github.com/makomori/Sharaku.git', :tag => s.version.to_s }
   s.social_media_url = 'https://twitter.com/makomori26'
-  s.ios.deployment_target = '8.3'
+  s.ios.deployment_target = '9.0'
   s.source_files = 'Sharaku/Classes/**/*'
   s.resources = ['Sharaku/Classes/**/*.xib', 'Sharaku/**/*.xcassets']
   s.resource_bundles = {

Sharaku/Assets/Media.xcassets/PhotoCropEditorBorder.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "PhotoCropEditorBorder.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Sharaku/Classes/ContainerViewController.swift

@@ -0,0 +1,179 @@
+import UIKit
+
+extension UIView {
+    func add(view: UIView) {
+        view.translatesAutoresizingMaskIntoConstraints = false
+        addSubview(view)
+    }
+    func add(views: [UIView]) {
+        views.forEach{ add(view: $0) }
+    }
+}
+
+extension UIViewController {
+    func removeFromContainer() {
+        guard parent != nil else { return }
+        willMove(toParentViewController: nil)
+        view.removeFromSuperview()
+        removeFromParentViewController()
+    }
+
+    func add(to viewController: UIViewController, container: UIView) {
+        viewController.addChildViewController(self)
+        container.add(view: view)
+        NSLayoutConstraint.activate([
+            view.topAnchor.constraint(equalTo: container.topAnchor),
+            view.leftAnchor.constraint(equalTo: container.leftAnchor),
+            view.rightAnchor.constraint(equalTo: container.rightAnchor),
+            view.bottomAnchor.constraint(equalTo: container.bottomAnchor),
+        ])
+    }
+}
+
+public final class ContainerViewController: UIViewController {
+    public var didFinishWithImage: (UIImage) -> Void = { _ in }
+    public var didCancel: () -> Void = { _ in }
+    private let filterViewController: SHViewController
+    private let cropViewController: CropViewController
+    private let containerView = UIView()
+    private let filter: UIButton = {
+       let b = UIButton()
+        b.setTitleColor(.gray, for: .normal)
+        b.setTitleColor(.black, for: .selected)
+        b.setTitle("Filter", for: .normal)
+        return b
+    }()
+    private let crop: UIButton = {
+        let b = UIButton()
+        b.setTitleColor(.gray, for: .normal)
+        b.setTitleColor(.black, for: .selected)
+        b.setTitle("Crop", for: .normal)
+        return b
+    }()
+
+    public init(image: UIImage) {
+        filterViewController = SHViewController(image: image)
+        cropViewController = CropViewController(image: image)
+        super.init(nibName: nil, bundle: nil)
+    }
+
+    required public init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    public override var prefersStatusBarHidden: Bool {
+        return true
+    }
+
+    override public func loadView() {
+        super.loadView()
+
+        let topBar = UIView()
+        topBar.backgroundColor = .white
+        view.add(view: topBar)
+
+        let next = UIButton()
+        next.setTitleColor(.black, for: .normal)
+        next.setTitle("Next", for: .normal)
+        next.addTarget(self, action: #selector(ContainerViewController.didTapNext), for: .touchUpInside)
+
+        let back = UIButton()
+        back.setTitleColor(.black, for: .normal)
+        back.setTitle("Back", for: .normal)
+        back.addTarget(self, action: #selector(ContainerViewController.didTapBack), for: .touchUpInside)
+
+        topBar.add(views: [next, back])
+
+        NSLayoutConstraint.activate([
+            topBar.leftAnchor.constraint(equalTo: view.leftAnchor),
+            topBar.rightAnchor.constraint(equalTo: view.rightAnchor),
+            topBar.topAnchor.constraint(equalTo: view.topAnchor),
+            topBar.heightAnchor.constraint(equalToConstant: 44),
+
+            next.rightAnchor.constraint(equalTo: topBar.rightAnchor, constant: -10),
+            next.topAnchor.constraint(equalTo: topBar.topAnchor),
+            next.bottomAnchor.constraint(equalTo: topBar.bottomAnchor),
+
+            back.leftAnchor.constraint(equalTo: topBar.leftAnchor, constant: 10),
+            back.topAnchor.constraint(equalTo: topBar.topAnchor),
+            back.bottomAnchor.constraint(equalTo: topBar.bottomAnchor)
+        ])
+
+        let bottomTab = UIView()
+        bottomTab.backgroundColor = .white
+        view.add(view: bottomTab)
+
+        bottomTab.add(views: [filter, crop])
+
+        NSLayoutConstraint.activate([
+            bottomTab.leftAnchor.constraint(equalTo: view.leftAnchor),
+            bottomTab.rightAnchor.constraint(equalTo: view.rightAnchor),
+            bottomTab.bottomAnchor.constraint(equalTo: view.bottomAnchor),
+            bottomTab.heightAnchor.constraint(equalToConstant: 44),
+
+            filter.leftAnchor.constraint(equalTo: bottomTab.leftAnchor),
+            filter.bottomAnchor.constraint(equalTo: bottomTab.bottomAnchor),
+            filter.topAnchor.constraint(equalTo: bottomTab.topAnchor),
+            filter.rightAnchor.constraint(equalTo: bottomTab.centerXAnchor),
+
+            crop.leftAnchor.constraint(equalTo: bottomTab.centerXAnchor),
+            crop.bottomAnchor.constraint(equalTo: bottomTab.bottomAnchor),
+            crop.topAnchor.constraint(equalTo: bottomTab.topAnchor),
+            crop.rightAnchor.constraint(equalTo: bottomTab.rightAnchor),
+        ])
+
+        view.add(view: containerView)
+
+        NSLayoutConstraint.activate([
+            containerView.topAnchor.constraint(equalTo: topBar.bottomAnchor),
+            containerView.leftAnchor.constraint(equalTo: view.leftAnchor),
+            containerView.rightAnchor.constraint(equalTo: view.rightAnchor),
+            containerView.bottomAnchor.constraint(equalTo: bottomTab.topAnchor),
+        ])
+    }
+
+    public override func viewDidLoad() {
+        super.viewDidLoad()
+        showFilter()
+        filter.addTarget(self, action: #selector(ContainerViewController.showFilter), for: .touchUpInside)
+        crop.addTarget(self, action: #selector(ContainerViewController.showCrop), for: .touchUpInside)
+    }
+
+    func showFilter() {
+        if let image = cropViewController.croppedImage {
+            filterViewController.image = image
+        }
+        cropViewController.removeFromContainer()
+        filterViewController.add(to: self, container: containerView)
+        filter.isSelected = true
+        crop.isSelected = false
+    }
+
+    func showCrop() {
+        filterViewController.removeFromContainer()
+        cropViewController.add(to: self, container: containerView)
+        filter.isSelected = false
+        crop.isSelected = true
+    }
+
+    func didTapNext() {
+        func sendImageFromFilter() {
+            guard let image = filterViewController.imageView?.image else {
+                assertionFailure()
+                return
+            }
+            didFinishWithImage(image)
+        }
+        if cropViewController.parent == nil {
+            sendImageFromFilter()
+        } else {
+            filterViewController.image = cropViewController.croppedImage
+            sendImageFromFilter()
+        }
+        dismiss(animated: true, completion: nil)
+    }
+
+    func didTapBack() {
+        didCancel()
+    }
+}