Skip to content
This repository has been archived by the owner on Nov 10, 2021. It is now read-only.

Commit

Permalink
JLPageViewController 1.11 지원
Browse files Browse the repository at this point in the history
  • Loading branch information
Woody committed Sep 19, 2016
1 parent d62bee0 commit 6b65773
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 24 deletions.
7 changes: 3 additions & 4 deletions JLFullScreenPageViewController.podspec
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
@version = "1.1"
Pod::Spec.new do |s|
s.name = "JLFullScreenPageViewController"
s.version = @version
s.version = "1.2"
s.summary = "JLFullScreenPageViewController"
s.homepage = "https://github.com/jangsy7883/JLFullScreenPageViewController"
s.license = { :type => 'MIT', :file => 'LICENSE' }
s.author = { "hmhv" => "jangsy7883@gmail.com" }
s.source = { :git => "https://github.com/jangsy7883/JLFullScreenPageViewController.git", :tag => @version }
s.source = { :git => "https://github.com/jangsy7883/JLFullScreenPageViewController.git", :tag => s.version }
s.source_files = 'JLFullScreenPageViewController/*.{h,m}','JLFullScreenPageViewController/Categorys/*.{h,m}'
s.requires_arc = true
s.ios.deployment_target = '8.0'
s.dependency 'JLPageViewController'
end
end
4 changes: 2 additions & 2 deletions JLFullScreenPageViewController/JLContentPageViewController.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@

@required

- (NSArray<UIViewController*> *)viewControllersForPageViewController:(JLPageViewController *)pageViewController;
- (NSArray<UIViewController*> *)contentViewControllersForPageViewController:(JLPageViewController *)pageViewController;

@end

@interface JLContentPageViewController : JLPageViewController

@property (nonatomic, readonly) NSArray *viewControllers;
@property (nonatomic, readonly) NSArray *contentViewControllers;
@property (nonatomic, weak) id<JLContentPageViewControllerDataSource> dataSource;

@end
14 changes: 7 additions & 7 deletions JLFullScreenPageViewController/JLContentPageViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ - (void)removeObservers;
@interface JLContentPageViewController ()

@property (nonatomic, weak) JLFullScreenPageViewController *fullScreenPageViewController;
@property (nonatomic, strong) NSArray *viewControllers;
@property (nonatomic, strong) NSArray *contentViewControllers;

@end

Expand All @@ -46,7 +46,7 @@ - (void)dealloc
{
[super removeObservers];

for (UIViewController *viewController in self.viewControllers)
for (UIViewController *viewController in self.contentViewControllers)
{
UIScrollView *scrollView = viewController.jl_scrollView;

Expand All @@ -64,7 +64,7 @@ - (void)dealloc
- (void)reloadData
{
//RESET VIEWCONTROLLER
for (UIViewController *viewController in self.viewControllers)
for (UIViewController *viewController in self.contentViewControllers)
{
UIScrollView *scrollView = viewController.jl_scrollView;

Expand All @@ -77,12 +77,12 @@ - (void)reloadData
}

//RELOAD VIEW CONTROLLER
if ([self.dataSource respondsToSelector:@selector(viewControllersForPageViewController:)])
if ([self.dataSource respondsToSelector:@selector(contentViewControllersForPageViewController:)])
{
self.viewControllers = [self.dataSource viewControllersForPageViewController:self];
self.contentViewControllers = [self.dataSource contentViewControllersForPageViewController:self];
}

for (UIViewController *viewController in self.viewControllers)
for (UIViewController *viewController in self.contentViewControllers)
{
UIScrollView *scrollView = viewController.jl_scrollView;

Expand Down Expand Up @@ -198,7 +198,7 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N

- (NSInteger)indexOfViewController:(UIViewController *)viewController
{
return [self.viewControllers indexOfObject:viewController];
return [self.contentViewControllers indexOfObject:viewController];
}

#pragma mark - GETTERS
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ - (void)layoutContentInsetAllChildScrollViews
{
CGFloat maxY = CGRectGetMaxY(self.contentHeaderView.frame);

for (UIViewController *viewController in self.pageViewController.viewControllers)
for (UIViewController *viewController in self.pageViewController.contentViewControllers)
{
[self layoutContentInsetForScrollView:viewController.jl_scrollView
atContentInsetTop:maxY];
Expand Down Expand Up @@ -468,16 +468,16 @@ - (void)setFullScreen:(BOOL)isFullScreen animated:(BOOL)animated completion:(voi

#pragma mark - JLContentPageViewController datasource

- (NSArray *)viewControllersForPageViewController:(JLPageViewController *)pageView
- (NSArray *)contentViewControllersForPageViewController:(JLPageViewController *)pageView
{
return nil;
}

- (UIViewController *)pageViewController:(JLPageViewController *)pageViewController viewControllerForIndex:(NSInteger)index
{
if (self.pageViewController.viewControllers.count > index && self.pageViewController.viewControllers.count > 0)
if (self.pageViewController.contentViewControllers.count > index && self.pageViewController.contentViewControllers.count > 0)
{
return self.pageViewController.viewControllers[index];
return self.pageViewController.contentViewControllers[index];
}
return nil;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -182,12 +182,13 @@
0FBA64931BD23A7A00124112 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0700;
LastUpgradeCheck = 0800;
ORGANIZATIONNAME = Dalkomm;
TargetAttributes = {
0FBA649A1BD23A7A00124112 = {
CreatedOnToolsVersion = 7.0.1;
DevelopmentTeam = 6V6UAGM9A4;
DevelopmentTeam = SCHCN3R38K;
ProvisioningStyle = Automatic;
};
};
};
Expand Down Expand Up @@ -304,8 +305,10 @@
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
Expand Down Expand Up @@ -347,8 +350,10 @@
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
Expand Down Expand Up @@ -379,6 +384,7 @@
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEVELOPMENT_TEAM = SCHCN3R38K;
INFOPLIST_FILE = JLFullScreenPageViewControllerDemo/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.1;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
Expand All @@ -396,6 +402,7 @@
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEVELOPMENT_TEAM = SCHCN3R38K;
INFOPLIST_FILE = JLFullScreenPageViewControllerDemo/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.1;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@ - (void)pressedCancel:(id)sender
[self.navigationController popViewControllerAnimated:YES];
}

#pragma mark - KMPagerView datasource
#pragma mark - JLContentPageViewController datasource

- (NSArray *)viewControllersForPageViewController:(JLContentPageViewController *)viewController
- (NSArray *)contentViewControllersForPageViewController:(JLContentPageViewController *)viewController
{
NSMutableArray *viewControllers = [NSMutableArray array];

Expand Down Expand Up @@ -118,7 +118,7 @@ - (NSInteger)defaultPageIndexForPageViewController:(JLContentPageViewController
return 1;
}

#pragma mark - KMPagerView delegate
#pragma mark - JLContentPageViewController delegate

- (void)pageViewController:(JLContentPageViewController*)pageViewController didScrollToCurrentPosition:(CGFloat)currentPosition
{
Expand Down
4 changes: 2 additions & 2 deletions JLFullScreenPageViewControllerDemo/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
PODS:
- JLPageViewController (1.9)
- JLPageViewController (1.11)

DEPENDENCIES:
- JLPageViewController

SPEC CHECKSUMS:
JLPageViewController: e75d12b24f382708ca21ff1748dd92e2d5a11132
JLPageViewController: f88cdd5af43cd6af30c7fda1c85ffb4b4aa92f5c

PODFILE CHECKSUM: 54b2ad06c8abb3c9bb363e4d87050bcaa32e23fb

Expand Down

0 comments on commit 6b65773

Please sign in to comment.