Skip to content

Commit

Permalink
Bump version.
Browse files Browse the repository at this point in the history
  • Loading branch information
sprint84 committed May 2, 2016
1 parent f682c0b commit 4106c2a
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion CropViewController/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.1</string>
<string>1.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
4 changes: 2 additions & 2 deletions Example/Example/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.1</string>
<string>1.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>2</string>
<string>3</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>UILaunchStoryboardName</key>
Expand Down
42 changes: 21 additions & 21 deletions Example/Example/ViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit 4106c2a

Please sign in to comment.