diff --git a/Example/Podfile b/Example/Podfile index ebf25e9..7dbce2b 100644 --- a/Example/Podfile +++ b/Example/Podfile @@ -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' diff --git a/Example/RSKImageCropperExample.xcodeproj/project.pbxproj b/Example/RSKImageCropperExample.xcodeproj/project.pbxproj index 80a1ed7..6b0688b 100755 --- a/Example/RSKImageCropperExample.xcodeproj/project.pbxproj +++ b/Example/RSKImageCropperExample.xcodeproj/project.pbxproj @@ -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; diff --git a/Example/RSKImageCropperExample/RSKAppDelegate.h b/Example/RSKImageCropperExample/RSKAppDelegate.h index e0ace92..9b5f64b 100755 --- a/Example/RSKImageCropperExample/RSKAppDelegate.h +++ b/Example/RSKImageCropperExample/RSKAppDelegate.h @@ -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 diff --git a/Example/RSKImageCropperExample/RSKAppDelegate.m b/Example/RSKImageCropperExample/RSKAppDelegate.m index cc45047..9738c1b 100755 --- a/Example/RSKImageCropperExample/RSKAppDelegate.m +++ b/Example/RSKImageCropperExample/RSKAppDelegate.m @@ -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 diff --git a/Example/RSKImageCropperExample/RSKExampleViewController.h b/Example/RSKImageCropperExample/RSKExampleViewController.h index ce7ccc6..4daca6e 100755 --- a/Example/RSKImageCropperExample/RSKExampleViewController.h +++ b/Example/RSKImageCropperExample/RSKExampleViewController.h @@ -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 diff --git a/Example/RSKImageCropperExample/RSKExampleViewController.m b/Example/RSKImageCropperExample/RSKExampleViewController.m index 328c4a8..338ec48 100755 --- a/Example/RSKImageCropperExample/RSKExampleViewController.m +++ b/Example/RSKImageCropperExample/RSKExampleViewController.m @@ -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 diff --git a/Example/RSKImageCropperExample/RSKImageCropperExample-Info.plist b/Example/RSKImageCropperExample/RSKImageCropperExample-Info.plist index f35f913..f31df5d 100755 --- a/Example/RSKImageCropperExample/RSKImageCropperExample-Info.plist +++ b/Example/RSKImageCropperExample/RSKImageCropperExample-Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.1.5 + 1.2.0 CFBundleSignature ???? CFBundleVersion diff --git a/Example/RSKImageCropperExample/main.m b/Example/RSKImageCropperExample/main.m index 95ce870..e3c5acc 100755 --- a/Example/RSKImageCropperExample/main.m +++ b/Example/RSKImageCropperExample/main.m @@ -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 diff --git a/Gemfile b/Gemfile index c7f0615..716b802 100644 --- a/Gemfile +++ b/Gemfile @@ -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' diff --git a/Gemfile.lock b/Gemfile.lock index 95c12a6..5038af6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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) diff --git a/RSKImageCropper.podspec b/RSKImageCropper.podspec index 7ed87a8..97e4e8c 100644 --- a/RSKImageCropper.podspec +++ b/RSKImageCropper.podspec @@ -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' } diff --git a/RSKImageCropper/RSKImageCropViewController+Protected.h b/RSKImageCropper/RSKImageCropViewController+Protected.h index b2814f3..28d1194 100644 --- a/RSKImageCropper/RSKImageCropViewController+Protected.h +++ b/RSKImageCropper/RSKImageCropViewController+Protected.h @@ -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; diff --git a/RSKImageCropper/RSKImageCropViewController.h b/RSKImageCropper/RSKImageCropViewController.h index 43a430f..1eb2907 100755 --- a/RSKImageCropper/RSKImageCropViewController.h +++ b/RSKImageCropper/RSKImageCropViewController.h @@ -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 diff --git a/RSKImageCropper/RSKImageCropViewController.m b/RSKImageCropper/RSKImageCropViewController.m index e4b8e67..520023e 100644 --- a/RSKImageCropper/RSKImageCropViewController.m +++ b/RSKImageCropper/RSKImageCropViewController.m @@ -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 diff --git a/RSKImageCropper/RSKImageCropper.h b/RSKImageCropper/RSKImageCropper.h index a6bf9e9..5846be8 100755 --- a/RSKImageCropper/RSKImageCropper.h +++ b/RSKImageCropper/RSKImageCropper.h @@ -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 diff --git a/RSKImageCropper/RSKTouchView.h b/RSKImageCropper/RSKTouchView.h index 05aa49e..6659511 100755 --- a/RSKImageCropper/RSKTouchView.h +++ b/RSKImageCropper/RSKTouchView.h @@ -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 diff --git a/RSKImageCropper/RSKTouchView.m b/RSKImageCropper/RSKTouchView.m index e0e91cc..c12ca26 100755 --- a/RSKImageCropper/RSKTouchView.m +++ b/RSKImageCropper/RSKTouchView.m @@ -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 diff --git a/RSKImageCropper/UIImage+RSKImageCropper.h b/RSKImageCropper/UIImage+RSKImageCropper.h index d9c889f..6079dab 100755 --- a/RSKImageCropper/UIImage+RSKImageCropper.h +++ b/RSKImageCropper/UIImage+RSKImageCropper.h @@ -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 diff --git a/RSKImageCropper/UIImage+RSKImageCropper.m b/RSKImageCropper/UIImage+RSKImageCropper.m index 0df069c..4f295c1 100755 --- a/RSKImageCropper/UIImage+RSKImageCropper.m +++ b/RSKImageCropper/UIImage+RSKImageCropper.m @@ -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