Skip to content
This repository was archived by the owner on Apr 24, 2022. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions ICViewPager.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
7CF3D66117CE32E40021036A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 7CF3D66017CE32E40021036A /* main.m */; };
7CF3D66517CE32E40021036A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7CF3D66417CE32E40021036A /* AppDelegate.m */; };
7CF3D67617CE336E0021036A /* Localization.strings in Resources */ = {isa = PBXBuildFile; fileRef = 7CF3D67817CE336E0021036A /* Localization.strings */; };
7CF3D67E17CE33E10021036A /* ViewPagerController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7CF3D67D17CE33E10021036A /* ViewPagerController.m */; };
7CF3D67E17CE33E10021036A /* ICViewPagerController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7CF3D67D17CE33E10021036A /* ICViewPagerController.m */; };
7CF3D68117CE33EC0021036A /* HostViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7CF3D68017CE33EC0021036A /* HostViewController.m */; };
7CF3D68217CE35500021036A /* iPhone.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7CF3D67117CE332F0021036A /* iPhone.storyboard */; };
7CF3D68517CE3F5B0021036A /* ContentViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7CF3D68417CE3F5B0021036A /* ContentViewController.m */; };
Expand All @@ -39,8 +39,8 @@
7CF3D67317CE335B0021036A /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/InfoPlist.strings; sourceTree = "<group>"; };
7CF3D67717CE336E0021036A /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localization.strings; sourceTree = "<group>"; };
7CF3D67917CE336F0021036A /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/Localization.strings; sourceTree = "<group>"; };
7CF3D67C17CE33E10021036A /* ViewPagerController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewPagerController.h; sourceTree = "<group>"; };
7CF3D67D17CE33E10021036A /* ViewPagerController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ViewPagerController.m; sourceTree = "<group>"; };
7CF3D67C17CE33E10021036A /* ICViewPagerController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ICViewPagerController.h; sourceTree = "<group>"; };
7CF3D67D17CE33E10021036A /* ICViewPagerController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ICViewPagerController.m; sourceTree = "<group>"; };
7CF3D67F17CE33EC0021036A /* HostViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HostViewController.h; sourceTree = "<group>"; };
7CF3D68017CE33EC0021036A /* HostViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HostViewController.m; sourceTree = "<group>"; };
7CF3D68317CE3F5B0021036A /* ContentViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContentViewController.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -129,8 +129,8 @@
7CF3D67B17CE33C80021036A /* ICViewPager */ = {
isa = PBXGroup;
children = (
7CF3D67C17CE33E10021036A /* ViewPagerController.h */,
7CF3D67D17CE33E10021036A /* ViewPagerController.m */,
7CF3D67C17CE33E10021036A /* ICViewPagerController.h */,
7CF3D67D17CE33E10021036A /* ICViewPagerController.m */,
);
path = ICViewPager;
sourceTree = "<group>";
Expand Down Expand Up @@ -204,7 +204,7 @@
files = (
7CF3D66117CE32E40021036A /* main.m in Sources */,
7CF3D66517CE32E40021036A /* AppDelegate.m in Sources */,
7CF3D67E17CE33E10021036A /* ViewPagerController.m in Sources */,
7CF3D67E17CE33E10021036A /* ICViewPagerController.m in Sources */,
7CF3D68117CE33EC0021036A /* HostViewController.m in Sources */,
7CF3D68517CE3F5B0021036A /* ContentViewController.m in Sources */,
);
Expand Down
4 changes: 2 additions & 2 deletions ICViewPager/Controller/HostViewController.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

#import <QuartzCore/QuartzCore.h>

#import "ViewPagerController.h"
#import "ICViewPagerController.h"

@interface HostViewController : ViewPagerController
@interface HostViewController : ICViewPagerController

@end
14 changes: 7 additions & 7 deletions ICViewPager/Controller/HostViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#import "HostViewController.h"
#import "ContentViewController.h"

@interface HostViewController () <ViewPagerDataSource, ViewPagerDelegate>
@interface HostViewController () <ICViewPagerControllerDataSource, ICViewPagerControllerDelegate>

@property (nonatomic) NSUInteger numberOfTabs;

Expand Down Expand Up @@ -79,11 +79,11 @@ - (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrie
[self performSelector:@selector(setNeedsReloadOptions) withObject:nil afterDelay:duration];
}

#pragma mark - ViewPagerDataSource
- (NSUInteger)numberOfTabsForViewPager:(ViewPagerController *)viewPager {
#pragma mark - ICViewPagerDataSource
- (NSUInteger)numberOfTabsForViewPager:(ICViewPagerController *)viewPager {
return self.numberOfTabs;
}
- (UIView *)viewPager:(ViewPagerController *)viewPager viewForTabAtIndex:(NSUInteger)index {
- (UIView *)viewPager:(ICViewPagerController *)viewPager viewForTabAtIndex:(NSUInteger)index {

UILabel *label = [UILabel new];
label.backgroundColor = [UIColor clearColor];
Expand All @@ -96,7 +96,7 @@ - (UIView *)viewPager:(ViewPagerController *)viewPager viewForTabAtIndex:(NSUInt
return label;
}

- (UIViewController *)viewPager:(ViewPagerController *)viewPager contentViewControllerForTabAtIndex:(NSUInteger)index {
- (UIViewController *)viewPager:(ICViewPagerController *)viewPager contentViewControllerForTabAtIndex:(NSUInteger)index {

ContentViewController *cvc = [self.storyboard instantiateViewControllerWithIdentifier:@"contentViewController"];

Expand All @@ -106,7 +106,7 @@ - (UIViewController *)viewPager:(ViewPagerController *)viewPager contentViewCont
}

#pragma mark - ViewPagerDelegate
- (CGFloat)viewPager:(ViewPagerController *)viewPager valueForOption:(ViewPagerOption)option withDefault:(CGFloat)value {
- (CGFloat)viewPager:(ICViewPagerController *)viewPager valueForOption:(ViewPagerOption)option withDefault:(CGFloat)value {

switch (option) {
case ViewPagerOptionStartFromSecondTab:
Expand All @@ -129,7 +129,7 @@ - (CGFloat)viewPager:(ViewPagerController *)viewPager valueForOption:(ViewPagerO
return value;
}
}
- (UIColor *)viewPager:(ViewPagerController *)viewPager colorForComponent:(ViewPagerComponent)component withDefault:(UIColor *)color {
- (UIColor *)viewPager:(ICViewPagerController *)viewPager colorForComponent:(ViewPagerComponent)component withDefault:(UIColor *)color {

switch (component) {
case ViewPagerIndicator:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// ViewPagerController.h
// ICViewPagerController.h
// ICViewPager
//
// Created by Ilter Cengiz on 28/08/2013.
Expand Down Expand Up @@ -32,7 +32,7 @@ typedef NS_ENUM(NSUInteger, ViewPagerOption) {
};

/**
* Main parts of the ViewPagerController
* Main parts of the ICViewPagerController
*
* ViewPagerIndicator: The colored line in the view of the active tab
* ViewPagerTabsView: The tabs view itself
Expand All @@ -44,21 +44,21 @@ typedef NS_ENUM(NSUInteger, ViewPagerComponent) {
ViewPagerContent
};

@protocol ViewPagerDataSource;
@protocol ViewPagerDelegate;
@protocol ICViewPagerControllerDataSource;
@protocol ICViewPagerControllerDelegate;

@interface ViewPagerController : UIViewController
@interface ICViewPagerController : UIViewController

/**
* The object that acts as the data source of the receiving viewPager
* @discussion The data source must adopt the ViewPagerDataSource protocol. The data source is not retained.
*/
@property (weak) id <ViewPagerDataSource> dataSource;
@property (weak) id <ICViewPagerControllerDataSource> dataSource;
/**
* The object that acts as the delegate of the receiving viewPager
* @discussion The delegate must adopt the ViewPagerDelegate protocol. The delegate is not retained.
*/
@property (weak) id <ViewPagerDelegate> delegate;
@property (weak) id <ICViewPagerControllerDelegate> delegate;

#pragma mark Methods
/**
Expand Down Expand Up @@ -96,7 +96,7 @@ typedef NS_ENUM(NSUInteger, ViewPagerComponent) {
* Call this method to get the value of a given option.
* Returns NAN for any undefined option.
*
* @param option The option key. Keys are defined in ViewPagerController.h
* @param option The option key. Keys are defined in ICViewPagerController.h
*
* @return A CGFloat, defining the setting for the given option
*/
Expand All @@ -106,7 +106,7 @@ typedef NS_ENUM(NSUInteger, ViewPagerComponent) {
* Call this method to get the color of a given component.
* Returns [UIColor clearColor] for any undefined component.
*
* @param component The component key. Keys are defined in ViewPagerController.h
* @param component The component key. Keys are defined in ICViewPagerController.h
*
* @return A UIColor for the given component
*/
Expand All @@ -115,14 +115,14 @@ typedef NS_ENUM(NSUInteger, ViewPagerComponent) {
@end

#pragma mark dataSource
@protocol ViewPagerDataSource <NSObject>
@protocol ICViewPagerControllerDataSource <NSObject>
/**
* Asks dataSource how many tabs will there be.
*
* @param viewPager The viewPager that's subject to
* @return Number of tabs
*/
- (NSUInteger)numberOfTabsForViewPager:(ViewPagerController *)viewPager;
- (NSUInteger)numberOfTabsForViewPager:(ICViewPagerController *)viewPager;
/**
* Asks dataSource to give a view to display as a tab item.
* It is suggested to return a view with a clearColor background.
Expand All @@ -133,7 +133,7 @@ typedef NS_ENUM(NSUInteger, ViewPagerComponent) {
*
* @return A view that will be shown as tab at the given index
*/
- (UIView *)viewPager:(ViewPagerController *)viewPager viewForTabAtIndex:(NSUInteger)index;
- (UIView *)viewPager:(ICViewPagerController *)viewPager viewForTabAtIndex:(NSUInteger)index;

@optional
/**
Expand All @@ -144,7 +144,7 @@ typedef NS_ENUM(NSUInteger, ViewPagerComponent) {
*
* @return A viewController whose view will be shown as content
*/
- (UIViewController *)viewPager:(ViewPagerController *)viewPager contentViewControllerForTabAtIndex:(NSUInteger)index;
- (UIViewController *)viewPager:(ICViewPagerController *)viewPager contentViewControllerForTabAtIndex:(NSUInteger)index;
/**
* The content for any tab. Return a view and ViewPager will use it to show as content.
*
Expand All @@ -153,12 +153,12 @@ typedef NS_ENUM(NSUInteger, ViewPagerComponent) {
*
* @return A view which will be shown as content
*/
- (UIView *)viewPager:(ViewPagerController *)viewPager contentViewForTabAtIndex:(NSUInteger)index;
- (UIView *)viewPager:(ICViewPagerController *)viewPager contentViewForTabAtIndex:(NSUInteger)index;

@end

#pragma mark delegate
@protocol ViewPagerDelegate <NSObject>
@protocol ICViewPagerControllerDelegate <NSObject>

@optional
/**
Expand All @@ -167,20 +167,20 @@ typedef NS_ENUM(NSUInteger, ViewPagerComponent) {
* @param viewPager The viewPager that's subject to
* @param index The index of the active tab
*/
- (void)viewPager:(ViewPagerController *)viewPager didChangeTabToIndex:(NSUInteger)index;
- (void)viewPager:(ICViewPagerController *)viewPager didChangeTabToIndex:(NSUInteger)index;
/**
* Every time -reloadData method called, ViewPager will ask its delegate for option values.
* So you don't have to set options from ViewPager itself.
* You don't have to provide values for all options.
* Just return the values for the interested options and return the given 'value' parameter for the rest.
*
* @param viewPager The viewPager that's subject to
* @param option The option key. Keys are defined in ViewPagerController.h
* @param option The option key. Keys are defined in ICViewPagerController.h
* @param value The default value for the given option
*
* @return A CGFloat, defining the setting for the given option
*/
- (CGFloat)viewPager:(ViewPagerController *)viewPager valueForOption:(ViewPagerOption)option withDefault:(CGFloat)value;
- (CGFloat)viewPager:(ICViewPagerController *)viewPager valueForOption:(ViewPagerOption)option withDefault:(CGFloat)value;

/**
* Use this method to customize the look and feel.
Expand All @@ -191,11 +191,11 @@ typedef NS_ENUM(NSUInteger, ViewPagerComponent) {
* and indicator will change its own color.
*
* @param viewPager The viewPager that's subject to
* @param component The component key. Keys are defined in ViewPagerController.h
* @param component The component key. Keys are defined in ICViewPagerController.h
* @param color The default color for the given component
*
* @return A UIColor for the given component
*/
- (UIColor *)viewPager:(ViewPagerController *)viewPager colorForComponent:(ViewPagerComponent)component withDefault:(UIColor *)color;
- (UIColor *)viewPager:(ICViewPagerController *)viewPager colorForComponent:(ViewPagerComponent)component withDefault:(UIColor *)color;

@end
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
//
// ViewPagerController.m
// ICViewPagerController.m
// ICViewPager
//
// Created by Ilter Cengiz on 28/08/2013.
// Copyright (c) 2013 Ilter Cengiz. All rights reserved.
//

#import "ViewPagerController.h"
#import "ICViewPagerController.h"

#pragma mark - Constants and macros
#define kTabViewTag 38
Expand Down Expand Up @@ -112,8 +112,8 @@ - (void)drawRect:(CGRect)rect {
}
@end

#pragma mark - ViewPagerController
@interface ViewPagerController () <UIPageViewControllerDataSource, UIPageViewControllerDelegate, UIScrollViewDelegate>
#pragma mark - ICViewPagerController
@interface ICViewPagerController () <UIPageViewControllerDataSource, UIPageViewControllerDelegate, UIScrollViewDelegate>

// Tab and content stuff
@property UIScrollView *tabsView;
Expand Down Expand Up @@ -150,7 +150,7 @@ @interface ViewPagerController () <UIPageViewControllerDataSource, UIPageViewCon

@end

@implementation ViewPagerController
@implementation ICViewPagerController

@synthesize tabHeight = _tabHeight;
@synthesize tabOffset = _tabOffset;
Expand Down Expand Up @@ -368,7 +368,7 @@ - (void)setActiveContentIndex:(NSUInteger)activeContentIndex {

// __weak pageViewController to be used in blocks to prevent retaining strong reference to self
__weak UIPageViewController *weakPageViewController = self.pageViewController;
__weak ViewPagerController *weakSelf = self;
__weak ICViewPagerController *weakSelf = self;

if (activeContentIndex == self.activeContentIndex) {

Expand Down