From 4711d3618f28aa01a68bc6a2b8978571b0c708d7 Mon Sep 17 00:00:00 2001 From: Vasko Date: Thu, 12 Mar 2020 17:19:34 +0200 Subject: [PATCH] chore: change method return type --- api-reports/NativeScript.api.md | 12 ++++++++++++ .../tab-navigation-base.d.ts | 8 ++++---- .../tab-navigation-base/tab-navigation-base.ts | 18 ++++++++++-------- 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/api-reports/NativeScript.api.md b/api-reports/NativeScript.api.md index 834f4fa39..82d7abcdc 100644 --- a/api-reports/NativeScript.api.md +++ b/api-reports/NativeScript.api.md @@ -2225,8 +2225,12 @@ export class TabNavigationBase extends View { getTabBarItemTextTransform(tabStripItem: TabStripItem): any + getTabBarSelectedItemColor(): Color + getTabBarTextTransform(): any + getTabBarUnSelectedItemColor(): Color + ios: any /* UITabBarController */; items: Array; @@ -2266,8 +2270,12 @@ export class TabNavigationBase extends View { setTabBarItemTitle(tabStripItem: TabStripItem, value: any): any + setTabBarSelectedItemColor(value: Color) + setTabBarTextTransform(value: any): void + setTabBarUnSelectedItemColor(value: Color) + tabStrip: TabStrip; } @@ -2320,6 +2328,10 @@ export class TabStrip extends View { on(eventNames: string, callback: (data: EventData) => void, thisArg?: any); on(event: "itemTap", callback: (args: TabStripItemEventData) => void, thisArg?: any); + + selectedItemColor: Color; + + unSelectedItemColor: Color; } // @public diff --git a/nativescript-core/ui/tab-navigation-base/tab-navigation-base/tab-navigation-base.d.ts b/nativescript-core/ui/tab-navigation-base/tab-navigation-base/tab-navigation-base.d.ts index f418caeb8..8d623e7d0 100644 --- a/nativescript-core/ui/tab-navigation-base/tab-navigation-base/tab-navigation-base.d.ts +++ b/nativescript-core/ui/tab-navigation-base/tab-navigation-base/tab-navigation-base.d.ts @@ -154,25 +154,25 @@ export class TabNavigationBase extends View { * @private * Method is intended to be overridden by inheritors and used as "protected" */ - getTabBarSelectedItemColor(): any + getTabBarSelectedItemColor(): Color /** * @private * Method is intended to be overridden by inheritors and used as "protected" */ - setTabBarSelectedItemColor(value: any) + setTabBarSelectedItemColor(value: Color) /** * @private * Method is intended to be overridden by inheritors and used as "protected" */ - getTabBarUnSelectedItemColor(): any + getTabBarUnSelectedItemColor(): Color /** * @private * Method is intended to be overridden by inheritors and used as "protected" */ - setTabBarUnSelectedItemColor(value: any) + setTabBarUnSelectedItemColor(value: Color) /** * @private diff --git a/nativescript-core/ui/tab-navigation-base/tab-navigation-base/tab-navigation-base.ts b/nativescript-core/ui/tab-navigation-base/tab-navigation-base/tab-navigation-base.ts index c053ddc66..09d8b2dd2 100644 --- a/nativescript-core/ui/tab-navigation-base/tab-navigation-base/tab-navigation-base.ts +++ b/nativescript-core/ui/tab-navigation-base/tab-navigation-base/tab-navigation-base.ts @@ -1,7 +1,7 @@ // Types import { TabNavigationBase as TabNavigationBaseDefinition, SelectedIndexChangedEventData } from "."; import { TabStripItem } from "../tab-strip-item"; -import { ViewBase, AddArrayFromBuilder, AddChildFromBuilder, EventData } from "../../core/view"; +import { ViewBase, AddArrayFromBuilder, AddChildFromBuilder, EventData, Color } from "../../core/view"; // Requires import { View, Property, CoercibleProperty, isIOS } from "../../core/view"; @@ -150,19 +150,21 @@ export class TabNavigationBase extends View implements TabNavigationBaseDefiniti // overridden by inheritors } - public getTabBarSelectedItemColor(): any { + public getTabBarSelectedItemColor(): Color { + // overridden by inheritors + return null; + } + + public setTabBarSelectedItemColor(value: Color) { // overridden by inheritors } - public setTabBarSelectedItemColor(value: any) { + public getTabBarUnSelectedItemColor(): Color { // overridden by inheritors + return null; } - public getTabBarUnSelectedItemColor(): any { - // overridden by inheritors - } - - public setTabBarUnSelectedItemColor(value: any) { + public setTabBarUnSelectedItemColor(value: Color) { // overridden by inheritors }