Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

支持push和pop到不同颜色的导航栏titleColor，tintColor #103

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

支持push和pop到不同颜色的导航栏titleColor，tintColor #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
38eed43
支持push和pop到不同颜色的导航栏titleColor，tintColor
Nov 23, 2017
ea9c436
swift4.0
Nov 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 54 additions & 29 deletions Example/Base.lproj/Main.storyboard
View file
Open in desktop

Large diffs are not rendered by default.

17 changes: 16 additions & 1 deletion Example/MainViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ class MainViewController: UITableViewController {
var currentNavigationBarData: NavigationBarData!
var nextNavigationBarData: NavigationBarData!

@IBOutlet weak var nextNavigationBarTitleColorText: UILabel!
@IBOutlet weak var nextNavigationBarTintColorText: UILabel!
@IBOutlet weak var nextNavigatioBarBackgroundImageColorText: UILabel!
@IBOutlet weak var nextNavigationBarPrefersHiddenSwitch: UISwitch!
Expand All @@ -38,11 +39,18 @@ class MainViewController: UITableViewController {
}
nextNavigationBarData = currentNavigationBarData

nextNavigationBarTitleColorText.text = nextNavigationBarData.titleColor.rawValue
nextNavigationBarTintColorText.text = nextNavigationBarData.barTintColor.rawValue
nextNavigatioBarBackgroundImageColorText.text = nextNavigationBarData.backgroundImageColor.rawValue
nextNavigationBarPrefersHiddenSwitch.isOn = nextNavigationBarData.prefersHidden
nextNavigationBarPrefersShadowImageHiddenSwitch.isOn = nextNavigationBarData.prefersShadowImageHidden


if let titleColor = currentNavigationBarData.titleColor.toUIColor {
navigationController?.navigationBar.tintColor = titleColor
navigationController?.navigationBar.titleTextAttributes = [NSAttributedStringKey.foregroundColor: titleColor]
}

navigationController?.navigationBar.barTintColor = currentNavigationBarData.barTintColor.toUIColor
navigationController?.navigationBar.setBackgroundImage(currentNavigationBarData.backgroundImageColor.toUIImage, for: .default)
navigationController?.navigationBar.shadowImage = (currentNavigationBarData.prefersShadowImageHidden) ? UIImage() : nil
Expand Down Expand Up @@ -91,7 +99,7 @@ extension MainViewController {

override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
switch (indexPath.section, indexPath.row) {
case (0, 0), (0, 1):
case (0, 0), (0, 1), (0, 2):
performSegue(withIdentifier: Constants.Segue.SetStyleIdentifier, sender: self)
default:
break
Expand Down Expand Up @@ -134,6 +142,13 @@ extension MainViewController {
self.nextNavigationBarData.backgroundImageColor = $0
self.nextNavigatioBarBackgroundImageColorText.text = $0.rawValue
}
case (0, 2):
colorsArray = NavigationBarData.BackgroundImageColorArray
selectedIndex = colorsArray.index(of: NavigationBarBackgroundViewColor(rawValue: nextNavigationBarTitleColorText.text!)!)
block = {
self.nextNavigationBarData.titleColor = $0
self.nextNavigationBarTitleColorText.text = $0.rawValue
}
default:
break
}
Expand Down
1 change: 1 addition & 0 deletions Example/NavigationBarData.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ struct NavigationBarData {
static let BarTintColorArray: [NavigationBarBackgroundViewColor] = [.Cyan, .Yellow, .Green, .Orange, .lightGray, .NoValue]
static let BackgroundImageColorArray: [NavigationBarBackgroundViewColor] = [.NoValue, .Transparent, .Cyan, .Yellow, .Green, .Orange, .lightGray]

var titleColor = NavigationBarData.BarTintColorArray.last!
var barTintColor = NavigationBarData.BarTintColorArray.first!
var backgroundImageColor = NavigationBarData.BackgroundImageColorArray.first!
var prefersHidden = false
Expand Down
8 changes: 5 additions & 3 deletions KMNavigationBarTransition.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@
TargetAttributes = {
CDA3726E1C3907CE00E39A6D = {
CreatedOnToolsVersion = 7.2;
LastSwiftMigration = 0820;
LastSwiftMigration = 0910;
};
CDC01B8F1E5CA42000F6F3E2 = {
CreatedOnToolsVersion = 8.2.1;
Expand Down Expand Up @@ -472,7 +472,8 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.mo.KMNavigationBarTransition-Example";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.0;
};
name = Debug;
};
Expand All @@ -485,7 +486,8 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.mo.KMNavigationBarTransition-Example";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.0;
};
name = Release;
};
Expand Down
36 changes: 18 additions & 18 deletions KMNavigationBarTransition/UINavigationController+KMNavigationBarTransition.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,8 @@ - (UIViewController *)km_popViewControllerAnimated:(BOOL)animated {
UIViewController *disappearingViewController = self.viewControllers.lastObject;
[disappearingViewController km_addTransitionNavigationBarIfNeeded];
UIViewController *appearingViewController = self.viewControllers[self.viewControllers.count - 2];
if (appearingViewController.km_transitionNavigationBar) {
UINavigationBar *appearingNavigationBar = appearingViewController.km_transitionNavigationBar;
self.navigationBar.barTintColor = appearingNavigationBar.barTintColor;
[self.navigationBar setBackgroundImage:[appearingNavigationBar backgroundImageForBarMetrics:UIBarMetricsDefault] forBarMetrics:UIBarMetricsDefault];
self.navigationBar.shadowImage = appearingNavigationBar.shadowImage;
}
[self renewTheNavigationBar:appearingViewController.km_transitionNavigationBar];

if (animated) {
disappearingViewController.navigationController.km_backgroundViewHidden = YES;
}
Expand All @@ -107,12 +103,8 @@ - (UIViewController *)km_popViewControllerAnimated:(BOOL)animated {
}
UIViewController *disappearingViewController = self.viewControllers.lastObject;
[disappearingViewController km_addTransitionNavigationBarIfNeeded];
if (viewController.km_transitionNavigationBar) {
UINavigationBar *appearingNavigationBar = viewController.km_transitionNavigationBar;
self.navigationBar.barTintColor = appearingNavigationBar.barTintColor;
[self.navigationBar setBackgroundImage:[appearingNavigationBar backgroundImageForBarMetrics:UIBarMetricsDefault] forBarMetrics:UIBarMetricsDefault];
self.navigationBar.shadowImage = appearingNavigationBar.shadowImage;
}
[self renewTheNavigationBar:viewController.km_transitionNavigationBar];

if (animated) {
disappearingViewController.navigationController.km_backgroundViewHidden = YES;
}
Expand All @@ -126,12 +118,8 @@ - (UIViewController *)km_popViewControllerAnimated:(BOOL)animated {
UIViewController *disappearingViewController = self.viewControllers.lastObject;
[disappearingViewController km_addTransitionNavigationBarIfNeeded];
UIViewController *rootViewController = self.viewControllers.firstObject;
if (rootViewController.km_transitionNavigationBar) {
UINavigationBar *appearingNavigationBar = rootViewController.km_transitionNavigationBar;
self.navigationBar.barTintColor = appearingNavigationBar.barTintColor;
[self.navigationBar setBackgroundImage:[appearingNavigationBar backgroundImageForBarMetrics:UIBarMetricsDefault] forBarMetrics:UIBarMetricsDefault];
self.navigationBar.shadowImage = appearingNavigationBar.shadowImage;
}
[self renewTheNavigationBar:rootViewController.km_transitionNavigationBar];

if (animated) {
disappearingViewController.navigationController.km_backgroundViewHidden = YES;
}
Expand All @@ -149,6 +137,18 @@ - (void)km_setViewControllers:(NSArray<UIViewController *> *)viewControllers ani
return [self km_setViewControllers:viewControllers animated:animated];
}

- (void)renewTheNavigationBar:(UINavigationBar *)appearingNavigationBar {
if (appearingNavigationBar == nil) {
return;
}
self.navigationBar.tintColor = appearingNavigationBar.tintColor;
self.navigationBar.titleTextAttributes = appearingNavigationBar.titleTextAttributes;

self.navigationBar.barTintColor = appearingNavigationBar.barTintColor;
self.navigationBar.shadowImage = appearingNavigationBar.shadowImage;
[self.navigationBar setBackgroundImage:[appearingNavigationBar backgroundImageForBarMetrics:UIBarMetricsDefault] forBarMetrics:UIBarMetricsDefault];
}

- (BOOL)km_backgroundViewHidden {
return [objc_getAssociatedObject(self, _cmd) boolValue];
}
Expand Down
4 changes: 4 additions & 0 deletions KMNavigationBarTransition/UIViewController+KMNavigationBarTransition.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ - (void)km_viewDidAppear:(BOOL)animated {
[self km_restoreScrollViewContentInsetAdjustmentBehaviorIfNeeded];
UIViewController *transitionViewController = self.navigationController.km_transitionContextToViewController;
if (self.km_transitionNavigationBar) {
self.navigationController.navigationBar.tintColor = self.km_transitionNavigationBar.tintColor;
self.navigationController.navigationBar.titleTextAttributes = self.km_transitionNavigationBar.titleTextAttributes;
self.navigationController.navigationBar.barTintColor = self.km_transitionNavigationBar.barTintColor;
[self.navigationController.navigationBar setBackgroundImage:[self.km_transitionNavigationBar backgroundImageForBarMetrics:UIBarMetricsDefault] forBarMetrics:UIBarMetricsDefault];
[self.navigationController.navigationBar setShadowImage:self.km_transitionNavigationBar.shadowImage];
Expand Down Expand Up @@ -132,6 +134,8 @@ - (void)km_addTransitionNavigationBarIfNeeded {
if (bar.translucent != self.navigationController.navigationBar.translucent) {
bar.translucent = self.navigationController.navigationBar.translucent;
}
bar.tintColor = self.navigationController.navigationBar.tintColor;
bar.titleTextAttributes = self.navigationController.navigationBar.titleTextAttributes;
bar.barTintColor = self.navigationController.navigationBar.barTintColor;
[bar setBackgroundImage:[self.navigationController.navigationBar backgroundImageForBarMetrics:UIBarMetricsDefault] forBarMetrics:UIBarMetricsDefault];
bar.shadowImage = self.navigationController.navigationBar.shadowImage;
Expand Down