Skip to content

Commit

Permalink
Merge pull request #92 from ruslanskorb/develop
Browse files Browse the repository at this point in the history
Version 1.5.0
  • Loading branch information
ruslanskorb committed Jan 29, 2016
2 parents f7c42b2 + e0bdd25 commit ef861fc
Showing 8 changed files with 198 additions and 61 deletions.
34 changes: 31 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -2,9 +2,15 @@
#
.DS_Store

# Xcode

# Build generated
#
build/
DerivedData


# Various settings
#
*.pbxuser
!default.pbxuser
*.mode1v3
@@ -14,15 +20,37 @@ build/
*.perspectivev3
!default.perspectivev3
xcuserdata


# Other
#
*.xccheckout
*.moved-aside
DerivedData
*.xcuserstate
*.xcscmblueprint


# Obj-C/Swift specific
#
*.hmap
*.ipa
*.xcuserstate
*.gcno
*.gcda


# Binaries
#
*.zip


# Carthage
#
# Add this line if you want to avoid checking in source code from Carthage dependencies.
# Carthage/Checkouts

Carthage/Build


# CocoaPods
#
# We recommend against adding the Pods directory to your .gitignore. However
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.4.1</string>
<string>1.5.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
2 changes: 1 addition & 1 deletion Framework/Info.plist
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.4.1</string>
<string>1.5.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
29 changes: 17 additions & 12 deletions RSKImageCropper.podspec
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
Pod::Spec.new do |s|
s.name = 'RSKImageCropper'
s.version = '1.4.1'
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' }
s.authors = { 'Ruslan Skorb' => '[email protected]' }
s.source = { :git => 'https://github.com/ruslanskorb/RSKImageCropper.git', :tag => s.version.to_s }
s.platform = :ios, '6.0'
s.source_files = 'RSKImageCropper/*.{h,m}'
s.resources = 'RSKImageCropper/RSKImageCropperStrings.bundle'
s.frameworks = 'QuartzCore', 'UIKit'
s.requires_arc = true
s.name = 'RSKImageCropper'
s.version = '1.5.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' }
s.authors = { 'Ruslan Skorb' => '[email protected]' }
s.source = { :git => 'https://github.com/ruslanskorb/RSKImageCropper.git', :tag => s.version.to_s }
s.platform = :ios, '6.0'
s.source_files = 'RSKImageCropper/*.{h,m}'
s.resources = 'RSKImageCropper/RSKImageCropperStrings.bundle'
s.frameworks = 'QuartzCore', 'UIKit'
s.requires_arc = true
s.public_header_files = [
'RSKImageCropper/RSKImageCropper.h',
'RSKImageCropper/RSKImageCropViewController.h',
'RSKImageCropper/RSKImageCropViewController+Protected.h'
]
end
12 changes: 6 additions & 6 deletions RSKImageCropper.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
@@ -226,7 +226,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1.4.1;
CURRENT_PROJECT_VERSION = 1.5.0;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
@@ -274,7 +274,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1.4.1;
CURRENT_PROJECT_VERSION = 1.5.0;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -300,8 +300,8 @@
isa = XCBuildConfiguration;
buildSettings = {
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1.4.1;
DYLIB_CURRENT_VERSION = 1.4.1;
DYLIB_COMPATIBILITY_VERSION = 1.5.0;
DYLIB_CURRENT_VERSION = 1.5.0;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = Framework/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -316,8 +316,8 @@
isa = XCBuildConfiguration;
buildSettings = {
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1.4.1;
DYLIB_CURRENT_VERSION = 1.4.1;
DYLIB_COMPATIBILITY_VERSION = 1.5.0;
DYLIB_CURRENT_VERSION = 1.5.0;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = Framework/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
14 changes: 14 additions & 0 deletions RSKImageCropper/RSKImageCropViewController+Protected.h
Original file line number Diff line number Diff line change
@@ -48,6 +48,20 @@ NS_ASSUME_NONNULL_BEGIN
*/
- (void)reset:(BOOL)animated;

/**
Sets the current rotation angle of the image in radians.
@param rotationAngle The rotation angle of the image in radians.
*/
- (void)setRotationAngle:(CGFloat)rotationAngle;

/**
Sets the current scale factor for the image.
@param zoomScale The scale factor for the image.
*/
- (void)setZoomScale:(CGFloat)zoomScale;

@end

NS_ASSUME_NONNULL_END
74 changes: 74 additions & 0 deletions RSKImageCropper/RSKImageCropViewController.h
Original file line number Diff line number Diff line change
@@ -192,6 +192,80 @@ typedef NS_ENUM(NSUInteger, RSKImageCropMode) {
*/
- (BOOL)isPortraitInterfaceOrientation;

/// -------------------------------------
/// @name Accessing the Layout Attributes
/// -------------------------------------

/**
The inset of the circle mask rect's area within the crop view's area in portrait orientation. Default value is `15.0f`.
*/
@property (assign, nonatomic) CGFloat portraitCircleMaskRectInnerEdgeInset;

/**
The inset of the square mask rect's area within the crop view's area in portrait orientation. Default value is `20.0f`.
*/
@property (assign, nonatomic) CGFloat portraitSquareMaskRectInnerEdgeInset;

/**
The vertical space between the top of the 'Move and Scale' label and the top of the crop view in portrait orientation. Default value is `64.0f`.
*/
@property (assign, nonatomic) CGFloat portraitMoveAndScaleLabelTopAndCropViewTopVerticalSpace;

/**
The vertical space between the bottom of the crop view and the bottom of the 'Cancel' button in portrait orientation. Default value is `21.0f`.
*/
@property (assign, nonatomic) CGFloat portraitCropViewBottomAndCancelButtonBottomVerticalSpace;

/**
The vertical space between the bottom of the crop view and the bottom of the 'Choose' button in portrait orientation. Default value is `21.0f`.
*/
@property (assign, nonatomic) CGFloat portraitCropViewBottomAndChooseButtonBottomVerticalSpace;

/**
The horizontal space between the leading of the 'Cancel' button and the leading of the crop view in portrait orientation. Default value is `13.0f`.
*/
@property (assign, nonatomic) CGFloat portraitCancelButtonLeadingAndCropViewLeadingHorizontalSpace;

/**
The horizontal space between the trailing of the crop view and the trailing of the 'Choose' button in portrait orientation. Default value is `13.0f`.
*/
@property (assign, nonatomic) CGFloat portraitCropViewTrailingAndChooseButtonTrailingHorizontalSpace;

/**
The inset of the circle mask rect's area within the crop view's area in landscape orientation. Default value is `45.0f`.
*/
@property (assign, nonatomic) CGFloat landscapeCircleMaskRectInnerEdgeInset;

/**
The inset of the square mask rect's area within the crop view's area in landscape orientation. Default value is `45.0f`.
*/
@property (assign, nonatomic) CGFloat landscapeSquareMaskRectInnerEdgeInset;

/**
The vertical space between the top of the 'Move and Scale' label and the top of the crop view in landscape orientation. Default value is `12.0f`.
*/
@property (assign, nonatomic) CGFloat landscapeMoveAndScaleLabelTopAndCropViewTopVerticalSpace;

/**
The vertical space between the bottom of the crop view and the bottom of the 'Cancel' button in landscape orientation. Default value is `12.0f`.
*/
@property (assign, nonatomic) CGFloat landscapeCropViewBottomAndCancelButtonBottomVerticalSpace;

/**
The vertical space between the bottom of the crop view and the bottom of the 'Choose' button in landscape orientation. Default value is `12.0f`.
*/
@property (assign, nonatomic) CGFloat landscapeCropViewBottomAndChooseButtonBottomVerticalSpace;

/**
The horizontal space between the leading of the 'Cancel' button and the leading of the crop view in landscape orientation. Default value is `13.0f`.
*/
@property (assign, nonatomic) CGFloat landscapeCancelButtonLeadingAndCropViewLeadingHorizontalSpace;

/**
The horizontal space between the trailing of the crop view and the trailing of the 'Choose' button in landscape orientation. Default value is `13.0f`.
*/
@property (assign, nonatomic) CGFloat landscapeCropViewTrailingAndChooseButtonTrailingHorizontalSpace;

@end

/**
Loading

0 comments on commit ef861fc

Please sign in to comment.