motion-image-editor 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bf6b38e31764220c4bb4d6f140089e3bdb50297
-  data.tar.gz: cb67aebfe59a677c3965522e83ce44151ff9af61
+  metadata.gz: 226472c295b2d57d3bd62e85792534346b931730
+  data.tar.gz: 08016d9fb24343fbac4d2247ba543756f957617e
 SHA512:
-  metadata.gz: 7b4f42115362f4ff5b14d2948949fe31db972b7d5d5fbbb608229778a3ad533468dfd724d48ec5fc8999842ff1fe0a20d4ba2b126b6b501ebef8e33d7a2f3f6f
-  data.tar.gz: ce32cb9001e626e9425cb70d421643ab5621e56c1e80cbe477e3a6f69a852517800cf1ddf89136fd95d94557934d3d885685f9357efa3435b277a07ae5b6b892
+  metadata.gz: c3721b52b59c18805e7b4d7ca69807fc854536ecf340da76670d9c1dfc6405600e04ac6874a7acada985310c99e15e27241981f21d0ca19eba8c762fa91c5cc5
+  data.tar.gz: f2bfa5a4e7a5226cbc930b3172d40e04821269d6b200a7472bdcad2ae9b4cf5e9bb4fcc04b10fecf1fa515bab63c169a0dbb31d5c2775b71021a2d9183612678

data/lib/project/controllers/image_editor_controller.rb

@@ -3,12 +3,15 @@ class Motion; class ImageEditorController < UIViewController
   MINIMUM_SCALE      = 1
   MAXIMUM_SCALE      = 3
 
-  attr_reader :touch_center,
-              :scale_center,
-              :scale,
-              :output_width,
-              :source_image,
-              :crop_rect
+  attr_reader :source_image, :crop_rect, :output_width
+  attr_writer :rotation_enabled, :enforce_bounds
+
+  def initWithNibName(nib, bundle: bundle)
+    super.tap do |controller|
+      controller.rotation_enabled = true
+      controller.enforce_bounds   = false
+    end
+  end
 
   def viewDidLoad
     super
@@ -20,6 +23,14 @@ class Motion; class ImageEditorController < UIViewController
     setup_constraints
   end
 
+  def viewDidAppear(animated)
+    super
+
+    image_view.image = preview_image
+
+    reset
+  end
+
   def add_subviews
     view.addSubview(crop_view)
     view.insertSubview(image_view, belowSubview: crop_view)
@@ -46,6 +57,53 @@ class Motion; class ImageEditorController < UIViewController
       views:   { 'crop' => crop_view }))
   end
 
+  def source_image=(image)
+    if image != source_image
+      @source_image  = image
+      @preview_image = nil
+    end
+  end
+
+  def crop_rect=(rect)
+    @crop_rect = rect
+
+    crop_view.crop_rect = rect
+  end
+
+  def handle_gesture_state?(state)
+    case state
+    when UIGestureRecognizerStateEnded || UIGestureRecognizerStateCancelled
+      new_scale = bounded_scale(scale)
+
+      delta_x = scale_center.x - image_view.bounds.size.width / 2.0
+      delta_y = scale_center.y - image_view.bounds.size.height / 2.0
+
+      transform = CGAffineTransformTranslate(image_view.transform, delta_x, delta_y)
+
+      transform = CGAffineTransformScale(transform, new_scale / scale , new_scale / scale)
+
+      transform = CGAffineTransformTranslate(transform, -delta_x, -delta_y)
+
+      view.userInteractionEnabled = false
+
+      UIView.animateWithDuration(
+        ANIMATION_DURATION,
+        delay: 0,
+        options: UIViewAnimationOptionCurveEaseOut,
+        animations: -> { image_view.transform = transform },
+        completion: -> (finished) {
+          view.userInteractionEnabled = true
+          @scale = new_scale
+      })
+
+      check_bounds if enforce_bounds?
+
+      false
+    else
+      true
+    end
+  end
+
   def process(&block)
     view.userInteractionEnabled = false
 
@@ -74,19 +132,6 @@ class Motion; class ImageEditorController < UIViewController
     end
   end
 
