diff --git a/CropViewController/Info.plist b/CropViewController/Info.plist index a6f720e..602d864 100644 --- a/CropViewController/Info.plist +++ b/CropViewController/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.1 + 1.2 CFBundleSignature ???? CFBundleVersion diff --git a/Example/Example/Info.plist b/Example/Example/Info.plist index 70678e3..14caf09 100644 --- a/Example/Example/Info.plist +++ b/Example/Example/Info.plist @@ -15,11 +15,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.1 + 1.2 CFBundleSignature ???? CFBundleVersion - 2 + 3 LSRequiresIPhoneOS UILaunchStoryboardName diff --git a/Example/Example/ViewController.swift b/Example/Example/ViewController.swift index 186bf19..9c9ed72 100644 --- a/Example/Example/ViewController.swift +++ b/Example/Example/ViewController.swift @@ -35,29 +35,29 @@ class ViewController: UIViewController, UINavigationControllerDelegate, UIImageP return } // Uncomment to use crop view directly - let imgView = UIImageView(image: image) - imgView.clipsToBounds = true - imgView.contentMode = .ScaleAspectFit - - let cropView = CropView(frame: imageView.frame) - cropView.opaque = false - cropView.clipsToBounds = true - cropView.backgroundColor = UIColor.clearColor() - cropView.image = image - cropView.showCroppedArea = false - cropView.cropAspectRatio = 1.0 - cropView.keepAspectRatio = true - cropView.resizeEnabled = false - - view.insertSubview(cropView, aboveSubview: imageView) +// let imgView = UIImageView(image: image) +// imgView.clipsToBounds = true +// imgView.contentMode = .ScaleAspectFit +// +// let cropView = CropView(frame: imageView.frame) +// cropView.opaque = false +// cropView.clipsToBounds = true +// cropView.backgroundColor = UIColor.clearColor() +// cropView.image = image +// cropView.showCroppedArea = false +// cropView.cropAspectRatio = 1.0 +// cropView.keepAspectRatio = true +// cropView.resizeEnabled = false +// +// view.insertSubview(cropView, aboveSubview: imageView) // Use view controller -// let controller = CropViewController() -// controller.delegate = self -// controller.image = image -// -// let navController = UINavigationController(rootViewController: controller) -// presentViewController(navController, animated: true, completion: nil) + let controller = CropViewController() + controller.delegate = self + controller.image = image + + let navController = UINavigationController(rootViewController: controller) + presentViewController(navController, animated: true, completion: nil) } @IBAction func cameraButtonAction(sender: UIBarButtonItem) {