Added selectedItemColor and unSelectedItemColor to the TabStrip (#8431)

* chore: add guard for ios

* feat(bottom-nav): adding new properties

* feat(tabs): new property implementation

* feat: new feature implementation in android

Implemented selectedItemColor and unSelectedItemColor properties on TabStrip

* chore: added some comments

* chore: change method return type

* fix: setting icon color

* fix: rendering mode setting

* chore: rename variable

* chore: fixed a typo

* chore: updated log in build gradle

* fix: item color setting in android

* fix: tab styling when no css aplied

* chore: private methods renamed

* tests: added selected-item test pages

* chore: renamed test pages

* chore: move css-tree package to the right place

* tests: added new ui tests

* fix: use renamed function

* fix: set item color

* tests: aded automationText attribute

* tests: trying to fix the tests

Co-authored-by: Dimitar Topuzov <dtopuzov@gmail.com>
This commit is contained in:
Vasil Trifonov
2020-03-16 12:54:30 +02:00
committed by GitHub
parent e081340665
commit 243dc98005
22 changed files with 675 additions and 196 deletions

View File

@ -2225,8 +2225,12 @@ export class TabNavigationBase extends View {
getTabBarItemTextTransform(tabStripItem: TabStripItem): any getTabBarItemTextTransform(tabStripItem: TabStripItem): any
getTabBarSelectedItemColor(): Color
getTabBarTextTransform(): any getTabBarTextTransform(): any
getTabBarUnSelectedItemColor(): Color
ios: any /* UITabBarController */; ios: any /* UITabBarController */;
items: Array<TabContentItem>; items: Array<TabContentItem>;
@ -2266,8 +2270,12 @@ export class TabNavigationBase extends View {
setTabBarItemTitle(tabStripItem: TabStripItem, value: any): any setTabBarItemTitle(tabStripItem: TabStripItem, value: any): any
setTabBarSelectedItemColor(value: Color)
setTabBarTextTransform(value: any): void setTabBarTextTransform(value: any): void
setTabBarUnSelectedItemColor(value: Color)
tabStrip: TabStrip; tabStrip: TabStrip;
} }
@ -2320,6 +2328,10 @@ export class TabStrip extends View {
on(eventNames: string, callback: (data: EventData) => void, thisArg?: any); on(eventNames: string, callback: (data: EventData) => void, thisArg?: any);
on(event: "itemTap", callback: (args: TabStripItemEventData) => void, thisArg?: any); on(event: "itemTap", callback: (args: TabStripItemEventData) => void, thisArg?: any);
selectedItemColor: Color;
unSelectedItemColor: Color;
} }
// @public // @public

View File

@ -1,8 +1,11 @@
import { EventData } from "tns-core-modules/data/observable"; import { EventData } from "tns-core-modules/data/observable";
import { TabView } from "tns-core-modules/ui/tab-view"; import { TabView } from "tns-core-modules/ui/tab-view";
import { isIOS } from "tns-core-modules/platform";
export function onLoaded(args: EventData) { export function onLoaded(args: EventData) {
console.log("TEST", args.object); console.log("TEST", args.object);
const tabView = <TabView>args.object; const tabView = <TabView>args.object;
if (isIOS) {
tabView.ios.tabBar.translucent = false; tabView.ios.tabBar.translucent = false;
} }
}

View File

@ -0,0 +1,7 @@
.font-awesome {
font-family: "FontAwesome";
}
.font-size {
font-size: 36;
}

View File

@ -0,0 +1,40 @@
<Page class="page">
<ActionBar title="BottomNavigation item-color" icon="" class="action-bar">
</ActionBar>
<BottomNavigation automationText="tabNavigation">
<TabStrip selectedItemColor="red" unSelectedItemColor="green">
<TabStripItem>
<Label text="First"/>
<Image src="res://baseline_motorcycle_black_24"/>
</TabStripItem>
<TabStripItem>
<Label text="Second"/>
<Image src="res://up"/>
</TabStripItem>
<TabStripItem>
<Label text="Third"/>
<Image src="font://&#xF10B;" class="font-awesome font-size" />
</TabStripItem>
</TabStrip>
<TabContentItem class="special">
<GridLayout>
<Label text="First View" />
</GridLayout>
</TabContentItem>
<TabContentItem>
<GridLayout>
<Label text="Second View" />
</GridLayout>
</TabContentItem>
<TabContentItem>
<GridLayout>
<Label text="Third View" />
</GridLayout>
</TabContentItem>
</BottomNavigation>
</Page>

View File

@ -26,6 +26,7 @@ export function loadExamples() {
examples.set("css-text-transform", "bottom-navigation/bottom-navigation-css-page"); examples.set("css-text-transform", "bottom-navigation/bottom-navigation-css-page");
examples.set("custom-tabstrip", "bottom-navigation/custom-tabstrip-page"); examples.set("custom-tabstrip", "bottom-navigation/custom-tabstrip-page");
examples.set("reselect", "bottom-navigation/reselect-page"); examples.set("reselect", "bottom-navigation/reselect-page");
examples.set("item-color", "bottom-navigation/item-color-page");
return examples; return examples;
} }

View File

@ -1,6 +1,6 @@
<Page class="page"> <Page class="page">
<StackLayout> <StackLayout>
<Tabs highlightColor="red" offscreenTabLimit="1"> <Tabs highlightColor="red" offscreenTabLimit="1" automationText="tabNavigation">
<TabStrip highlightColor="green" itemTap="onItemTap"> <TabStrip highlightColor="green" itemTap="onItemTap">
<TabStripItem title="1"></TabStripItem> <TabStripItem title="1"></TabStripItem>
<TabStripItem title="2"></TabStripItem> <TabStripItem title="2"></TabStripItem>

View File

@ -0,0 +1,20 @@
.font-awesome {
font-family: "FontAwesome";
}
.font-size {
font-size: 36;
}
/* TabStrip {
color: mediumvioletred;
}
TabStripItem {
color: skyblue;
}
TabStripItem:active {
color: darkblue;
} */

View File

@ -0,0 +1,40 @@
<Page class="page">
<ActionBar title="Tabs item-color" icon="" class="action-bar">
</ActionBar>
<Tabs automationText="tabNavigation">
<TabStrip selectedItemColor="red" unSelectedItemColor="green">
<TabStripItem>
<Label text="First"/>
<Image src="res://baseline_motorcycle_black_24"/>
</TabStripItem>
<TabStripItem>
<Label text="Second"/>
<Image src="res://up"/>
</TabStripItem>
<TabStripItem>
<Label text="Third"/>
<Image src="font://&#xF10B;" class="font-awesome font-size" />
</TabStripItem>
</TabStrip>
<TabContentItem class="special">
<GridLayout>
<Label text="First View" />
</GridLayout>
</TabContentItem>
<TabContentItem>
<GridLayout>
<Label text="Second View" />
</GridLayout>
</TabContentItem>
<TabContentItem>
<GridLayout>
<Label text="Third View" />
</GridLayout>
</TabContentItem>
</Tabs>
</Page>

View File

@ -33,6 +33,7 @@ export function loadExamples() {
examples.set("nested-bottom-navigation", "tabs/nested-bottom-navigation-page"); examples.set("nested-bottom-navigation", "tabs/nested-bottom-navigation-page");
examples.set("custom-tabstrip", "tabs/custom-tabstrip-page"); examples.set("custom-tabstrip", "tabs/custom-tabstrip-page");
examples.set("frame-in-tabs", "tabs/frame-in-tabs"); examples.set("frame-in-tabs", "tabs/frame-in-tabs");
examples.set("item-color", "tabs/item-color-page");
return examples; return examples;
} }