-  def crop_rect=(rect)
-    @crop_rect = rect
-
-    crop_view.crop_rect = rect
-  end
-
-  def scale_reset_orientations
-    [ UIImageOrientationUpMirrored,
-      UIImageOrientationDownMirrored,
-      UIImageOrientationLeftMirrored,
-      UIImageOrientationRightMirrored ]
-  end
-
   def transform_image(transform, source_image: source_image, source_size: source_size, source_orientation: source_orientation, output_width: output_width, crop_rect: crop_rect, image_view_size: image_view_size)
     aspect = crop_rect.size.height / crop_rect.size.width
     output_size = CGSizeMake(output_width, output_width * aspect)
@@ -145,14 +190,6 @@ class Motion; class ImageEditorController < UIViewController
     CGBitmapContextCreateImage(context)
   end
 
-  def viewDidAppear(animated)
-    super
-
-    image_view.image = preview_image
-
-    reset
-  end
-
   def reset(options = {})
     animated = options.fetch(:animated, false)
 
@@ -163,8 +200,8 @@ class Motion; class ImageEditorController < UIViewController
     crop_aspect   = crop_rect.size.height    / crop_rect.size.width
 
     if source_aspect > crop_aspect
-        w = crop_rect.size.width
-        h = source_aspect * w
+      w = crop_rect.size.width
+      h = source_aspect * w
     else
       h = crop_rect.size.height
       w = h / source_aspect
@@ -189,7 +226,53 @@ class Motion; class ImageEditorController < UIViewController
     end
   end
 
-  # Touch handling
+  def check_bounds
+    y_offset = 0
+    x_offset = 0
+
+    if image_view.frame.origin.x > crop_rect.origin.x
+      x_offset    = -(image_view.frame.origin.x - crop_rect.origin.x)
+      new_right_x = CGRectGetMaxX(image_view.frame) + x_offset
+
+      if new_right_x < CGRectGetMaxX(crop_rect)
+        x_offset = CGRectGetMaxX(crop_rect) - CGRectGetMaxX(image_view.frame)
+      end
+    elsif CGRectGetMaxX(image_view.frame) < CGRectGetMaxX(crop_rect)
+      x_offset = CGRectGetMaxX(crop_rect) - CGRectGetMaxX(image_view.frame)
+      new_left_x = image_view.frame.origin.x + x_offset
+
+      if new_left_x > crop_rect.origin.x
+        x_offset = crop_rect.origin.x - image_view.frame.origin.x
+      end
+    end
+
+    if image_view.frame.origin.y > crop_rect.origin.y
+      y_offset = -(image_view.frame.origin.y - crop_rect.origin.y)
+      new_bottom_y = CGRectGetMaxY(image_view.frame) + y_offset
+
+      if new_bottom_y < CGRectGetMaxY(crop_rect)
+        y_offset = CGRectGetMaxY(crop_rect) - CGRectGetMaxY(image_view.frame)
+      end
+    elsif CGRectGetMaxY(image_view.frame) < CGRectGetMaxY(crop_rect)
+      y_offset = CGRectGetMaxY(crop_rect) - CGRectGetMaxY(image_view.frame)
+      new_top_y = image_view.frame.origin.y + y_offset
+
+      if new_top_y > crop_rect.origin.y
+        y_offset = crop_rect.origin.y - image_view.frame.origin.y
+      end
+    end
+
+    if x_offset || y_offset
+      view.userInteractionEnabled = false
+      transform = CGAffineTransformTranslate(image_view.transform, x_offset / scale, y_offset / scale)
+      UIView.animateWithDuration(
+        ANIMATION_DURATION,
+        delay:      0,
+        options:    UIViewAnimationOptionCurveEaseOut,
+        animations: -> { image_view.transform = transform },
+        completion: -> (finished) { view.userInteractionEnabled = true })
+    end
+  end
 
   def touchesBegan(touches, withEvent: event)
     handle_touches(event.allTouches)
@@ -221,48 +304,19 @@ class Motion; class ImageEditorController < UIViewController
     end
   end
 
-  def handle_state?(state)
-    if state == UIGestureRecognizerStateEnded
-      new_scale = bounded_scale(scale)
-
-      delta_x = scale_center.x - image_view.bounds.size.width / 2.0
-      delta_y = scale_center.y - image_view.bounds.size.height / 2.0
-
-      transform = CGAffineTransformTranslate(image_view.transform, delta_x, delta_y)
-
-      transform = CGAffineTransformScale(transform, new_scale / scale , new_scale / scale)
-
-      transform = CGAffineTransformTranslate(transform, -delta_x, -delta_y)
-
-      view.userInteractionEnabled = false
-
-      UIView.animateWithDuration(
-        ANIMATION_DURATION,
-        delay: 0,
-        options: UIViewAnimationOptionCurveEaseOut,
-        animations: -> { image_view.transform = transform },
-        completion: -> (finished) {
-          view.userInteractionEnabled = true
-          @scale = new_scale
-      })
-
-      false
-    else
-      true
-    end
-  end
-
   def handle_pan(recognizer)
