添加 splitTopBarTransitionIOS 支持

listenzz · May 30, 2021 · 9b5c0f7 · 9b5c0f7
1 parent d45b93b
commit 9b5c0f7
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 0 deletions.
diff --git a/example/src/index.ts b/example/src/index.ts
@@ -67,6 +67,7 @@ Garden.setStyle({
   titleTextColorLightContent: '#FFFFFF',
   titleTextSize: 17,
   swipeBackEnabledAndroid: true,
+  // splitTopBarTransitionIOS: true,
   // badgeColor: '#00FFFF',
 
   statusBarColorAndroid: Platform.OS === 'android' && Platform.Version < 23 ? '#4A4A4A' : undefined,

diff --git a/ios/HybridNavigation/GlobalStyle.h b/ios/HybridNavigation/GlobalStyle.h
@@ -18,6 +18,7 @@
 @property (nonatomic, copy) NSString *tabBarItemColorHexString;
 @property (nonatomic, copy) NSString *tabBarUnselectedItemColorHexString;
 @property (nonatomic, strong, readonly) UIColor *tabBarBackgroundColor;
+@property (nonatomic, assign, readonly) BOOL awaysSplitNavigationBarTransition;
 
 - (instancetype)initWithOptions:(NSDictionary *)options;
 

diff --git a/ios/HybridNavigation/GlobalStyle.m b/ios/HybridNavigation/GlobalStyle.m
@@ -34,6 +34,8 @@ @interface GlobalStyle ()
 @property (nonatomic, strong) UIColor *tabBarTintColor;
 @property (nonatomic, strong) UIColor *tabBarUnselectedTintColor;
 
+@property (nonatomic, assign, readwrite) BOOL awaysSplitNavigationBarTransition;
+
 @end
 
 @implementation GlobalStyle
@@ -63,6 +65,11 @@ - (instancetype)initWithOptions:(NSDictionary *)options {
             self.barTintColor = [HBDUtils colorWithHexString:topBarColor];
         }
 
+        NSNumber *splitTopBarTransitionIOS = self.options[@"splitTopBarTransitionIOS"];
+        if (splitTopBarTransitionIOS) {
+            self.awaysSplitNavigationBarTransition = [splitTopBarTransitionIOS boolValue];
+        }
+
         NSString *topBarColorDarkContent = self.options[@"topBarColorDarkContent"];
         if (topBarColorDarkContent) {
             self.barTintColorDarkContent = [HBDUtils colorWithHexString:topBarColorDarkContent];

diff --git a/ios/HybridNavigation/ViewController/HBDNavigationController.m b/ios/HybridNavigation/ViewController/HBDNavigationController.m
@@ -15,6 +15,7 @@
 #import "HBDReactViewController.h"
 #import "HBDPushAnimation.h"
 #import "HBDPopAnimation.h"
+#import "HBDGarden.h"
 #import <React/RCTLog.h>
 
 UIColor* blendColor(UIColor *from, UIColor *to, float percent) {
@@ -379,6 +380,10 @@ - (void)resetButtonLabelInView:(UIView *)view {
 }
 
 - (BOOL)shouldShowFakeBarFrom:(UIViewController *)from to:(UIViewController *)to viewController:(UIViewController * _Nonnull)viewController {
+    if ([HBDGarden globalStyle].awaysSplitNavigationBarTransition) {
+        return YES;
+    }
+
     BOOL shouldFake = to == viewController && (![from.hbd_barTintColor.description  isEqual:to.hbd_barTintColor.description] || ABS(from.hbd_barAlpha - to.hbd_barAlpha) > 0.1);
     return shouldFake;
 }

diff --git a/src/Garden.ts b/src/Garden.ts
@@ -29,6 +29,7 @@ export interface Style {
   titleAlignmentAndroid?: TitleAlignment // TopBar 标题的位置，可选项有 `TitleAlignmentLeft` 和 `TitleAlignmentCenter` ，仅对 Android 生效
   barButtonItemTextSize?: number // TopBar 按钮字体大小，默认是 15 dp(pt)
   swipeBackEnabledAndroid?: boolean // Android 是否开启右滑返回，默认是 false
+  splitTopBarTransitionIOS?: boolean // iOS 侧滑返回时，是否总是割裂导航栏背景
 
   tabBarColor?: Color // 底部 TabBar 背景颜色，请勿使用带透明度的颜色。
   tabBarShadowImage?: ShadowImage // 底部 TabBar 阴影图片。对于 iOS, 只有同时设置了 tabBarColor 才会生效