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

Commit e93fd8d

Browse files
committed
Merge branch 'release/0.3.10'
2 parents 7b37519 + fd0698e commit e93fd8d

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

MSSTabbedPageViewController.podspec

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
22

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

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

2425
end

README.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
1+
**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.**
2+
3+
**A seperate component, [Pageboy](https://github.com/MerrickSapsford/Pageboy) is available to provide the UIPageViewController enhancements present in MSSTabbedPageViewController and much more.**
4+
15
<p align="center">
26
<img src="https://github.com/MerrickSapsford/MSSTabbedPageViewController/blob/develop/Resource/Icon.png?raw=true" alt="MSSTabbedPageViewController" height="160" width="160"/>
37
</p>
48

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

914
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.

Source/MSSTabbedPageViewController.m

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ - (void)viewWillAppear:(BOOL)animated {
4646
tabBarView.dataSource = self;
4747
tabBarView.delegate = self;
4848
self.tabBarView = tabBarView;
49+
self.tabBarView.hidden = NO;
4950

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

6667
// remove the current tab bar
68+
self.tabBarView.hidden = YES;
6769
self.tabBarView = nil;
6870
}
6971
}

0 commit comments

Comments
 (0)