-    translation = recognizer.translationInView(image_view)
-    transform   = CGAffineTransformTranslate(image_view.transform, translation.x, translation.y)
+    if handle_gesture_state? recognizer.state
+      translation = recognizer.translationInView(image_view)
+      transform   = CGAffineTransformTranslate(image_view.transform, translation.x, translation.y)
 
-    image_view.transform = transform
+      image_view.transform = transform
 
-    recognizer.setTranslation(CGPointZero, inView: crop_view)
+      recognizer.setTranslation(CGPointZero, inView: crop_view)
+    end
   end
 
   def handle_pinch(recognizer)
-    if handle_state? recognizer.state
+    if handle_gesture_state? recognizer.state
       if recognizer.state == UIGestureRecognizerStateBegan
         @scale_center = @touch_center
       end
@@ -283,22 +337,37 @@ class Motion; class ImageEditorController < UIViewController
   end
 
   def handle_rotation(recognizer)
-    delta_x = touch_center.x - image_view.bounds.size.width / 2
-    delta_y = touch_center.y - image_view.bounds.size.height / 2
+    if rotation_enabled? && handle_gesture_state?(recognizer.state)
+      delta_x = touch_center.x - image_view.bounds.size.width / 2
+      delta_y = touch_center.y - image_view.bounds.size.height / 2
 
-    transform = CGAffineTransformTranslate(image_view.transform, delta_x, delta_y)
-    transform = CGAffineTransformRotate(transform, recognizer.rotation)
-    transform = CGAffineTransformTranslate(transform, -delta_x, -delta_y)
+      transform = CGAffineTransformTranslate(image_view.transform, delta_x, delta_y)
+      transform = CGAffineTransformRotate(transform, recognizer.rotation)
+      transform = CGAffineTransformTranslate(transform, -delta_x, -delta_y)
 
-    image_view.transform = transform
+      image_view.transform = transform
 
-    recognizer.rotation = 0
+      recognizer.rotation = 0
+    end
   end
 
   def handle_tap(recognizer)
     reset(animated: true)
   end
 
+  def bounded_scale(scale)
+    return scale if (MINIMUM_SCALE..MAXIMUM_SCALE).include? scale
+
+    scale < MINIMUM_SCALE ? MINIMUM_SCALE : MAXIMUM_SCALE
+  end
+
+  def scale_reset_orientations
+    [ UIImageOrientationUpMirrored,
+      UIImageOrientationDownMirrored,
+      UIImageOrientationLeftMirrored,
+      UIImageOrientationRightMirrored ]
+  end
+
   def pan_recognizer
     @pan_recognizer ||= UIPanGestureRecognizer.alloc.initWithTarget(self, action: 'handle_pan:').tap do |recognizer|
       recognizer.cancelsTouchesInView = false
@@ -326,19 +395,6 @@ class Motion; class ImageEditorController < UIViewController
     end
   end
 
-  def source_image=(image)
-    if image != source_image
-      @source_image  = image
-      @preview_image = nil
-    end
-  end
-
-  def bounded_scale(scale)
-    return scale if (MINIMUM_SCALE..MAXIMUM_SCALE).include? scale
-
-    scale < MINIMUM_SCALE ? MINIMUM_SCALE : MAXIMUM_SCALE
-  end
-
   def preview_image
     @preview_image ||= source_image.resizedImageToFitInSize(view.bounds.size, scaleIfSmaller: false)
   end
@@ -355,7 +411,27 @@ class Motion; class ImageEditorController < UIViewController
     end
   end
 
+  def scale
+    @scale ||= 1
+  end
+
+  def touch_center
+    @touch_center ||= CGPointZero
+  end
+
+  def scale_center
+    @scale_center ||= CGPointZero
+  end
+
   def prefersStatusBarHidden
     true
   end
+
+  def rotation_enabled?
+    !!@rotation_enabled
+  end
+
+  def enforce_bounds?
+    !!@enforce_bounds
+  end
 end; end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion-image-editor
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Devon Blandin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-29 00:00:00.000000000 Z
+date: 2013-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: motion-cocoapods