From f7383f03eda4e1b31a56f5106d9354590c94a7fa Mon Sep 17 00:00:00 2001 From: JyHu Date: Fri, 21 Jul 2017 23:44:27 +0800 Subject: [PATCH 1/8] add an useful property --- THSegmentedPager/THSegmentedPager.h | 2 ++ THSegmentedPager/THSegmentedPager.m | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/THSegmentedPager/THSegmentedPager.h b/THSegmentedPager/THSegmentedPager.h index a24a8a1..cd51041 100644 --- a/THSegmentedPager/THSegmentedPager.h +++ b/THSegmentedPager/THSegmentedPager.h @@ -15,6 +15,8 @@ @property (weak, nonatomic) IBOutlet HMSegmentedControl *pageControl; @property (weak, nonatomic) IBOutlet UIView *contentContainer; +@property (assign, nonatomic) BOOL needPagerAnimateWhenSegmentSelectionChanged; + @property (strong, nonatomic)NSMutableArray *pages; @property (assign, nonatomic, getter=isShouldBounce)BOOL shouldBounce; /*! Instead of setting the pages manually you can give to the controller an array of identifiers which will be loaded from the storyboard at runtime diff --git a/THSegmentedPager/THSegmentedPager.m b/THSegmentedPager/THSegmentedPager.m index 1389378..a208873 100644 --- a/THSegmentedPager/THSegmentedPager.m +++ b/THSegmentedPager/THSegmentedPager.m @@ -51,6 +51,8 @@ - (void)viewDidLoad { self.pageControl.verticalDividerEnabled = YES; self.pageControl.verticalDividerColor = [UIColor colorWithRed:127/255.0 green:127/255.0 blue:127/255.0 alpha:1]; + self.needPagerAnimateWhenSegmentSelectionChanged = YES; + // Obtain the ScrollViewDelegate self.shouldBounce = YES; for (UIView *view in self.pageViewController.view.subviews ) { @@ -239,7 +241,7 @@ - (void)pageControlValueChanged:(id)sender { __weak THSegmentedPager *blocksafeSelf = self; [self.pageViewController setViewControllers:@[[self selectedController]] direction:direction - animated:YES + animated:self.needPagerAnimateWhenSegmentSelectionChanged completion:^(BOOL finished) { // ref: http://stackoverflow.com/questions/12939280/uipageviewcontroller-navigates-to-wrong-page-with-scroll-transition-style // workaround for UIPageViewController's bug to avoid transition to wrong page From ba308e0748ac3d85d91fe8d50076e3808a845a90 Mon Sep 17 00:00:00 2001 From: JyHu Date: Thu, 24 Aug 2017 19:55:19 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E4=BC=98=E5=8C=96pager=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=B8=80=E4=B8=AA=E6=B5=8B=E8=AF=95=E7=9A=84demo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- THSegmentedPager/THSegmentedPager.h | 19 +- THSegmentedPager/THSegmentedPager.m | 272 +++++++--- THSegmentedPagerExample/Podfile | 12 - THSegmentedPagerExample/Podfile.lock | 32 -- .../project.pbxproj | 498 ++++++------------ .../contents.xcworkspacedata | 2 +- .../THSegmentedPagerExample.xcscheme | 115 ---- .../contents.xcworkspacedata | 1 - .../THSegmentedPagerExample.xccheckout | 41 -- .../THSegmentedPagerExample/AppDelegate.h | 8 +- .../THSegmentedPagerExample/AppDelegate.m | 59 ++- .../AppIcon.appiconset/Contents.json | 30 ++ .../Base.lproj/LaunchScreen.storyboard | 27 + .../Base.lproj/Main.storyboard | 161 ++++++ .../BaseTableViewController.h | 15 + .../BaseTableViewController.m | 66 +++ .../BrandAsset.launchimage/Contents.json | 66 --- .../Images.xcassets/Contents.json | 6 - ...ntedPagerExample-Info.plist => Info.plist} | 23 +- .../Launch Screen.storyboard | 53 -- .../PagerViewController.h | 13 + .../PagerViewController.m | 55 ++ .../SamplePagedViewController.h | 16 - .../SamplePagedViewController.m | 29 - .../THSegmentedPagerExample-Prefix.pch | 16 - .../TestViewController.h | 13 + .../TestViewController.m | 52 ++ .../THSegmentedPagerExample/ViewController.h | 15 + .../THSegmentedPagerExample/ViewController.m | 49 ++ .../en.lproj/InfoPlist.strings | 2 - .../THSegmentedPagerExample/iPhone.storyboard | 146 ----- .../THSegmentedPagerExample/main.m | 10 +- .../with_Foo_Bar_Baz_pages_looks_good@2x.png | Bin 33698 -> 0 bytes ...ges_when_Bar_is_selected_looks_good@2x.png | Bin 35882 -> 0 bytes .../with_one_page_looks_good@2x.png | Bin 31864 -> 0 bytes .../Storyboard.storyboard | 113 ---- .../THSegmentedPagerExampleTests-Info.plist | 22 - .../THSegmentedPagerTests.m | 89 ---- .../en.lproj/InfoPlist.strings | 2 - ThSegmentedPagerExample/Podfile | 8 + ThSegmentedPagerExample/Podfile.lock | 19 + .../contents.xcworkspacedata | 10 + 42 files changed, 959 insertions(+), 1226 deletions(-) delete mode 100644 THSegmentedPagerExample/Podfile delete mode 100644 THSegmentedPagerExample/Podfile.lock delete mode 100644 THSegmentedPagerExample/THSegmentedPagerExample.xcodeproj/xcshareddata/xcschemes/THSegmentedPagerExample.xcscheme delete mode 100644 THSegmentedPagerExample/THSegmentedPagerExample.xcworkspace/contents.xcworkspacedata delete mode 100644 THSegmentedPagerExample/THSegmentedPagerExample.xcworkspace/xcshareddata/THSegmentedPagerExample.xccheckout rename THSegmentedPagerExample/THSegmentedPagerExample/{Images.xcassets => Assets.xcassets}/AppIcon.appiconset/Contents.json (54%) create mode 100644 THSegmentedPagerExample/THSegmentedPagerExample/Base.lproj/LaunchScreen.storyboard create mode 100644 THSegmentedPagerExample/THSegmentedPagerExample/Base.lproj/Main.storyboard create mode 100644 THSegmentedPagerExample/THSegmentedPagerExample/BaseTableViewController.h create mode 100644 THSegmentedPagerExample/THSegmentedPagerExample/BaseTableViewController.m delete mode 100644 THSegmentedPagerExample/THSegmentedPagerExample/Images.xcassets/BrandAsset.launchimage/Contents.json delete mode 100644 THSegmentedPagerExample/THSegmentedPagerExample/Images.xcassets/Contents.json rename THSegmentedPagerExample/THSegmentedPagerExample/{THSegmentedPagerExample-Info.plist => Info.plist} (68%) delete mode 100644 THSegmentedPagerExample/THSegmentedPagerExample/Launch Screen.storyboard create mode 100644 THSegmentedPagerExample/THSegmentedPagerExample/PagerViewController.h create mode 100644 THSegmentedPagerExample/THSegmentedPagerExample/PagerViewController.m delete mode 100644 THSegmentedPagerExample/THSegmentedPagerExample/SamplePagedViewController.h delete mode 100644 THSegmentedPagerExample/THSegmentedPagerExample/SamplePagedViewController.m delete mode 100644 THSegmentedPagerExample/THSegmentedPagerExample/THSegmentedPagerExample-Prefix.pch create mode 100644 THSegmentedPagerExample/THSegmentedPagerExample/TestViewController.h create mode 100644 THSegmentedPagerExample/THSegmentedPagerExample/TestViewController.m create mode 100644 THSegmentedPagerExample/THSegmentedPagerExample/ViewController.h create mode 100644 THSegmentedPagerExample/THSegmentedPagerExample/ViewController.m delete mode 100644 THSegmentedPagerExample/THSegmentedPagerExample/en.lproj/InfoPlist.strings delete mode 100644 THSegmentedPagerExample/THSegmentedPagerExample/iPhone.storyboard delete mode 100644 THSegmentedPagerExample/THSegmentedPagerExampleTests/ReferenceImages/THSegmentedPagerSpec/with_Foo_Bar_Baz_pages_looks_good@2x.png delete mode 100644 THSegmentedPagerExample/THSegmentedPagerExampleTests/ReferenceImages/THSegmentedPagerSpec/with_Foo_Bar_Baz_pages_when_Bar_is_selected_looks_good@2x.png delete mode 100644 THSegmentedPagerExample/THSegmentedPagerExampleTests/ReferenceImages/THSegmentedPagerSpec/with_one_page_looks_good@2x.png delete mode 100644 THSegmentedPagerExample/THSegmentedPagerExampleTests/Storyboard.storyboard delete mode 100644 THSegmentedPagerExample/THSegmentedPagerExampleTests/THSegmentedPagerExampleTests-Info.plist delete mode 100644 THSegmentedPagerExample/THSegmentedPagerExampleTests/THSegmentedPagerTests.m delete mode 100644 THSegmentedPagerExample/THSegmentedPagerExampleTests/en.lproj/InfoPlist.strings create mode 100644 ThSegmentedPagerExample/Podfile create mode 100644 ThSegmentedPagerExample/Podfile.lock create mode 100644 ThSegmentedPagerExample/ThSegmentedPagerExample.xcworkspace/contents.xcworkspacedata diff --git a/THSegmentedPager/THSegmentedPager.h b/THSegmentedPager/THSegmentedPager.h index cd51041..4e9286f 100644 --- a/THSegmentedPager/THSegmentedPager.h +++ b/THSegmentedPager/THSegmentedPager.h @@ -11,18 +11,21 @@ @interface THSegmentedPager : UIViewController -@property (strong, nonatomic)UIPageViewController *pageViewController; -@property (weak, nonatomic) IBOutlet HMSegmentedControl *pageControl; -@property (weak, nonatomic) IBOutlet UIView *contentContainer; +@property (strong, nonatomic, readonly) HMSegmentedControl *pageControl; +@property (strong, nonatomic, readonly) UIPageViewController *pageViewController; +@property (strong, nonatomic, readonly) UIView *contentContainer; @property (assign, nonatomic) BOOL needPagerAnimateWhenSegmentSelectionChanged; -@property (strong, nonatomic)NSMutableArray *pages; -@property (assign, nonatomic, getter=isShouldBounce)BOOL shouldBounce; +@property (strong, nonatomic) NSArray *pages; +@property (assign, nonatomic) BOOL shouldBounce; + /*! Instead of setting the pages manually you can give to the controller an array of identifiers which will be loaded from the storyboard at runtime - * \param identifiers Array of identifiers to load + * \param pageIdentifiers Array of identifiers to load */ -- (void)setupPagesFromStoryboardWithIdentifiers:(NSArray *)identifiers; +- (void)setupPagesFromStoryboardWithIdentifier:(NSString *)storybardIdentifier pageIdentifiers:(NSArray *)pageIdentifiers; +- (void)setupPagesFromStoryboard:(UIStoryboard *)storyboard pageIdentifiers:(NSArray *)pageIdentifiers; +- (void)setupPagesFromStoryboardWithPageIdentifiers:(NSArray *)pageIdentifiers; - (void)setPageControlHidden:(BOOL)hidden animated:(BOOL)animated; - (void)setSelectedPageIndex:(NSUInteger)index animated:(BOOL)animated; @@ -31,7 +34,7 @@ /*! Get the selected viewcontroller * \returns The actual selected viewcontroller */ -- (UIViewController *)selectedController; +@property (strong, nonatomic, readonly) UIViewController *selectedController; /*! The control will ask from every viewcontroller an updated title string */ diff --git a/THSegmentedPager/THSegmentedPager.m b/THSegmentedPager/THSegmentedPager.m index a208873..e02f9b3 100644 --- a/THSegmentedPager/THSegmentedPager.m +++ b/THSegmentedPager/THSegmentedPager.m @@ -14,48 +14,53 @@ @interface THSegmentedPager () @property (nonatomic,assign) NSUInteger currentIndex; @property (nonatomic,assign) NSUInteger nextIndex; @property (nonatomic,assign) BOOL userDraggingStartedTransitionInProgress; + +@property (strong, nonatomic) HMSegmentedControl *pri_segmentControl; +@property (strong, nonatomic) UIPageViewController *pri_pageViewController; +@property (strong, nonatomic) UIView *pri_contentContainer; +@property (strong, nonatomic) NSMutableArray *pri_pages; + @end @implementation THSegmentedPager -@synthesize pageViewController = _pageViewController; -@synthesize pages = _pages; -@synthesize shouldBounce = _shouldBounce; +@synthesize pri_pages = _pri_pages; + +- (instancetype)init { + if (self = [super init]) { + self.needPagerAnimateWhenSegmentSelectionChanged = NO; + } + return self; +} -- (NSMutableArray *)pages { - if (!_pages)_pages = [NSMutableArray new]; - return _pages; +- (instancetype)initWithCoder:(NSCoder *)aDecoder { + if (self = [super initWithCoder:aDecoder]) { + self.needPagerAnimateWhenSegmentSelectionChanged = NO; + } + return self; +} + +- (instancetype)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil { + if (self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]) { + self.needPagerAnimateWhenSegmentSelectionChanged = NO; + } + return self; } - (void)viewDidLoad { [super viewDidLoad]; - // Init PageViewController - self.pageViewController = [[UIPageViewController alloc] initWithTransitionStyle:UIPageViewControllerTransitionStyleScroll navigationOrientation:UIPageViewControllerNavigationOrientationHorizontal options:nil]; - self.pageViewController.view.frame = CGRectMake(0, 0, self.contentContainer.frame.size.width, self.contentContainer.frame.size.height); - [self.pageViewController setDataSource:self]; - [self.pageViewController setDelegate:self]; - [self.pageViewController.view setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)]; - [self addChildViewController:self.pageViewController]; - [self.contentContainer addSubview:self.pageViewController.view]; - - [self.pageControl addTarget:self - action:@selector(pageControlValueChanged:) - forControlEvents:UIControlEventValueChanged]; - - self.pageControl.backgroundColor = [UIColor colorWithRed:69/255.0 green:69/255.0 blue:69/255.0 alpha:1]; - self.pageControl.titleTextAttributes = @{NSForegroundColorAttributeName : [UIColor colorWithRed:127/255.0 green:127/255.0 blue:127/255.0 alpha:1]}; - self.pageControl.selectionIndicatorColor = [UIColor colorWithRed:242/255.0 green:121/255.0 blue:53/255.0 alpha:1]; - self.pageControl.selectionIndicatorLocation = HMSegmentedControlSelectionIndicatorLocationDown; - self.pageControl.selectedTitleTextAttributes = @{NSForegroundColorAttributeName : [UIColor whiteColor]}; - self.pageControl.selectionStyle = HMSegmentedControlSelectionStyleFullWidthStripe; - self.pageControl.verticalDividerEnabled = YES; - self.pageControl.verticalDividerColor = [UIColor colorWithRed:127/255.0 green:127/255.0 blue:127/255.0 alpha:1]; + + self.view.backgroundColor = [UIColor whiteColor]; - self.needPagerAnimateWhenSegmentSelectionChanged = YES; + [self addChildViewController:self.pri_pageViewController]; + [self.pri_contentContainer addSubview:self.pri_pageViewController.view]; + [self.view addSubview:self.pri_contentContainer]; + + [self.view addSubview:self.pri_segmentControl]; // Obtain the ScrollViewDelegate self.shouldBounce = YES; - for (UIView *view in self.pageViewController.view.subviews ) { + for (UIView *view in self.pri_pageViewController.view.subviews ) { if ([view isKindOfClass:[UIScrollView class]]) { ((UIScrollView *)view).delegate = self; } @@ -64,8 +69,8 @@ - (void)viewDidLoad { - (void)viewWillAppear:(BOOL)animated { [super viewWillAppear:animated]; - if ([self.pages count]>0) { - [self setSelectedPageIndex:[self.pageControl selectedSegmentIndex] animated:animated]; + if ([self.pri_pages count]>0) { + [self setSelectedPageIndex:[self.pri_segmentControl selectedSegmentIndex] animated:animated]; } [self updateTitleLabels]; } @@ -78,24 +83,34 @@ - (void)dealloc { #pragma mark - Setup -- (void)setupPagesFromStoryboardWithIdentifiers:(NSArray *)identifiers { - if (self.storyboard) { - for (NSString *identifier in identifiers) { - UIViewController *viewController = [self.storyboard instantiateViewControllerWithIdentifier:identifier]; +- (void)setupPagesFromStoryboardWithPageIdentifiers:(NSArray *)pageIdentifiers { + [self setupPagesFromStoryboard:self.storyboard pageIdentifiers:pageIdentifiers]; +} + +- (void)setupPagesFromStoryboardWithIdentifier:(NSString *)storybardIdentifier pageIdentifiers:(NSArray *)pageIdentifiers { + if (storybardIdentifier) { + [self setupPagesFromStoryboard:[UIStoryboard storyboardWithName:storybardIdentifier bundle:nil] pageIdentifiers:pageIdentifiers]; + } +} + +- (void)setupPagesFromStoryboard:(UIStoryboard *)storyboard pageIdentifiers:(NSArray *)pageIdentifiers { + if (storyboard) { + for (NSString *identifier in pageIdentifiers) { + UIViewController *viewController = [storyboard instantiateViewControllerWithIdentifier:identifier]; if (viewController) { - [self.pages addObject:viewController]; + [self.pri_pages addObject:viewController]; } } } } - (void)updateTitleLabels { - [self.pageControl setSectionTitles:[self titleLabels]]; + [self.pri_segmentControl setSectionTitles:[self titleLabels]]; } - (NSArray *)titleLabels { NSMutableArray *titles = [NSMutableArray new]; - for (UIViewController *vc in self.pages) { + for (UIViewController *vc in self.pri_pages) { if ([vc conformsToProtocol:@protocol(THSegmentedPageViewControllerDelegate)] && [vc respondsToSelector:@selector(viewControllerTitle)] && [((UIViewController *)vc) viewControllerTitle]) { [titles addObject:[((UIViewController *)vc) viewControllerTitle]]; } else { @@ -106,21 +121,32 @@ - (NSArray *)titleLabels { } - (void)setPageControlHidden:(BOOL)hidden animated:(BOOL)animated { - [UIView animateWithDuration:animated ? 0.25f : 0.f animations:^{ - self.pageControl.alpha = hidden ? 0.0f : 1.0f; - }]; - [self.pageControl setHidden:hidden]; - [self.view setNeedsLayout]; -} - -- (UIViewController *)selectedController { - return self.pages[[self.pageControl selectedSegmentIndex]]; + + NSTimeInterval duration = (animated ? 0.25f : 0.0f); + + if (hidden && !self.pri_segmentControl.hidden) { + [UIView animateWithDuration:duration animations:^{ + self.pri_segmentControl.alpha = 0.0f; + self.pri_contentContainer.frame = CGRectUnion(self.pri_contentContainer.frame, self.pri_segmentControl.frame); + } completion:^(BOOL finished) { + self.pri_segmentControl.hidden = YES; + }]; + } else if (!hidden && self.pri_segmentControl.hidden) { + self.pri_segmentControl.hidden = NO; + [UIView animateWithDuration:duration animations:^{ + CGRect remainder; + CGRect slice; + CGRectDivide(self.pri_contentContainer.frame, &slice, &remainder, CGRectGetHeight(self.pri_segmentControl.frame), CGRectMinYEdge); + self.pri_contentContainer.frame = remainder; + self.pri_segmentControl.alpha = 1.0f; + }]; + } } - (void)setSelectedPageIndex:(NSUInteger)index animated:(BOOL)animated { - if (index < [self.pages count]) { - [self.pageControl setSelectedSegmentIndex:index animated:YES]; - [self.pageViewController setViewControllers:@[self.pages[index]] + if (index < [self.pri_pages count]) { + [self.pri_segmentControl setSelectedSegmentIndex:index animated:YES]; + [self.pri_pageViewController setViewControllers:@[self.pri_pages[index]] direction:UIPageViewControllerNavigationDirectionForward animated:animated completion:NULL]; @@ -130,31 +156,31 @@ - (void)setSelectedPageIndex:(NSUInteger)index animated:(BOOL)animated { #pragma mark - UIPageViewControllerDataSource - (UIViewController *)pageViewController:(UIPageViewController *)pageViewController viewControllerBeforeViewController:(UIViewController *)viewController { - NSUInteger index = [self.pages indexOfObject:viewController]; + NSUInteger index = [self.pri_pages indexOfObject:viewController]; if ((index == NSNotFound) || (index == 0)) { return nil; } - return self.pages[--index]; + return self.pri_pages[--index]; } - (UIViewController *)pageViewController:(UIPageViewController *)pageViewController viewControllerAfterViewController:(UIViewController *)viewController { - NSUInteger index = [self.pages indexOfObject:viewController]; - if ((index == NSNotFound)||(index+1 >= [self.pages count])) { + NSUInteger index = [self.pri_pages indexOfObject:viewController]; + if ((index == NSNotFound)||(index+1 >= [self.pri_pages count])) { return nil; } - return self.pages[++index]; + return self.pri_pages[++index]; } - (void)pageViewController:(UIPageViewController *)pageViewController willTransitionToViewControllers:(NSArray *)pendingViewControllers{ - self.nextIndex = [self.pages indexOfObject:[pendingViewControllers firstObject]]; + self.nextIndex = [self.pri_pages indexOfObject:[pendingViewControllers firstObject]]; } - (void)pageViewController:(UIPageViewController *)pageViewController didFinishAnimating:(BOOL)finished previousViewControllers:(NSArray *)previousViewControllers transitionCompleted:(BOOL)completed{ if(completed){ // DIRTY FIX - if (self.nextIndex != [self.pages indexOfObject:[previousViewControllers firstObject]]) { - self.currentIndex = [self.pages indexOfObject:[pageViewController.viewControllers objectAtIndex:0]]; - [self.pageControl setSelectedSegmentIndex:self.currentIndex animated:YES]; + if (self.nextIndex != [self.pri_pages indexOfObject:[previousViewControllers firstObject]]) { + self.currentIndex = [self.pri_pages indexOfObject:[pageViewController.viewControllers objectAtIndex:0]]; + [self.pri_segmentControl setSelectedSegmentIndex:self.currentIndex animated:YES]; } } self.nextIndex = self.currentIndex; @@ -173,19 +199,19 @@ - (void)scrollViewDidScroll:(UIScrollView *)scrollView /* Scrolling forwards */ if (scrollView.contentOffset.x < (self.lastPosition - (.9 * scrollView.bounds.size.width))) { self.currentIndex = self.nextIndex; - [self.pageControl setSelectedSegmentIndex:self.currentIndex]; + [self.pri_segmentControl setSelectedSegmentIndex:self.currentIndex]; } } else { /* Scrolling backwards */ if (scrollView.contentOffset.x > (self.lastPosition + (.9 * scrollView.bounds.size.width))) { self.currentIndex = self.nextIndex; - [self.pageControl setSelectedSegmentIndex:self.currentIndex]; + [self.pri_segmentControl setSelectedSegmentIndex:self.currentIndex]; } } /* Need to calculate max/min offset for *every* page, not just the first and last. */ CGFloat minXOffset = scrollView.bounds.size.width - (self.currentIndex * scrollView.bounds.size.width); - CGFloat maxXOffset = (([self.pages count] - self.currentIndex) * scrollView.bounds.size.width); + CGFloat maxXOffset = (([self.pri_pages count] - self.currentIndex) * scrollView.bounds.size.width); if (!self.shouldBounce) { CGRect scrollBounds = scrollView.bounds; @@ -205,7 +231,7 @@ - (void)scrollViewWillEndDragging:(UIScrollView *)scrollView withVelocity:(CGPoi { /* Need to calculate max/min offset for *every* page, not just the first and last. */ CGFloat minXOffset = scrollView.bounds.size.width - (self.currentIndex * scrollView.bounds.size.width); - CGFloat maxXOffset = (([self.pages count] - self.currentIndex) * scrollView.bounds.size.width); + CGFloat maxXOffset = (([self.pri_pages count] - self.currentIndex) * scrollView.bounds.size.width); if (!self.shouldBounce) { if (scrollView.contentOffset.x <= minXOffset) { @@ -235,27 +261,113 @@ - (void)pageControlValueChanged:(id)sender { if (!self.userDraggingStartedTransitionInProgress) { // Update NextIndex - self.nextIndex = [self.pageControl selectedSegmentIndex]; - UIPageViewControllerNavigationDirection direction = self.nextIndex > [self.pages indexOfObject:[self.pageViewController.viewControllers lastObject]] ? UIPageViewControllerNavigationDirectionForward : UIPageViewControllerNavigationDirectionReverse; + self.nextIndex = [self.pri_segmentControl selectedSegmentIndex]; + UIPageViewControllerNavigationDirection direction = self.nextIndex > [self.pri_pages indexOfObject:[self.pri_pageViewController.viewControllers lastObject]] ? UIPageViewControllerNavigationDirectionForward : UIPageViewControllerNavigationDirectionReverse; + + if (!self.needPagerAnimateWhenSegmentSelectionChanged && self.pri_segmentControl.selectedSegmentIndex < self.pri_pages.count) { + self.currentIndex = [self.pri_segmentControl selectedSegmentIndex]; + } __weak THSegmentedPager *blocksafeSelf = self; - [self.pageViewController setViewControllers:@[[self selectedController]] - direction:direction - animated:self.needPagerAnimateWhenSegmentSelectionChanged - completion:^(BOOL finished) { - // ref: http://stackoverflow.com/questions/12939280/uipageviewcontroller-navigates-to-wrong-page-with-scroll-transition-style - // workaround for UIPageViewController's bug to avoid transition to wrong page - // (ex: after switching from p1 to p3 using pageControl, you can only swipe back from p3 to p1 instead of p2) - dispatch_async(dispatch_get_main_queue(), ^{ - [blocksafeSelf.pageViewController setViewControllers:@[[blocksafeSelf selectedController]] - direction:direction - animated:NO - completion:nil]; - }); - }]; + void (^completionBlock)(BOOL finished) = ^(BOOL finished) { + // ref: http://stackoverflow.com/questions/12939280/uipageviewcontroller-navigates-to-wrong-page-with-scroll-transition-style + // workaround for UIPageViewController's bug to avoid transition to wrong page + // (ex: after switching from p1 to p3 using pageControl, you can only swipe back from p3 to p1 instead of p2) + dispatch_async(dispatch_get_main_queue(), ^{ + [blocksafeSelf.pri_pageViewController setViewControllers:@[[blocksafeSelf selectedController]] direction:direction animated:NO completion:nil]; + }); + }; + + [self.pri_pageViewController setViewControllers:@[[self selectedController]] direction:direction + animated:self.needPagerAnimateWhenSegmentSelectionChanged completion:completionBlock]; } else { - [self.pageControl setSelectedSegmentIndex:self.currentIndex animated:NO]; + [self.pri_segmentControl setSelectedSegmentIndex:self.currentIndex animated:NO]; + } +} + +#pragma mark - getter + +- (UIView *)pri_contentContainer +{ + if (!_pri_contentContainer) { + _pri_contentContainer = [[UIView alloc] initWithFrame:CGRectMake(0, CGRectGetMaxY(self.pri_segmentControl.frame), CGRectGetWidth(self.view.frame), CGRectGetHeight(self.view.frame) - CGRectGetMaxY(self.pri_segmentControl.frame))]; + _pri_contentContainer.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight; + _pri_contentContainer.backgroundColor = [UIColor clearColor]; + } + + return _pri_contentContainer; +} + +- (UIPageViewController *)pri_pageViewController +{ + if (!_pri_pageViewController) { + _pri_pageViewController = [[UIPageViewController alloc] initWithTransitionStyle:UIPageViewControllerTransitionStyleScroll navigationOrientation:UIPageViewControllerNavigationOrientationHorizontal options:nil]; + _pri_pageViewController.view.frame = self.pri_contentContainer.bounds; + [_pri_pageViewController setDataSource:self]; + [_pri_pageViewController setDelegate:self]; + [_pri_pageViewController.view setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)]; } + + return _pri_pageViewController; +} + +- (HMSegmentedControl *)pri_segmentControl +{ + if (!_pri_segmentControl) { + _pri_segmentControl = [[HMSegmentedControl alloc] initWithFrame:CGRectMake(0, 0, CGRectGetWidth(self.view.bounds), 40)]; + _pri_segmentControl.autoresizingMask = UIViewAutoresizingFlexibleWidth; + _pri_segmentControl.backgroundColor = [UIColor colorWithRed:69/255.0 green:69/255.0 blue:69/255.0 alpha:1]; + _pri_segmentControl.titleTextAttributes = @{NSForegroundColorAttributeName : [UIColor colorWithRed:127/255.0 green:127/255.0 blue:127/255.0 alpha:1]}; + _pri_segmentControl.selectionIndicatorColor = [UIColor colorWithRed:242/255.0 green:121/255.0 blue:53/255.0 alpha:1]; + _pri_segmentControl.selectionIndicatorLocation = HMSegmentedControlSelectionIndicatorLocationDown; + _pri_segmentControl.selectedTitleTextAttributes = @{NSForegroundColorAttributeName : [UIColor whiteColor]}; + _pri_segmentControl.selectionStyle = HMSegmentedControlSelectionStyleFullWidthStripe; + _pri_segmentControl.verticalDividerEnabled = YES; + _pri_segmentControl.verticalDividerColor = [UIColor colorWithRed:127/255.0 green:127/255.0 blue:127/255.0 alpha:1]; + + [_pri_segmentControl addTarget:self action:@selector(pageControlValueChanged:) forControlEvents:UIControlEventValueChanged]; + } + return _pri_segmentControl; +} + +- (HMSegmentedControl *)pageControl +{ + return self.pri_segmentControl; +} + +- (UIPageViewController *)pageViewController +{ + return self.pri_pageViewController; +} + +- (UIView *)contentContainer +{ + return self.pri_contentContainer; +} + +- (NSMutableArray *)pri_pages +{ + if (!_pri_pages) { + _pri_pages = [[NSMutableArray alloc] init]; + } + return _pri_pages; +} + +- (NSArray *)pages +{ + return self.pri_pages; +} + +- (void)setPages:(NSArray *)pages +{ + if (pages) { + [self.pri_pages removeAllObjects]; + [self.pri_pages addObjectsFromArray:pages]; + } +} + +- (UIViewController *)selectedController { + return self.pri_pages[[self.pri_segmentControl selectedSegmentIndex]]; } @end diff --git a/THSegmentedPagerExample/Podfile b/THSegmentedPagerExample/Podfile deleted file mode 100644 index e77b94f..0000000 --- a/THSegmentedPagerExample/Podfile +++ /dev/null @@ -1,12 +0,0 @@ -source 'https://github.com/CocoaPods/Specs.git' -platform :ios, '7.0' - -pod 'HMSegmentedControl', '~> 1.5.2' -pod 'THSegmentedPager', :path=> '../../THSegmentedPager' - -target 'THSegmentedPagerExampleTests', :exclusive => true do - pod 'FBSnapshotTestCase/Core' - pod 'Expecta+Snapshots' - pod 'Specta' - pod 'Expecta' -end diff --git a/THSegmentedPagerExample/Podfile.lock b/THSegmentedPagerExample/Podfile.lock deleted file mode 100644 index 0ac5114..0000000 --- a/THSegmentedPagerExample/Podfile.lock +++ /dev/null @@ -1,32 +0,0 @@ -PODS: - - Expecta (1.0.3) - - Expecta+Snapshots (2.0.0): - - Expecta (~> 1.0) - - FBSnapshotTestCase/Core (~> 2.0.3) - - FBSnapshotTestCase/Core (2.0.4) - - HMSegmentedControl (1.5.2) - - Specta (1.0.4) - - THSegmentedPager (1.1.3): - - HMSegmentedControl (~> 1.5.2) - -DEPENDENCIES: - - Expecta - - Expecta+Snapshots - - FBSnapshotTestCase/Core - - HMSegmentedControl (~> 1.5.2) - - Specta - - THSegmentedPager (from `../../THSegmentedPager`) - -EXTERNAL SOURCES: - THSegmentedPager: - :path: "../../THSegmentedPager" - -SPEC CHECKSUMS: - Expecta: 9d1bff6c8b0eeee73a166a2ee898892478927a15 - Expecta+Snapshots: 29b38dd695bc72a0ed2bea833937d78df41943ba - FBSnapshotTestCase: d94cf34841c9e77390e29009e8e2713479d48753 - HMSegmentedControl: 83b9686022d2176fb6457d2bdb61e5d6393fed7d - Specta: 69bb134672aae190a1379ff91df07dad8dd1f869 - THSegmentedPager: 9d4fb2acc78d77246caf1e71d2e878bf5977b904 - -COCOAPODS: 0.38.2 diff --git a/THSegmentedPagerExample/THSegmentedPagerExample.xcodeproj/project.pbxproj b/THSegmentedPagerExample/THSegmentedPagerExample.xcodeproj/project.pbxproj index abe6c67..6811ccd 100644 --- a/THSegmentedPagerExample/THSegmentedPagerExample.xcodeproj/project.pbxproj +++ b/THSegmentedPagerExample/THSegmentedPagerExample.xcodeproj/project.pbxproj @@ -7,406 +7,277 @@ objects = { /* Begin PBXBuildFile section */ - 3CCB8815A52E480C87E30210 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B0378D4EB5754459AF84BA34 /* libPods.a */; }; - 502EEB741AE2DBFF000CFA05 /* THSegmentedPagerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 502EEB731AE2DBFF000CFA05 /* THSegmentedPagerTests.m */; }; - 502EEB771AE2DCBD000CFA05 /* Storyboard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 502EEB761AE2DCBD000CFA05 /* Storyboard.storyboard */; }; - 6A1FCE59DEC24EB61262FDDC /* libPods-THSegmentedPagerExampleTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 38BB6F8377F5CBD51D308DB8 /* libPods-THSegmentedPagerExampleTests.a */; }; - 9918A27A1BC6AA0C00A15A77 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 99C8C818198281240039193A /* Images.xcassets */; settings = {ASSET_TAGS = (); }; }; - 9918A27C1BC6AA9600A15A77 /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9918A27B1BC6AA9600A15A77 /* Launch Screen.storyboard */; settings = {ASSET_TAGS = (); }; }; - 99C8C807198281240039193A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 99C8C806198281240039193A /* Foundation.framework */; }; - 99C8C809198281240039193A /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 99C8C808198281240039193A /* CoreGraphics.framework */; }; - 99C8C80B198281240039193A /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 99C8C80A198281240039193A /* UIKit.framework */; }; - 99C8C811198281240039193A /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 99C8C80F198281240039193A /* InfoPlist.strings */; }; - 99C8C813198281240039193A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 99C8C812198281240039193A /* main.m */; }; - 99C8C817198281240039193A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 99C8C816198281240039193A /* AppDelegate.m */; }; - 99C8C819198281240039193A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 99C8C818198281240039193A /* Images.xcassets */; }; - 99C8C820198281240039193A /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 99C8C81F198281240039193A /* XCTest.framework */; }; - 99C8C821198281240039193A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 99C8C806198281240039193A /* Foundation.framework */; }; - 99C8C822198281240039193A /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 99C8C80A198281240039193A /* UIKit.framework */; }; - 99C8C82A198281240039193A /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 99C8C828198281240039193A /* InfoPlist.strings */; }; - 99C8C836198281580039193A /* iPhone.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 99C8C835198281580039193A /* iPhone.storyboard */; }; - 99C8C84719829C650039193A /* SamplePagedViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 99C8C84619829C650039193A /* SamplePagedViewController.m */; }; + 1C1AEF891F4EA624005C8FB8 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C1AEF881F4EA624005C8FB8 /* main.m */; }; + 1C1AEF8C1F4EA624005C8FB8 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C1AEF8B1F4EA624005C8FB8 /* AppDelegate.m */; }; + 1C1AEF8F1F4EA624005C8FB8 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C1AEF8E1F4EA624005C8FB8 /* ViewController.m */; }; + 1C1AEF921F4EA624005C8FB8 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 1C1AEF901F4EA624005C8FB8 /* Main.storyboard */; }; + 1C1AEF941F4EA624005C8FB8 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1C1AEF931F4EA624005C8FB8 /* Assets.xcassets */; }; + 1C1AEF971F4EA624005C8FB8 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 1C1AEF951F4EA624005C8FB8 /* LaunchScreen.storyboard */; }; + 1C1AEFA01F4EA7FA005C8FB8 /* BaseTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C1AEF9F1F4EA7FA005C8FB8 /* BaseTableViewController.m */; }; + 1C1AEFA31F4EAC96005C8FB8 /* PagerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C1AEFA21F4EAC96005C8FB8 /* PagerViewController.m */; }; + 1C1AEFA61F4EBA73005C8FB8 /* TestViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C1AEFA51F4EBA73005C8FB8 /* TestViewController.m */; }; + 32749EFB26E011CEF355C6AA /* Pods_ThSegmentedPagerExample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7B5685ACEE81C8F2BC88A0A /* Pods_ThSegmentedPagerExample.framework */; }; /* End PBXBuildFile section */ -/* Begin PBXContainerItemProxy section */ - 99C8C823198281240039193A /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 99C8C7FB198281240039193A /* Project object */; - proxyType = 1; - remoteGlobalIDString = 99C8C802198281240039193A; - remoteInfo = THSegmentedPagerExample; - }; -/* End PBXContainerItemProxy section */ - /* Begin PBXFileReference section */ - 38BB6F8377F5CBD51D308DB8 /* libPods-THSegmentedPagerExampleTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-THSegmentedPagerExampleTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - 502EEB731AE2DBFF000CFA05 /* THSegmentedPagerTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = THSegmentedPagerTests.m; sourceTree = ""; }; - 502EEB761AE2DCBD000CFA05 /* Storyboard.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Storyboard.storyboard; sourceTree = ""; }; - 57357A84FB65AC89CDE5F74B /* Pods-THSegmentedPagerExampleTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-THSegmentedPagerExampleTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-THSegmentedPagerExampleTests/Pods-THSegmentedPagerExampleTests.debug.xcconfig"; sourceTree = ""; }; - 9918A27B1BC6AA9600A15A77 /* Launch Screen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = ""; }; - 99C8C803198281240039193A /* THSegmentedPagerExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = THSegmentedPagerExample.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 99C8C806198281240039193A /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; - 99C8C808198281240039193A /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; - 99C8C80A198281240039193A /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; - 99C8C80E198281240039193A /* THSegmentedPagerExample-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "THSegmentedPagerExample-Info.plist"; sourceTree = ""; }; - 99C8C810198281240039193A /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; - 99C8C812198281240039193A /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; - 99C8C814198281240039193A /* THSegmentedPagerExample-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "THSegmentedPagerExample-Prefix.pch"; sourceTree = ""; }; - 99C8C815198281240039193A /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; - 99C8C816198281240039193A /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; - 99C8C818198281240039193A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; - 99C8C81E198281240039193A /* THSegmentedPagerExampleTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = THSegmentedPagerExampleTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 99C8C81F198281240039193A /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; }; - 99C8C827198281240039193A /* THSegmentedPagerExampleTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "THSegmentedPagerExampleTests-Info.plist"; sourceTree = ""; }; - 99C8C829198281240039193A /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; - 99C8C835198281580039193A /* iPhone.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = iPhone.storyboard; sourceTree = ""; }; - 99C8C84519829C650039193A /* SamplePagedViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SamplePagedViewController.h; sourceTree = ""; }; - 99C8C84619829C650039193A /* SamplePagedViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SamplePagedViewController.m; sourceTree = ""; }; - B0378D4EB5754459AF84BA34 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; }; - B86019CAE24EC80D2397F99D /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = ""; }; - E9CACEA33C0AB51FDF71D7B5 /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = ""; }; - F436489982B76D37541A6DB1 /* Pods-THSegmentedPagerExampleTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-THSegmentedPagerExampleTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-THSegmentedPagerExampleTests/Pods-THSegmentedPagerExampleTests.release.xcconfig"; sourceTree = ""; }; + 1C1AEF841F4EA624005C8FB8 /* ThSegmentedPagerExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ThSegmentedPagerExample.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 1C1AEF881F4EA624005C8FB8 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; + 1C1AEF8A1F4EA624005C8FB8 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; + 1C1AEF8B1F4EA624005C8FB8 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; + 1C1AEF8D1F4EA624005C8FB8 /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = ""; }; + 1C1AEF8E1F4EA624005C8FB8 /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = ""; }; + 1C1AEF911F4EA624005C8FB8 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + 1C1AEF931F4EA624005C8FB8 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 1C1AEF961F4EA624005C8FB8 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; + 1C1AEF981F4EA624005C8FB8 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 1C1AEF9E1F4EA7FA005C8FB8 /* BaseTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BaseTableViewController.h; sourceTree = ""; }; + 1C1AEF9F1F4EA7FA005C8FB8 /* BaseTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BaseTableViewController.m; sourceTree = ""; }; + 1C1AEFA11F4EAC96005C8FB8 /* PagerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PagerViewController.h; sourceTree = ""; }; + 1C1AEFA21F4EAC96005C8FB8 /* PagerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PagerViewController.m; sourceTree = ""; }; + 1C1AEFA41F4EBA73005C8FB8 /* TestViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestViewController.h; sourceTree = ""; }; + 1C1AEFA51F4EBA73005C8FB8 /* TestViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TestViewController.m; sourceTree = ""; }; + C8918BF900C98EEF7131C90D /* Pods-ThSegmentedPagerExample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ThSegmentedPagerExample.release.xcconfig"; path = "Pods/Target Support Files/Pods-ThSegmentedPagerExample/Pods-ThSegmentedPagerExample.release.xcconfig"; sourceTree = ""; }; + E7B5685ACEE81C8F2BC88A0A /* Pods_ThSegmentedPagerExample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ThSegmentedPagerExample.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + FE52F4410F6DFBC3E444EFA1 /* Pods-ThSegmentedPagerExample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ThSegmentedPagerExample.debug.xcconfig"; path = "Pods/Target Support Files/Pods-ThSegmentedPagerExample/Pods-ThSegmentedPagerExample.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 99C8C800198281240039193A /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 99C8C809198281240039193A /* CoreGraphics.framework in Frameworks */, - 99C8C80B198281240039193A /* UIKit.framework in Frameworks */, - 99C8C807198281240039193A /* Foundation.framework in Frameworks */, - 3CCB8815A52E480C87E30210 /* libPods.a in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 99C8C81B198281240039193A /* Frameworks */ = { + 1C1AEF811F4EA624005C8FB8 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 99C8C820198281240039193A /* XCTest.framework in Frameworks */, - 99C8C822198281240039193A /* UIKit.framework in Frameworks */, - 99C8C821198281240039193A /* Foundation.framework in Frameworks */, - 6A1FCE59DEC24EB61262FDDC /* libPods-THSegmentedPagerExampleTests.a in Frameworks */, + 32749EFB26E011CEF355C6AA /* Pods_ThSegmentedPagerExample.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 4ABE35039A712EBCB9D85E14 /* Pods */ = { + 1C1AEF7B1F4EA624005C8FB8 = { isa = PBXGroup; children = ( - E9CACEA33C0AB51FDF71D7B5 /* Pods.debug.xcconfig */, - B86019CAE24EC80D2397F99D /* Pods.release.xcconfig */, - 57357A84FB65AC89CDE5F74B /* Pods-THSegmentedPagerExampleTests.debug.xcconfig */, - F436489982B76D37541A6DB1 /* Pods-THSegmentedPagerExampleTests.release.xcconfig */, + 1C1AEF861F4EA624005C8FB8 /* ThSegmentedPagerExample */, + 1C1AEF851F4EA624005C8FB8 /* Products */, + FA563CC82ABD459C84377457 /* Pods */, + 87591CA62F2EDC4A642B9CC4 /* Frameworks */, ); - name = Pods; sourceTree = ""; }; - 502EEB751AE2DC9F000CFA05 /* Fixtures */ = { + 1C1AEF851F4EA624005C8FB8 /* Products */ = { isa = PBXGroup; children = ( - 502EEB761AE2DCBD000CFA05 /* Storyboard.storyboard */, - ); - name = Fixtures; - sourceTree = ""; - }; - 99C8C7FA198281240039193A = { - isa = PBXGroup; - children = ( - 99C8C80C198281240039193A /* THSegmentedPagerExample */, - 99C8C825198281240039193A /* THSegmentedPagerExampleTests */, - 99C8C805198281240039193A /* Frameworks */, - 99C8C804198281240039193A /* Products */, - 4ABE35039A712EBCB9D85E14 /* Pods */, - ); - indentWidth = 4; - sourceTree = ""; - tabWidth = 4; - }; - 99C8C804198281240039193A /* Products */ = { - isa = PBXGroup; - children = ( - 99C8C803198281240039193A /* THSegmentedPagerExample.app */, - 99C8C81E198281240039193A /* THSegmentedPagerExampleTests.xctest */, + 1C1AEF841F4EA624005C8FB8 /* ThSegmentedPagerExample.app */, ); name = Products; sourceTree = ""; }; - 99C8C805198281240039193A /* Frameworks */ = { + 1C1AEF861F4EA624005C8FB8 /* ThSegmentedPagerExample */ = { isa = PBXGroup; children = ( - 99C8C806198281240039193A /* Foundation.framework */, - 99C8C808198281240039193A /* CoreGraphics.framework */, - 99C8C80A198281240039193A /* UIKit.framework */, - 99C8C81F198281240039193A /* XCTest.framework */, - B0378D4EB5754459AF84BA34 /* libPods.a */, - 38BB6F8377F5CBD51D308DB8 /* libPods-THSegmentedPagerExampleTests.a */, - ); - name = Frameworks; + 1C1AEF8A1F4EA624005C8FB8 /* AppDelegate.h */, + 1C1AEF8B1F4EA624005C8FB8 /* AppDelegate.m */, + 1C1AEF8D1F4EA624005C8FB8 /* ViewController.h */, + 1C1AEF8E1F4EA624005C8FB8 /* ViewController.m */, + 1C1AEF9E1F4EA7FA005C8FB8 /* BaseTableViewController.h */, + 1C1AEF9F1F4EA7FA005C8FB8 /* BaseTableViewController.m */, + 1C1AEFA11F4EAC96005C8FB8 /* PagerViewController.h */, + 1C1AEFA21F4EAC96005C8FB8 /* PagerViewController.m */, + 1C1AEFA41F4EBA73005C8FB8 /* TestViewController.h */, + 1C1AEFA51F4EBA73005C8FB8 /* TestViewController.m */, + 1C1AEF901F4EA624005C8FB8 /* Main.storyboard */, + 1C1AEF931F4EA624005C8FB8 /* Assets.xcassets */, + 1C1AEF951F4EA624005C8FB8 /* LaunchScreen.storyboard */, + 1C1AEF981F4EA624005C8FB8 /* Info.plist */, + 1C1AEF871F4EA624005C8FB8 /* Supporting Files */, + ); + path = ThSegmentedPagerExample; sourceTree = ""; }; - 99C8C80C198281240039193A /* THSegmentedPagerExample */ = { + 1C1AEF871F4EA624005C8FB8 /* Supporting Files */ = { isa = PBXGroup; children = ( - 99C8C84519829C650039193A /* SamplePagedViewController.h */, - 99C8C84619829C650039193A /* SamplePagedViewController.m */, - 99C8C815198281240039193A /* AppDelegate.h */, - 99C8C816198281240039193A /* AppDelegate.m */, - 99C8C818198281240039193A /* Images.xcassets */, - 99C8C80D198281240039193A /* Supporting Files */, - 99C8C835198281580039193A /* iPhone.storyboard */, - 9918A27B1BC6AA9600A15A77 /* Launch Screen.storyboard */, - ); - path = THSegmentedPagerExample; - sourceTree = ""; - }; - 99C8C80D198281240039193A /* Supporting Files */ = { - isa = PBXGroup; - children = ( - 99C8C80E198281240039193A /* THSegmentedPagerExample-Info.plist */, - 99C8C80F198281240039193A /* InfoPlist.strings */, - 99C8C812198281240039193A /* main.m */, - 99C8C814198281240039193A /* THSegmentedPagerExample-Prefix.pch */, + 1C1AEF881F4EA624005C8FB8 /* main.m */, ); name = "Supporting Files"; sourceTree = ""; }; - 99C8C825198281240039193A /* THSegmentedPagerExampleTests */ = { + 87591CA62F2EDC4A642B9CC4 /* Frameworks */ = { isa = PBXGroup; children = ( - 99C8C826198281240039193A /* Supporting Files */, - 502EEB731AE2DBFF000CFA05 /* THSegmentedPagerTests.m */, + E7B5685ACEE81C8F2BC88A0A /* Pods_ThSegmentedPagerExample.framework */, ); - path = THSegmentedPagerExampleTests; + name = Frameworks; sourceTree = ""; }; - 99C8C826198281240039193A /* Supporting Files */ = { + FA563CC82ABD459C84377457 /* Pods */ = { isa = PBXGroup; children = ( - 502EEB751AE2DC9F000CFA05 /* Fixtures */, - 99C8C827198281240039193A /* THSegmentedPagerExampleTests-Info.plist */, - 99C8C828198281240039193A /* InfoPlist.strings */, + FE52F4410F6DFBC3E444EFA1 /* Pods-ThSegmentedPagerExample.debug.xcconfig */, + C8918BF900C98EEF7131C90D /* Pods-ThSegmentedPagerExample.release.xcconfig */, ); - name = "Supporting Files"; + name = Pods; sourceTree = ""; }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 99C8C802198281240039193A /* THSegmentedPagerExample */ = { + 1C1AEF831F4EA624005C8FB8 /* ThSegmentedPagerExample */ = { isa = PBXNativeTarget; - buildConfigurationList = 99C8C82F198281240039193A /* Build configuration list for PBXNativeTarget "THSegmentedPagerExample" */; + buildConfigurationList = 1C1AEF9B1F4EA624005C8FB8 /* Build configuration list for PBXNativeTarget "ThSegmentedPagerExample" */; buildPhases = ( - 2732873956584C6784AB8C11 /* Check Pods Manifest.lock */, - 99C8C7FF198281240039193A /* Sources */, - 99C8C800198281240039193A /* Frameworks */, - 99C8C801198281240039193A /* Resources */, - 49B247F1B39A4B758AF32B62 /* Copy Pods Resources */, + 031A4F227C0F2DE88C26BA03 /* [CP] Check Pods Manifest.lock */, + 1C1AEF801F4EA624005C8FB8 /* Sources */, + 1C1AEF811F4EA624005C8FB8 /* Frameworks */, + 1C1AEF821F4EA624005C8FB8 /* Resources */, + 99318926B5411CB48DAF2087 /* [CP] Embed Pods Frameworks */, + B2AE61DB94D54429ADB2158F /* [CP] Copy Pods Resources */, ); buildRules = ( ); dependencies = ( ); - name = THSegmentedPagerExample; - productName = THSegmentedPagerExample; - productReference = 99C8C803198281240039193A /* THSegmentedPagerExample.app */; + name = ThSegmentedPagerExample; + productName = ThSegmentedPagerExample; + productReference = 1C1AEF841F4EA624005C8FB8 /* ThSegmentedPagerExample.app */; productType = "com.apple.product-type.application"; }; - 99C8C81D198281240039193A /* THSegmentedPagerExampleTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = 99C8C832198281240039193A /* Build configuration list for PBXNativeTarget "THSegmentedPagerExampleTests" */; - buildPhases = ( - 034D194D6DD5C8CB06F7360E /* Check Pods Manifest.lock */, - 99C8C81A198281240039193A /* Sources */, - 99C8C81B198281240039193A /* Frameworks */, - 99C8C81C198281240039193A /* Resources */, - E802B37DE433CB88DDBF430D /* Copy Pods Resources */, - ); - buildRules = ( - ); - dependencies = ( - 99C8C824198281240039193A /* PBXTargetDependency */, - ); - name = THSegmentedPagerExampleTests; - productName = THSegmentedPagerExampleTests; - productReference = 99C8C81E198281240039193A /* THSegmentedPagerExampleTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ - 99C8C7FB198281240039193A /* Project object */ = { + 1C1AEF7C1F4EA624005C8FB8 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0700; - ORGANIZATIONNAME = 3Bus; + LastUpgradeCheck = 0830; + ORGANIZATIONNAME = "胡金友"; TargetAttributes = { - 99C8C81D198281240039193A = { - TestTargetID = 99C8C802198281240039193A; + 1C1AEF831F4EA624005C8FB8 = { + CreatedOnToolsVersion = 8.3.3; + DevelopmentTeam = NFE8L9VTV6; + ProvisioningStyle = Manual; }; }; }; - buildConfigurationList = 99C8C7FE198281240039193A /* Build configuration list for PBXProject "THSegmentedPagerExample" */; + buildConfigurationList = 1C1AEF7F1F4EA624005C8FB8 /* Build configuration list for PBXProject "ThSegmentedPagerExample" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( en, + Base, ); - mainGroup = 99C8C7FA198281240039193A; - productRefGroup = 99C8C804198281240039193A /* Products */; + mainGroup = 1C1AEF7B1F4EA624005C8FB8; + productRefGroup = 1C1AEF851F4EA624005C8FB8 /* Products */; projectDirPath = ""; projectRoot = ""; targets = ( - 99C8C802198281240039193A /* THSegmentedPagerExample */, - 99C8C81D198281240039193A /* THSegmentedPagerExampleTests */, + 1C1AEF831F4EA624005C8FB8 /* ThSegmentedPagerExample */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ - 99C8C801198281240039193A /* Resources */ = { + 1C1AEF821F4EA624005C8FB8 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 99C8C811198281240039193A /* InfoPlist.strings in Resources */, - 99C8C836198281580039193A /* iPhone.storyboard in Resources */, - 9918A27C1BC6AA9600A15A77 /* Launch Screen.storyboard in Resources */, - 99C8C819198281240039193A /* Images.xcassets in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 99C8C81C198281240039193A /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 9918A27A1BC6AA0C00A15A77 /* Images.xcassets in Resources */, - 99C8C82A198281240039193A /* InfoPlist.strings in Resources */, - 502EEB771AE2DCBD000CFA05 /* Storyboard.storyboard in Resources */, + 1C1AEF971F4EA624005C8FB8 /* LaunchScreen.storyboard in Resources */, + 1C1AEF941F4EA624005C8FB8 /* Assets.xcassets in Resources */, + 1C1AEF921F4EA624005C8FB8 /* Main.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 034D194D6DD5C8CB06F7360E /* Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "Check Pods Manifest.lock"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; - showEnvVarsInLog = 0; - }; - 2732873956584C6784AB8C11 /* Check Pods Manifest.lock */ = { + 031A4F227C0F2DE88C26BA03 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Check Pods Manifest.lock"; + name = "[CP] Check Pods Manifest.lock"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n"; showEnvVarsInLog = 0; }; - 49B247F1B39A4B758AF32B62 /* Copy Pods Resources */ = { + 99318926B5411CB48DAF2087 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Copy Pods Resources"; + name = "[CP] Embed Pods Frameworks"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-resources.sh\"\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ThSegmentedPagerExample/Pods-ThSegmentedPagerExample-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - E802B37DE433CB88DDBF430D /* Copy Pods Resources */ = { + B2AE61DB94D54429ADB2158F /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Copy Pods Resources"; + name = "[CP] Copy Pods Resources"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-THSegmentedPagerExampleTests/Pods-THSegmentedPagerExampleTests-resources.sh\"\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ThSegmentedPagerExample/Pods-ThSegmentedPagerExample-resources.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - 99C8C7FF198281240039193A /* Sources */ = { + 1C1AEF801F4EA624005C8FB8 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 99C8C817198281240039193A /* AppDelegate.m in Sources */, - 99C8C84719829C650039193A /* SamplePagedViewController.m in Sources */, - 99C8C813198281240039193A /* main.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 99C8C81A198281240039193A /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 502EEB741AE2DBFF000CFA05 /* THSegmentedPagerTests.m in Sources */, + 1C1AEFA61F4EBA73005C8FB8 /* TestViewController.m in Sources */, + 1C1AEF8F1F4EA624005C8FB8 /* ViewController.m in Sources */, + 1C1AEFA31F4EAC96005C8FB8 /* PagerViewController.m in Sources */, + 1C1AEF8C1F4EA624005C8FB8 /* AppDelegate.m in Sources */, + 1C1AEFA01F4EA7FA005C8FB8 /* BaseTableViewController.m in Sources */, + 1C1AEF891F4EA624005C8FB8 /* main.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ -/* Begin PBXTargetDependency section */ - 99C8C824198281240039193A /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 99C8C802198281240039193A /* THSegmentedPagerExample */; - targetProxy = 99C8C823198281240039193A /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - /* Begin PBXVariantGroup section */ - 99C8C80F198281240039193A /* InfoPlist.strings */ = { + 1C1AEF901F4EA624005C8FB8 /* Main.storyboard */ = { isa = PBXVariantGroup; children = ( - 99C8C810198281240039193A /* en */, + 1C1AEF911F4EA624005C8FB8 /* Base */, ); - name = InfoPlist.strings; + name = Main.storyboard; sourceTree = ""; }; - 99C8C828198281240039193A /* InfoPlist.strings */ = { + 1C1AEF951F4EA624005C8FB8 /* LaunchScreen.storyboard */ = { isa = PBXVariantGroup; children = ( - 99C8C829198281240039193A /* en */, + 1C1AEF961F4EA624005C8FB8 /* Base */, ); - name = InfoPlist.strings; + name = LaunchScreen.storyboard; sourceTree = ""; }; /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ - 99C8C82D198281240039193A /* Debug */ = { + 1C1AEF991F4EA624005C8FB8 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -414,40 +285,48 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; 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"; COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; - GCC_GENERATE_TEST_COVERAGE_FILES = YES; - GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES; + GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", "$(inherited)", ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 7.0; + IPHONEOS_DEPLOYMENT_TARGET = 10.3; + MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; }; - 99C8C82E198281240039193A /* Release */ = { + 1C1AEF9A1F4EA624005C8FB8 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -455,138 +334,87 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; 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"; - COPY_PHASE_STRIP = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_GENERATE_TEST_COVERAGE_FILES = YES; - GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES; + GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 7.0; + IPHONEOS_DEPLOYMENT_TARGET = 10.3; + MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; }; name = Release; }; - 99C8C830198281240039193A /* Debug */ = { + 1C1AEF9C1F4EA624005C8FB8 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = E9CACEA33C0AB51FDF71D7B5 /* Pods.debug.xcconfig */; + baseConfigurationReference = FE52F4410F6DFBC3E444EFA1 /* Pods-ThSegmentedPagerExample.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = BrandAsset; - GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "THSegmentedPagerExample/THSegmentedPagerExample-Prefix.pch"; - INFOPLIST_FILE = "THSegmentedPagerExample/THSegmentedPagerExample-Info.plist"; - PRODUCT_BUNDLE_IDENTIFIER = "it.3bus.${PRODUCT_NAME:rfc1034identifier}"; + DEVELOPMENT_TEAM = NFE8L9VTV6; + INFOPLIST_FILE = ThSegmentedPagerExample/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = com.jyhu.ThSegmentedPagerExample; PRODUCT_NAME = "$(TARGET_NAME)"; - WRAPPER_EXTENSION = app; + PROVISIONING_PROFILE = "4586ff62-821a-4e40-99a7-7682f668d1ca"; + PROVISIONING_PROFILE_SPECIFIER = "hujinyou-mbp-dev-all-170329"; }; name = Debug; }; - 99C8C831198281240039193A /* Release */ = { + 1C1AEF9D1F4EA624005C8FB8 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = B86019CAE24EC80D2397F99D /* Pods.release.xcconfig */; + baseConfigurationReference = C8918BF900C98EEF7131C90D /* Pods-ThSegmentedPagerExample.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = BrandAsset; - GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "THSegmentedPagerExample/THSegmentedPagerExample-Prefix.pch"; - INFOPLIST_FILE = "THSegmentedPagerExample/THSegmentedPagerExample-Info.plist"; - PRODUCT_BUNDLE_IDENTIFIER = "it.3bus.${PRODUCT_NAME:rfc1034identifier}"; + DEVELOPMENT_TEAM = ""; + INFOPLIST_FILE = ThSegmentedPagerExample/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = com.jyhu.ThSegmentedPagerExample; PRODUCT_NAME = "$(TARGET_NAME)"; - WRAPPER_EXTENSION = app; - }; - name = Release; - }; - 99C8C833198281240039193A /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 57357A84FB65AC89CDE5F74B /* Pods-THSegmentedPagerExampleTests.debug.xcconfig */; - buildSettings = { - BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/THSegmentedPagerExample.app/THSegmentedPagerExample"; - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - "$(DEVELOPER_FRAMEWORKS_DIR)", - ); - GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "THSegmentedPagerExample/THSegmentedPagerExample-Prefix.pch"; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - INFOPLIST_FILE = "THSegmentedPagerExampleTests/THSegmentedPagerExampleTests-Info.plist"; - PRODUCT_BUNDLE_IDENTIFIER = "it.3bus.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUNDLE_LOADER)"; - WRAPPER_EXTENSION = xctest; - }; - name = Debug; - }; - 99C8C834198281240039193A /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = F436489982B76D37541A6DB1 /* Pods-THSegmentedPagerExampleTests.release.xcconfig */; - buildSettings = { - BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/THSegmentedPagerExample.app/THSegmentedPagerExample"; - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - "$(DEVELOPER_FRAMEWORKS_DIR)", - ); - GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "THSegmentedPagerExample/THSegmentedPagerExample-Prefix.pch"; - INFOPLIST_FILE = "THSegmentedPagerExampleTests/THSegmentedPagerExampleTests-Info.plist"; - PRODUCT_BUNDLE_IDENTIFIER = "it.3bus.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUNDLE_LOADER)"; - WRAPPER_EXTENSION = xctest; + PROVISIONING_PROFILE_SPECIFIER = ""; }; name = Release; }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 99C8C7FE198281240039193A /* Build configuration list for PBXProject "THSegmentedPagerExample" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 99C8C82D198281240039193A /* Debug */, - 99C8C82E198281240039193A /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 99C8C82F198281240039193A /* Build configuration list for PBXNativeTarget "THSegmentedPagerExample" */ = { + 1C1AEF7F1F4EA624005C8FB8 /* Build configuration list for PBXProject "ThSegmentedPagerExample" */ = { isa = XCConfigurationList; buildConfigurations = ( - 99C8C830198281240039193A /* Debug */, - 99C8C831198281240039193A /* Release */, + 1C1AEF991F4EA624005C8FB8 /* Debug */, + 1C1AEF9A1F4EA624005C8FB8 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 99C8C832198281240039193A /* Build configuration list for PBXNativeTarget "THSegmentedPagerExampleTests" */ = { + 1C1AEF9B1F4EA624005C8FB8 /* Build configuration list for PBXNativeTarget "ThSegmentedPagerExample" */ = { isa = XCConfigurationList; buildConfigurations = ( - 99C8C833198281240039193A /* Debug */, - 99C8C834198281240039193A /* Release */, + 1C1AEF9C1F4EA624005C8FB8 /* Debug */, + 1C1AEF9D1F4EA624005C8FB8 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; /* End XCConfigurationList section */ }; - rootObject = 99C8C7FB198281240039193A /* Project object */; + rootObject = 1C1AEF7C1F4EA624005C8FB8 /* Project object */; } diff --git a/THSegmentedPagerExample/THSegmentedPagerExample.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/THSegmentedPagerExample/THSegmentedPagerExample.xcodeproj/project.xcworkspace/contents.xcworkspacedata index 1318ca7..898c493 100644 --- a/THSegmentedPagerExample/THSegmentedPagerExample.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/THSegmentedPagerExample/THSegmentedPagerExample.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:ThSegmentedPagerExample.xcodeproj"> diff --git a/THSegmentedPagerExample/THSegmentedPagerExample.xcodeproj/xcshareddata/xcschemes/THSegmentedPagerExample.xcscheme b/THSegmentedPagerExample/THSegmentedPagerExample.xcodeproj/xcshareddata/xcschemes/THSegmentedPagerExample.xcscheme deleted file mode 100644 index 5f022ae..0000000 --- a/THSegmentedPagerExample/THSegmentedPagerExample.xcodeproj/xcshareddata/xcschemes/THSegmentedPagerExample.xcscheme +++ /dev/null @@ -1,115 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/THSegmentedPagerExample/THSegmentedPagerExample.xcworkspace/contents.xcworkspacedata b/THSegmentedPagerExample/THSegmentedPagerExample.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index ebc18af..0000000 --- a/THSegmentedPagerExample/THSegmentedPagerExample.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/THSegmentedPagerExample/THSegmentedPagerExample.xcworkspace/xcshareddata/THSegmentedPagerExample.xccheckout b/THSegmentedPagerExample/THSegmentedPagerExample.xcworkspace/xcshareddata/THSegmentedPagerExample.xccheckout deleted file mode 100644 index debb9d2..0000000 --- a/THSegmentedPagerExample/THSegmentedPagerExample.xcworkspace/xcshareddata/THSegmentedPagerExample.xccheckout +++ /dev/null @@ -1,41 +0,0 @@ - - - - - IDESourceControlProjectFavoriteDictionaryKey - - IDESourceControlProjectIdentifier - FEDAB18C-D2CA-4BE0-B96A-C3B4C7824FBD - IDESourceControlProjectName - THSegmentedPagerExample - IDESourceControlProjectOriginsDictionary - - 28D1BF7DB311DBDC3521C5ECE4B3F708CC3BC6C2 - https://github.com/hons82/THSegmentedPager.git - - IDESourceControlProjectPath - THSegmentedPagerExample/THSegmentedPagerExample.xcworkspace - IDESourceControlProjectRelativeInstallPathDictionary - - 28D1BF7DB311DBDC3521C5ECE4B3F708CC3BC6C2 - ../.. - - IDESourceControlProjectURL - https://github.com/hons82/THSegmentedPager.git - IDESourceControlProjectVersion - 111 - IDESourceControlProjectWCCIdentifier - 28D1BF7DB311DBDC3521C5ECE4B3F708CC3BC6C2 - IDESourceControlProjectWCConfigurations - - - IDESourceControlRepositoryExtensionIdentifierKey - public.vcs.git - IDESourceControlWCCIdentifierKey - 28D1BF7DB311DBDC3521C5ECE4B3F708CC3BC6C2 - IDESourceControlWCCName - THSegmentedPager - - - - diff --git a/THSegmentedPagerExample/THSegmentedPagerExample/AppDelegate.h b/THSegmentedPagerExample/THSegmentedPagerExample/AppDelegate.h index ca2b9f0..0462f7a 100644 --- a/THSegmentedPagerExample/THSegmentedPagerExample/AppDelegate.h +++ b/THSegmentedPagerExample/THSegmentedPagerExample/AppDelegate.h @@ -1,9 +1,9 @@ // // AppDelegate.h -// THSegmentedPagerExample +// ThSegmentedPagerExample // -// Created by Hannes Tribus on 25/07/14. -// Copyright (c) 2014 3Bus. All rights reserved. +// Created by 胡金友 on 2017/8/24. +// Copyright © 2017年 胡金友. All rights reserved. // #import @@ -12,4 +12,6 @@ @property (strong, nonatomic) UIWindow *window; + @end + diff --git a/THSegmentedPagerExample/THSegmentedPagerExample/AppDelegate.m b/THSegmentedPagerExample/THSegmentedPagerExample/AppDelegate.m index 69264c2..b42ce8d 100644 --- a/THSegmentedPagerExample/THSegmentedPagerExample/AppDelegate.m +++ b/THSegmentedPagerExample/THSegmentedPagerExample/AppDelegate.m @@ -1,36 +1,51 @@ // // AppDelegate.m -// THSegmentedPagerExample +// ThSegmentedPagerExample // -// Created by Hannes Tribus on 25/07/14. -// Copyright (c) 2014 3Bus. All rights reserved. +// Created by 胡金友 on 2017/8/24. +// Copyright © 2017年 胡金友. All rights reserved. // #import "AppDelegate.h" -#import "THSegmentedPager.h" -#import "SamplePagedViewController.h" -//#define LOAD_WITH_IDENTIFIERS = 0; +@interface AppDelegate () + +@end @implementation AppDelegate -- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions -{ - THSegmentedPager *pager = (THSegmentedPager *)((UINavigationController *)self.window.rootViewController).topViewController; -#ifndef LOAD_WITH_IDENTIFIERS - NSMutableArray *pages = [NSMutableArray new]; - for (int i = 1; i < 4; i++) { - // Create a new view controller and pass suitable data. - SamplePagedViewController *pagedViewController = [pager.storyboard instantiateViewControllerWithIdentifier:@"SamplePagedViewController"]; - [pagedViewController setViewTitle:[NSString stringWithFormat:@"Page %d",i]]; - [pagedViewController.view setBackgroundColor:[UIColor colorWithHue:((i/8)%20)/20.0+0.02 saturation:(i%8+3)/10.0 brightness:91/100.0 alpha:1]]; - [pages addObject:pagedViewController]; - } - [pager setPages:pages]; -#else - [pager setupPagesFromStoryboardWithIdentifiers:@[@"SamplePagedViewController",@"SamplePagedViewController",@"SamplePagedViewController"]]; -#endif + +- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { + // Override point for customization after application launch. return YES; } + +- (void)applicationWillResignActive:(UIApplication *)application { + // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state. + // Use this method to pause ongoing tasks, disable timers, and invalidate graphics rendering callbacks. Games should use this method to pause the game. +} + + +- (void)applicationDidEnterBackground:(UIApplication *)application { + // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. + // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits. +} + + +- (void)applicationWillEnterForeground:(UIApplication *)application { + // Called as part of the transition from the background to the active state; here you can undo many of the changes made on entering the background. +} + + +- (void)applicationDidBecomeActive:(UIApplication *)application { + // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface. +} + + +- (void)applicationWillTerminate:(UIApplication *)application { + // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:. +} + + @end diff --git a/THSegmentedPagerExample/THSegmentedPagerExample/Images.xcassets/AppIcon.appiconset/Contents.json b/THSegmentedPagerExample/THSegmentedPagerExample/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 54% rename from THSegmentedPagerExample/THSegmentedPagerExample/Images.xcassets/AppIcon.appiconset/Contents.json rename to THSegmentedPagerExample/THSegmentedPagerExample/Assets.xcassets/AppIcon.appiconset/Contents.json index 118c98f..36d2c80 100644 --- a/THSegmentedPagerExample/THSegmentedPagerExample/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/THSegmentedPagerExample/THSegmentedPagerExample/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -29,6 +29,36 @@ "idiom" : "iphone", "size" : "60x60", "scale" : "3x" + }, + { + "idiom" : "ipad", + "size" : "29x29", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "29x29", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "40x40", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "40x40", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "76x76", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "76x76", + "scale" : "2x" } ], "info" : { diff --git a/THSegmentedPagerExample/THSegmentedPagerExample/Base.lproj/LaunchScreen.storyboard b/THSegmentedPagerExample/THSegmentedPagerExample/Base.lproj/LaunchScreen.storyboard new file mode 100644 index 0000000..fdf3f97 --- /dev/null +++ b/THSegmentedPagerExample/THSegmentedPagerExample/Base.lproj/LaunchScreen.storyboard @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/THSegmentedPagerExample/THSegmentedPagerExample/Base.lproj/Main.storyboard b/THSegmentedPagerExample/THSegmentedPagerExample/Base.lproj/Main.storyboard new file mode 100644 index 0000000..d8ee995 --- /dev/null +++ b/THSegmentedPagerExample/THSegmentedPagerExample/Base.lproj/Main.storyboard @@ -0,0 +1,161 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/THSegmentedPagerExample/THSegmentedPagerExample/BaseTableViewController.h b/THSegmentedPagerExample/THSegmentedPagerExample/BaseTableViewController.h new file mode 100644 index 0000000..d0d9125 --- /dev/null +++ b/THSegmentedPagerExample/THSegmentedPagerExample/BaseTableViewController.h @@ -0,0 +1,15 @@ +// +// BaseTableViewController.h +// ThSegmentedPagerExample +// +// Created by 胡金友 on 2017/8/24. +// Copyright © 2017年 胡金友. All rights reserved. +// + +#import + +@interface BaseTableViewController : UITableViewController + +- (instancetype)initWithTitle:(NSString *)title; + +@end diff --git a/THSegmentedPagerExample/THSegmentedPagerExample/BaseTableViewController.m b/THSegmentedPagerExample/THSegmentedPagerExample/BaseTableViewController.m new file mode 100644 index 0000000..accc276 --- /dev/null +++ b/THSegmentedPagerExample/THSegmentedPagerExample/BaseTableViewController.m @@ -0,0 +1,66 @@ +// +// BaseTableViewController.m +// ThSegmentedPagerExample +// +// Created by 胡金友 on 2017/8/24. +// Copyright © 2017年 胡金友. All rights reserved. +// + +#import "BaseTableViewController.h" + +@interface BaseTableViewController () + +@end + +@implementation BaseTableViewController + +- (instancetype)initWithTitle:(NSString *)title +{ + if (self = [super initWithStyle:UITableViewStyleGrouped]) { + self.title = title; + } + + return self; +} + +- (instancetype)initWithStyle:(UITableViewStyle)style +{ + return [super initWithStyle:UITableViewStyleGrouped]; +} + +- (void)viewDidLoad { + [super viewDidLoad]; + + self.tableView.tableFooterView = [UIView new]; +} + +- (void)didReceiveMemoryWarning { + [super didReceiveMemoryWarning]; + // Dispose of any resources that can be recreated. +} + +#pragma mark - Table view data source + +- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { + return arc4random_uniform(10) + 2; +} + +- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { + return arc4random_uniform(20) + 5; +} + +- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { + static NSString *reusefulIdentifier = @"reusefulIdentifier"; + UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:reusefulIdentifier]; + + if (!cell) { + cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:reusefulIdentifier]; + } + + cell.textLabel.text = [NSString stringWithFormat:@"%ld - %ld", indexPath.section, indexPath.row]; + + return cell; +} + + +@end diff --git a/THSegmentedPagerExample/THSegmentedPagerExample/Images.xcassets/BrandAsset.launchimage/Contents.json b/THSegmentedPagerExample/THSegmentedPagerExample/Images.xcassets/BrandAsset.launchimage/Contents.json deleted file mode 100644 index e6c8ec6..0000000 --- a/THSegmentedPagerExample/THSegmentedPagerExample/Images.xcassets/BrandAsset.launchimage/Contents.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "images" : [ - { - "orientation" : "portrait", - "idiom" : "iphone", - "extent" : "full-screen", - "minimum-system-version" : "8.0", - "subtype" : "736h", - "scale" : "3x" - }, - { - "orientation" : "landscape", - "idiom" : "iphone", - "extent" : "full-screen", - "minimum-system-version" : "8.0", - "subtype" : "736h", - "scale" : "3x" - }, - { - "orientation" : "portrait", - "idiom" : "iphone", - "extent" : "full-screen", - "minimum-system-version" : "8.0", - "subtype" : "667h", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "iphone", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "iphone", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "subtype" : "retina4", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "iphone", - "extent" : "full-screen", - "scale" : "1x" - }, - { - "orientation" : "portrait", - "idiom" : "iphone", - "extent" : "full-screen", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "iphone", - "extent" : "full-screen", - "subtype" : "retina4", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/THSegmentedPagerExample/THSegmentedPagerExample/Images.xcassets/Contents.json b/THSegmentedPagerExample/THSegmentedPagerExample/Images.xcassets/Contents.json deleted file mode 100644 index da4a164..0000000 --- a/THSegmentedPagerExample/THSegmentedPagerExample/Images.xcassets/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/THSegmentedPagerExample/THSegmentedPagerExample/THSegmentedPagerExample-Info.plist b/THSegmentedPagerExample/THSegmentedPagerExample/Info.plist similarity index 68% rename from THSegmentedPagerExample/THSegmentedPagerExample/THSegmentedPagerExample-Info.plist rename to THSegmentedPagerExample/THSegmentedPagerExample/Info.plist index 92083c6..d052473 100644 --- a/THSegmentedPagerExample/THSegmentedPagerExample/THSegmentedPagerExample-Info.plist +++ b/THSegmentedPagerExample/THSegmentedPagerExample/Info.plist @@ -4,30 +4,26 @@ CFBundleDevelopmentRegion en - CFBundleDisplayName - ${PRODUCT_NAME} CFBundleExecutable - ${EXECUTABLE_NAME} + $(EXECUTABLE_NAME) CFBundleIdentifier $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName - ${PRODUCT_NAME} + $(PRODUCT_NAME) CFBundlePackageType APPL CFBundleShortVersionString - 1.1.0 - CFBundleSignature - ???? + 1.0 CFBundleVersion - 6 + 1 LSRequiresIPhoneOS UILaunchStoryboardName - Launch Screen + LaunchScreen UIMainStoryboardFile - iPhone + Main UIRequiredDeviceCapabilities armv7 @@ -38,5 +34,12 @@ UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + diff --git a/THSegmentedPagerExample/THSegmentedPagerExample/Launch Screen.storyboard b/THSegmentedPagerExample/THSegmentedPagerExample/Launch Screen.storyboard deleted file mode 100644 index 8b5865c..0000000 --- a/THSegmentedPagerExample/THSegmentedPagerExample/Launch Screen.storyboard +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/THSegmentedPagerExample/THSegmentedPagerExample/PagerViewController.h b/THSegmentedPagerExample/THSegmentedPagerExample/PagerViewController.h new file mode 100644 index 0000000..9f60b76 --- /dev/null +++ b/THSegmentedPagerExample/THSegmentedPagerExample/PagerViewController.h @@ -0,0 +1,13 @@ +// +// PagerViewController.h +// ThSegmentedPagerExample +// +// Created by 胡金友 on 2017/8/24. +// Copyright © 2017年 胡金友. All rights reserved. +// + +#import + +@interface PagerViewController : THSegmentedPager + +@end diff --git a/THSegmentedPagerExample/THSegmentedPagerExample/PagerViewController.m b/THSegmentedPagerExample/THSegmentedPagerExample/PagerViewController.m new file mode 100644 index 0000000..a35adf1 --- /dev/null +++ b/THSegmentedPagerExample/THSegmentedPagerExample/PagerViewController.m @@ -0,0 +1,55 @@ +// +// PagerViewController.m +// ThSegmentedPagerExample +// +// Created by 胡金友 on 2017/8/24. +// Copyright © 2017年 胡金友. All rights reserved. +// + +#import "PagerViewController.h" +#import "BaseTableViewController.h" + +@interface PagerViewController () + +@end + +@implementation PagerViewController + +- (void)viewDidLoad { + [super viewDidLoad]; + + self.navigationController.navigationBar.translucent = NO; + + self.shouldBounce = NO; + + BaseTableViewController *b1 = [[BaseTableViewController alloc] initWithTitle:@"B1"]; + BaseTableViewController *b2 = [[BaseTableViewController alloc] initWithTitle:@"B2"]; + BaseTableViewController *b3 = [[BaseTableViewController alloc] initWithTitle:@"B3"]; + BaseTableViewController *b4 = [[BaseTableViewController alloc] initWithTitle:@"B4"]; + + [self setPages:@[b1, b2, b3, b4]]; + + dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ + [self setPageControlHidden:YES animated:YES]; + dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ + [self setPageControlHidden:NO animated:YES]; + }); + }); +} + +- (void)didReceiveMemoryWarning { + [super didReceiveMemoryWarning]; + // Dispose of any resources that can be recreated. +} + +/* +#pragma mark - Navigation + +// In a storyboard-based application, you will often want to do a little preparation before navigation +- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { + // Get the new view controller using [segue destinationViewController]. + // Pass the selected object to the new view controller. +} +*/ + +@end diff --git a/THSegmentedPagerExample/THSegmentedPagerExample/SamplePagedViewController.h b/THSegmentedPagerExample/THSegmentedPagerExample/SamplePagedViewController.h deleted file mode 100644 index 9369151..0000000 --- a/THSegmentedPagerExample/THSegmentedPagerExample/SamplePagedViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// SamplePagedViewController.h -// THSegmentedPagerExample -// -// Created by Hannes Tribus on 25/07/14. -// Copyright (c) 2014 3Bus. All rights reserved. -// - -#import -#import "THSegmentedPageViewControllerDelegate.h" - -@interface SamplePagedViewController : UIViewController - -@property(nonatomic,strong)NSString *viewTitle; - -@end diff --git a/THSegmentedPagerExample/THSegmentedPagerExample/SamplePagedViewController.m b/THSegmentedPagerExample/THSegmentedPagerExample/SamplePagedViewController.m deleted file mode 100644 index 6a013b0..0000000 --- a/THSegmentedPagerExample/THSegmentedPagerExample/SamplePagedViewController.m +++ /dev/null @@ -1,29 +0,0 @@ -// -// SamplePagedViewController.m -// THSegmentedPagerExample -// -// Created by Hannes Tribus on 25/07/14. -// Copyright (c) 2014 3Bus. All rights reserved. -// - -#import "SamplePagedViewController.h" - -@interface SamplePagedViewController () - -@property (weak, nonatomic) IBOutlet UILabel *sampleLabel; - -@end - -@implementation SamplePagedViewController - -- (void)viewWillAppear:(BOOL)animated { - [super viewWillAppear:animated]; - - [self.sampleLabel setText:self.viewControllerTitle]; -} - -- (NSString *)viewControllerTitle { - return self.viewTitle ? self.viewTitle : self.title; -} - -@end diff --git a/THSegmentedPagerExample/THSegmentedPagerExample/THSegmentedPagerExample-Prefix.pch b/THSegmentedPagerExample/THSegmentedPagerExample/THSegmentedPagerExample-Prefix.pch deleted file mode 100644 index 743435c..0000000 --- a/THSegmentedPagerExample/THSegmentedPagerExample/THSegmentedPagerExample-Prefix.pch +++ /dev/null @@ -1,16 +0,0 @@ -// -// Prefix header -// -// The contents of this file are implicitly included at the beginning of every source file. -// - -#import - -#ifndef __IPHONE_3_0 -#warning "This project uses features only available in iOS SDK 3.0 and later." -#endif - -#ifdef __OBJC__ - #import - #import -#endif diff --git a/THSegmentedPagerExample/THSegmentedPagerExample/TestViewController.h b/THSegmentedPagerExample/THSegmentedPagerExample/TestViewController.h new file mode 100644 index 0000000..1f9b26e --- /dev/null +++ b/THSegmentedPagerExample/THSegmentedPagerExample/TestViewController.h @@ -0,0 +1,13 @@ +// +// TestViewController.h +// ThSegmentedPagerExample +// +// Created by 胡金友 on 2017/8/24. +// Copyright © 2017年 胡金友. All rights reserved. +// + +#import + +@interface TestViewController : THSegmentedPager + +@end diff --git a/THSegmentedPagerExample/THSegmentedPagerExample/TestViewController.m b/THSegmentedPagerExample/THSegmentedPagerExample/TestViewController.m new file mode 100644 index 0000000..cba9a34 --- /dev/null +++ b/THSegmentedPagerExample/THSegmentedPagerExample/TestViewController.m @@ -0,0 +1,52 @@ +// +// TestViewController.m +// ThSegmentedPagerExample +// +// Created by 胡金友 on 2017/8/24. +// Copyright © 2017年 胡金友. All rights reserved. +// + +#import "TestViewController.h" +#import "PagerViewController.h" + +@interface TestViewController () + +@end + +@implementation TestViewController + +- (void)viewDidLoad { + [super viewDidLoad]; + + self.navigationController.navigationBar.translucent = NO; + + self.pageControl.backgroundColor = [UIColor blackColor]; + + PagerViewController *p1 = [[PagerViewController alloc] init]; + p1.title = @"P1"; + PagerViewController *p2 = [[PagerViewController alloc] init]; + p2.title = @"P2"; + PagerViewController *p3 = [[PagerViewController alloc] init]; + p3.title = @"P3"; + PagerViewController *p4 = [[PagerViewController alloc] init]; + p4.title = @"P4"; + + [self setPages:@[p1, p2, p3, p4]]; +} + +- (void)didReceiveMemoryWarning { + [super didReceiveMemoryWarning]; + // Dispose of any resources that can be recreated. +} + +/* +#pragma mark - Navigation + +// In a storyboard-based application, you will often want to do a little preparation before navigation +- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { + // Get the new view controller using [segue destinationViewController]. + // Pass the selected object to the new view controller. +} +*/ + +@end diff --git a/THSegmentedPagerExample/THSegmentedPagerExample/ViewController.h b/THSegmentedPagerExample/THSegmentedPagerExample/ViewController.h new file mode 100644 index 0000000..9067ac6 --- /dev/null +++ b/THSegmentedPagerExample/THSegmentedPagerExample/ViewController.h @@ -0,0 +1,15 @@ +// +// ViewController.h +// ThSegmentedPagerExample +// +// Created by 胡金友 on 2017/8/24. +// Copyright © 2017年 胡金友. All rights reserved. +// + +#import + +@interface ViewController : UIViewController + + +@end + diff --git a/THSegmentedPagerExample/THSegmentedPagerExample/ViewController.m b/THSegmentedPagerExample/THSegmentedPagerExample/ViewController.m new file mode 100644 index 0000000..0f818e5 --- /dev/null +++ b/THSegmentedPagerExample/THSegmentedPagerExample/ViewController.m @@ -0,0 +1,49 @@ +// +// ViewController.m +// ThSegmentedPagerExample +// +// Created by 胡金友 on 2017/8/24. +// Copyright © 2017年 胡金友. All rights reserved. +// + +#import "ViewController.h" +#import "PagerViewController.h" +#import "TestViewController.h" + +@interface ViewController () + +@end + +@implementation ViewController + +- (void)viewDidLoad { + [super viewDidLoad]; + // Do any additional setup after loading the view, typically from a nib. +} +- (IBAction)example01:(id)sender { + [self.navigationController pushViewController:[[PagerViewController alloc] init] animated:YES]; +} +- (IBAction)example02:(id)sender { + [self.navigationController pushViewController:[[TestViewController alloc] init] animated:YES]; +} +- (IBAction)example03:(id)sender { + THSegmentedPager *pager = [[THSegmentedPager alloc] init]; + pager.needPagerAnimateWhenSegmentSelectionChanged = YES; + [pager setupPagesFromStoryboardWithIdentifier:@"Main" pageIdentifiers:@[@"T01", @"T02", @"T03"]]; + [self.navigationController pushViewController:pager animated:YES]; + + pager.navigationController.navigationBar.translucent = NO; +} + +- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event +{ + [self.navigationController pushViewController:[[TestViewController alloc] init] animated:YES]; +} + +- (void)didReceiveMemoryWarning { + [super didReceiveMemoryWarning]; + // Dispose of any resources that can be recreated. +} + + +@end diff --git a/THSegmentedPagerExample/THSegmentedPagerExample/en.lproj/InfoPlist.strings b/THSegmentedPagerExample/THSegmentedPagerExample/en.lproj/InfoPlist.strings deleted file mode 100644 index 477b28f..0000000 --- a/THSegmentedPagerExample/THSegmentedPagerExample/en.lproj/InfoPlist.strings +++ /dev/null @@ -1,2 +0,0 @@ -/* Localized versions of Info.plist keys */ - diff --git a/THSegmentedPagerExample/THSegmentedPagerExample/iPhone.storyboard b/THSegmentedPagerExample/THSegmentedPagerExample/iPhone.storyboard deleted file mode 100644 index f666263..0000000 --- a/THSegmentedPagerExample/THSegmentedPagerExample/iPhone.storyboard +++ /dev/null @@ -1,146 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/THSegmentedPagerExample/THSegmentedPagerExample/main.m b/THSegmentedPagerExample/THSegmentedPagerExample/main.m index 46ba8ee..1e49baf 100644 --- a/THSegmentedPagerExample/THSegmentedPagerExample/main.m +++ b/THSegmentedPagerExample/THSegmentedPagerExample/main.m @@ -1,17 +1,15 @@ // // main.m -// THSegmentedPagerExample +// ThSegmentedPagerExample // -// Created by Hannes Tribus on 25/07/14. -// Copyright (c) 2014 3Bus. All rights reserved. +// Created by 胡金友 on 2017/8/24. +// Copyright © 2017年 胡金友. All rights reserved. // #import - #import "AppDelegate.h" -int main(int argc, char * argv[]) -{ +int main(int argc, char * argv[]) { @autoreleasepool { return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class])); } diff --git a/THSegmentedPagerExample/THSegmentedPagerExampleTests/ReferenceImages/THSegmentedPagerSpec/with_Foo_Bar_Baz_pages_looks_good@2x.png b/THSegmentedPagerExample/THSegmentedPagerExampleTests/ReferenceImages/THSegmentedPagerSpec/with_Foo_Bar_Baz_pages_looks_good@2x.png deleted file mode 100644 index 9076fc8b602b8585ee691a6d08859077d7973eef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 33698 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 EKb=d3AOHXW diff --git a/THSegmentedPagerExample/THSegmentedPagerExampleTests/ReferenceImages/THSegmentedPagerSpec/with_Foo_Bar_Baz_pages_when_Bar_is_selected_looks_good@2x.png b/THSegmentedPagerExample/THSegmentedPagerExampleTests/ReferenceImages/THSegmentedPagerSpec/with_Foo_Bar_Baz_pages_when_Bar_is_selected_looks_good@2x.png deleted file mode 100644 index 418684fa494bb66b5eb1dcbee3714e6db91cd6d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 35882 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 DN3^n{ diff --git a/THSegmentedPagerExample/THSegmentedPagerExampleTests/Storyboard.storyboard b/THSegmentedPagerExample/THSegmentedPagerExampleTests/Storyboard.storyboard deleted file mode 100644 index 2758d34..0000000 --- a/THSegmentedPagerExample/THSegmentedPagerExampleTests/Storyboard.storyboard +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/THSegmentedPagerExample/THSegmentedPagerExampleTests/THSegmentedPagerExampleTests-Info.plist b/THSegmentedPagerExample/THSegmentedPagerExampleTests/THSegmentedPagerExampleTests-Info.plist deleted file mode 100644 index 169b6f7..0000000 --- a/THSegmentedPagerExample/THSegmentedPagerExampleTests/THSegmentedPagerExampleTests-Info.plist +++ /dev/null @@ -1,22 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - BNDL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - - diff --git a/THSegmentedPagerExample/THSegmentedPagerExampleTests/THSegmentedPagerTests.m b/THSegmentedPagerExample/THSegmentedPagerExampleTests/THSegmentedPagerTests.m deleted file mode 100644 index dc6d43e..0000000 --- a/THSegmentedPagerExample/THSegmentedPagerExampleTests/THSegmentedPagerTests.m +++ /dev/null @@ -1,89 +0,0 @@ -// -// THSegmentedPagerTests.m -// THSegmentedPagerExample -// -// Created by Victor Ilyukevich on 4/18/15. -// Copyright (c) 2015 3Bus. All rights reserved. -// - -#import -#import -#import -#import -#import "THSegmentedPager.h" - -void TriggerViewAppearing(UIViewController *controller); - -SpecBegin(THSegmentedPager) - -__block THSegmentedPager *subject; - -beforeEach(^{ - UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"Storyboard" bundle:[NSBundle bundleForClass:self.class]]; - subject = [storyboard instantiateInitialViewController]; -}); - -it(@"can load and then add pages from Storyboard", ^{ - expect(subject.pages.count).to.equal(0); - [subject setupPagesFromStoryboardWithIdentifiers:@[@"Foo", @"Bar"]]; - expect(subject.pages.count).to.equal(2); - [subject setupPagesFromStoryboardWithIdentifiers:@[@"Baz"]]; - expect(subject.pages.count).to.equal(3); - - TriggerViewAppearing(subject); - expect(subject.pageControl.sectionTitles).to.equal(@[@"Foo", @"Bar", @"Baz"]); -}); - -context(@"with one page", ^{ - beforeEach(^{ - [subject setupPagesFromStoryboardWithIdentifiers:@[@"Baz"]]; - TriggerViewAppearing(subject); - }); - it(@"is selected by default", ^{ - expect(subject.selectedController.title).to.equal(@"Baz"); - }); - it(@"looks good", ^{ - //expect(subject).to.recordSnapshot(); - expect(subject).to.haveValidSnapshot(); - }); -}); - -context(@"with Foo, Bar, Baz pages", ^{ - beforeEach(^{ - [subject setupPagesFromStoryboardWithIdentifiers:@[@"Foo", @"Bar", @"Baz"]]; - TriggerViewAppearing(subject); - }); - - it(@"has Foo selected by default as the first page", ^{ - expect(subject.selectedController.title).to.equal(@"Foo"); - }); - - it(@"looks good", ^{ - //expect(subject).to.recordSnapshot(); - expect(subject).to.haveValidSnapshot(); - }); - - context(@"when Bar is selected", ^{ - beforeEach(^{ - [subject setSelectedPageIndex:1 animated:NO]; - }); - - it(@"has Bar selected", ^{ - expect(subject.selectedController.title).to.equal(@"Bar"); - }); - - it(@"looks good", ^{ - //expect(subject).to.recordSnapshot(); - expect(subject).to.haveValidSnapshot(); - }); - }); -}); - -SpecEnd - -void TriggerViewAppearing(UIViewController *controller) -{ - [controller beginAppearanceTransition:YES animated:NO]; - [controller.view setNeedsUpdateConstraints]; - [controller endAppearanceTransition]; -} diff --git a/THSegmentedPagerExample/THSegmentedPagerExampleTests/en.lproj/InfoPlist.strings b/THSegmentedPagerExample/THSegmentedPagerExampleTests/en.lproj/InfoPlist.strings deleted file mode 100644 index 477b28f..0000000 --- a/THSegmentedPagerExample/THSegmentedPagerExampleTests/en.lproj/InfoPlist.strings +++ /dev/null @@ -1,2 +0,0 @@ -/* Localized versions of Info.plist keys */ - diff --git a/ThSegmentedPagerExample/Podfile b/ThSegmentedPagerExample/Podfile new file mode 100644 index 0000000..53aa050 --- /dev/null +++ b/ThSegmentedPagerExample/Podfile @@ -0,0 +1,8 @@ +use_frameworks! +platform:'ios', '8.0' + +target 'ThSegmentedPagerExample' do + +pod 'THSegmentedPager', :path => '../../THSegmentedPager' + +end diff --git a/ThSegmentedPagerExample/Podfile.lock b/ThSegmentedPagerExample/Podfile.lock new file mode 100644 index 0000000..4cc0f78 --- /dev/null +++ b/ThSegmentedPagerExample/Podfile.lock @@ -0,0 +1,19 @@ +PODS: + - HMSegmentedControl (1.5.4) + - THSegmentedPager (1.1.3): + - HMSegmentedControl (~> 1.5.2) + +DEPENDENCIES: + - THSegmentedPager (from `../../THSegmentedPager`) + +EXTERNAL SOURCES: + THSegmentedPager: + :path: ../../THSegmentedPager + +SPEC CHECKSUMS: + HMSegmentedControl: b25bc4ec44766e073d62c473188fb354ee244b76 + THSegmentedPager: 9d4fb2acc78d77246caf1e71d2e878bf5977b904 + +PODFILE CHECKSUM: 4c62b73aa77c867cac98f2dddce0bf6dc9b16228 + +COCOAPODS: 1.2.1 diff --git a/ThSegmentedPagerExample/ThSegmentedPagerExample.xcworkspace/contents.xcworkspacedata b/ThSegmentedPagerExample/ThSegmentedPagerExample.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..41fea34 --- /dev/null +++ b/ThSegmentedPagerExample/ThSegmentedPagerExample.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,10 @@ + + + + + + + From d4e9683c472b7e62c2ebceec44a1e480f8360311 Mon Sep 17 00:00:00 2001 From: JyHu Date: Fri, 25 Aug 2017 01:45:18 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=96=B9=E6=B3=95=E5=92=8C=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=94=A8=E4=BE=8B=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .DS_Store | Bin 0 -> 6148 bytes THSegmentedPager/THSegmentedPager.h | 16 ++- THSegmentedPager/THSegmentedPager.m | 95 +++++++++++++++++- THSegmentedPagerExample/.gitignore | 28 ++++++ .../project.pbxproj | 16 +-- .../BaseTableViewController.m | 83 ++++++++++++++- .../THSegmentedPagerExample/Info.plist | 2 + .../PagerViewController.m | 7 -- ThSegmentedPagerExample/Podfile.lock | 6 +- .../contents.xcworkspacedata | 3 + 10 files changed, 229 insertions(+), 27 deletions(-) create mode 100644 .DS_Store create mode 100644 THSegmentedPagerExample/.gitignore diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..cef93007b3923f584a57d6eba42dcd2ca6545d03 GIT binary patch literal 6148 zcmeHK%Wl&^6ur|1>hKU*RBD&ADXWO43bbsHtTYuMp{kM#EC97OHjTmYM1It5Ly&(1 z{-|Hj-{H(7s8y&UHVDzV(%f@Bb03}~&y0tNSg#B>h+0JCph;}pf%=WeaoJ{M!SpnM zOy!6vp@<$qiy3d*VHvOt{A&!zwR?}AW7Q7n6J1`vAL+}e2ws(Wk-_I7y`~&q8T2}R zrc)YF39FBlUQw!6yicJT-KQ7i!S@I`Ba9W$A?=Zm9+_c%PR(6Y^V;`9{0hyhvO_1R zIHZx>lY%NA1&Ig{c^-_CI4?S#3%0P>xOIEUX*QkaedmKW5S3T>MVa^f?45dw!zeKJ zz7WYT+YjEvQFYK--WF-$$7z&Za)19ePD4@kM45)U%CqMe1H`IA2d&ldxZ8c&=1)4C zlQti3ZFSoGad&evah#R4jb|?pho@)buaj@z@v;zxtyRebgH!kc;}2;#_Odh)=@BBQ zS*O`7-Z%!#C*a(@aWl6QwhUMX<}o1m2aYDuHCSs@TL+Z70s!T2gc8{DE+J#MLDyid z5hD<$LxDP!nJWg<;ppea&ox+U)ZxU;<%5~Z%-m3zs*e0zxf63WT5TDy3|wVkQ9rii z`M-1h{r_r^eX *pages; @property (assign, nonatomic) BOOL shouldBounce; /*! Instead of setting the pages manually you can give to the controller an array of identifiers which will be loaded from the storyboard at runtime * \param pageIdentifiers Array of identifiers to load */ -- (void)setupPagesFromStoryboardWithIdentifier:(NSString *)storybardIdentifier pageIdentifiers:(NSArray *)pageIdentifiers; -- (void)setupPagesFromStoryboard:(UIStoryboard *)storyboard pageIdentifiers:(NSArray *)pageIdentifiers; -- (void)setupPagesFromStoryboardWithPageIdentifiers:(NSArray *)pageIdentifiers; +- (void)setupPagesFromStoryboardWithIdentifier:(NSString *)storybardIdentifier pageIdentifiers:(NSArray *)pageIdentifiers; +- (void)setupPagesFromStoryboard:(UIStoryboard *)storyboard pageIdentifiers:(NSArray *)pageIdentifiers; +- (void)setupPagesFromStoryboardWithPageIdentifiers:(NSArray *)pageIdentifiers; - (void)setPageControlHidden:(BOOL)hidden animated:(BOOL)animated; - (void)setSelectedPageIndex:(NSUInteger)index animated:(BOOL)animated; +- (void)setPageControlHeight:(CGFloat)pageControlHeight; +- (void)setPageControlHeight:(CGFloat)pageControlHeight animated:(BOOL)animated; /*! Get the selected viewcontroller @@ -41,3 +43,9 @@ - (void)updateTitleLabels; @end + +@interface UIViewController (THSegmentedPager) + +@property (weak, nonatomic) THSegmentedPager *segmentedPager; + +@end diff --git a/THSegmentedPager/THSegmentedPager.m b/THSegmentedPager/THSegmentedPager.m index e02f9b3..723d59b 100644 --- a/THSegmentedPager/THSegmentedPager.m +++ b/THSegmentedPager/THSegmentedPager.m @@ -8,6 +8,7 @@ #import "THSegmentedPager.h" #import "THSegmentedPageViewControllerDelegate.h" +#import @interface THSegmentedPager () @property (nonatomic,assign) CGFloat lastPosition; @@ -98,6 +99,7 @@ - (void)setupPagesFromStoryboard:(UIStoryboard *)storyboard pageIdentifiers:(NSA for (NSString *identifier in pageIdentifiers) { UIViewController *viewController = [storyboard instantiateViewControllerWithIdentifier:identifier]; if (viewController) { + viewController.segmentedPager = self; [self.pri_pages addObject:viewController]; } } @@ -134,6 +136,7 @@ - (void)setPageControlHidden:(BOOL)hidden animated:(BOOL)animated { } else if (!hidden && self.pri_segmentControl.hidden) { self.pri_segmentControl.hidden = NO; [UIView animateWithDuration:duration animations:^{ +#warning - 需要在动画结束以后再改变container的高度，否则会在动画的过程中导致底部出现一部分的空白 CGRect remainder; CGRect slice; CGRectDivide(self.pri_contentContainer.frame, &slice, &remainder, CGRectGetHeight(self.pri_segmentControl.frame), CGRectMinYEdge); @@ -358,11 +361,44 @@ - (NSArray *)pages return self.pri_pages; } -- (void)setPages:(NSArray *)pages +- (void)setPages:(NSArray *)pages { if (pages) { - [self.pri_pages removeAllObjects]; - [self.pri_pages addObjectsFromArray:pages]; + self.pri_pages = [pages mutableCopy]; + for (UIViewController *viewController in pages) { + viewController.segmentedPager = self; + } + } +} + +- (void)setPageControlHeight:(CGFloat)pageControlHeight +{ + [self setPageControlHeight:pageControlHeight animated:NO]; +} + +- (void)setPageControlHeight:(CGFloat)pageControlHeight animated:(BOOL)animated +{ + if (pageControlHeight > 0) { + if (self.pageControl.hidden) { + self.pageControl.frame = (CGRect){self.pageControl.frame.origin, (CGSize){self.pageControl.frame.size.width, pageControlHeight}}; + } else { + NSTimeInterval duration = animated ? 0.25f : 0.0f; + [UIView animateWithDuration:duration animations:^{ + + CGRect pageControlFrame = self.pageControl.frame; + CGRect contentContainerFrame = self.contentContainer.frame; + + CGFloat increaseHeight = pageControlHeight - CGRectGetHeight(pageControlFrame); + + pageControlFrame.size.height = pageControlHeight; + + contentContainerFrame.origin.y = CGRectGetMaxY(pageControlFrame); + contentContainerFrame.size.height -= increaseHeight; + + self.pageControl.frame = pageControlFrame; + self.contentContainer.frame = contentContainerFrame; + }]; + } } } @@ -371,3 +407,56 @@ - (UIViewController *)selectedController { } @end + + + + + + + + + +@interface _THWeakContainer : NSObject + +@property (weak, nonatomic) THSegmentedPager *segmentedPager; + +@end + +@implementation _THWeakContainer + +@end + +@interface UIViewController (_THSegmentedPager) + +@property (retain, nonatomic) _THWeakContainer *weakContainer; + +@end + +@implementation UIViewController (THSegmentedPager) + +- (void)setSegmentedPager:(THSegmentedPager *)segmentedPager { + if ([segmentedPager isKindOfClass:[THSegmentedPager class]]) { + self.weakContainer.segmentedPager = segmentedPager; + } +} + +- (THSegmentedPager *)segmentedPager { + return self.weakContainer.segmentedPager; +} + +- (void)setWeakContainer:(_THWeakContainer *)weakContainer { + objc_setAssociatedObject(self, @selector(weakContainer), weakContainer, OBJC_ASSOCIATION_RETAIN_NONATOMIC); +} + +- (_THWeakContainer *)weakContainer { + _THWeakContainer *weakContainer = objc_getAssociatedObject(self, @selector(weakContainer)); + if (!weakContainer) { + weakContainer = [[_THWeakContainer alloc] init]; + self.weakContainer = weakContainer; + } + return weakContainer; +} + +@end + + diff --git a/THSegmentedPagerExample/.gitignore b/THSegmentedPagerExample/.gitignore new file mode 100644 index 0000000..3766327 --- /dev/null +++ b/THSegmentedPagerExample/.gitignore @@ -0,0 +1,28 @@ + + + +# Xcode +.DS_Store +build/ +*.pbxuser +!default.pbxuser +*.mode1v3 +!default.mode1v3 +*.mode2v3 +!default.mode2v3 +*.perspectivev3 +!default.perspectivev3 +*.xcworkspace +!default.xcworkspace +xcuserdata +profile +*.moved-aside +DerivedData +.idea/ +# Pods - for those of you who use CocoaPods +Pods +Podfile.lock +*.xcuserstate + + + diff --git a/THSegmentedPagerExample/THSegmentedPagerExample.xcodeproj/project.pbxproj b/THSegmentedPagerExample/THSegmentedPagerExample.xcodeproj/project.pbxproj index 6811ccd..ae86d73 100644 --- a/THSegmentedPagerExample/THSegmentedPagerExample.xcodeproj/project.pbxproj +++ b/THSegmentedPagerExample/THSegmentedPagerExample.xcodeproj/project.pbxproj @@ -152,8 +152,8 @@ TargetAttributes = { 1C1AEF831F4EA624005C8FB8 = { CreatedOnToolsVersion = 8.3.3; - DevelopmentTeam = NFE8L9VTV6; - ProvisioningStyle = Manual; + DevelopmentTeam = EHNB49T236; + ProvisioningStyle = Automatic; }; }; }; @@ -201,7 +201,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n"; + shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n"; showEnvVarsInLog = 0; }; 99318926B5411CB48DAF2087 /* [CP] Embed Pods Frameworks */ = { @@ -369,13 +369,14 @@ baseConfigurationReference = FE52F4410F6DFBC3E444EFA1 /* Pods-ThSegmentedPagerExample.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - DEVELOPMENT_TEAM = NFE8L9VTV6; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + DEVELOPMENT_TEAM = EHNB49T236; INFOPLIST_FILE = ThSegmentedPagerExample/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.jyhu.ThSegmentedPagerExample; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE = "4586ff62-821a-4e40-99a7-7682f668d1ca"; - PROVISIONING_PROFILE_SPECIFIER = "hujinyou-mbp-dev-all-170329"; + PROVISIONING_PROFILE = ""; + PROVISIONING_PROFILE_SPECIFIER = ""; }; name = Debug; }; @@ -384,7 +385,8 @@ baseConfigurationReference = C8918BF900C98EEF7131C90D /* Pods-ThSegmentedPagerExample.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - DEVELOPMENT_TEAM = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + DEVELOPMENT_TEAM = EHNB49T236; INFOPLIST_FILE = ThSegmentedPagerExample/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.jyhu.ThSegmentedPagerExample; diff --git a/THSegmentedPagerExample/THSegmentedPagerExample/BaseTableViewController.m b/THSegmentedPagerExample/THSegmentedPagerExample/BaseTableViewController.m index accc276..387765e 100644 --- a/THSegmentedPagerExample/THSegmentedPagerExample/BaseTableViewController.m +++ b/THSegmentedPagerExample/THSegmentedPagerExample/BaseTableViewController.m @@ -7,6 +7,7 @@ // #import "BaseTableViewController.h" +#import @interface BaseTableViewController () @@ -28,6 +29,16 @@ - (instancetype)initWithStyle:(UITableViewStyle)style return [super initWithStyle:UITableViewStyleGrouped]; } +- (void)viewWillAppear:(BOOL)animated { + [super viewWillAppear:animated]; + if (self.segmentedPager) { + self.segmentedPager.title = self.title; + if (self.segmentedPager.segmentedPager) { + self.segmentedPager.segmentedPager.title = self.title; + } + } +} + - (void)viewDidLoad { [super viewDidLoad]; @@ -42,11 +53,11 @@ - (void)didReceiveMemoryWarning { #pragma mark - Table view data source - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { - return arc4random_uniform(10) + 2; + return 3; } - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return arc4random_uniform(20) + 5; + return 12; } - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { @@ -57,10 +68,76 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:reusefulIdentifier]; } - cell.textLabel.text = [NSString stringWithFormat:@"%ld - %ld", indexPath.section, indexPath.row]; + cell.textLabel.font = [UIFont systemFontOfSize:13]; + cell.backgroundColor = indexPath.row % 2 == 0 ? [UIColor colorWithRed:0.9 green:0.9 blue:0.9 alpha:1] : [UIColor colorWithRed:0.95 green:0.95 blue:0.95 alpha:1]; + + cell.textLabel.text = @[@"隐藏page control，需要动画", + @"显示page control，需要动画", + @"隐藏page control，不需要动画", + @"显示page control，不需要动画", + @"隐藏父pager的page control，需要动画", + @"显示父pager的page control，需要动画", + @"隐藏父pager的page control，不需要动画", + @"显示父pager的page control，不需要动画", + @"随机设置page control高度，需要动画", + @"随机设置page control高度，不需要动画", + @"随机设置父pager的page control高度，需要动画", + @"随机设置父pager的page control高度，不需要动画"][indexPath.row]; return cell; } +- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath +{ + switch (indexPath.row) { + case 0: [self hideSelfPageControl:YES animate:YES]; break; + case 1: [self hideSelfPageControl:NO animate:YES]; break; + case 2: [self hideSelfPageControl:YES animate:NO]; break; + case 3: [self hideSelfPageControl:NO animate:NO]; break; + + case 4: [self hidePageControlOfSelfPageControl:YES animate:YES]; break; + case 5: [self hidePageControlOfSelfPageControl:NO animate:YES]; break; + case 6: [self hidePageControlOfSelfPageControl:YES animate:NO]; break; + case 7: [self hidePageControlOfSelfPageControl:NO animate:NO]; break; + + case 8: [self randomPageControlHeightWithAnimated:YES]; break; + case 9: [self randomPageControlHeightWithAnimated:NO]; break; + case 10: [self randomSuperPageControlHeightWithAnimated:YES]; break; + case 11: [self randomSuperPageControlHeightWithAnimated:NO]; break; + + default: + break; + } + + [tableView deselectRowAtIndexPath:indexPath animated:YES]; +} + +- (void)hideSelfPageControl:(BOOL)hide animate:(BOOL)animate +{ + if (self.segmentedPager) { + [self.segmentedPager setPageControlHidden:hide animated:animate]; + } +} + +- (void)hidePageControlOfSelfPageControl:(BOOL)hide animate:(BOOL)animate +{ + if (self.segmentedPager && self.segmentedPager.segmentedPager) { + [self.segmentedPager.segmentedPager setPageControlHidden:hide animated:animate]; + } +} + +- (void)randomPageControlHeightWithAnimated:(BOOL)animated +{ + if (self.segmentedPager) { + [self.segmentedPager setPageControlHeight:arc4random_uniform(50) + 20 animated:animated]; + } +} + +- (void)randomSuperPageControlHeightWithAnimated:(BOOL)animated +{ + if (self.segmentedPager && self.segmentedPager.segmentedPager) { + [self.segmentedPager.segmentedPager setPageControlHeight:arc4random_uniform(50) + 20 animated:animated]; + } +} @end diff --git a/THSegmentedPagerExample/THSegmentedPagerExample/Info.plist b/THSegmentedPagerExample/THSegmentedPagerExample/Info.plist index d052473..db03c64 100644 --- a/THSegmentedPagerExample/THSegmentedPagerExample/Info.plist +++ b/THSegmentedPagerExample/THSegmentedPagerExample/Info.plist @@ -4,6 +4,8 @@ CFBundleDevelopmentRegion en + CFBundleDisplayName + Pager CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier diff --git a/THSegmentedPagerExample/THSegmentedPagerExample/PagerViewController.m b/THSegmentedPagerExample/THSegmentedPagerExample/PagerViewController.m index a35adf1..1960720 100644 --- a/THSegmentedPagerExample/THSegmentedPagerExample/PagerViewController.m +++ b/THSegmentedPagerExample/THSegmentedPagerExample/PagerViewController.m @@ -28,13 +28,6 @@ - (void)viewDidLoad { BaseTableViewController *b4 = [[BaseTableViewController alloc] initWithTitle:@"B4"]; [self setPages:@[b1, b2, b3, b4]]; - - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self setPageControlHidden:YES animated:YES]; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self setPageControlHidden:NO animated:YES]; - }); - }); } - (void)didReceiveMemoryWarning { diff --git a/ThSegmentedPagerExample/Podfile.lock b/ThSegmentedPagerExample/Podfile.lock index 4cc0f78..dbbbb75 100644 --- a/ThSegmentedPagerExample/Podfile.lock +++ b/ThSegmentedPagerExample/Podfile.lock @@ -1,5 +1,5 @@ PODS: - - HMSegmentedControl (1.5.4) + - HMSegmentedControl (1.5.3) - THSegmentedPager (1.1.3): - HMSegmentedControl (~> 1.5.2) @@ -11,9 +11,9 @@ EXTERNAL SOURCES: :path: ../../THSegmentedPager SPEC CHECKSUMS: - HMSegmentedControl: b25bc4ec44766e073d62c473188fb354ee244b76 + HMSegmentedControl: 7c6145afb50f26cec5f3243082f6f12b9f41318f THSegmentedPager: 9d4fb2acc78d77246caf1e71d2e878bf5977b904 PODFILE CHECKSUM: 4c62b73aa77c867cac98f2dddce0bf6dc9b16228 -COCOAPODS: 1.2.1 +COCOAPODS: 1.1.1 diff --git a/ThSegmentedPagerExample/ThSegmentedPagerExample.xcworkspace/contents.xcworkspacedata b/ThSegmentedPagerExample/ThSegmentedPagerExample.xcworkspace/contents.xcworkspacedata index 41fea34..3f7af3b 100644 --- a/ThSegmentedPagerExample/ThSegmentedPagerExample.xcworkspace/contents.xcworkspacedata +++ b/ThSegmentedPagerExample/ThSegmentedPagerExample.xcworkspace/contents.xcworkspacedata @@ -7,4 +7,7 @@ + + From 8696287ad2a1076fcf0b36fd1fe1d4116adb6409 Mon Sep 17 00:00:00 2001 From: JyHu Date: Sun, 27 Aug 2017 00:22:26 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=9E=E7=8E=B0?= =?UTF-8?q?=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../THSegmentedPageViewControllerDelegate.h | 11 +++++++ THSegmentedPager/THSegmentedPager.h | 7 ++++- THSegmentedPager/THSegmentedPager.m | 25 ++++++++++++---- .../project.pbxproj | 14 ++++----- .../BaseTableViewController.m | 29 +++++++++++++++++++ .../TestViewController.m | 3 +- ThSegmentedPagerExample/Podfile.lock | 2 +- 7 files changed, 76 insertions(+), 15 deletions(-) diff --git a/THSegmentedPager/THSegmentedPageViewControllerDelegate.h b/THSegmentedPager/THSegmentedPageViewControllerDelegate.h index b0bb526..fe22aa2 100644 --- a/THSegmentedPager/THSegmentedPageViewControllerDelegate.h +++ b/THSegmentedPager/THSegmentedPageViewControllerDelegate.h @@ -8,10 +8,21 @@ #import +@class THSegmentedPager; + @protocol THSegmentedPageViewControllerDelegate @optional + +/** + 当前类需要实现的方法，用于返回当前选择的页面索引 + + @param controller self + @param index 页面索引 + */ +- (void)pageViewController:(THSegmentedPager *)controller changeToSelectedIndex:(NSUInteger)index; + - (NSString *)viewControllerTitle; @end diff --git a/THSegmentedPager/THSegmentedPager.h b/THSegmentedPager/THSegmentedPager.h index c933879..099a3de 100644 --- a/THSegmentedPager/THSegmentedPager.h +++ b/THSegmentedPager/THSegmentedPager.h @@ -8,8 +8,11 @@ #import #import +#import "THSegmentedPageViewControllerDelegate.h" -@interface THSegmentedPager : UIViewController +@interface THSegmentedPager : UIViewController + +- (instancetype)initWithContentEdgeInsets:(UIEdgeInsets)edgeInsets; @property (strong, nonatomic, readonly) HMSegmentedControl *pageControl; @property (strong, nonatomic, readonly) UIPageViewController *pageViewController; @@ -28,7 +31,9 @@ - (void)setupPagesFromStoryboardWithPageIdentifiers:(NSArray *)pageIdentifiers; - (void)setPageControlHidden:(BOOL)hidden animated:(BOOL)animated; + - (void)setSelectedPageIndex:(NSUInteger)index animated:(BOOL)animated; + - (void)setPageControlHeight:(CGFloat)pageControlHeight; - (void)setPageControlHeight:(CGFloat)pageControlHeight animated:(BOOL)animated; diff --git a/THSegmentedPager/THSegmentedPager.m b/THSegmentedPager/THSegmentedPager.m index 723d59b..a12240a 100644 --- a/THSegmentedPager/THSegmentedPager.m +++ b/THSegmentedPager/THSegmentedPager.m @@ -20,6 +20,7 @@ @interface THSegmentedPager () @property (strong, nonatomic) UIPageViewController *pri_pageViewController; @property (strong, nonatomic) UIView *pri_contentContainer; @property (strong, nonatomic) NSMutableArray *pri_pages; +@property (assign, nonatomic) UIEdgeInsets edgeInsets; @end @@ -27,6 +28,13 @@ @implementation THSegmentedPager @synthesize pri_pages = _pri_pages; +- (instancetype)initWithContentEdgeInsets:(UIEdgeInsets)edgeInsets { + if (self = [self init]) { + self.edgeInsets = edgeInsets; + } + return self; +} + - (instancetype)init { if (self = [super init]) { self.needPagerAnimateWhenSegmentSelectionChanged = NO; @@ -136,9 +144,7 @@ - (void)setPageControlHidden:(BOOL)hidden animated:(BOOL)animated { } else if (!hidden && self.pri_segmentControl.hidden) { self.pri_segmentControl.hidden = NO; [UIView animateWithDuration:duration animations:^{ -#warning - 需要在动画结束以后再改变container的高度，否则会在动画的过程中导致底部出现一部分的空白 - CGRect remainder; - CGRect slice; + CGRect remainder, slice; CGRectDivide(self.pri_contentContainer.frame, &slice, &remainder, CGRectGetHeight(self.pri_segmentControl.frame), CGRectMinYEdge); self.pri_contentContainer.frame = remainder; self.pri_segmentControl.alpha = 1.0f; @@ -293,7 +299,7 @@ - (void)pageControlValueChanged:(id)sender { - (UIView *)pri_contentContainer { if (!_pri_contentContainer) { - _pri_contentContainer = [[UIView alloc] initWithFrame:CGRectMake(0, CGRectGetMaxY(self.pri_segmentControl.frame), CGRectGetWidth(self.view.frame), CGRectGetHeight(self.view.frame) - CGRectGetMaxY(self.pri_segmentControl.frame))]; + _pri_contentContainer = [[UIView alloc] initWithFrame:CGRectMake(self.edgeInsets.left, CGRectGetMaxY(self.pri_segmentControl.frame), CGRectGetWidth(self.view.frame) - self.edgeInsets.left - self.edgeInsets.right, CGRectGetHeight(self.view.frame) - CGRectGetMaxY(self.pri_segmentControl.frame) - self.edgeInsets.bottom)]; _pri_contentContainer.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight; _pri_contentContainer.backgroundColor = [UIColor clearColor]; } @@ -317,7 +323,7 @@ - (UIPageViewController *)pri_pageViewController - (HMSegmentedControl *)pri_segmentControl { if (!_pri_segmentControl) { - _pri_segmentControl = [[HMSegmentedControl alloc] initWithFrame:CGRectMake(0, 0, CGRectGetWidth(self.view.bounds), 40)]; + _pri_segmentControl = [[HMSegmentedControl alloc] initWithFrame:CGRectMake(self.edgeInsets.left, self.edgeInsets.top, CGRectGetWidth(self.view.bounds) - self.edgeInsets.left - self.edgeInsets.right, 40)]; _pri_segmentControl.autoresizingMask = UIViewAutoresizingFlexibleWidth; _pri_segmentControl.backgroundColor = [UIColor colorWithRed:69/255.0 green:69/255.0 blue:69/255.0 alpha:1]; _pri_segmentControl.titleTextAttributes = @{NSForegroundColorAttributeName : [UIColor colorWithRed:127/255.0 green:127/255.0 blue:127/255.0 alpha:1]}; @@ -406,6 +412,15 @@ - (UIViewController *)selectedController { return self.pri_pages[[self.pri_segmentControl selectedSegmentIndex]]; } +- (void)setCurrentIndex:(NSUInteger)currentIndex +{ + _currentIndex = currentIndex; + + if ([self respondsToSelector:@selector(pageViewController:changeToSelectedIndex:)]) { + [self pageViewController:self changeToSelectedIndex:currentIndex]; + } +} + @end diff --git a/THSegmentedPagerExample/THSegmentedPagerExample.xcodeproj/project.pbxproj b/THSegmentedPagerExample/THSegmentedPagerExample.xcodeproj/project.pbxproj index ae86d73..6d1c80f 100644 --- a/THSegmentedPagerExample/THSegmentedPagerExample.xcodeproj/project.pbxproj +++ b/THSegmentedPagerExample/THSegmentedPagerExample.xcodeproj/project.pbxproj @@ -152,8 +152,8 @@ TargetAttributes = { 1C1AEF831F4EA624005C8FB8 = { CreatedOnToolsVersion = 8.3.3; - DevelopmentTeam = EHNB49T236; - ProvisioningStyle = Automatic; + DevelopmentTeam = NFE8L9VTV6; + ProvisioningStyle = Manual; }; }; }; @@ -201,7 +201,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n"; showEnvVarsInLog = 0; }; 99318926B5411CB48DAF2087 /* [CP] Embed Pods Frameworks */ = { @@ -370,13 +370,13 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - DEVELOPMENT_TEAM = EHNB49T236; + DEVELOPMENT_TEAM = NFE8L9VTV6; INFOPLIST_FILE = ThSegmentedPagerExample/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.jyhu.ThSegmentedPagerExample; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE = ""; - PROVISIONING_PROFILE_SPECIFIER = ""; + PROVISIONING_PROFILE = "4586ff62-821a-4e40-99a7-7682f668d1ca"; + PROVISIONING_PROFILE_SPECIFIER = "hujinyou-mbp-dev-all-170329"; }; name = Debug; }; @@ -386,7 +386,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - DEVELOPMENT_TEAM = EHNB49T236; + DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = ThSegmentedPagerExample/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.jyhu.ThSegmentedPagerExample; diff --git a/THSegmentedPagerExample/THSegmentedPagerExample/BaseTableViewController.m b/THSegmentedPagerExample/THSegmentedPagerExample/BaseTableViewController.m index 387765e..65fbd32 100644 --- a/THSegmentedPagerExample/THSegmentedPagerExample/BaseTableViewController.m +++ b/THSegmentedPagerExample/THSegmentedPagerExample/BaseTableViewController.m @@ -11,6 +11,8 @@ @interface BaseTableViewController () +@property (retain, nonatomic) UIBarButtonItem *barButtonItem; + @end @implementation BaseTableViewController @@ -37,6 +39,16 @@ - (void)viewWillAppear:(BOOL)animated { self.segmentedPager.segmentedPager.title = self.title; } } + + self.barButtonItem.title = self.title; + self.segmentedPager.navigationItem.rightBarButtonItem = self.barButtonItem; +} + +- (void)viewWillDisappear:(BOOL)animated +{ + [super viewWillDisappear:animated]; + + self.segmentedPager.navigationItem.rightBarButtonItem = nil; } - (void)viewDidLoad { @@ -50,6 +62,23 @@ - (void)didReceiveMemoryWarning { // Dispose of any resources that can be recreated. } +#pragma mark - action + +- (void)barbuttonAction +{ + +} + +#pragma mark - getter + +- (UIBarButtonItem *)barButtonItem +{ + if (!_barButtonItem) { + _barButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"" style:UIBarButtonItemStyleDone target:self action:@selector(barbuttonAction)]; + } + return _barButtonItem; +} + #pragma mark - Table view data source - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { diff --git a/THSegmentedPagerExample/THSegmentedPagerExample/TestViewController.m b/THSegmentedPagerExample/THSegmentedPagerExample/TestViewController.m index cba9a34..9750119 100644 --- a/THSegmentedPagerExample/THSegmentedPagerExample/TestViewController.m +++ b/THSegmentedPagerExample/THSegmentedPagerExample/TestViewController.m @@ -24,7 +24,8 @@ - (void)viewDidLoad { PagerViewController *p1 = [[PagerViewController alloc] init]; p1.title = @"P1"; - PagerViewController *p2 = [[PagerViewController alloc] init]; + PagerViewController *p2 = [[PagerViewController alloc] initWithContentEdgeInsets:UIEdgeInsetsMake(20, 30, 40, 50)]; + p2.view.backgroundColor = [UIColor redColor]; p2.title = @"P2"; PagerViewController *p3 = [[PagerViewController alloc] init]; p3.title = @"P3"; diff --git a/ThSegmentedPagerExample/Podfile.lock b/ThSegmentedPagerExample/Podfile.lock index dbbbb75..a95780e 100644 --- a/ThSegmentedPagerExample/Podfile.lock +++ b/ThSegmentedPagerExample/Podfile.lock @@ -16,4 +16,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 4c62b73aa77c867cac98f2dddce0bf6dc9b16228 -COCOAPODS: 1.1.1 +COCOAPODS: 1.2.1 From 2c6e0cf22d81fe891305dd4cdf46b22602cc9632 Mon Sep 17 00:00:00 2001 From: JyHu Date: Sun, 27 Aug 2017 00:59:38 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=B9navigation?= =?UTF-8?q?=E4=BE=A7=E6=BB=91=E6=89=8B=E5=8A=BF=E7=9A=84=E5=85=BC=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- THSegmentedPager/THSegmentedPager.m | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/THSegmentedPager/THSegmentedPager.m b/THSegmentedPager/THSegmentedPager.m index a12240a..bdbb4e0 100644 --- a/THSegmentedPager/THSegmentedPager.m +++ b/THSegmentedPager/THSegmentedPager.m @@ -69,9 +69,28 @@ - (void)viewDidLoad { // Obtain the ScrollViewDelegate self.shouldBounce = YES; + + // 遍历获取navigation的侧滑手势 + UIScreenEdgePanGestureRecognizer *screenEdgePanGestureRecognizer; + + if (self.navigationController) { + if (self.navigationController.view.gestureRecognizers.count > 0) { + for (UIGestureRecognizer *recognizer in self.navigationController.view.gestureRecognizers) { + if ([recognizer isKindOfClass:[UIScreenEdgePanGestureRecognizer class]]) { + screenEdgePanGestureRecognizer = (UIScreenEdgePanGestureRecognizer *)recognizer; + break; + } + } + } + } + for (UIView *view in self.pri_pageViewController.view.subviews ) { if ([view isKindOfClass:[UIScrollView class]]) { ((UIScrollView *)view).delegate = self; + if (screenEdgePanGestureRecognizer) { + // 当时侧滑返回的时候，禁掉scrollview的滑动响应 + [((UIScrollView *)view).panGestureRecognizer requireGestureRecognizerToFail:screenEdgePanGestureRecognizer]; + } } } } From d120bfc08661c0592574ccc68f2c3fdbb7769e5e Mon Sep 17 00:00:00 2001 From: JyHu Date: Sun, 27 Aug 2017 16:44:49 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E6=8E=A7=E5=88=B6scroll=E6=98=AF=E5=90=A6=E5=8F=AF=E6=BB=91?= =?UTF-8?q?=E5=8A=A8=E7=9A=84=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- THSegmentedPager/THSegmentedPager.h | 3 ++- THSegmentedPager/THSegmentedPager.m | 11 +++++++++++ .../THSegmentedPagerExample/PagerViewController.m | 4 ++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/THSegmentedPager/THSegmentedPager.h b/THSegmentedPager/THSegmentedPager.h index 099a3de..ff370a6 100644 --- a/THSegmentedPager/THSegmentedPager.h +++ b/THSegmentedPager/THSegmentedPager.h @@ -18,9 +18,10 @@ @property (strong, nonatomic, readonly) UIPageViewController *pageViewController; @property (strong, nonatomic, readonly) UIView *contentContainer; -@property (assign, nonatomic) BOOL needPagerAnimateWhenSegmentSelectionChanged; +@property (assign, nonatomic) BOOL needPagerAnimateWhenSegmentSelectionChanged; // default is no @property (strong, nonatomic) NSArray *pages; +@property (assign, nonatomic) BOOL scrollEnable; @property (assign, nonatomic) BOOL shouldBounce; /*! Instead of setting the pages manually you can give to the controller an array of identifiers which will be loaded from the storyboard at runtime diff --git a/THSegmentedPager/THSegmentedPager.m b/THSegmentedPager/THSegmentedPager.m index bdbb4e0..30d6677 100644 --- a/THSegmentedPager/THSegmentedPager.m +++ b/THSegmentedPager/THSegmentedPager.m @@ -440,6 +440,17 @@ - (void)setCurrentIndex:(NSUInteger)currentIndex } } +- (void)setScrollEnable:(BOOL)scrollEnable +{ + _scrollEnable = scrollEnable; + + for (UIView *view in self.pri_pageViewController.view.subviews ) { + if ([view isKindOfClass:[UIScrollView class]]) { + ((UIScrollView *)view).scrollEnabled = scrollEnable; + } + } +} + @end diff --git a/THSegmentedPagerExample/THSegmentedPagerExample/PagerViewController.m b/THSegmentedPagerExample/THSegmentedPagerExample/PagerViewController.m index 1960720..ef899df 100644 --- a/THSegmentedPagerExample/THSegmentedPagerExample/PagerViewController.m +++ b/THSegmentedPagerExample/THSegmentedPagerExample/PagerViewController.m @@ -28,6 +28,10 @@ - (void)viewDidLoad { BaseTableViewController *b4 = [[BaseTableViewController alloc] initWithTitle:@"B4"]; [self setPages:@[b1, b2, b3, b4]]; + + dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ + self.scrollEnable = NO; + }); } - (void)didReceiveMemoryWarning { From d30d58e4901f0d136d1a27c650407bf9074b839d Mon Sep 17 00:00:00 2001 From: JyHu Date: Sun, 27 Aug 2017 17:15:17 +0800 Subject: [PATCH 7/8] Modify some initialize methods --- .../THSegmentedPageViewControllerDelegate.h | 11 ----- THSegmentedPager/THSegmentedPager.h | 14 ++++++- THSegmentedPager/THSegmentedPager.m | 41 ++++--------------- 3 files changed, 21 insertions(+), 45 deletions(-) diff --git a/THSegmentedPager/THSegmentedPageViewControllerDelegate.h b/THSegmentedPager/THSegmentedPageViewControllerDelegate.h index fe22aa2..b0bb526 100644 --- a/THSegmentedPager/THSegmentedPageViewControllerDelegate.h +++ b/THSegmentedPager/THSegmentedPageViewControllerDelegate.h @@ -8,21 +8,10 @@ #import -@class THSegmentedPager; - @protocol THSegmentedPageViewControllerDelegate @optional - -/** - 当前类需要实现的方法，用于返回当前选择的页面索引 - - @param controller self - @param index 页面索引 - */ -- (void)pageViewController:(THSegmentedPager *)controller changeToSelectedIndex:(NSUInteger)index; - - (NSString *)viewControllerTitle; @end diff --git a/THSegmentedPager/THSegmentedPager.h b/THSegmentedPager/THSegmentedPager.h index ff370a6..884bd18 100644 --- a/THSegmentedPager/THSegmentedPager.h +++ b/THSegmentedPager/THSegmentedPager.h @@ -10,7 +10,7 @@ #import #import "THSegmentedPageViewControllerDelegate.h" -@interface THSegmentedPager : UIViewController +@interface THSegmentedPager : UIViewController - (instancetype)initWithContentEdgeInsets:(UIEdgeInsets)edgeInsets; @@ -18,7 +18,7 @@ @property (strong, nonatomic, readonly) UIPageViewController *pageViewController; @property (strong, nonatomic, readonly) UIView *contentContainer; -@property (assign, nonatomic) BOOL needPagerAnimateWhenSegmentSelectionChanged; // default is no +@property (assign, nonatomic) BOOL needPagerAnimateWhenSegmentSelectionChanged; // default is YES @property (strong, nonatomic) NSArray *pages; @property (assign, nonatomic) BOOL scrollEnable; @@ -48,6 +48,16 @@ */ - (void)updateTitleLabels; + + +/** + 当前类需要实现的方法，用于返回当前选择的页面索引 + + @param controller self + @param index 页面索引 + */ +- (void)pageViewController:(THSegmentedPager *)controller changeToSelectedIndex:(NSUInteger)index; + @end @interface UIViewController (THSegmentedPager) diff --git a/THSegmentedPager/THSegmentedPager.m b/THSegmentedPager/THSegmentedPager.m index 30d6677..1264198 100644 --- a/THSegmentedPager/THSegmentedPager.m +++ b/THSegmentedPager/THSegmentedPager.m @@ -29,29 +29,8 @@ @implementation THSegmentedPager @synthesize pri_pages = _pri_pages; - (instancetype)initWithContentEdgeInsets:(UIEdgeInsets)edgeInsets { - if (self = [self init]) { - self.edgeInsets = edgeInsets; - } - return self; -} - -- (instancetype)init { if (self = [super init]) { - self.needPagerAnimateWhenSegmentSelectionChanged = NO; - } - return self; -} - -- (instancetype)initWithCoder:(NSCoder *)aDecoder { - if (self = [super initWithCoder:aDecoder]) { - self.needPagerAnimateWhenSegmentSelectionChanged = NO; - } - return self; -} - -- (instancetype)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil { - if (self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]) { - self.needPagerAnimateWhenSegmentSelectionChanged = NO; + self.edgeInsets = edgeInsets; } return self; } @@ -73,13 +52,11 @@ - (void)viewDidLoad { // 遍历获取navigation的侧滑手势 UIScreenEdgePanGestureRecognizer *screenEdgePanGestureRecognizer; - if (self.navigationController) { - if (self.navigationController.view.gestureRecognizers.count > 0) { - for (UIGestureRecognizer *recognizer in self.navigationController.view.gestureRecognizers) { - if ([recognizer isKindOfClass:[UIScreenEdgePanGestureRecognizer class]]) { - screenEdgePanGestureRecognizer = (UIScreenEdgePanGestureRecognizer *)recognizer; - break; - } + if (self.navigationController && self.navigationController.view.gestureRecognizers.count > 0) { + for (UIGestureRecognizer *recognizer in self.navigationController.view.gestureRecognizers) { + if ([recognizer isKindOfClass:[UIScreenEdgePanGestureRecognizer class]]) { + screenEdgePanGestureRecognizer = (UIScreenEdgePanGestureRecognizer *)recognizer; + break; } } } @@ -435,9 +412,7 @@ - (void)setCurrentIndex:(NSUInteger)currentIndex { _currentIndex = currentIndex; - if ([self respondsToSelector:@selector(pageViewController:changeToSelectedIndex:)]) { - [self pageViewController:self changeToSelectedIndex:currentIndex]; - } + [self pageViewController:self changeToSelectedIndex:currentIndex]; } - (void)setScrollEnable:(BOOL)scrollEnable @@ -451,6 +426,8 @@ - (void)setScrollEnable:(BOOL)scrollEnable } } +- (void)pageViewController:(THSegmentedPager *)controller changeToSelectedIndex:(NSUInteger)index {} + @end From e4c02e873dc40be8f747e4a6d9ff32c64c7600b5 Mon Sep 17 00:00:00 2001 From: JyHu Date: Tue, 23 Jan 2018 19:20:31 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=BB=91=E5=8A=A8=E6=97=B6=E9=80=89=E6=8B=A9?= =?UTF-8?q?segment=E5=AF=BC=E8=87=B4=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- THSegmentedPager/THSegmentedPager.m | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/THSegmentedPager/THSegmentedPager.m b/THSegmentedPager/THSegmentedPager.m index 1264198..fe6f2ff 100644 --- a/THSegmentedPager/THSegmentedPager.m +++ b/THSegmentedPager/THSegmentedPager.m @@ -287,6 +287,11 @@ - (void)pageControlValueChanged:(id)sender { animated:self.needPagerAnimateWhenSegmentSelectionChanged completion:completionBlock]; } else { [self.pri_segmentControl setSelectedSegmentIndex:self.currentIndex animated:NO]; + + if (self.nextIndex == self.currentIndex) { + self.userDraggingStartedTransitionInProgress = NO; + [self setSelectedPageIndex:self.currentIndex animated:NO]; + } } }