Skip to content

Commit

Permalink
Merge pull request #56 from ruslanskorb/develop
Browse files Browse the repository at this point in the history
Version 1.2.0
ruslanskorb committed Jun 12, 2015
2 parents 8d03fcc + 86c5f30 commit 1b6d921
Showing 19 changed files with 72 additions and 68 deletions.
2 changes: 2 additions & 0 deletions Example/Podfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
platform :ios, '6.0'

inhibit_all_warnings!

target 'RSKImageCropperExampleTests', :exclusive => true do
pod 'FBSnapshotTestCase', '1.5'
pod 'Expecta+Snapshots', '~> 1.3'
2 changes: 1 addition & 1 deletion Example/RSKImageCropperExample.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
@@ -211,6 +211,7 @@
B87A9A2519A4D39800D12CD4 /* RSKImageCropper.h */,
B87A9A2619A4D39800D12CD4 /* RSKImageCropViewController.h */,
B87A9A2719A4D39800D12CD4 /* RSKImageCropViewController.m */,
46AAEE5D1B29155700E10C42 /* RSKImageCropViewController+Protected.h */,
B87A9A2319A4D39800D12CD4 /* RSKImageScrollView.h */,
B87A9A2419A4D39800D12CD4 /* RSKImageScrollView.m */,
B87A9A2819A4D39800D12CD4 /* RSKTouchView.h */,
@@ -219,7 +220,6 @@
B8B3824B1AC721A7004C55F0 /* UIApplication+RSKImageCropper.m */,
B87A9A2A19A4D39800D12CD4 /* UIImage+RSKImageCropper.h */,
B87A9A2B19A4D39800D12CD4 /* UIImage+RSKImageCropper.m */,
46AAEE5D1B29155700E10C42 /* RSKImageCropViewController+Protected.h */,
);
name = RSKImageCropper;
path = ../RSKImageCropper;
2 changes: 1 addition & 1 deletion Example/RSKImageCropperExample/RSKAppDelegate.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// RSKAppDelegate.h
//
// Copyright (c) 2014 Ruslan Skorb, http://ruslanskorb.com/
// Copyright (c) 2014-present Ruslan Skorb, http://ruslanskorb.com/
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
2 changes: 1 addition & 1 deletion Example/RSKImageCropperExample/RSKAppDelegate.m
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// RSKAppDelegate.m
//
// Copyright (c) 2014 Ruslan Skorb, http://ruslanskorb.com/
// Copyright (c) 2014-present Ruslan Skorb, http://ruslanskorb.com/
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
2 changes: 1 addition & 1 deletion Example/RSKImageCropperExample/RSKExampleViewController.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// RSKExampleViewController.h
//
// Copyright (c) 2014 Ruslan Skorb, http://ruslanskorb.com/
// Copyright (c) 2014-present Ruslan Skorb, http://ruslanskorb.com/
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
2 changes: 1 addition & 1 deletion Example/RSKImageCropperExample/RSKExampleViewController.m
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// RSKExampleViewController.m
//
// Copyright (c) 2014 Ruslan Skorb, http://ruslanskorb.com/
// Copyright (c) 2014-present Ruslan Skorb, http://ruslanskorb.com/
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.1.5</string>
<string>1.2.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
2 changes: 1 addition & 1 deletion Example/RSKImageCropperExample/main.m
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// main.m
//
// Copyright (c) 2014 Ruslan Skorb, http://ruslanskorb.com/
// Copyright (c) 2014-present Ruslan Skorb, http://ruslanskorb.com/
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'https://rubygems.org'

gem 'cocoapods', :git => 'https://github.com/CocoaPods/CocoaPods.git'
gem 'cocoapods', '0.36.3'

