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

Commit

Permalink
Merge branch 'release/0.3.10'
Browse files Browse the repository at this point in the history
  • Loading branch information
msaps committed Mar 20, 2017
2 parents 7b37519 + fd0698e commit e93fd8d
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
3 changes: 2 additions & 1 deletion MSSTabbedPageViewController.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|

s.name = "MSSTabbedPageViewController"
s.version = "0.3.9"
s.version = "0.3.10"
s.summary = "A custom container UIViewController which provides a simple to implement page view controller with scrolling tab bar"

s.description = <<-DESC
Expand All @@ -20,5 +20,6 @@ Pod::Spec.new do |s|
s.source_files = "MSSTabbedPageViewController/Classes", "Source/**/*.{h,m}"
s.resources = ['Source/**/*.{xib}']
s.frameworks = 'UIKit'
s.deprecated_in_favor_of = 'Tabman'

end
7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
**MSSTabbedPageViewController is now deprecated, and a new Swift component is available in the form of [Tabman](https://github.com/MerrickSapsford/Tabman). Unfortunately this can't be made compatible with Objective-C.**

**A seperate component, [Pageboy](https://github.com/MerrickSapsford/Pageboy) is available to provide the UIPageViewController enhancements present in MSSTabbedPageViewController and much more.**

<p align="center">
<img src="https://github.com/MerrickSapsford/MSSTabbedPageViewController/blob/develop/Resource/Icon.png?raw=true" alt="MSSTabbedPageViewController" height="160" width="160"/>
</p>

# MSSTabbedPageViewController
[![Build Status](https://travis-ci.org/MerrickSapsford/MSSTabbedPageViewController.svg?branch=develop)](https://travis-ci.org/MerrickSapsford/MSSTabbedPageViewController)
[![Status](https://img.shields.io/badge/status-deprecated-red.svg)]()
[![Build Status](https://travis-ci.org/msaps/MSSTabbedPageViewController.svg?branch=develop)](https://travis-ci.org/msaps/MSSTabbedPageViewController)
[![CocoaPods](https://img.shields.io/cocoapods/v/MSSTabbedPageViewController.svg)]()

MSSTabbedPageViewController is a UIViewController that provides a simple to implement page view controller with scrolling tab bar. It also includes a UIPageViewController wrapper that provides improved data source and delegation methods.
Expand Down
2 changes: 2 additions & 0 deletions Source/MSSTabbedPageViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ - (void)viewWillAppear:(BOOL)animated {
tabBarView.dataSource = self;
tabBarView.delegate = self;
self.tabBarView = tabBarView;
self.tabBarView.hidden = NO;

BOOL isInitialController = (self.navigationController.viewControllers.firstObject == self);
[navigationBar tabbedPageViewController:self viewWillAppear:animated isInitial:isInitialController];
Expand All @@ -64,6 +65,7 @@ - (void)viewWillDisappear:(BOOL)animated {
}

// remove the current tab bar
self.tabBarView.hidden = YES;
self.tabBarView = nil;
}
}
Expand Down

0 comments on commit e93fd8d

Please sign in to comment.