View File

@ -303,4 +303,20 @@ describe(`${suite}-${spec}-suite`, async function () {
assert.isTrue(driver.imageHelper.hasImageComparisonPassed()); assert.isTrue(driver.imageHelper.hasImageComparisonPassed());
await bottomNavigationBasePage.navigateBackToSuitMainPage(); await bottomNavigationBasePage.navigateBackToSuitMainPage();
}); });
it(`${spec}-item-color`, async function () {
await bottomNavigationBasePage.navigateToSample("item-color");
await bottomNavigationBasePage.refreshTabItems();
await driver.imageHelper.compareScreen();
// go through the tabs and check that they are loaded
await bottomNavigationBasePage.tabOnItem(1);
await driver.imageHelper.compareScreen();
await bottomNavigationBasePage.tabOnItem(2);
await driver.imageHelper.compareScreen();
assert.isTrue(driver.imageHelper.hasImageComparisonPassed());
await bottomNavigationBasePage.navigateBackToSuitMainPage();
});
}); });

View File

@ -284,21 +284,38 @@ describe(`${imagePrefix}-suite`, async function () {
await tabsViewBasePage.navigateBackToSuitMainPage(); await tabsViewBasePage.navigateBackToSuitMainPage();
}); });
// it(`${imagePrefix}-frame-in-tabs`, async function () { it(`${imagePrefix}-frame-in-tabs`, async function () {
// await tabsViewBasePage.navigateToSample("frame-in-tabs"); await tabsViewBasePage.navigateToSample("frame-in-tabs");
// await driver.imageHelper.compareScreen(); await tabsViewBasePage.refreshTabItems();
await driver.imageHelper.compareScreen();
// // go through the tabs and check that they are loaded // go through the tabs and check that they are loaded
// await tabsViewBasePage.tabOnItem(1); await tabsViewBasePage.tabOnItem(1);
// await driver.imageHelper.compareScreen(); await driver.imageHelper.compareScreen();
// await tabsViewBasePage.tabOnItem(2); await tabsViewBasePage.tabOnItem(2);
// await driver.imageHelper.compareScreen(); await driver.imageHelper.compareScreen();
// await tabsViewBasePage.tabOnItem(3); await tabsViewBasePage.tabOnItem(3);
// await driver.imageHelper.compareScreen(); await driver.imageHelper.compareScreen();
// assert.isTrue(driver.imageHelper.hasImageComparisonPassed()); assert.isTrue(driver.imageHelper.hasImageComparisonPassed());
// await tabsViewBasePage.navigateBackToSuitMainPage(); await tabsViewBasePage.navigateBackToSuitMainPage();
// }); });
it(`${spec}-item-color`, async function () {
await tabsViewBasePage.navigateToSample("item-color");
await tabsViewBasePage.refreshTabItems();
await driver.imageHelper.compareScreen();
// go through the tabs and check that they are loaded
await tabsViewBasePage.tabOnItem(1);
await driver.imageHelper.compareScreen();
await tabsViewBasePage.tabOnItem(2);
await driver.imageHelper.compareScreen();
assert.isTrue(driver.imageHelper.hasImageComparisonPassed());
await tabsViewBasePage.navigateBackToSuitMainPage();
});
}); });

View File

