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: setting icon color

Browse Source
This commit is contained in:
Vasko
2020-03-12 18:56:35 +02:00
parent 4711d3618f
commit 1ae0abc4f6
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nativescript-core/ui/bottom-navigation/bottom-navigation.android.ts
View File

@@ -598,10 +598,8 @@ export class BottomNavigation extends TabNavigationBase {
tabItemSpec.backgroundColor = backgroundColor ? backgroundColor.android : this.getTabBarBackgroundArgbColor();
// COLOR
let color = this.selectedIndex === tabStripItem._index ? this._selectedItemColor : this._unSelectedItemColor;
if (!color) {
color = titleLabel.style.color;
}
let rowColor = this.selectedIndex === tabStripItem._index ? this._selectedItemColor : this._unSelectedItemColor;
const color = rowColor || titleLabel.style.color;
tabItemSpec.color = color && color.android;
// FONT
@@ -614,7 +612,7 @@ export class BottomNavigation extends TabNavigationBase {
// ICON
const iconSource = tabStripItem.image && tabStripItem.image.src;
if (iconSource) {
const iconInfo = this.getIconInfo(tabStripItem, color);
const iconInfo = this.getIconInfo(tabStripItem, rowColor);
if (iconInfo) {
// TODO: Make this native call that accepts string so that we don't load Bitmap in JS.

9
nativescript-core/ui/tabs/tabs.android.ts
View File

@@ -669,11 +669,8 @@ export class Tabs extends TabsBase {
tabItemSpec.backgroundColor = backgroundColor ? backgroundColor.android : this.getTabBarBackgroundArgbColor();
// COLOR
let color = this.selectedIndex === tabStripItem._index ? this._selectedItemColor : this._unSelectedItemColor;
if (!color) {
color = nestedLabel.style.color;
}
let rowColor = this.selectedIndex === tabStripItem._index ? this._selectedItemColor : this._unSelectedItemColor;
const color = rowColor || nestedLabel.style.color;
tabItemSpec.color = color && color.android;
// FONT
@@ -686,7 +683,7 @@ export class Tabs extends TabsBase {
// ICON
const iconSource = tabStripItem.image && tabStripItem.image.src;
if (iconSource) {
const icon = this.getIcon(tabStripItem, color);
const icon = this.getIcon(tabStripItem, rowColor);
if (icon) {
// TODO: Make this native call that accepts string so that we don't load Bitmap in JS.