Skip to content

Commit

Permalink
Merge pull request Tencent#512 from ziecho/master
Browse files Browse the repository at this point in the history 
 add tintColor transition, fix qmui_usedAsTableHeaderView
  • Loading branch information
@MoLice
MoLice authored Feb 27, 2019
2 parents f9e4af7 + 16db03b commit 92cf6e1
Show file tree
Hide file tree
Showing 2 changed files with 69 additions and 18 deletions.
18 changes: 13 additions & 5 deletions ...t/QMUIComponents/NavigationBarTransition/UINavigationController+NavigationBarTransition.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -286,11 +286,19 @@ - (void)renderNavigationStyleInViewController:(UIViewController *)viewController
}

// 导航栏上控件的主题色
if ([vc respondsToSelector:@selector(navigationBarTintColor)]) {
UIColor *tintColor = [vc navigationBarTintColor];
viewController.navigationController.navigationBar.tintColor = tintColor;
} else if (QMUICMIActivated) {
viewController.navigationController.navigationBar.tintColor = NavBarTintColor;
UIColor *tintColor =
[vc respondsToSelector:@selector(navigationBarTintColor)] ? [vc navigationBarTintColor] :
QMUICMIActivated ? NavBarTintColor : nil;
if (tintColor) {
// 手势从 B 返回 A 过程中，取消手势，会调用 B 的 viewWillAppear，animateAlongsideTransition 在这种情况下不会生效，所以要用 qmui_poppingByInteractivePopGestureRecognizer 针对这种情况判断。
BOOL shouldApplyTintColorTransition = (animated && ![vc qmui_poppingByInteractivePopGestureRecognizer]);
if (shouldApplyTintColorTransition) {
[viewController.transitionCoordinator animateAlongsideTransition:^ (id <UIViewControllerTransitionCoordinatorContext> context) {
viewController.navigationController.navigationBar.tintColor = tintColor;
} completion:nil];
} else {
viewController.navigationController.navigationBar.tintColor = tintColor;
}
}

// 导航栏title的颜色
Expand Down
69 changes: 56 additions & 13 deletions QMUIKit/UIKitExtensions/UISearchBar+QMUI.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@
#import "UIImage+QMUI.h"
#import "UIView+QMUI.h"

#define SearchBarActiveHeightIOS11Later (IS_NOTCHED_SCREEN ? 55.0f : 50.0f)
#define SearchBarNormalHeightIOS11Later 56.0f


@implementation UISearchBar (QMUI)

QMUISynthesizeBOOLProperty(qmui_usedAsTableHeaderView, setQmui_usedAsTableHeaderView)
Expand Down Expand Up @@ -127,17 +131,20 @@ - (UISegmentedControl *)qmui_segmentedControl {
}

- (BOOL)qmui_isActive {
// 某些情况下 scopeBar 是显示在搜索框右边的，所以要区分判断
CGFloat scopeBarHeight = self.qmui_segmentedControl && self.qmui_segmentedControl.superview.qmui_top < self.qmui_textField.qmui_bottom ? 0 : self.qmui_segmentedControl.superview.qmui_height;
BOOL result = self.qmui_height - scopeBarHeight == 50;
return result;
return (self.qmui_searchController.isBeingPresented || self.qmui_searchController.isActive);
}

- (UISearchController *)qmui_searchController {
return [self valueForKey:@"_searchController"];
}

- (void)qmuisb_layoutSubviews {
[self qmuisb_layoutSubviews];

[self fixLandscapeStyle];

[self fixDismissingAnimation];

if (!UIEdgeInsetsEqualToEdgeInsets(self.qmui_textFieldMargins, UIEdgeInsetsZero)) {
self.qmui_textField.frame = CGRectInsetEdges(self.qmui_textField.frame, self.qmui_textFieldMargins);
}
Expand All @@ -155,11 +162,50 @@ - (void)fixLandscapeStyle {
if (@available(iOS 11, *)) {
if ([self qmui_isActive] && IS_LANDSCAPE) {
// 11.0 及以上的版本，横屏时，searchBar 内部的内容布局会偏上，所以这里强制居中一下
self.qmui_textField.frame = CGRectSetY(self.qmui_textField.frame, self.qmui_textField.qmui_topWhenCenterInSuperview);
self.qmui_cancelButton.frame = CGRectSetY(self.qmui_cancelButton.frame, self.qmui_cancelButton.qmui_topWhenCenterInSuperview);
CGFloat fixedOffset = (SearchBarActiveHeightIOS11Later - SearchBarNormalHeightIOS11Later) / 2.0;
self.qmui_textField.frame = CGRectSetY(self.qmui_textField.frame, self.qmui_textField.qmui_topWhenCenterInSuperview + fixedOffset);
self.qmui_cancelButton.frame = CGRectSetY(self.qmui_cancelButton.frame, self.qmui_cancelButton.qmui_topWhenCenterInSuperview + fixedOffset);
if (self.qmui_segmentedControl.superview.qmui_top < self.qmui_textField.qmui_bottom) {
// scopeBar 显示在搜索框右边
self.qmui_segmentedControl.superview.qmui_top = self.qmui_segmentedControl.superview.qmui_topWhenCenterInSuperview;
self.qmui_segmentedControl.superview.qmui_top = self.qmui_segmentedControl.superview.qmui_topWhenCenterInSuperview + fixedOffset;
}
}
}
}
}

- (void)fixDismissingAnimation {
if (self.qmui_usedAsTableHeaderView) {
if (@available(iOS 11, *)) {
if (self.qmui_searchController.isBeingDismissed) {
self.qmui_textField.superview.qmui_height = SearchBarNormalHeightIOS11Later;
self.qmui_textField.frame = CGRectSetY(self.qmui_textField.frame, self.qmui_textField.qmui_topWhenCenterInSuperview);
self.qmui_backgroundView.frame = self.qmui_textField.superview.bounds;
if (IS_NOTCHED_SCREEN && self.frame.origin.y == 43) { // 修复刘海屏下，系统计算少了一个 px
self.frame = CGRectSetY(self.frame, StatusBarHeightConstant);
}

UIView *searchBarContainerView = self.superview;
if (searchBarContainerView.layer.masksToBounds) {
searchBarContainerView.layer.masksToBounds = NO;
if (self.showsScopeBar && !IS_LANDSCAPE) {
//竖屏并且显示了 ScopeBar 系统可以自然过渡，无需添加 mask 动画
return;
}
// 之所以给 searchBarContainerView 设置mask 动画, 而非 backgroundView 是因为 searchBarContainerView 在每次激活都会重新创建一个，修改 masksToBounds 和设置动画不会去影响其他东西
CAShapeLayer *maskLayer = [CAShapeLayer layer];
CGMutablePathRef path = CGPathCreateMutable();
CGPathAddRect(path, NULL, CGRectMake(0, 0, searchBarContainerView.qmui_width, StatusBarHeight + SearchBarActiveHeightIOS11Later));
maskLayer.path = path;
searchBarContainerView.layer.mask = maskLayer;

CABasicAnimation *animation = [CABasicAnimation animationWithKeyPath:@"path"];
CGMutablePathRef animationPath = CGPathCreateMutable();
CGPathAddRect(animationPath, NULL, CGRectMake(0, 0, searchBarContainerView.qmui_width, StatusBarHeight + SearchBarNormalHeightIOS11Later));
animation.toValue = (__bridge id)animationPath;
animation.removedOnCompletion = NO;
animation.fillMode = kCAFillModeForwards;
[searchBarContainerView.layer.mask addAnimation:animation forKey:nil];
}
}
}
Expand Down Expand Up @@ -211,12 +257,9 @@ - (void)qmuisb_setFrame:(CGRect)frame {
frame = CGRectSetY(frame, 0);
}
}

if (self.layer.animationKeys) {
// 这一段是为了修复进入/退出搜索状态时的抖动
if (CGRectGetHeight(self.superview.frame) == (CGRectGetHeight(frame) + StatusBarHeight) && !self.showsScopeBar) {
frame = CGRectSetHeight(frame, 56);
}
// 强制在激活状态下 高度也为 56，方便后续做平滑过渡动画 (iOS 11 默认下，非刘海屏的机器激活后为 50，刘海屏激活后为 55)
if (frame.size.height == SearchBarActiveHeightIOS11Later) {
frame.size.height = 56;
}
}

Expand Down

0 comments on commit 92cf6e1

Please sign in to comment.