Skip to content

Commit 1daff13

Browse files
Merge pull request #5 from Yalantis/feature/version1.1
Feature/version1.1
2 parents 88989db + 0c2e0e5 commit 1daff13

12 files changed

Lines changed: 100 additions & 482 deletions

File tree

Podfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
platform :ios, '8.0'
2+
use_frameworks!
3+
4+
pod "PullToMakeFlight", :path => "./"

PullToMakeFlight.podspec

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
22

33
s.name = "PullToMakeFlight"
4-
s.version = "1.0"
4+
s.version = "1.1"
55
s.summary = "Custom animated pull-to-refresh that can be easily added to UIScrollView"
66

77
s.homepage = "http://yalantis.com"
@@ -16,11 +16,13 @@ Pod::Spec.new do |s|
1616
s.ios.deployment_target = "8.0"
1717

1818

19-
s.source = { :git => "https://github.com/Yalantis/PullToMakeFlight.git", :tag => "1.0" }
19+
s.source = { :git => "https://github.com/Yalantis/PullToMakeFlight.git", :tag => "1.1" }
2020
s.source_files = "PullToMakeFlight/**/*.{h,swift}"
2121
s.resources = 'PullToMakeFlight/**/*.{png,xib}'
2222
s.module_name = "PullToMakeFlight"
2323
s.requires_arc = true
2424
s.framework = 'CoreGraphics'
2525

26+
s.dependency 'PullToRefresher', '~> 1.0'
27+
2628
end

PullToMakeFlight/CAKeyframeAnimation+Extensions.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
//
2-
// CAKeyframeAnimation+Extensions.swift
3-
// PullToMakeSoup
4-
//
52
// Created by Anastasiya Gorban on 4/20/15.
63
// Copyright (c) 2015 Yalantis. All rights reserved.
74
//
5+
// Licensed under the MIT license: http://opensource.org/licenses/MIT
6+
// Latest version can be found at https://github.com/Yalantis/PullToMakeFlight
7+
//
88

99
import CoreGraphics
1010

@@ -66,7 +66,7 @@ extension CAKeyframeAnimation {
6666

6767
extension UIView {
6868
func addAnimation(animation: CAKeyframeAnimation) {
69-
layer.addAnimation(animation, forKey: description + animation.keyPath)
69+
layer.addAnimation(animation, forKey: description + animation.keyPath!)
7070
layer.speed = 0
7171
}
7272

PullToMakeFlight/PullToMakeFlight.swift

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
//
2-
// PullToMakeFlight.swift
3-
// PullToMakeFlightDemo
4-
//
52
// Created by Anastasiya Gorban on 5/27/15.
63
// Copyright (c) 2015 Yalantis. All rights reserved.
74
//
5+
// Licensed under the MIT license: http://opensource.org/licenses/MIT
6+
// Latest version can be found at https://github.com/Yalantis/PullToMakeFlight
7+
//
88

99
import Foundation
1010
import CoreGraphics
11+
import PullToRefresh
1112

1213
// MARK: - PullToMakeFlight
1314

@@ -17,6 +18,7 @@ public class PullToMakeFlight: PullToRefresh {
1718
let refreshView = NSBundle(forClass: self.dynamicType).loadNibNamed("FlightView", owner: nil, options: nil).first as! FlightView
1819
let animator = FlightAnimator(refreshView: refreshView)
1920
self.init(refreshView: refreshView, animator: animator)
21+
self.hideDelay = 0.2
2022
}
2123
}
2224

@@ -179,7 +181,7 @@ class FlightAnimator : RefreshViewAnimator {
179181

180182
refreshView.leftArrow.frame = CGRectMake(
181183
refreshView.leftArrow.frame.origin.x,
182-
refreshView.cloudsRight.layer.presentationLayer().frame.origin.y - refreshView.leftArrow.frame.height,
184+
refreshView.cloudsRight.layer.presentationLayer()!.frame.origin.y - refreshView.leftArrow.frame.height,
183185
refreshView.leftArrow.frame.width,
184186
refreshView.leftArrow.frame.height)
185187

PullToMakeFlight/PullToRefresh/PullToRefresh.swift

Lines changed: 0 additions & 231 deletions
This file was deleted.

PullToMakeFlight/PullToRefresh/UIScrollView+PullToRefresh.swift

Lines changed: 0 additions & 52 deletions
This file was deleted.

0 commit comments

Comments
 (0)