gem 'coveralls', require: false
gem 'fui', '~> 0.3.0'
92 changes: 47 additions & 45 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,84 +1,83 @@
GIT
remote: https://github.com/CocoaPods/CocoaPods.git
revision: 70fc758ad6db8bbefda5205b11f701145260083e
specs:
cocoapods (0.36.0)
activesupport (>= 3.2.15)
claide (~> 0.8.1)
cocoapods-core (= 0.36.0)
cocoapods-downloader (~> 0.8.1)
cocoapods-plugins (~> 0.4.1)
cocoapods-trunk (~> 0.6.0)
cocoapods-try (~> 0.4.3)
colored (~> 1.2)
escape (~> 0.0.4)
molinillo (~> 0.2.1)
nap (~> 0.8)
open4 (~> 1.3)
xcodeproj (~> 0.23.0)

GEM
remote: https://rubygems.org/
specs:
activesupport (4.2.0)
activesupport (4.2.1)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
aws-sdk-v1 (1.63.0)
aws-sdk-v1 (1.64.0)
json (~> 1.4)
nokogiri (>= 1.4.4)
claide (0.8.1)
clamp (0.6.4)
cocoapods-core (0.36.0)
clamp (0.6.5)
cocoapods (0.36.3)
activesupport (>= 3.2.15)
claide (~> 0.8.1)
cocoapods-core (= 0.36.3)
cocoapods-downloader (~> 0.9.0)
cocoapods-plugins (~> 0.4.1)
cocoapods-trunk (~> 0.6.0)
cocoapods-try (~> 0.4.3)
colored (~> 1.2)
escape (~> 0.0.4)
molinillo (~> 0.2.1)
nap (~> 0.8)
open4 (~> 1.3)
xcodeproj (~> 0.23.1)
cocoapods-core (0.36.3)
activesupport (>= 3.2.15)
fuzzy_match (~> 2.0.4)
nap (~> 0.8.0)
cocoapods-downloader (0.8.1)
cocoapods-plugins (0.4.1)
cocoapods-downloader (0.9.0)
cocoapods-plugins (0.4.2)
nap
cocoapods-trunk (0.6.0)
cocoapods-trunk (0.6.1)
nap (>= 0.8)
netrc (= 0.7.8)
cocoapods-try (0.4.3)
cocoapods-try (0.4.5)
colored (1.2)
coveralls (0.7.11)
multi_json (~> 1.10)
coveralls (0.8.1)
json (~> 1.8)
rest-client (>= 1.6.8, < 2)
simplecov (~> 0.9.1)
simplecov (~> 0.10.0)
term-ansicolor (~> 1.3)
thor (~> 0.19.1)
docile (1.1.5)
domain_name (0.5.24)
unf (>= 0.0.5, < 1.0.0)
escape (0.0.4)
fui (0.3.0)
gli
fuzzy_match (2.0.4)
gli (2.13.0)
gli (2.13.1)
http-cookie (1.0.2)
domain_name (~> 0.5)
i18n (0.7.0)
json (1.8.2)
mime-types (2.4.3)
json (1.8.3)
mime-types (2.6.1)
mini_portile (0.6.2)
minitest (5.5.1)
molinillo (0.2.1)
multi_json (1.11.0)
minitest (5.7.0)
molinillo (0.2.3)
mustache (0.99.8)
nap (0.8.0)
netrc (0.7.8)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
open4 (1.3.4)
rest-client (1.7.3)
rest-client (1.8.0)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 3.0)
netrc (~> 0.7)
second_curtain (0.2.4)
aws-sdk-v1 (~> 1.52)
mustache (~> 0.99)
simplecov (0.9.2)
simplecov (0.10.0)
docile (~> 1.1.0)
multi_json (~> 1.0)
simplecov-html (~> 0.9.0)
simplecov-html (0.9.0)
json (~> 1.8)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
slather (1.7.0)
clamp (~> 0.6)
nokogiri (~> 1.6.3)
@@ -87,19 +86,22 @@ GEM
tins (~> 1.0)
thor (0.19.1)
thread_safe (0.3.5)
tins (1.3.5)
tins (1.5.2)
tzinfo (1.2.2)
thread_safe (~> 0.1)
xcodeproj (0.23.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.1)
xcodeproj (0.23.1)
activesupport (>= 3)
colored (~> 1.2)
xcpretty (0.1.8)
xcpretty (0.1.10)

