diff --git a/tests/app/ui/tab-view/tab-view-tests.ts b/tests/app/ui/tab-view/tab-view-tests.ts index 5a33d57dc..005072476 100644 --- a/tests/app/ui/tab-view/tab-view-tests.ts +++ b/tests/app/ui/tab-view/tab-view-tests.ts @@ -4,7 +4,6 @@ import helper = require("../helper"); import labelModule = require("ui/label"); import stackLayoutModule = require("ui/layouts/stack-layout"); import tabViewTestsNative = require("./tab-view-tests-native"); -import style = require("ui/styling/style"); import { resetStyleProperties } from "ui/core/view"; // Using a TabView requires the "ui/tab-view" module. @@ -331,7 +330,7 @@ export class TabViewTest extends testModule.UITest { assertFontsAreEqual(tabViewTestsNative.getNativeFont(this.testView), nativeFont, "Font must be bold 12 monospace after rebinding items."); //console.log(`>>>>>>>>>>>>> nativeFont: ${fontToString(nativeFont)}`); - //console.log(`>>>>>>>>>>>>> RESET`); + console.log(`>>>>>>>>>>>>> RESET`); resetStyleProperties(this.testView.style); assertFontsAreEqual(tabViewTestsNative.getNativeFont(this.testView), originalFont, "Font must be the original one after resetting the style."); } diff --git a/tns-core-modules/ui/tab-view/tab-view.android.ts b/tns-core-modules/ui/tab-view/tab-view.android.ts index d060c99a4..617711dce 100644 --- a/tns-core-modules/ui/tab-view/tab-view.android.ts +++ b/tns-core-modules/ui/tab-view/tab-view.android.ts @@ -2,7 +2,7 @@ import { TabViewBase, TabViewItemBase, itemsProperty, selectedIndexProperty, tabTextColorProperty, tabBackgroundColorProperty, selectedTabTextColorProperty, androidSelectedTabHighlightColorProperty, androidOffscreenTabLimitProperty, - fontInternalProperty, traceCategory, View, colorProperty, layout, Color, Font, traceEnabled, traceWrite + fontInternalProperty, traceCategory, View, layout, Color, Font, traceEnabled, traceWrite } from "./tab-view-common" import { textTransformProperty, TextTransform, getTransformedText } from "ui/text-base"; import { fromFileOrResource } from "image-source"; @@ -323,10 +323,10 @@ export class TabView extends TabViewBase { this.setAdapter(value); } - get [colorProperty.native](): number { + get [tabTextColorProperty.native](): number { return this._tabLayout.getTabTextColor(); } - set [colorProperty.native](value: number | Color) { + set [tabTextColorProperty.native](value: number | Color) { let color = value instanceof Color ? value.android : value; this._tabLayout.setTabTextColor(color); } diff --git a/tns-core-modules/ui/tab-view/tab-view.ios.ts b/tns-core-modules/ui/tab-view/tab-view.ios.ts index 0eac8d8b5..c25aee44c 100644 --- a/tns-core-modules/ui/tab-view/tab-view.ios.ts +++ b/tns-core-modules/ui/tab-view/tab-view.ios.ts @@ -402,7 +402,6 @@ export class TabView extends TabViewBase { this.setViewControllers(value); } - get [tabTextColorProperty.native](): UIColor { return null; }