From 4eeea47e73c7cff7ed4ff90451a4861cbb4742b5 Mon Sep 17 00:00:00 2001 From: Vasil Chimev Date: Wed, 11 Sep 2019 17:06:12 +0300 Subject: [PATCH] fix(dark-mode): tabs colors --- tns-core-modules/color/compatibility-colors.ios.ts | 6 ++++++ tns-core-modules/ui/tabs/tabs.ios.ts | 14 ++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/tns-core-modules/color/compatibility-colors.ios.ts b/tns-core-modules/color/compatibility-colors.ios.ts index 2244a075a..8df393f9e 100644 --- a/tns-core-modules/color/compatibility-colors.ios.ts +++ b/tns-core-modules/color/compatibility-colors.ios.ts @@ -3,4 +3,10 @@ import { ios } from "../utils/utils"; const majorVersion = ios.MajorVersion; export const activityIndicatorViewStyle = () => { return majorVersion <= 12 ? UIActivityIndicatorViewStyle.Gray : UIActivityIndicatorViewStyle.Medium }; + +// UI Element Colors export const backgroundColor = () => { return majorVersion <= 12 ? UIColor.whiteColor : UIColor.systemBackgroundColor }; +export const labelColor = () => { return majorVersion <= 12 ? UIColor.blackColor : UIColor.labelColor }; + +// Standard Colors +export const blueColor = () => { return majorVersion <= 12 ? UIColor.blueColor : UIColor.systemBlueColor }; diff --git a/tns-core-modules/ui/tabs/tabs.ios.ts b/tns-core-modules/ui/tabs/tabs.ios.ts index be26ca1b0..78756b2de 100644 --- a/tns-core-modules/ui/tabs/tabs.ios.ts +++ b/tns-core-modules/ui/tabs/tabs.ios.ts @@ -6,6 +6,7 @@ import { TextTransform } from "../text-base"; // Requires import { Color } from "../../color"; +import { backgroundColor, blueColor, labelColor } from "../../color/compatibility-colors.ios"; import { fromFileOrResource, fromFontIconCode, ImageSource } from "../../image-source"; import { ios as iosUtils, isFontIconURI, layout } from "../../utils/utils"; import { ios as iosView, View } from "../core/view"; @@ -90,10 +91,15 @@ class UIPageViewControllerImpl extends UIPageViewController { } tabBar.delegate = this.tabBarDelegate = MDCTabBarDelegateImpl.initWithOwner(new WeakRef(owner)); - tabBar.tintColor = UIColor.blueColor; - tabBar.barTintColor = UIColor.whiteColor; - tabBar.setTitleColorForState(UIColor.blackColor, MDCTabBarItemState.Normal); - tabBar.setTitleColorForState(UIColor.blackColor, MDCTabBarItemState.Selected); + tabBar.tintColor = blueColor(); + tabBar.barTintColor = backgroundColor(); + tabBar.setTitleColorForState(labelColor(), MDCTabBarItemState.Normal); + tabBar.setTitleColorForState(labelColor(), MDCTabBarItemState.Selected); + + if (majorVersion >= 13) { + tabBar.inkColor = UIColor.clearColor; + } + tabBar.autoresizingMask = UIViewAutoresizing.FlexibleWidth | UIViewAutoresizing.FlexibleBottomMargin; tabBar.alignment = MDCTabBarAlignment.Leading; tabBar.sizeToFit();