@ -19,9 +19,9 @@
], ],
"license": "Apache-2.0", "license": "Apache-2.0",
"dependencies": { "dependencies": {
"css-tree": "^1.0.0-alpha.37",
"nativescript-hook": "0.2.5", "nativescript-hook": "0.2.5",
"reduce-css-calc": "^2.1.6", "reduce-css-calc": "^2.1.6",
"css-tree": "^1.0.0-alpha.37",
"semver": "6.3.0", "semver": "6.3.0",
"tns-core-modules-widgets": "next", "tns-core-modules-widgets": "next",
"tslib": "1.10.0" "tslib": "1.10.0"
@ -41,14 +41,12 @@
"ios": "6.0.0", "ios": "6.0.0",
"android": "6.0.0" "android": "6.0.0"
}, },
"hooks": [ "hooks": [{
{
"name": "nativescript-core", "name": "nativescript-core",
"type": "before-checkForChanges", "type": "before-checkForChanges",
"script": "cli-hooks/before-checkForChanges.js", "script": "cli-hooks/before-checkForChanges.js",
"inject": true "inject": true
} }]
]
}, },
"snapshot": { "snapshot": {
"android": { "android": {

View File

@ -169,13 +169,13 @@ function initializeNativeClasses() {
if (position >= 0 && tabStripItems && tabStripItems[position]) { if (position >= 0 && tabStripItems && tabStripItems[position]) {
tabStripItems[position]._emit(TabStripItem.selectEvent); tabStripItems[position]._emit(TabStripItem.selectEvent);
owner._setItemColor(tabStripItems[position]);
} }
if (prevPosition >= 0 && tabStripItems && tabStripItems[prevPosition]) { if (prevPosition >= 0 && tabStripItems && tabStripItems[prevPosition]) {
tabStripItems[prevPosition]._emit(TabStripItem.unselectEvent); tabStripItems[prevPosition]._emit(TabStripItem.unselectEvent);
owner._setItemColor(tabStripItems[prevPosition]);
} }
owner.selectedIndex = position;
} }
public onTap(position: number): boolean { public onTap(position: number): boolean {
@ -257,6 +257,8 @@ export class BottomNavigation extends TabNavigationBase {
private _attachedToWindow = false; private _attachedToWindow = false;
public _originalBackground: any; public _originalBackground: any;
private _textTransform: TextTransform = "none"; private _textTransform: TextTransform = "none";
private _selectedItemColor: Color;
private _unSelectedItemColor: Color;
constructor() { constructor() {
super(); super();
@ -529,6 +531,7 @@ export class BottomNavigation extends TabNavigationBase {
} }
this._currentFragment = fragment; this._currentFragment = fragment;
this.selectedIndex = position;
const tabItems = this.items; const tabItems = this.items;
const tabItem = tabItems ? tabItems[position] : null; const tabItem = tabItems ? tabItems[position] : null;
@ -573,6 +576,7 @@ export class BottomNavigation extends TabNavigationBase {
items.forEach((item, i, arr) => { items.forEach((item, i, arr) => {
const textView = this._bottomNavigationBar.getTextViewForItemAt(i); const textView = this._bottomNavigationBar.getTextViewForItemAt(i);
item.setNativeView(textView); item.setNativeView(textView);
this._setItemColor(item);
}); });
} }
@ -605,10 +609,9 @@ export class BottomNavigation extends TabNavigationBase {
tabItemSpec.backgroundColor = backgroundColor ? backgroundColor.android : this.getTabBarBackgroundArgbColor(); tabItemSpec.backgroundColor = backgroundColor ? backgroundColor.android : this.getTabBarBackgroundArgbColor();
// COLOR // COLOR
const color = titleLabel.style.color; let itemColor = this.selectedIndex === tabStripItem._index ? this._selectedItemColor : this._unSelectedItemColor;
if (color) { const color = itemColor || titleLabel.style.color;
tabItemSpec.color = color.android; tabItemSpec.color = color && color.android;
}
// FONT // FONT
const fontInternal = titleLabel.style.fontInternal; const fontInternal = titleLabel.style.fontInternal;
@ -620,7 +623,7 @@ export class BottomNavigation extends TabNavigationBase {
// ICON // ICON
const iconSource = tabStripItem.image && tabStripItem.image.src; const iconSource = tabStripItem.image && tabStripItem.image.src;
if (iconSource) { if (iconSource) {
const iconInfo = this.getIconInfo(tabStripItem); const iconInfo = this.getIconInfo(tabStripItem, itemColor);
if (iconInfo) { if (iconInfo) {
// TODO: Make this native call that accepts string so that we don't load Bitmap in JS. // TODO: Make this native call that accepts string so that we don't load Bitmap in JS.
@ -637,7 +640,7 @@ export class BottomNavigation extends TabNavigationBase {
return tabItemSpec; return tabItemSpec;
} }
private getOriginalIcon(tabStripItem: TabStripItem): android.graphics.Bitmap { private getOriginalIcon(tabStripItem: TabStripItem, color?: Color): android.graphics.Bitmap {
const iconSource = tabStripItem.image && tabStripItem.image.src; const iconSource = tabStripItem.image && tabStripItem.image.src;
if (!iconSource) { if (!iconSource) {
return null; return null;
@ -648,7 +651,9 @@ export class BottomNavigation extends TabNavigationBase {
const fontIconCode = iconSource.split("//")[1]; const fontIconCode = iconSource.split("//")[1];
const target = tabStripItem.image ? tabStripItem.image : tabStripItem; const target = tabStripItem.image ? tabStripItem.image : tabStripItem;
const font = target.style.fontInternal; const font = target.style.fontInternal;
const color = target.style.color; if (!color) {
color = target.style.color;
}
is = ImageSource.fromFontIconCodeSync(fontIconCode, font, color); is = ImageSource.fromFontIconCodeSync(fontIconCode, font, color);
} else { } else {
is = ImageSource.fromFileOrResourceSync(iconSource); is = ImageSource.fromFileOrResourceSync(iconSource);
@ -674,8 +679,8 @@ export class BottomNavigation extends TabNavigationBase {
return new IconInfo(); return new IconInfo();
} }
private getIconInfo(tabStripItem: TabStripItem): IconInfo { private getIconInfo(tabStripItem: TabStripItem, color?: Color): IconInfo {
let originalIcon = this.getOriginalIcon(tabStripItem); let originalIcon = this.getOriginalIcon(tabStripItem, color);
return this.getDrawableInfo(originalIcon); return this.getDrawableInfo(originalIcon);
} }
@ -710,6 +715,22 @@ export class BottomNavigation extends TabNavigationBase {
} }
} }
public getTabBarSelectedItemColor(): Color {
return this._selectedItemColor;
}
public setTabBarSelectedItemColor(value: Color) {
this._selectedItemColor = value;
}
public getTabBarUnSelectedItemColor(): Color {
return this._unSelectedItemColor;
}
public setTabBarUnSelectedItemColor(value: Color) {
this._unSelectedItemColor = value;
}
public setTabBarItemTitle(tabStripItem: TabStripItem, value: string): void { public setTabBarItemTitle(tabStripItem: TabStripItem, value: string): void {
// TODO: Should figure out a way to do it directly with the the nativeView // TODO: Should figure out a way to do it directly with the the nativeView
const tabStripItemIndex = this.tabStrip.items.indexOf(tabStripItem); const tabStripItemIndex = this.tabStrip.items.indexOf(tabStripItem);
@ -724,21 +745,51 @@ export class BottomNavigation extends TabNavigationBase {
this.updateAndroidItemAt(tabStripItemIndex, tabItemSpec); this.updateAndroidItemAt(tabStripItemIndex, tabItemSpec);
} }
public setTabBarItemColor(tabStripItem: TabStripItem, value: number | Color): void { public _setItemColor(tabStripItem: TabStripItem) {
if (typeof value === "number") { const itemColor = (tabStripItem._index === this.selectedIndex) ? this._selectedItemColor : this._unSelectedItemColor;
tabStripItem.nativeViewProtected.setTextColor(value); if (!itemColor) {
} else { return;
tabStripItem.nativeViewProtected.setTextColor(value.android);
} }
// set label color
tabStripItem.nativeViewProtected.setTextColor(itemColor.android);
// set icon color
this.setIconColor(tabStripItem, itemColor);
}
private setIconColor(tabStripItem: TabStripItem, color?: Color) {
const tabBarItem = this._bottomNavigationBar.getViewForItemAt(tabStripItem._index);
const drawableInfo = this.getIconInfo(tabStripItem, color);
const imgView = <android.widget.ImageView>tabBarItem.getChildAt(0);
imgView.setImageDrawable(drawableInfo.drawable);
if (color) {
imgView.setColorFilter(color.android);
}
}
public setTabBarItemColor(tabStripItem: TabStripItem, value: number | Color): void {
const itemColor = (tabStripItem._index === this.selectedIndex) ? this._selectedItemColor : this._unSelectedItemColor;
if (itemColor) {
// the itemColor is set through the selectedItemColor and unSelectedItemColor properties
// so it does not respect the css color
return;
}
const androidColor = value instanceof Color ? value.android : value;
tabStripItem.nativeViewProtected.setTextColor(androidColor);
} }
public setTabBarIconColor(tabStripItem: TabStripItem, value: number | Color): void { public setTabBarIconColor(tabStripItem: TabStripItem, value: number | Color): void {
const index = tabStripItem._index; const itemColor = (tabStripItem._index === this.selectedIndex) ? this._selectedItemColor : this._unSelectedItemColor;
const tabBarItem = this._bottomNavigationBar.getViewForItemAt(index); if (itemColor) {
const imgView = <android.widget.ImageView>tabBarItem.getChildAt(0); // the itemColor is set through the selectedItemColor and unSelectedItemColor properties
const drawableInfo = this.getIconInfo(tabStripItem); // so it does not respect the css color
return;
}
imgView.setImageDrawable(drawableInfo.drawable); this.setIconColor(tabStripItem);
} }
public setTabBarItemFontInternal(tabStripItem: TabStripItem, value: Font): void { public setTabBarItemFontInternal(tabStripItem: TabStripItem, value: Font): void {

View File

@ -257,6 +257,8 @@ export class BottomNavigation extends TabNavigationBase {
private _delegate: UITabBarControllerDelegateImpl; private _delegate: UITabBarControllerDelegateImpl;
private _moreNavigationControllerDelegate: UINavigationControllerDelegateImpl; private _moreNavigationControllerDelegate: UINavigationControllerDelegateImpl;
private _iconsCache = {}; private _iconsCache = {};
private _selectedItemColor: Color;
private _unSelectedItemColor: Color;
constructor() { constructor() {
super(); super();
@ -372,18 +374,20 @@ export class BottomNavigation extends TabNavigationBase {
} }
public setTabBarItemColor(tabStripItem: TabStripItem, value: UIColor | Color): void { public setTabBarItemColor(tabStripItem: TabStripItem, value: UIColor | Color): void {
setViewTextAttributes(tabStripItem.nativeView, tabStripItem.label, this.viewController.tabBar); this.setViewAttributes(tabStripItem.nativeView, tabStripItem.label);
} }
public setTabBarIconColor(tabStripItem: TabStripItem, value: UIColor | Color): void { public setTabBarIconColor(tabStripItem: TabStripItem, value: UIColor | Color): void {
if (!this._unSelectedItemColor && !this._selectedItemColor) {
const image = this.getIcon(tabStripItem); const image = this.getIcon(tabStripItem);
tabStripItem.nativeView.image = image; tabStripItem.nativeView.image = image;
tabStripItem.nativeView.selectedImage = image; tabStripItem.nativeView.selectedImage = image;
} }
}
public setTabBarItemFontInternal(tabStripItem: TabStripItem, value: Font): void { public setTabBarItemFontInternal(tabStripItem: TabStripItem, value: Font): void {
setViewTextAttributes(tabStripItem.nativeView, tabStripItem.label, this.viewController.tabBar); this.setViewAttributes(tabStripItem.nativeView, tabStripItem.label);
} }
public setTabBarItemTextTransform(tabStripItem: TabStripItem, value: TextTransform): void { public setTabBarItemTextTransform(tabStripItem: TabStripItem, value: TextTransform): void {
@ -400,6 +404,22 @@ export class BottomNavigation extends TabNavigationBase {
this._ios.tabBar.tintColor = nativeColor; this._ios.tabBar.tintColor = nativeColor;
} }
public getTabBarSelectedItemColor(): Color {
return this._selectedItemColor;
}
public setTabBarSelectedItemColor(value: Color) {
this._selectedItemColor = value;
}
public getTabBarUnSelectedItemColor(): Color {
return this._unSelectedItemColor;
}
public setTabBarUnSelectedItemColor(value: Color) {
this._unSelectedItemColor = value;
}
public onMeasure(widthMeasureSpec: number, heightMeasureSpec: number): void { public onMeasure(widthMeasureSpec: number, heightMeasureSpec: number): void {
const width = layout.getMeasureSpecSize(widthMeasureSpec); const width = layout.getMeasureSpecSize(widthMeasureSpec);
const widthMode = layout.getMeasureSpecMode(widthMeasureSpec); const widthMode = layout.getMeasureSpecMode(widthMeasureSpec);
@ -521,7 +541,7 @@ export class BottomNavigation extends TabNavigationBase {
const tabBarItem = this.createTabBarItem(tabStripItem, i); const tabBarItem = this.createTabBarItem(tabStripItem, i);
updateTitleAndIconPositions(tabStripItem, tabBarItem, controller); updateTitleAndIconPositions(tabStripItem, tabBarItem, controller);
setViewTextAttributes(tabBarItem, tabStripItem.label, this.viewController.tabBar); this.setViewAttributes(tabBarItem, tabStripItem.label);
controller.tabBarItem = tabBarItem; controller.tabBarItem = tabBarItem;
tabStripItem._index = i; tabStripItem._index = i;
@ -531,6 +551,8 @@ export class BottomNavigation extends TabNavigationBase {
controllers.addObject(controller); controllers.addObject(controller);
}); });
this.setItemImages();
this._ios.viewControllers = controllers; this._ios.viewControllers = controllers;
this._ios.customizableViewControllers = null; this._ios.customizableViewControllers = null;
@ -538,6 +560,23 @@ export class BottomNavigation extends TabNavigationBase {
this._ios.moreNavigationController.delegate = this._moreNavigationControllerDelegate; this._ios.moreNavigationController.delegate = this._moreNavigationControllerDelegate;
} }
private setItemImages() {
if (this._selectedItemColor || this._unSelectedItemColor) {
if (this.tabStrip && this.tabStrip.items) {
this.tabStrip.items.forEach(item => {
if (this._unSelectedItemColor && item.nativeView) {
item.nativeView.image = this.getIcon(item, this._unSelectedItemColor);
item.nativeView.tintColor = this._unSelectedItemColor;
}
if (this._selectedItemColor && item.nativeView) {
item.nativeView.selectedImage = this.getIcon(item, this._selectedItemColor);
item.nativeView.tintColor = this._selectedItemColor;
}
});
}
}
}
private createTabBarItem(item: TabStripItem, index: number): UITabBarItem { private createTabBarItem(item: TabStripItem, index: number): UITabBarItem {
let image: UIImage; let image: UIImage;
let title: string; let title: string;
@ -569,7 +608,7 @@ export class BottomNavigation extends TabNavigationBase {
} }
} }
private getIcon(tabStripItem: TabStripItem): UIImage { private getIcon(tabStripItem: TabStripItem, color?: Color): UIImage {
// Image and Label children of TabStripItem // Image and Label children of TabStripItem
// take priority over its `iconSource` and `title` properties // take priority over its `iconSource` and `title` properties
const iconSource = tabStripItem.image && tabStripItem.image.src; const iconSource = tabStripItem.image && tabStripItem.image.src;
@ -579,7 +618,9 @@ export class BottomNavigation extends TabNavigationBase {
const target = tabStripItem.image; const target = tabStripItem.image;
const font = target.style.fontInternal; const font = target.style.fontInternal;
const color = target.style.color; if (!color) {
color = target.style.color;
}
const iconTag = [iconSource, font.fontStyle, font.fontWeight, font.fontSize, font.fontFamily, color].join(";"); const iconTag = [iconSource, font.fontStyle, font.fontWeight, font.fontSize, font.fontFamily, color].join(";");
let isFontIcon = false; let isFontIcon = false;
@ -688,9 +729,8 @@ export class BottomNavigation extends TabNavigationBase {
this.setViewControllers(this.items); this.setViewControllers(this.items);
selectedIndexProperty.coerce(this); selectedIndexProperty.coerce(this);
} }
}
function setViewTextAttributes(item: UITabBarItem, view: View, tabBar: UITabBar): any { private setViewAttributes(item: UITabBarItem, view: View): any {
if (!view) { if (!view) {
return null; return null;
} }
@ -701,10 +741,17 @@ function setViewTextAttributes(item: UITabBarItem, view: View, tabBar: UITabBar)
const tabItemTextColor = view.style.color; const tabItemTextColor = view.style.color;
const textColor = tabItemTextColor instanceof Color ? tabItemTextColor.ios : null; const textColor = tabItemTextColor instanceof Color ? tabItemTextColor.ios : null;
let attributes: any = { [NSFontAttributeName]: font }; let attributes: any = { [NSFontAttributeName]: font };
// if selectedItemColor or unSelectedItemColor is set we don't respect the color from the style
if (!this._selectedItemColor && !this._unSelectedItemColor) {
if (textColor) { if (textColor) {
attributes[UITextAttributeTextColor] = textColor; attributes[UITextAttributeTextColor] = textColor;
attributes[NSForegroundColorAttributeName] = textColor; attributes[NSForegroundColorAttributeName] = textColor;
} }
} else {
this.viewController.tabBar.unselectedItemTintColor = this._unSelectedItemColor && this._unSelectedItemColor.ios;
this.viewController.tabBar.selectedImageTintColor = this._selectedItemColor && this._selectedItemColor.ios;
}
item.setTitleTextAttributesForState(attributes, UIControlState.Selected); item.setTitleTextAttributesForState(attributes, UIControlState.Selected);
item.setTitleTextAttributesForState(attributes, UIControlState.Normal); item.setTitleTextAttributesForState(attributes, UIControlState.Normal);
@ -713,8 +760,9 @@ function setViewTextAttributes(item: UITabBarItem, view: View, tabBar: UITabBar)
// https://books.google.bg/books?id=99_BDwAAQBAJ&q=tabBar.unselectedItemTintColor // https://books.google.bg/books?id=99_BDwAAQBAJ&q=tabBar.unselectedItemTintColor
// to fix the above issue we are applying the selected fix only for the case, when there is no background set // to fix the above issue we are applying the selected fix only for the case, when there is no background set
// in that case we have the following known issue: // in that case we have the following known issue:
// we will set the color to all unselected items, so you won't be able to set different colors for the different not selected items // // we will set the color to all unselected items, so you won't be able to set different colors for the different not selected items
if (!tabBar.barTintColor && attributes[UITextAttributeTextColor] && (majorVersion > 9)) { if (!this.viewController.tabBar.barTintColor && attributes[UITextAttributeTextColor] && (majorVersion > 9)) {
tabBar.unselectedItemTintColor = attributes[UITextAttributeTextColor]; this.viewController.tabBar.unselectedItemTintColor = attributes[UITextAttributeTextColor];
}
} }
} }

View File

@ -4,7 +4,7 @@
*/ /** */ */ /** */
import { import {
View, ViewBase, Property, CoercibleProperty, isIOS, AddArrayFromBuilder, AddChildFromBuilder, EventData View, ViewBase, Property, CoercibleProperty, isIOS, AddArrayFromBuilder, AddChildFromBuilder, EventData, Color
} from "../../core/view"; } from "../../core/view";
import { TabStrip } from "../tab-strip"; import { TabStrip } from "../tab-strip";
import { TabStripItem } from "../tab-strip-item"; import { TabStripItem } from "../tab-strip-item";
@ -150,6 +150,30 @@ export class TabNavigationBase extends View {
*/ */
setTabBarHighlightColor(value: any) setTabBarHighlightColor(value: any)
/**
* @private
* Method is intended to be overridden by inheritors and used as "protected"
*/
getTabBarSelectedItemColor(): Color
/**
* @private
* Method is intended to be overridden by inheritors and used as "protected"
*/
setTabBarSelectedItemColor(value: Color)
/**
* @private
* Method is intended to be overridden by inheritors and used as "protected"
*/
getTabBarUnSelectedItemColor(): Color
/**
* @private
* Method is intended to be overridden by inheritors and used as "protected"
*/
setTabBarUnSelectedItemColor(value: Color)
/** /**
* @private * @private
* Method is intended to be overridden by inheritors and used as "protected" * Method is intended to be overridden by inheritors and used as "protected"

View File

@ -1,7 +1,7 @@
// Types // Types
import { TabNavigationBase as TabNavigationBaseDefinition, SelectedIndexChangedEventData } from "."; import { TabNavigationBase as TabNavigationBaseDefinition, SelectedIndexChangedEventData } from ".";
import { TabStripItem } from "../tab-strip-item"; import { TabStripItem } from "../tab-strip-item";
import { ViewBase, AddArrayFromBuilder, AddChildFromBuilder, EventData } from "../../core/view"; import { ViewBase, AddArrayFromBuilder, AddChildFromBuilder, EventData, Color } from "../../core/view";
// Requires // Requires
import { View, Property, CoercibleProperty, isIOS } from "../../core/view"; import { View, Property, CoercibleProperty, isIOS } from "../../core/view";
@ -150,6 +150,24 @@ export class TabNavigationBase extends View implements TabNavigationBaseDefiniti
// overridden by inheritors // overridden by inheritors
} }
public getTabBarSelectedItemColor(): Color {
// overridden by inheritors
return null;
}
public setTabBarSelectedItemColor(value: Color) {
// overridden by inheritors
}
public getTabBarUnSelectedItemColor(): Color {
// overridden by inheritors
return null;
}
public setTabBarUnSelectedItemColor(value: Color) {
// overridden by inheritors
}
public getTabBarColor(): any { public getTabBarColor(): any {
// overridden by inheritors // overridden by inheritors
return null; return null;

View File

@ -32,6 +32,16 @@ export class TabStrip extends View {
*/ */
highlightColor: Color; highlightColor: Color;
/**
* Gets or sets the color of the selected item in the tab strip.
*/
selectedItemColor: Color;
/**
* Gets or sets the color of the non-selected items in the tab strip.
*/
unSelectedItemColor: Color;
/** /**
* @private * @private
*/ */
@ -73,3 +83,5 @@ export interface TabStripItemEventData extends EventData {
export const iosIconRenderingModeProperty: Property<TabStrip, "automatic" | "alwaysOriginal" | "alwaysTemplate">; export const iosIconRenderingModeProperty: Property<TabStrip, "automatic" | "alwaysOriginal" | "alwaysTemplate">;
export const isIconSizeFixedProperty: Property<TabStrip, boolean>; export const isIconSizeFixedProperty: Property<TabStrip, boolean>;
export const selectedItemColorProperty: Property<TabStrip, Color>;
export const unSelectedItemColorProperty: Property<TabStrip, Color>;

View File

@ -17,6 +17,8 @@ export const traceCategory = "TabView";
// Place this on top because the webpack ts-loader doesn't work when export // Place this on top because the webpack ts-loader doesn't work when export
// is after reference // is after reference
export const highlightColorProperty = new Property<TabStrip, Color>({ name: "highlightColor", equalityComparer: Color.equals, valueConverter: (v) => new Color(v) }); export const highlightColorProperty = new Property<TabStrip, Color>({ name: "highlightColor", equalityComparer: Color.equals, valueConverter: (v) => new Color(v) });
export const selectedItemColorProperty = new Property<TabStrip, Color>({ name: "selectedItemColor", equalityComparer: Color.equals, valueConverter: (v) => new Color(v) });
export const unSelectedItemColorProperty = new Property<TabStrip, Color>({ name: "unSelectedItemColor", equalityComparer: Color.equals, valueConverter: (v) => new Color(v) });
@CSSType("TabStrip") @CSSType("TabStrip")
export class TabStrip extends View implements TabStripDefinition, AddChildFromBuilder, AddArrayFromBuilder { export class TabStrip extends View implements TabStripDefinition, AddChildFromBuilder, AddArrayFromBuilder {
@ -25,6 +27,8 @@ export class TabStrip extends View implements TabStripDefinition, AddChildFromBu
public isIconSizeFixed: boolean; public isIconSizeFixed: boolean;
public iosIconRenderingMode: "automatic" | "alwaysOriginal" | "alwaysTemplate"; public iosIconRenderingMode: "automatic" | "alwaysOriginal" | "alwaysTemplate";
public highlightColor: Color; public highlightColor: Color;
public selectedItemColor: Color;
public unSelectedItemColor: Color;
public _hasImage: boolean; public _hasImage: boolean;
public _hasTitle: boolean; public _hasTitle: boolean;
@ -127,6 +131,28 @@ export class TabStrip extends View implements TabStripDefinition, AddChildFromBu
return parent && parent.setTabBarHighlightColor(value); return parent && parent.setTabBarHighlightColor(value);
} }
[selectedItemColorProperty.getDefault](): Color {
const parent = <TabNavigationBase>this.parent;
return parent && parent.getTabBarSelectedItemColor();
}
[selectedItemColorProperty.setNative](value: Color) {
const parent = <TabNavigationBase>this.parent;
return parent && parent.setTabBarSelectedItemColor(value);
}
[unSelectedItemColorProperty.getDefault](): Color {
const parent = <TabNavigationBase>this.parent;
return parent && parent.getTabBarUnSelectedItemColor();
}
[unSelectedItemColorProperty.setNative](value: Color) {
const parent = <TabNavigationBase>this.parent;
return parent && parent.setTabBarUnSelectedItemColor(value);
}
} }
export interface TabStrip { export interface TabStrip {
@ -150,3 +176,5 @@ export const isIconSizeFixedProperty = new Property<TabStrip, boolean>({
isIconSizeFixedProperty.register(TabStrip); isIconSizeFixedProperty.register(TabStrip);
highlightColorProperty.register(TabStrip); highlightColorProperty.register(TabStrip);
selectedItemColorProperty.register(TabStrip);
unSelectedItemColorProperty.register(TabStrip);

View File

@ -300,10 +300,12 @@ function initializeNativeClasses() {
if (position >= 0 && tabStripItems && tabStripItems[position]) { if (position >= 0 && tabStripItems && tabStripItems[position]) {
tabStripItems[position]._emit(TabStripItem.selectEvent); tabStripItems[position]._emit(TabStripItem.selectEvent);
owner._setItemColor(tabStripItems[position]);
} }
if (prevPosition >= 0 && tabStripItems && tabStripItems[prevPosition]) { if (prevPosition >= 0 && tabStripItems && tabStripItems[prevPosition]) {
tabStripItems[prevPosition]._emit(TabStripItem.unselectEvent); tabStripItems[prevPosition]._emit(TabStripItem.unselectEvent);
owner._setItemColor(tabStripItems[prevPosition]);
} }
} }
@ -374,6 +376,8 @@ export class Tabs extends TabsBase {
private _androidViewId: number = -1; private _androidViewId: number = -1;
public _originalBackground: any; public _originalBackground: any;
private _textTransform: TextTransform = "uppercase"; private _textTransform: TextTransform = "uppercase";
private _selectedItemColor: Color;
private _unSelectedItemColor: Color;
constructor() { constructor() {
super(); super();
@ -635,6 +639,7 @@ export class Tabs extends TabsBase {
items.forEach((item, i, arr) => { items.forEach((item, i, arr) => {
const tv = tabsBar.getTextViewForItemAt(i); const tv = tabsBar.getTextViewForItemAt(i);
item.setNativeView(tv); item.setNativeView(tv);
this._setItemColor(item);
}); });
} }
@ -667,10 +672,9 @@ export class Tabs extends TabsBase {
tabItemSpec.backgroundColor = backgroundColor ? backgroundColor.android : this.getTabBarBackgroundArgbColor(); tabItemSpec.backgroundColor = backgroundColor ? backgroundColor.android : this.getTabBarBackgroundArgbColor();
// COLOR // COLOR
const color = nestedLabel.style.color; let itemColor = this.selectedIndex === tabStripItem._index ? this._selectedItemColor : this._unSelectedItemColor;
if (color) { const color = itemColor || nestedLabel.style.color;
tabItemSpec.color = color.android; tabItemSpec.color = color && color.android;
}
// FONT // FONT
const fontInternal = nestedLabel.style.fontInternal; const fontInternal = nestedLabel.style.fontInternal;
@ -682,7 +686,7 @@ export class Tabs extends TabsBase {
// ICON // ICON
const iconSource = tabStripItem.image && tabStripItem.image.src; const iconSource = tabStripItem.image && tabStripItem.image.src;
if (iconSource) { if (iconSource) {
const icon = this.getIcon(tabStripItem); const icon = this.getIcon(tabStripItem, itemColor);
if (icon) { if (icon) {
// TODO: Make this native call that accepts string so that we don't load Bitmap in JS. // TODO: Make this native call that accepts string so that we don't load Bitmap in JS.
@ -698,7 +702,7 @@ export class Tabs extends TabsBase {
return tabItemSpec; return tabItemSpec;
} }
private getIcon(tabStripItem: TabStripItem): android.graphics.drawable.BitmapDrawable { private getIcon(tabStripItem: TabStripItem, color?: Color): android.graphics.drawable.BitmapDrawable {
const iconSource = tabStripItem.image && tabStripItem.image.src; const iconSource = tabStripItem.image && tabStripItem.image.src;
if (!iconSource) { if (!iconSource) {
return null; return null;
@ -709,7 +713,9 @@ export class Tabs extends TabsBase {
const fontIconCode = iconSource.split("//")[1]; const fontIconCode = iconSource.split("//")[1];
const target = tabStripItem.image ? tabStripItem.image : tabStripItem; const target = tabStripItem.image ? tabStripItem.image : tabStripItem;
const font = target.style.fontInternal; const font = target.style.fontInternal;
const color = target.style.color; if (!color) {
color = target.style.color;
}
is = ImageSource.fromFontIconCodeSync(fontIconCode, font, color); is = ImageSource.fromFontIconCodeSync(fontIconCode, font, color);
} else { } else {
is = ImageSource.fromFileOrResourceSync(iconSource); is = ImageSource.fromFileOrResourceSync(iconSource);
@ -801,6 +807,22 @@ export class Tabs extends TabsBase {
this._tabsBar.setSelectedIndicatorColors([color]); this._tabsBar.setSelectedIndicatorColors([color]);
} }
public getTabBarSelectedItemColor(): Color {
return this._selectedItemColor;
}
public setTabBarSelectedItemColor(value: Color) {
this._selectedItemColor = value;
}
public getTabBarUnSelectedItemColor(): Color {
return this._unSelectedItemColor;
}
public setTabBarUnSelectedItemColor(value: Color) {
this._unSelectedItemColor = value;
}
public setTabBarItemTitle(tabStripItem: TabStripItem, value: string): void { public setTabBarItemTitle(tabStripItem: TabStripItem, value: string): void {
// TODO: Should figure out a way to do it directly with the the nativeView // TODO: Should figure out a way to do it directly with the the nativeView
const tabStripItemIndex = this.tabStrip.items.indexOf(tabStripItem); const tabStripItemIndex = this.tabStrip.items.indexOf(tabStripItem);
@ -815,21 +837,51 @@ export class Tabs extends TabsBase {
this.updateAndroidItemAt(tabStripItemIndex, tabItemSpec); this.updateAndroidItemAt(tabStripItemIndex, tabItemSpec);
} }
public setTabBarItemColor(tabStripItem: TabStripItem, value: number | Color): void { public _setItemColor(tabStripItem: TabStripItem) {
if (typeof value === "number") { const itemColor = (tabStripItem._index === this.selectedIndex) ? this._selectedItemColor : this._unSelectedItemColor;
tabStripItem.nativeViewProtected.setTextColor(value); if (!itemColor) {
} else { return;
tabStripItem.nativeViewProtected.setTextColor(value.android);
} }
// set label color
tabStripItem.nativeViewProtected.setTextColor(itemColor.android);
// set icon color
this.setIconColor(tabStripItem, itemColor);
}
private setIconColor(tabStripItem: TabStripItem, color?: Color) {
const tabBarItem = this._tabsBar.getViewForItemAt(tabStripItem._index);
const drawable = this.getIcon(tabStripItem, color);
const imgView = <android.widget.ImageView>tabBarItem.getChildAt(0);
imgView.setImageDrawable(drawable);
if (color) {
imgView.setColorFilter(color.android);
}
}
public setTabBarItemColor(tabStripItem: TabStripItem, value: number | Color): void {
const itemColor = (tabStripItem._index === this.selectedIndex) ? this._selectedItemColor : this._unSelectedItemColor;
if (itemColor) {
// the itemColor is set through the selectedItemColor and unSelectedItemColor properties
// so it does not respect the css color
return;
}
const androidColor = value instanceof Color ? value.android : value;
tabStripItem.nativeViewProtected.setTextColor(androidColor);
} }
public setTabBarIconColor(tabStripItem: TabStripItem, value: number | Color): void { public setTabBarIconColor(tabStripItem: TabStripItem, value: number | Color): void {
const index = tabStripItem._index; const itemColor = (tabStripItem._index === this.selectedIndex) ? this._selectedItemColor : this._unSelectedItemColor;
const tabBarItem = this._tabsBar.getViewForItemAt(index); if (itemColor) {
const imgView = <android.widget.ImageView>tabBarItem.getChildAt(0); // the itemColor is set through the selectedItemColor and unSelectedItemColor properties
const drawable = this.getIcon(tabStripItem); // so it does not respect the css color
return;
}
imgView.setImageDrawable(drawable); this.setIconColor(tabStripItem);
} }
public setTabBarItemFontInternal(tabStripItem: TabStripItem, value: Font): void { public setTabBarItemFontInternal(tabStripItem: TabStripItem, value: Font): void {

View File

@ -461,6 +461,8 @@ export class Tabs extends TabsBase {
private _iconsCache = {}; private _iconsCache = {};
private _backgroundIndicatorColor: UIColor; private _backgroundIndicatorColor: UIColor;
public _defaultItemBackgroundColor: UIColor; public _defaultItemBackgroundColor: UIColor;
private _selectedItemColor: Color;
private _unSelectedItemColor: Color;
constructor() { constructor() {
super(); super();
@ -548,10 +550,12 @@ export class Tabs extends TabsBase {
if (tabStripItems) { if (tabStripItems) {
if (tabStripItems[newIndex]) { if (tabStripItems[newIndex]) {
tabStripItems[newIndex]._emit(TabStripItem.selectEvent); tabStripItems[newIndex]._emit(TabStripItem.selectEvent);
this.setIconColor(tabStripItems[newIndex]);
} }
if (tabStripItems[oldIndex]) { if (tabStripItems[oldIndex]) {
tabStripItems[oldIndex]._emit(TabStripItem.unselectEvent); tabStripItems[oldIndex]._emit(TabStripItem.unselectEvent);
this.setIconColor(tabStripItems[oldIndex]);
} }
} }
@ -702,7 +706,7 @@ export class Tabs extends TabsBase {
const tabBarItem = this.createTabBarItem(tabStripItem, i); const tabBarItem = this.createTabBarItem(tabStripItem, i);
updateTitleAndIconPositions(tabStripItem, tabBarItem, controller); updateTitleAndIconPositions(tabStripItem, tabBarItem, controller);
setViewTextAttributes(this._ios.tabBar, tabStripItem.label, i === this.selectedIndex); this.setViewTextAttributes(tabStripItem.label, i === this.selectedIndex);
controller.tabBarItem = tabBarItem; controller.tabBarItem = tabBarItem;
tabStripItem._index = i; tabStripItem._index = i;
@ -714,6 +718,8 @@ export class Tabs extends TabsBase {
viewControllers.push(controller); viewControllers.push(controller);
}); });
this.setItemImages();
this.viewControllers = viewControllers; this.viewControllers = viewControllers;
this.tabBarItems = tabBarItems; this.tabBarItems = tabBarItems;
@ -728,6 +734,23 @@ export class Tabs extends TabsBase {
} }
} }
private setItemImages() {
if (this._selectedItemColor || this._unSelectedItemColor) {
if (this.tabStrip && this.tabStrip.items) {
this.tabStrip.items.forEach(item => {
if (this._unSelectedItemColor && item.nativeView) {
item.nativeView.image = this.getIcon(item, this._unSelectedItemColor);
}
if (this._selectedItemColor && item.nativeView) {
if (this.selectedIndex === item._index) {
item.nativeView.image = this.getIcon(item, this._selectedItemColor);
}
}
});
}
}
}
private createTabBarItem(item: TabStripItem, index: number): UITabBarItem { private createTabBarItem(item: TabStripItem, index: number): UITabBarItem {
let image: UIImage; let image: UIImage;
let title: string; let title: string;
@ -764,11 +787,20 @@ export class Tabs extends TabsBase {
} }
private getIconRenderingMode(): UIImageRenderingMode { private getIconRenderingMode(): UIImageRenderingMode {
// MDCTabBar doesn't work with rendering mode AlwaysTemplate switch (this.tabStrip && this.tabStrip.iosIconRenderingMode) {
case "alwaysOriginal":
return UIImageRenderingMode.AlwaysOriginal; return UIImageRenderingMode.AlwaysOriginal;
case "alwaysTemplate":
return UIImageRenderingMode.AlwaysTemplate;
case "automatic":
default:
const hasItemColor = this._selectedItemColor || this._unSelectedItemColor;
return hasItemColor ? UIImageRenderingMode.AlwaysTemplate : UIImageRenderingMode.AlwaysOriginal;
}
} }
private getIcon(tabStripItem: TabStripItem): UIImage { private getIcon(tabStripItem: TabStripItem, color?: Color): UIImage {
// Image and Label children of TabStripItem // Image and Label children of TabStripItem
// take priority over its `iconSource` and `title` properties // take priority over its `iconSource` and `title` properties
const iconSource = tabStripItem.image && tabStripItem.image.src; const iconSource = tabStripItem.image && tabStripItem.image.src;
@ -778,7 +810,9 @@ export class Tabs extends TabsBase {
const target = tabStripItem.image; const target = tabStripItem.image;
const font = target.style.fontInternal; const font = target.style.fontInternal;
const color = target.style.color; if (!color) {
color = target.style.color;
}
const iconTag = [iconSource, font.fontStyle, font.fontWeight, font.fontSize, font.fontFamily, color].join(";"); const iconTag = [iconSource, font.fontStyle, font.fontWeight, font.fontSize, font.fontFamily, color].join(";");
let isFontIcon = false; let isFontIcon = false;
@ -800,16 +834,13 @@ export class Tabs extends TabsBase {
image = this.getFixedSizeIcon(image); image = this.getFixedSizeIcon(image);
} }
let renderingMode: UIImageRenderingMode = UIImageRenderingMode.AlwaysOriginal; let renderingMode: UIImageRenderingMode = UIImageRenderingMode.Automatic;
if (!isFontIcon) { if (!isFontIcon) {
renderingMode = this.getIconRenderingMode(); renderingMode = this.getIconRenderingMode();
} }
const originalRenderedImage = image.imageWithRenderingMode(renderingMode); const originalRenderedImage = image.imageWithRenderingMode(renderingMode);
this._iconsCache[iconTag] = originalRenderedImage; this._iconsCache[iconTag] = originalRenderedImage;
image = originalRenderedImage; image = originalRenderedImage;
} else {
// TODO
// traceMissingIcon(iconSource);
} }
} }
@ -862,6 +893,11 @@ export class Tabs extends TabsBase {
} }
private isSelectedAndHightlightedItem(tabStripItem: TabStripItem): boolean { private isSelectedAndHightlightedItem(tabStripItem: TabStripItem): boolean {
// to find out whether the current tab strip item is active (has style with :active selector applied)
// we need to check whether its _visualState is equal to "highlighted" as when changing tabs
// we first go through setTabBarItemBackgroundColor thice, once before setting the "highlighted" state
// and once after that, but if the "highlighted" state is not set we cannot get the backgroundColor
// set using :active selector
return (tabStripItem._index === this.selectedIndex && tabStripItem["_visualState"] === "highlighted"); return (tabStripItem._index === this.selectedIndex && tabStripItem["_visualState"] === "highlighted");
} }
@ -873,6 +909,14 @@ export class Tabs extends TabsBase {
let newColor = value instanceof Color ? value.ios : value; let newColor = value instanceof Color ? value.ios : value;
const itemSelectedAndHighlighted = this.isSelectedAndHightlightedItem(tabStripItem); const itemSelectedAndHighlighted = this.isSelectedAndHightlightedItem(tabStripItem);
// As we cannot implement selected item background color in Tabs we are using the Indicator for this
// To be able to detect that there are two different background colors (one for selected and one for not selected item)
// we are checking whether the current item is not selected and higlighted and we store the value of its
// background color to _defaultItemBackgroundColor and later if we need to process a selected and highlighted item
// we are comparing it's backgroun color to the default one and if there's a difference
// we are changing the selectionIndicatorTemplate from underline to the whole item
// in that mode we are not able to show the indicator as it is used for the background of the selected item
if (!this._defaultItemBackgroundColor && !itemSelectedAndHighlighted) { if (!this._defaultItemBackgroundColor && !itemSelectedAndHighlighted) {
this._defaultItemBackgroundColor = newColor; this._defaultItemBackgroundColor = newColor;
} }
@ -890,18 +934,40 @@ export class Tabs extends TabsBase {
} }
public setTabBarItemColor(tabStripItem: TabStripItem, value: UIColor | Color): void { public setTabBarItemColor(tabStripItem: TabStripItem, value: UIColor | Color): void {
setViewTextAttributes(this._ios.tabBar, tabStripItem.label); this.setViewTextAttributes(tabStripItem.label);
}
private setItemColors(): void {
if (this._selectedItemColor) {
this.viewController.tabBar.selectedItemTintColor = this._selectedItemColor.ios;
}
if (this._unSelectedItemColor) {
this.viewController.tabBar.unselectedItemTintColor = this._unSelectedItemColor.ios;
}
}
private setIconColor(tabStripItem: TabStripItem, forceReload: boolean = false): void {
// if there is no change in the css color and there is no item color set
// we don't need to reload the icon
if (!forceReload && !this._selectedItemColor && !this._unSelectedItemColor) {
return;
}
let image: UIImage;
// if selectedItemColor or unSelectedItemColor is set we don't respect the color from the style
const tabStripColor = (this.selectedIndex === tabStripItem._index) ? this._selectedItemColor : this._unSelectedItemColor;
image = this.getIcon(tabStripItem, tabStripColor);
tabStripItem.nativeView.image = image;
} }
public setTabBarIconColor(tabStripItem: TabStripItem, value: UIColor | Color): void { public setTabBarIconColor(tabStripItem: TabStripItem, value: UIColor | Color): void {
const image = this.getIcon(tabStripItem); this.setIconColor(tabStripItem, true);
tabStripItem.nativeView.image = image;
tabStripItem.nativeView.selectedImage = image;
} }
public setTabBarItemFontInternal(tabStripItem: TabStripItem, value: Font): void { public setTabBarItemFontInternal(tabStripItem: TabStripItem, value: Font): void {
setViewTextAttributes(this._ios.tabBar, tabStripItem.label); this.setViewTextAttributes(tabStripItem.label);
} }
public getTabBarFontInternal(): UIFont { public getTabBarFontInternal(): UIFont {
@ -958,6 +1024,22 @@ export class Tabs extends TabsBase {
this._ios.tabBar.tintColor = nativeColor; this._ios.tabBar.tintColor = nativeColor;
} }
public getTabBarSelectedItemColor(): Color {
return this._selectedItemColor;
}
public setTabBarSelectedItemColor(value: Color) {
this._selectedItemColor = value;
}
public getTabBarUnSelectedItemColor(): Color {
return this._unSelectedItemColor;
}
public setTabBarUnSelectedItemColor(value: Color) {
this._unSelectedItemColor = value;
}
private visitFrames(view: ViewBase, operation: (frame: Frame) => {}) { private visitFrames(view: ViewBase, operation: (frame: Frame) => {}) {
if (view instanceof Frame) { if (view instanceof Frame) {
operation(view); operation(view);
@ -1082,9 +1164,8 @@ export class Tabs extends TabsBase {
this.viewController.tabBar.alignment = alignment; this.viewController.tabBar.alignment = alignment;
} }
}
function setViewTextAttributes(tabBar: MDCTabBar, view: View, setSelected: boolean = false): any { private setViewTextAttributes(view: View, setSelected: boolean = false): any {
if (!view) { if (!view) {
return null; return null;
} }
@ -1093,17 +1174,27 @@ function setViewTextAttributes(tabBar: MDCTabBar, view: View, setSelected: boole
const tabItemFontSize = view.style.fontSize || defaultTabItemFontSize; const tabItemFontSize = view.style.fontSize || defaultTabItemFontSize;
const font: UIFont = view.style.fontInternal.getUIFont(UIFont.systemFontOfSize(tabItemFontSize)); const font: UIFont = view.style.fontInternal.getUIFont(UIFont.systemFontOfSize(tabItemFontSize));
tabBar.unselectedItemTitleFont = font; this.viewController.tabBar.unselectedItemTitleFont = font;
tabBar.selectedItemTitleFont = font; this.viewController.tabBar.selectedItemTitleFont = font;
const tabItemTextColor = view.style.color; const tabItemTextColor = view.style.color;
const textColor = tabItemTextColor instanceof Color ? tabItemTextColor.ios : null; const textColor = tabItemTextColor instanceof Color ? tabItemTextColor.ios : null;
if (textColor) { if (textColor) {
tabBar.setTitleColorForState(textColor, MDCTabBarItemState.Normal); this.viewController.tabBar.setTitleColorForState(textColor, MDCTabBarItemState.Normal);
this.viewController.tabBar.setImageTintColorForState(textColor, MDCTabBarItemState.Normal);
if (setSelected) { if (setSelected) {
tabBar.setTitleColorForState(textColor, MDCTabBarItemState.Selected); this.viewController.tabBar.setTitleColorForState(textColor, MDCTabBarItemState.Selected);
this.viewController.tabBar.setImageTintColorForState(textColor, MDCTabBarItemState.Selected);
} }
} }
tabBar.inkColor = UIColor.clearColor; if (this._selectedItemColor) {
this.viewController.tabBar.selectedItemTintColor = this._selectedItemColor.ios;
}
if (this._unSelectedItemColor) {
this.viewController.tabBar.unselectedItemTintColor = this._unSelectedItemColor.ios;
}
}
} }

View File

@ -73,7 +73,7 @@ dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs') implementation fileTree(include: ['*.jar'], dir: 'libs')
if(project.hasProperty("useAndroidX")) { if(project.hasProperty("useAndroidX")) {
println 'Using androix' println 'Using android X'
def androidxVersion = computeAndroidXVersion() def androidxVersion = computeAndroidXVersion()
implementation 'androidx.viewpager:viewpager:' + androidxVersion implementation 'androidx.viewpager:viewpager:' + androidxVersion
implementation 'androidx.fragment:fragment:' + androidxVersion implementation 'androidx.fragment:fragment:' + androidxVersion