Skip to content

Commit 47df0a6

Browse files
committed
fix(dark-mode): tabs colors
1 parent f5c1abe commit 47df0a6

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

tns-core-modules/color/compatibility-colors.ios.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,10 @@ import { ios } from "../utils/utils";
33
const majorVersion = ios.MajorVersion;
44

55
export const activityIndicatorViewStyle = () => { return majorVersion <= 12 ? UIActivityIndicatorViewStyle.Gray : UIActivityIndicatorViewStyle.Medium };
6+
7+
// UI Element Colors
68
export const backgroundColor = () => { return majorVersion <= 12 ? UIColor.whiteColor : UIColor.systemBackgroundColor };
9+
export const labelColor = () => { return majorVersion <= 12 ? UIColor.blackColor : UIColor.labelColor };
10+
11+
// Standard Colors
12+
export const blueColor = () => { return majorVersion <= 12 ? UIColor.blueColor : UIColor.systemBlueColor };

tns-core-modules/ui/tabs/tabs.ios.ts

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import { TextTransform } from "../text-base";
66

77
// Requires
88
import { Color } from "../../color";
9+
import { backgroundColor, blueColor, labelColor } from "../../color/compatibility-colors.ios";
910
import { fromFileOrResource, fromFontIconCode, ImageSource } from "../../image-source";
1011
import { ios as iosUtils, isFontIconURI, layout } from "../../utils/utils";
1112
import { ios as iosView, View } from "../core/view";
@@ -91,10 +92,15 @@ class UIPageViewControllerImpl extends UIPageViewController {
9192
}
9293

9394
tabBar.delegate = this.tabBarDelegate = MDCTabBarDelegateImpl.initWithOwner(new WeakRef(owner));
94-
tabBar.tintColor = UIColor.blueColor;
95-
tabBar.barTintColor = UIColor.whiteColor;
96-
tabBar.setTitleColorForState(UIColor.blackColor, MDCTabBarItemState.Normal);
97-
tabBar.setTitleColorForState(UIColor.blackColor, MDCTabBarItemState.Selected);
95+
tabBar.tintColor = blueColor();
96+
tabBar.barTintColor = backgroundColor();
97+
tabBar.setTitleColorForState(labelColor(), MDCTabBarItemState.Normal);
98+
tabBar.setTitleColorForState(labelColor(), MDCTabBarItemState.Selected);
99+
100+
if (majorVersion >= 13) {
101+
tabBar.inkColor = UIColor.clearColor;
102+
}
103+
98104
tabBar.autoresizingMask = UIViewAutoresizing.FlexibleWidth | UIViewAutoresizing.FlexibleBottomMargin;
99105
tabBar.alignment = MDCTabBarAlignment.Leading;
100106
tabBar.sizeToFit();

0 commit comments

Comments
 (0)