Updated to version 1.6.2

sleepsheep · Jul 17, 2014 · d3fa898 · d3fa898
1 parent 773d0f6
commit d3fa898
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 10 deletions.
diff --git a/FXBlurView.podspec b/FXBlurView.podspec
@@ -1,10 +1,10 @@
 Pod::Spec.new do |s|
   s.name         =  'FXBlurView'
-  s.version      =  '1.6.1'
+  s.version      =  ‘1.6.2’
   s.license      =  'zlib'
   s.summary      =  'UIView subclass that replicates the iOS 7 realtime background blur effect, but works on iOS 5 and above.'
   s.author       =  { 'Nick Lockwood' => 'http://charcoaldesign.co.uk/' }
-  s.source       =  { :git => 'https://github.com/nicklockwood/FXBlurView.git', :tag => '1.6.1' }
+  s.source       =  { :git => 'https://github.com/nicklockwood/FXBlurView.git', :tag => ‘1.6.2’ }
   s.homepage     =  'http://github.com/nicklockwood/FXBlurView'
   s.platform     =  :ios
   s.source_files =  'FXBlurView'

diff --git a/FXBlurView/FXBlurView.h b/FXBlurView/FXBlurView.h
@@ -1,7 +1,7 @@
 //
 //  FXBlurView.h
 //
-//  Version 1.6.1
+//  Version 1.6.2
 //
 //  Created by Nick Lockwood on 25/08/2013.
 //  Copyright (c) 2013 Charcoal Design
@@ -32,7 +32,6 @@
 
 
 #import <UIKit/UIKit.h>
-#import <Accelerate/Accelerate.h>
 
 
 #pragma GCC diagnostic push

diff --git a/FXBlurView/FXBlurView.m b/FXBlurView/FXBlurView.m
@@ -1,7 +1,7 @@
 //
 //  FXBlurView.m
 //
-//  Version 1.6.1
+//  Version 1.6.2
 //
 //  Created by Nick Lockwood on 25/08/2013.
 //  Copyright (c) 2013 Charcoal Design
@@ -35,6 +35,7 @@
 #import <objc/runtime.h>
 #import <objc/message.h>
 #import <QuartzCore/QuartzCore.h>
+#import <Accelerate/Accelerate.h>
 
 
 #pragma GCC diagnostic ignored "-Wobjc-missing-property-synthesis"
@@ -479,15 +480,26 @@ - (void)displayLayer:(__unused CALayer *)layer
     if ([key isEqualToString:@"blurRadius"])
     {
         //animations are enabled
-        CAAnimation *action = (CAAnimation *)[super actionForLayer:layer forKey:@"bounds"];
+        CAAnimation *action = (CAAnimation *)[super actionForLayer:layer forKey:@"backgroundColor"];
         if ((NSNull *)action != [NSNull null])
         {
             CABasicAnimation *animation = [CABasicAnimation animationWithKeyPath:key];
             animation.fromValue = [layer.presentationLayer valueForKey:key];
+
+            //CAMediatiming attributes
+            animation.beginTime = action.beginTime;
             animation.duration = action.duration;
-            animation.timingFunction = action.timingFunction;
+            animation.speed = action.speed;
             animation.timeOffset = action.timeOffset;
+            animation.repeatCount = action.repeatCount;
+            animation.repeatDuration = action.repeatDuration;
+            animation.autoreverses = action.autoreverses;
+            animation.fillMode = action.fillMode;
+
+            //CAAnimation attributes
+            animation.timingFunction = action.timingFunction;
             animation.delegate = action.delegate;
+
             return animation;
         }
     }

diff --git a/LICENCE.md b/LICENCE.md
@@ -1,6 +1,6 @@
 FXBlurView
 
-Version 1.6.1, April 28th, 2014
+Version 1.6.2, July 17th, 2014
 
 Copyright (C) 2013 Charcoal Design
 

diff --git a/README.md b/README.md
@@ -7,8 +7,8 @@ FXBlurView is a UIView subclass that replicates the iOS 7 realtime background bl
 Supported iOS & SDK Versions
 -----------------------------
 
-* Supported build target - iOS 7.1 (Xcode 5.1, Apple LLVM compiler 5.1)
-* Earliest supported deployment target - iOS 5.0
+* Supported build target - iOS 8.0 (Xcode 6.0, Apple LLVM compiler 6.0)
+* Earliest supported deployment target - iOS 6.0
 * Earliest compatible deployment target - iOS 4.3
 
 NOTE: 'Supported' means that the library has been tested with this version. 'Compatible' means that the library should work on this iOS version (i.e. it doesn't rely on any unavailable SDK features) but is no longer being tested for compatibility and may require tweaking or bug fixes to run correctly.
@@ -114,6 +114,11 @@ FAQ
 Release Notes
 -----------------
 
+Version 1.6.2
+
+- Fixed crash on iOS 8 when animating blur
+- Fixed issue when using FXBlurView with Swift
+
 Version 1.6.1
 
 - Fixed issue with animation completion block not firing