Skip to content

Commit

Permalink
Bump version.
Browse files Browse the repository at this point in the history
  • Loading branch information
cuzv committed Nov 11, 2018
1 parent 5f59c47 commit c29f9aa
Show file tree
Hide file tree
Showing 7 changed files with 41 additions and 11 deletions.
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,9 @@
### 0.4.1

- Remove `RRNavigationControllerDelegate`
- Re-implement `UINavigationControllerDelegate`
- Re-implement `UINavigationControllerDelegate`

### 1.0

- Working with `RRNavigationTransitioning`

28 changes: 24 additions & 4 deletions Example/EmbedTabBarController.m
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,26 @@
#import "NoneTranslucentViewController.h"
#import "Helper.h"
#import "UIColor+EKExtension.h"
//#import <RRNavigationTransitioning/RRNavigationTransitioning.h>

@interface RRNavigationController : UINavigationController
//@property (nonatomic, strong) RRNavigationTransition *transition;
@end


@implementation RRNavigationController

- (void)viewDidLoad {
[super viewDidLoad];

// RRNavigationTransition *transition = [[RRNavigationTransition alloc] initWithNavigationController:self];
// self.transition = transition;
// self.delegate = self.transition;
// self.interactivePopGestureRecognizer.delegate = nil;
// self.interactivePopGestureRecognizer.enabled = NO;
}

@end

@interface EmbedTabBarController ()

Expand All @@ -34,19 +54,19 @@ - (void)viewDidLoad {
// global.backIndicatorTransitionMaskImage = indicatorImage;
}

UINavigationController *productRoot = [[UINavigationController alloc] initWithRootViewController:[ProductListViewController new]];
UINavigationController *productRoot = [[RRNavigationController alloc] initWithRootViewController:[ProductListViewController new]];
productRoot.tabBarItem.title = @"Product";
productRoot.navigationBar.tintColor = [UIColor redColor];

// UINavigationController *exampleRoot = [UINavigationController new];
// exampleRoot.viewControllers = @[[TableViewController new], [TableViewController new], [TableViewController new]];
UINavigationController *exampleRoot = [[UINavigationController alloc] initWithRootViewController:[TableViewController new]];
UINavigationController *exampleRoot = [[RRNavigationController alloc] initWithRootViewController:[TableViewController new]];
exampleRoot.tabBarItem.title = @"Custom";

UINavigationController *storyboardRoot = [[UINavigationController alloc] initWithRootViewController:[StoryboardViewController new]];
UINavigationController *storyboardRoot = [[RRNavigationController alloc] initWithRootViewController:[StoryboardViewController new]];
storyboardRoot.tabBarItem.title = @"Storyboard";

UINavigationController *noneTranslucentRoot = [[UINavigationController alloc] initWithRootViewController:[NoneTranslucentViewController new]];
UINavigationController *noneTranslucentRoot = [[RRNavigationController alloc] initWithRootViewController:[NoneTranslucentViewController new]];
noneTranslucentRoot.tabBarItem.title = @"NoneTranslucent";
noneTranslucentRoot.navigationBar.translucent = NO;
noneTranslucentRoot.navigationItem.title = @"NoneTranslucent";
Expand Down
1 change: 1 addition & 0 deletions Example/Product/ProductMoreViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ @implementation ProductMoreViewController

- (void)viewDidLoad {
[super viewDidLoad];
self.view.backgroundColor = UIColor.yellowColor;
self.navigationItem.title = @"More";
self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"Pop" style:UIBarButtonItemStylePlain target:self action:@selector(pop:)];
self.rr_interactivePopGestureRecognizerDisabled = YES;
Expand Down
4 changes: 3 additions & 1 deletion Example/Product/ProductViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@ - (void)viewDidLoad {
}

- (void)handleClickMore:(UIBarButtonItem *)sender {
[self.navigationController pushViewController:[ProductMoreViewController new] animated:YES];
UIViewController *vc = [ProductMoreViewController new];
vc.hidesBottomBarWhenPushed = YES;
[self.navigationController pushViewController:vc animated:YES];
}

- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context {
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[![License](https://img.shields.io/badge/license-MIT-lightgrey.svg)](https://github.com/cuzv/RRNavigationBar/blob/master/LICENSE)
[![CocoaPods Compatible](https://img.shields.io/badge/CocoaPods-v0.4.1-green.svg)](https://github.com/CocoaPods/CocoaPods)
[![CocoaPods Compatible](https://img.shields.io/badge/CocoaPods-v1.0-green.svg)](https://github.com/CocoaPods/CocoaPods)
[![Weibo](https://img.shields.io/badge/Weibo-cuzval-yellowgreen.svg)](https://weibo.com/cuzval/)
[![Twitter](https://img.shields.io/twitter/url/http/shields.io.svg?style=social)](https://twitter.com/cuzval)

Expand Down
4 changes: 2 additions & 2 deletions RRNavigationBar.podspec
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
Pod::Spec.new do |s|
s.name = "RRNavigationBar"
s.version = "0.4.1"
s.version = "1.0"
s.summary = "bring `UINavigationBar` to` UIViewController`"

s.homepage = "https://github.com/cuzv/RRNavigationBar.git"
s.license = "MIT"
s.author = { "Moch Xiao" => "[email protected]" }
s.author = { "Shaw" => "[email protected]" }
s.platform = :ios, "7.0"
s.requires_arc = true
s.source = { :git => "https://github.com/cuzv/RRNavigationBar.git",
Expand Down
6 changes: 4 additions & 2 deletions Sources/UINavigationController+RRNavigationBar.m
Original file line number Diff line number Diff line change
Expand Up @@ -210,8 +210,10 @@ - (void)_handleWillShowViewController:(UIViewController *)viewController {
RRLog(@"Pop canceled.");
}
};
if ([transitionCoordinator respondsToSelector:@selector(notifyWhenInteractionChangesUsingBlock:)]) {
[transitionCoordinator notifyWhenInteractionChangesUsingBlock:handleCancel];
if (@available(ios 10.0, *)) {
if ([transitionCoordinator respondsToSelector:@selector(notifyWhenInteractionChangesUsingBlock:)]) {
[transitionCoordinator notifyWhenInteractionChangesUsingBlock:handleCancel];
}
} else {
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
Expand Down

0 comments on commit c29f9aa

Please sign in to comment.