Fix topBar transparent background on iOS 12 (#5791)

* Fix topBar transparent background on iOS 12 * Fix unit test iOS destination
wix · Dec 18, 2019 · cd3d347 · cd3d347
1 parent 71af559
commit cd3d347
Show file tree

Hide file tree

Showing 10 changed files with 946 additions and 30 deletions.
diff --git a/lib/ios/TopBarAppearancePresenter.m b/lib/ios/TopBarAppearancePresenter.m
@@ -45,10 +45,6 @@ - (void)updateBackgroundAppearance {
     }
 }
 
-- (BOOL)transparent {
-    return (_backgroundColor && CGColorGetAlpha(_backgroundColor.CGColor) == 0.0);
-}
-
 - (void)showBorder:(BOOL)showBorder {
     UIColor* shadowColor = showBorder ? [[UINavigationBarAppearance new] shadowColor] : nil;
     _appearance.shadowColor = shadowColor;

diff --git a/lib/ios/TopBarPresenter.h b/lib/ios/TopBarPresenter.h
@@ -11,7 +11,8 @@
 
 - (instancetype)initWithNavigationController:(UINavigationController *)boundNavigationController;
 
-@property (nonatomic) BOOL transparent;
+- (BOOL)transparent;
+
 @property (nonatomic) BOOL translucent;
 @property (nonatomic, strong) UIColor* backgroundColor;
 

diff --git a/lib/ios/TopBarPresenter.m b/lib/ios/TopBarPresenter.m
@@ -69,7 +69,7 @@ - (void)setBackgroundColor:(UIColor *)backgroundColor {
 }
 
 - (void)updateBackgroundAppearance {
-    if (_transparent) {
+    if (self.transparent) {
         [self setBackgroundColorTransparent];
     } else if (_backgroundColor) {
         self.navigationController.navigationBar.barTintColor = _backgroundColor;
@@ -125,4 +125,8 @@ - (void)setBackButtonIcon:(UIImage *)icon withColor:(UIColor *)color title:(NSSt
     lastViewControllerInStack.navigationItem.backBarButtonItem = backItem;
 }
 
+- (BOOL)transparent {
+    return (_backgroundColor && CGColorGetAlpha(_backgroundColor.CGColor) == 0.0);
+}
+
 @end
diff --git a/playground/ios/NavigationIOS12Tests/Info.plist b/playground/ios/NavigationIOS12Tests/Info.plist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>