Skip to content

Commit

Permalink
Updated to version 1.3.2
Browse files Browse the repository at this point in the history
  • Loading branch information
nicklockwood committed Apr 28, 2014
1 parent b8956b9 commit 4925fbb
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 17 deletions.
2 changes: 1 addition & 1 deletion LICENCE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
SwipeView

Version 1.3.1, February 26th, 2014
Version 1.3.2, April 28th, 2014

Copyright (C) 2010 Charcoal Design

Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,10 @@ If you wish to detect other types of interaction such as swipes, double taps or
Release Notes
----------------

Version 1.3.2

- Reverted fix from 1.3.1 as it caused other scrollOffset bugs that were worse

Version 1.3.1

- Fixed bug with scrollOffset changing when screen is rotated
Expand Down
4 changes: 2 additions & 2 deletions SwipeView.podspec
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
Pod::Spec.new do |s|
s.name = "SwipeView"
s.version = "1.3.1"
s.version = "1.3.2"
s.summary = "Horizontal, paged scrolling views based on UIScrollView, with convenient functionality in UITableView-style."
s.description = "SwipeView is a class designed to simplify the implementation of horizontal, paged scrolling views on iOS. It is based on a UIScrollView, but adds convenient functionality such as a UITableView-style dataSource/delegate interface and efficient view loading, unloading and recycling."
s.homepage = "https://github.com/nicklockwood/SwipeView"
s.license = { :type => 'zlib', :file => 'LICENCE.md' }
s.author = { "Nick Lockwood" => "[email protected]" }
s.source = { :git => "https://github.com/nicklockwood/SwipeView.git", :tag => "1.3.1" }
s.source = { :git => "https://github.com/nicklockwood/SwipeView.git", :tag => "1.3.2" }
s.source_files = 'SwipeView'
s.requires_arc = true
s.platform = :ios
Expand Down
2 changes: 1 addition & 1 deletion SwipeView/SwipeView.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// SwipeView.h
//
// Version 1.3.1
// Version 1.3.2
//
// Created by Nick Lockwood on 03/09/2010.
// Copyright 2010 Charcoal Design
Expand Down
15 changes: 2 additions & 13 deletions SwipeView/SwipeView.m
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// SwipeView.m
//
// Version 1.3
// Version 1.3.2
//
// Created by Nick Lockwood on 03/09/2010.
// Copyright 2010 Charcoal Design
Expand Down Expand Up @@ -72,7 +72,6 @@ @interface SwipeView () <UIScrollViewDelegate, UIGestureRecognizerDelegate>
@property (nonatomic, strong) NSMutableSet *itemViewPool;
@property (nonatomic, assign) NSInteger previousItemIndex;
@property (nonatomic, assign) CGPoint previousContentOffset;
@property (nonatomic, assign) CGRect previousViewFrame;
@property (nonatomic, assign) CGSize itemSize;
@property (nonatomic, assign) BOOL suppressScrollEvent;
@property (nonatomic, assign) NSTimeInterval scrollDuration;
Expand Down Expand Up @@ -124,7 +123,6 @@ - (void)setUp
_itemViews = [[NSMutableDictionary alloc] init];
_previousItemIndex = 0;
_previousContentOffset = _scrollView.contentOffset;
_previousViewFrame = _scrollView.frame;
_scrollOffset = 0.0f;
_currentItemIndex = 0;
_numberOfItems = 0;
Expand Down Expand Up @@ -1139,16 +1137,7 @@ - (void)didTap:(UITapGestureRecognizer *)tapGesture

- (void)scrollViewDidScroll:(__unused UIScrollView *)scrollView
{
if (!CGRectEqualToRect(_previousViewFrame, _scrollView.frame))
{
//save previous data
_previousContentOffset = _scrollView.contentOffset;
_previousViewFrame = _scrollView.frame;

//update view and call delegate
[self didScroll];
}
else if (!_suppressScrollEvent)
if (!_suppressScrollEvent)
{
//stop scrolling animation
_scrolling = NO;
Expand Down

0 comments on commit 4925fbb

Please sign in to comment.