From 27ec4d422e9b49b31860e2056fb37bfe9838b832 Mon Sep 17 00:00:00 2001 From: VivienCormier Date: Mon, 24 Mar 2014 23:41:10 +0100 Subject: [PATCH] Fix iOS 7.1 / Add podspec --- .../UIImageViewModeScaleAspect/ViewController.m | 6 +----- UIImageViewModeScaleAspect.podspec | 4 ++-- .../UIImageViewModeScaleAspect.h | 9 +++------ .../UIImageViewModeScaleAspect.m | 13 +------------ 4 files changed, 7 insertions(+), 25 deletions(-) diff --git a/Example/UIImageViewModeScaleAspect/UIImageViewModeScaleAspect/ViewController.m b/Example/UIImageViewModeScaleAspect/UIImageViewModeScaleAspect/ViewController.m index ea27b4f..c4a1e45 100644 --- a/Example/UIImageViewModeScaleAspect/UIImageViewModeScaleAspect/ViewController.m +++ b/Example/UIImageViewModeScaleAspect/UIImageViewModeScaleAspect/ViewController.m @@ -26,14 +26,10 @@ - (void)viewDidLoad // self.myImage = [[UIImageViewModeScaleAspect alloc]initWithFrame:CGRectMake(0, 100, 200, 100)]; self.myImage.contentMode = UIViewContentModeScaleAspectFill; // Add the first contentMode - self.myImage.image = [UIImage imageNamed:@"becomeapanda_tumblr_com_portrait"]; + self.myImage.image = [UIImage imageNamed:@"becomeapanda_tumblr_com"]; self.myImage.backgroundColor = [UIColor blackColor]; [self.view addSubview:_myImage]; - // - // New : use to get the UIImage use [self.myImage getImage] instead of [self.myImage image] - // - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(animateImage)]; [self.view addGestureRecognizer:tap]; } diff --git a/UIImageViewModeScaleAspect.podspec b/UIImageViewModeScaleAspect.podspec index c6804d5..a166366 100644 --- a/UIImageViewModeScaleAspect.podspec +++ b/UIImageViewModeScaleAspect.podspec @@ -1,10 +1,10 @@ Pod::Spec.new do |s| s.name = 'UIImageViewModeScaleAspect' - s.version = '1.2' + s.version = '1.3' s.summary = 'Create animation of a UIImageView between twice contentMode ( UIViewContentModeScaleAspectFill / UIViewContentModeScaleAspectFit ).' s.homepage = "https://github.com/VivienCormier/UIImageViewModeScaleAspect" s.author = {'Vivien Cormier' => 'vivien.cormier@gmail.com'} - s.source = {:git => 'https://github.com/VivienCormier/UIImageViewModeScaleAspect.git', :tag => '1.2'} + s.source = {:git => 'https://github.com/VivienCormier/UIImageViewModeScaleAspect.git', :tag => '1.3'} s.platform = :ios, '5.0' s.source_files = 'UIImageViewModeScaleAspect/UIImageViewModeScaleAspect.{h,m}' s.license = 'MIT' diff --git a/UIImageViewModeScaleAspect/UIImageViewModeScaleAspect.h b/UIImageViewModeScaleAspect/UIImageViewModeScaleAspect.h index c273174..97102e2 100644 --- a/UIImageViewModeScaleAspect/UIImageViewModeScaleAspect.h +++ b/UIImageViewModeScaleAspect/UIImageViewModeScaleAspect.h @@ -9,7 +9,9 @@ #import -@interface UIImageViewModeScaleAspect : UIImageView +@interface UIImageViewModeScaleAspect : UIView + +@property(nonatomic, strong) UIImage *image; #pragma mark - Automatic Animate @@ -103,9 +105,4 @@ */ - (void)animateFinishToScaleAspectFill; - -- (UIImage *)getImage; - -- (UIImage *)image __attribute((deprecated("use getImage method"))); - @end \ No newline at end of file diff --git a/UIImageViewModeScaleAspect/UIImageViewModeScaleAspect.m b/UIImageViewModeScaleAspect/UIImageViewModeScaleAspect.m index ffd866b..621c583 100644 --- a/UIImageViewModeScaleAspect/UIImageViewModeScaleAspect.m +++ b/UIImageViewModeScaleAspect/UIImageViewModeScaleAspect.m @@ -19,8 +19,6 @@ @interface UIImageViewModeScaleAspect () @implementation UIImageViewModeScaleAspect -@synthesize image = _image; - #pragma mark - Lifecycle /** @@ -275,14 +273,6 @@ - (void)animateFinishToScaleAspectFill{ } -#pragma mark - Getter - -- (UIImage *)getImage{ - - return _img.image; - -} - #pragma mark - Rewrite Setter / Getter - (void)setImage:(UIImage *)image{ @@ -293,9 +283,8 @@ - (void)setImage:(UIImage *)image{ - (UIImage *)image{ - // If you want the UIImage use "getImage" + return _img.image; - return nil; } - (void)setContentMode:(UIViewContentMode)contentMode{