-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #6 from ClementPadovani/develop
1.0.1
- Loading branch information
Showing
26 changed files
with
431 additions
and
299 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
# Change Log | ||
|
||
## [1.0.1](https://github.com/ClementPadovani/CPSegmentedScrollView/releases/tag/1.0.1) | ||
|
||
### Added | ||
|
||
- Documentation | ||
|
||
## [1.0.0](https://github.com/ClementPadovani/CPSegmentedScrollView/releases/tag/1.0.0) (10/08/2016) | ||
|
||
- Initial release |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,24 +8,26 @@ | |
|
||
Pod::Spec.new do |s| | ||
s.name = 'CPSegmentedScrollView' | ||
s.version = '1.0.0' | ||
s.version = '1.0.1' | ||
s.summary = 'CPSegmentedScrollView is a consul to animate a segmented control when paired with a scroll view.' | ||
|
||
s.homepage = 'https://github.com/ClementPadovani/CPSegmentedScrollView' | ||
s.screenshots = 'https://raw.githubusercontent.com/ClementPadovani/CPSegmentedScrollView/master/CPSegmentedScrollView.gif' | ||
s.license = { :type => 'MIT', :file => 'LICENSE' } | ||
s.author = { 'Clément Padovani' => '[email protected].com' } | ||
s.author = { 'Clément Padovani' => 'clement.padovani@gmail.com' } | ||
s.source = { :git => 'https://github.com/ClementPadovani/CPSegmentedScrollView.git', :tag => s.version.to_s } | ||
|
||
s.platform = :ios | ||
|
||
s.requires_arc = true | ||
|
||
s.ios.deployment_target = '8.0' | ||
|
||
s.source_files = 'CPSegmentedScrollView/Classes/**/*' | ||
|
||
# s.resource_bundles = { | ||
# 'CPSegmentedScrollView' => ['CPSegmentedScrollView/Assets/*.png'] | ||
# } | ||
|
||
# s.public_header_files = 'Pod/Classes/**/*.h' | ||
# s.frameworks = 'UIKit', 'MapKit' | ||
# s.dependency 'AFNetworking', '~> 2.3' | ||
s.public_header_files = 'CPSegmentedScrollView/Classes/Public/*.h' | ||
|
||
s.private_header_files = 'CPSegmentedScrollView/Classes/Private/*.h' | ||
|
||
s.frameworks = 'UIKit', 'Foundation' | ||
end |
26 changes: 0 additions & 26 deletions
26
CPSegmentedScrollView/Classes/CLPScrollViewSegmentedControlConsul.h
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
42 changes: 42 additions & 0 deletions
42
CPSegmentedScrollView/Classes/Public/CLPScrollViewSegmentedControlConsul.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
// | ||
// CLPScrollViewSegmentedControlConsul.h | ||
// Segmented Test | ||
// | ||
// Created by Clément Padovani on 10/2/16. | ||
// Copyright (c) 2016 Clement Padovani. All rights reserved. | ||
// | ||
|
||
@import Foundation; | ||
@import UIKit; | ||
|
||
NS_ASSUME_NONNULL_BEGIN | ||
|
||
@interface CLPScrollViewSegmentedControlConsul : NSObject | ||
|
||
/** | ||
Create a new consul to manage the transition between pages of `scrollView` in coordination with `segmentedControl` | ||
@param segmentedControl An instance of `UISegmentedControl` with the same number of segments as the number of `scrollView`’s number of pages. | ||
@param scrollView An instance of `UIScrollView`, with a pre-existing delegate, whose number of pages is the same as `segmentedControl`’s number of segments | ||
@exception NSInvalidArgumentException Throws if: | ||
- `scrollView` or `segmentedControl` is `nil` | ||
- `scrollView`’s `delegate` is nil | ||
- `scrollView` or `segmentedControl`’s number of pages/segments is less than 2 | ||
- `scrollView` and `segmentedControl`’s number of pages/segments differ | ||
- `scrollView` has paging disabled | ||
- `segmentedControl` is a momentary segmented control (`[UISegmentedControl isMomentary]`) | ||
@return An instance of `CLPScrollViewSegmentedControlConsul` that manages the transitions | ||
*/ | ||
+ (instancetype) consulWithSegmentedControl: (UISegmentedControl *) segmentedControl withScrollView: (UIScrollView *) scrollView; | ||
|
||
- (instancetype) init NS_UNAVAILABLE; | ||
|
||
+ (instancetype) alloc NS_UNAVAILABLE; | ||
|
||
+ (instancetype) new NS_UNAVAILABLE; | ||
|
||
@end | ||
|
||
NS_ASSUME_NONNULL_END |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
17 changes: 12 additions & 5 deletions
17
Example/Pods/Local Podspecs/CPSegmentedScrollView.podspec.json
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Oops, something went wrong.