javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(dark-mode): tabs colors

Browse Source
This commit is contained in:
Vasil Chimev
2019-09-11 17:06:12 +03:00
parent 50a6834a3e
commit 4eeea47e73
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tns-core-modules/color/compatibility-colors.ios.ts
View File

@@ -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 };

14
tns-core-modules/ui/tabs/tabs.ios.ts
View File

@@ -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();