Scaling issues tmp fixes & Swift 3 support

Example/Athlee-ImageEditorKit/Athlee-ImageEditorKit.xcodeproj/project.pbxproj

@@ -706,7 +706,7 @@
 				DEVELOPMENT_TEAM = RG4N372RZE;
 				INFOPLIST_FILE = "Athlee-ImageEditorKit/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = "io.athlee.Athlee-ImageEditorKit";
+				PRODUCT_BUNDLE_IDENTIFIER = "io.athlee.Athlee-ImageEditorKit-Demo";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -721,7 +721,7 @@
 				DEVELOPMENT_TEAM = RG4N372RZE;
 				INFOPLIST_FILE = "Athlee-ImageEditorKit/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = "io.athlee.Athlee-ImageEditorKit";
+				PRODUCT_BUNDLE_IDENTIFIER = "io.athlee.Athlee-ImageEditorKit-Demo";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2";

Example/Athlee-ImageEditorKit/Athlee-ImageEditorKit/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,5 +1,15 @@
 {
   "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "3x"
+    },
     {
       "idiom" : "iphone",
       "size" : "29x29",

Example/Athlee-ImageEditorKit/Athlee-ImageEditorKit/CropViewController.swift

@@ -7,21 +7,19 @@
 //
 
 import UIKit
+import ImagePickerKit
 
 final class CropViewController: UIViewController {
 
-  // MARK: Outlets 
+  // MARK: Outlets
 
   @IBOutlet weak var scalePicker: ScalePicker!
 
   // MARK: Properties 
 
-  var theta: Float = 0
-  var beta: Float = 0
-
-  var transformView: UIView {
-    return ContainerViewController.Children.image.cropContainerView
-  }
+  var theta: Double = 0
+  var beta: Double = 0
+  var angle: CGFloat = 0
 
   // MARK: Life cycle 
 
@@ -30,32 +28,49 @@ final class CropViewController: UIViewController {
     scalePicker.reset()
   }
 
-  // MARK: IBActions 
+  // MARK: IBActions
 
   @IBAction func didPressResetButton(_ sender: AnyObject) {
-    scalePicker.reset()
-    transformView.transform = CGAffineTransform.identity
     theta = 0
     beta = 0
+    angle = 0
+
+    scalePicker.reset()
+    applyAngleTransform()
+
+    let imageViewController = ContainerViewController.Children.image
+    imageViewController?.updateContent()
   }
 
   @IBAction func didChangeValue(_ sender: ScalePicker) {
     let value = sender.value
-    beta = value
-    let angle = theta + value
-    let transform = CGAffineTransform(rotationAngle: angle.toRadians())
-    transformView.transform = transform
+    beta = Double(value.toRadians())
+    angle = CGFloat(theta + beta)
+
+    applyAngleTransform()
   }
 
   @IBAction func didPressRotateButton(_ sender: AnyObject) {
-    theta += -90
-    let transform = CGAffineTransform(rotationAngle: (theta + beta).toRadians())
-    transformView.transform = transform
+    theta += (-90.0).toRadians()
+
+    applyAngleTransform()
   }
-}
-
-extension Float {
-  func toRadians() -> CGFloat {
-    return CGFloat(self) * (CGFloat(M_PI) / 180)
+
+  // MARK: Utils 
+
+  fileprivate func applyAngleTransform() {
+    let scrollView = ContainerViewController.Children.image.cropView
+    let imageView = ContainerViewController.Children.image.childView
+    let transform = CGAffineTransform(rotationAngle: CGFloat(angle))
+      .scaling(toFill: scrollView.bounds.size, with: imageView.bounds.size, atAngle: Double(angle))
+
+    let minZoomFactor = CGAffineTransform.scalingFactor(toFill: scrollView.bounds.size,
+                                                        with: imageView.bounds.size,
+                                                        atAngle: Double(angle))
+
+    scrollView.minimumZoomScale = CGFloat(minZoomFactor)
+    imageView.transform = angle != 0 ? transform : .identity
   }
 }
+
+

Example/Athlee-ImageEditorKit/Athlee-ImageEditorKit/ImageViewController.swift

@@ -20,6 +20,7 @@ final class ImageViewController: UIViewController, Cropable {
 
   var cropView = UIScrollView()
   var childView = UIImageView()
+  var childContainerView = UIView()
   var linesView = LinesView()
 
   var alwaysShowGuidelines: Bool = true

Source/UI/ScalePicker.swift

@@ -226,4 +226,8 @@ extension ScalePicker {
 
     scrollView.setContentOffset(offset, animated: false)
   }
+
+  public func scrollViewDidEndDragging(_ scrollView: UIScrollView, willDecelerate decelerate: Bool) {
+    sendActions(for: .editingDidEnd)
+  }
 }