PLATFORMS
ruby

DEPENDENCIES
cocoapods!
cocoapods (= 0.36.3)
coveralls
fui (~> 0.3.0)
second_curtain (~> 0.2.3)
2 changes: 1 addition & 1 deletion RSKImageCropper.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'RSKImageCropper'
s.version = '1.1.5'
s.version = '1.2.0'
s.summary = 'An image cropper for iOS like in the Contacts app with support for landscape orientation.'
s.homepage = 'https://github.com/ruslanskorb/RSKImageCropper'
s.license = { :type => 'MIT', :file => 'LICENSE' }
14 changes: 7 additions & 7 deletions RSKImageCropper/RSKImageCropViewController+Protected.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// RSKTouchView.h
// RSKImageCropViewController+Protected.h
//
// Copyright (c) 2014 Ruslan Skorb, http://ruslanskorb.com/
// Copyright (c) 2014-present Ruslan Skorb, http://ruslanskorb.com/
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
@@ -25,19 +25,19 @@
@interface RSKImageCropViewController (Protected)

/**
* Asynchronously crops the original image in accordance with the current settings
Asynchronously crops the original image in accordance with the current settings and tells the delegate that the original image will be / has been cropped.
*/
- (void)cropImage;

/**
* Method that invokes the protocol method imageCropViewControllerDidCancelCrop:
Tells the delegate that the crop has been canceled.
*/
- (void)cancelCrop;

/**
* Method that resets the image to its original position in the scroll view.
*
* @param animated BOOL
Resets the rotation angle, the position and the zoom scale of the original image to the default values.
@param animated Set this value to YES to animate the reset.
*/
- (void)reset:(BOOL)animated;

2 changes: 1 addition & 1 deletion RSKImageCropper/RSKImageCropViewController.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// RSKImageCropViewController.h
//
// Copyright (c) 2014 Ruslan Skorb, http://ruslanskorb.com/
// Copyright (c) 2014-present Ruslan Skorb, http://ruslanskorb.com/
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
2 changes: 1 addition & 1 deletion RSKImageCropper/RSKImageCropViewController.m
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// RSKImageCropViewController.m
//
// Copyright (c) 2014 Ruslan Skorb, http://ruslanskorb.com/
// Copyright (c) 2014-present Ruslan Skorb, http://ruslanskorb.com/
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
2 changes: 1 addition & 1 deletion RSKImageCropper/RSKImageCropper.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// RSKImageCropper.h
//
// Copyright (c) 2014 Ruslan Skorb, http://ruslanskorb.com/
// Copyright (c) 2014-present Ruslan Skorb, http://ruslanskorb.com/
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
2 changes: 1 addition & 1 deletion RSKImageCropper/RSKTouchView.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// RSKTouchView.h
//
// Copyright (c) 2014 Ruslan Skorb, http://ruslanskorb.com/
// Copyright (c) 2014-present Ruslan Skorb, http://ruslanskorb.com/
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
2 changes: 1 addition & 1 deletion RSKImageCropper/RSKTouchView.m
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// RSKTouchView.m
//
// Copyright (c) 2014 Ruslan Skorb, http://ruslanskorb.com/
// Copyright (c) 2014-present Ruslan Skorb, http://ruslanskorb.com/
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
2 changes: 1 addition & 1 deletion RSKImageCropper/UIImage+RSKImageCropper.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// UIImage+RSKImageCropper.h
//
// Copyright (c) 2014 Ruslan Skorb, http://ruslanskorb.com/
// Copyright (c) 2014-present Ruslan Skorb, http://ruslanskorb.com/
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
2 changes: 1 addition & 1 deletion RSKImageCropper/UIImage+RSKImageCropper.m
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// UIImage+RSKImageCropper.m
//
// Copyright (c) 2014 Ruslan Skorb, http://ruslanskorb.com/
// Copyright (c) 2014-present Ruslan Skorb, http://ruslanskorb.com/
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal

0 comments on commit 1b6d921

Please sign in to comment.