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

Fixed: Setting setTypeface() to null object

Browse Source 
Resolves #3147
This commit is contained in:
Rossen Hristov
2016-12-07 17:21:48 +02:00
parent 39007ab05e
commit ae68368d29
8 changed files with 112 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
tests/app/fonts/Pacifico.ttf Normal file
View File

Binary file not shown.

13
tests/app/ui/tab-view/tab-view-tests-native.android.ts
View File

@@ -13,4 +13,17 @@ export function selectNativeTab(tabView: tabViewModule.TabView, index: number):
export function getNativeSelectedIndex(tabView: tabViewModule.TabView): number {
var viewPager: android.support.v4.view.ViewPager = (<any>tabView)._viewPager;
return viewPager.getCurrentItem();
}
export function getNativeFont(tabView: tabViewModule.TabView): any {
var tv: android.widget.TextView = tabView._getAndroidTabView().getTextViewForItemAt(0);
if (tv) {
return {
typeface: tv.getTypeface(),
size: tv.getTextSize()
}
}
else {
return null;
}
}

3
tests/app/ui/tab-view/tab-view-tests-native.d.ts vendored
View File

@@ -3,4 +3,5 @@ import tabViewModule = require("ui/tab-view");
export declare function getNativeTabCount(tabView: tabViewModule.TabView): number;
export declare function selectNativeTab(tabView: tabViewModule.TabView, index: number): void;
export declare function getNativeSelectedIndex(tabView: tabViewModule.TabView): number;
export declare function getNativeSelectedIndex(tabView: tabViewModule.TabView): number;
export declare function getNativeFont(tabView: tabViewModule.TabView): any;

20
tests/app/ui/tab-view/tab-view-tests-native.ios.ts
View File

@@ -1,4 +1,6 @@
import tabViewModule = require("ui/tab-view");
import * as utils from "utils/utils";
import getter = utils.ios.getter;
export function getNativeTabCount(tabView: tabViewModule.TabView): number {
if (!tabView.ios.viewControllers) {
@@ -15,4 +17,22 @@ export function selectNativeTab(tabView: tabViewModule.TabView, index: number):
export function getNativeSelectedIndex(tabView: tabViewModule.TabView): number {
return tabView.ios.selectedIndex;
}
export function getNativeFont(tabView: tabViewModule.TabView): any {
let tabBar = <UITabBar>tabView.ios.tabBar;
let currentFont;
if (tabBar.items.count > 0) {
let currentAttrs = tabBar.items[0].titleTextAttributesForState(UIControlState.Normal);
if (currentAttrs) {
currentFont = currentAttrs.objectForKey(NSFontAttributeName);
}
}
if (!currentFont) {
currentFont = UIFont.systemFontOfSize(getter(UIFont, UIFont.labelFontSize));
}
return currentFont;
}

139
tests/app/ui/tab-view/tab-view-tests.ts
View File

@@ -4,6 +4,7 @@ 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");
// Using a TabView requires the "ui/tab-view" module.
// >> article-require-tabview-module
@@ -276,102 +277,58 @@ export class TabViewTest extends testModule.UITest<tabViewModule.TabView> {
TKUnit.assertEqual(actualNewIndex, expectedNewIndex, "expectedNewIndex");
}
// public testAndroidOffscreenTabLimit_Default = function () {
// let tabView = this.testView;
// if (!tabView.android){
// return;
// }
public test_FontIsReappliedWhenTabItemsChange = function () {
// let fontToString = (font: any): string => {
// if (this.testView.ios){
// return font.toString();
// }
// else {
// return `${font.typeface} ${font.size}`;
// }
// }
// tabView.androidOffscreenTabLimit = 1;
// tabView.items = this._createItems(20);
// this.waitUntilTestElementIsLoaded();
// for (let index = 0, length = tabView.items.length; index < length; index++){
// tabViewTestsNative.selectNativeTab(tabView, index);
// TKUnit.waitUntilReady(function () {
// return tabView.selectedIndex === index;
// }, helper.ASYNC);
// }
let assertFontsAreEqual = (actual: any, expected: any, message?: string) => {
if (this.testView.ios){
TKUnit.assertEqual(actual, expected, message);
}
else {
TKUnit.assertEqual(actual.typeface, expected.typeface, `${message} [typeface]`);
TKUnit.assertEqual(actual.size, expected.size, `${message} [size]`);
}
}
// let viewsWithParent = 0;
// let viewsWithoutParent = 0;
// for (let i = 0, length = tabView.items.length; i < length; i++){
// if (tabView.items[i].view.parent) {
// viewsWithParent++;
// }
// else {
// viewsWithoutParent++;
// }
// }
// TKUnit.assertTrue(viewsWithoutParent > viewsWithParent, `Most of the views should be recycled: viewsWithoutParent = ${viewsWithoutParent}; viewsWithParent = ${viewsWithParent};`);
// }
// public testAndroidOffscreenTabLimit_KeepAllAlive = function () {
// let tabView = this.testView;
// if (!tabView.android){
// return;
// }
//console.log(`>>>>>>>>>>>>> CREATE 3 ITEMS`);
this.testView.items = this._createItems(1);
this.waitUntilTestElementIsLoaded();
// tabView.androidOffscreenTabLimit = 20;
let originalFont = tabViewTestsNative.getNativeFont(this.testView);
//console.log(`>>>>>>>>>>>>> originalFont: ${fontToString(originalFont)}`);
let nativeFont: any;
//console.log(`>>>>>>>>>>>>> PACIFICO`);
this.testView.style.font = "20 Pacifico";
nativeFont = tabViewTestsNative.getNativeFont(this.testView);
//console.log(`>>>>>>>>>>>>> nativeFont: ${fontToString(nativeFont)}`);
// tabView.items = this._createItems(20);
// this.waitUntilTestElementIsLoaded();
// for (let index = 0, length = tabView.items.length; index < length; index++){
// tabViewTestsNative.selectNativeTab(tabView, index);
// TKUnit.waitUntilReady(function () {
// return tabView.selectedIndex === index;
// }, helper.ASYNC);
// }
//console.log(`>>>>>>>>>>>>> CREATE 3 ITEMS`);
this.testView.items = this._createItems(2);
assertFontsAreEqual(tabViewTestsNative.getNativeFont(this.testView), nativeFont, "Font must be 20 Pacifico after rebinding items.");
//console.log(`>>>>>>>>>>>>> nativeFont: ${fontToString(nativeFont)}`);
//console.log(`>>>>>>>>>>>>> MONOSPACE;`);
this.testView.style.font = "bold 12 monospace";
nativeFont = tabViewTestsNative.getNativeFont(this.testView);
//console.log(`>>>>>>>>>>>>> nativeFont: ${fontToString(nativeFont)}`);
//console.log(`>>>>>>>>>>>>> CREATE 3 ITEMS`);
this.testView.items = this._createItems(3);
assertFontsAreEqual(tabViewTestsNative.getNativeFont(this.testView), nativeFont, "Font must be bold 12 monospace after rebinding items.");
//console.log(`>>>>>>>>>>>>> nativeFont: ${fontToString(nativeFont)}`);
// for (let i = 0, length = tabView.items.length; i < length; i++){
// TKUnit.assertNotNull(tabView.items[i].view.parent, `tabView.items[${i}].view should have a parent!`);
// }
// }
/*
public testBindingIsRefreshedWhenTabViewItemIsUnselectedAndThenSelectedAgain() {
var viewModel = new observable.Observable();
viewModel.set("counter", 0);
this.testPage.bindingContext = viewModel;
var tabView = this.testView;
var items = this._createItems(10);
var StackLayout0 = new stackLayoutModule.StackLayout();
var label0 = new labelModule.Label();
label0.text = "Tab 0";
label0.id = "testLabel";
label0.bind({ sourceProperty: "counter", targetProperty: "text", twoWay: true });
StackLayout0.addChild(label0);
var tabEntry0 = new tabViewModule.TabViewItem({
title: "Tab 0",
view: StackLayout0
});
items.push(tabEntry0);
tabView.items = items;
tabView.selectedIndex = 10;
TKUnit.waitUntilReady(function () {
return tabViewTestsNative.getNativeSelectedIndex(tabView) === tabView.selectedIndex;
}, helper.ASYNC);
TKUnit.assertEqual(label0.text, 0, "binding is not working!");
tabView.selectedIndex = 0;
TKUnit.waitUntilReady(function () {
return tabViewTestsNative.getNativeSelectedIndex(tabView) === tabView.selectedIndex;
}, helper.ASYNC);
tabView.selectedIndex = 10;
TKUnit.waitUntilReady(function () {
return tabViewTestsNative.getNativeSelectedIndex(tabView) === tabView.selectedIndex;
}, helper.ASYNC);
var expectedValue = 5;
viewModel.set("counter", expectedValue);
TKUnit.assertEqual(label0.text, expectedValue, "binding is not working!");
}*/
//console.log(`>>>>>>>>>>>>> RESET`);
this.testView.style._resetValue(style.fontInternalProperty);
assertFontsAreEqual(tabViewTestsNative.getNativeFont(this.testView), originalFont, "Font must be the original one after resetting the style.");
}
}
export function createTestCase(): TabViewTest {

52
tns-core-modules/ui/tab-view/tab-view.android.ts
View File

@@ -277,6 +277,9 @@ export class TabView extends common.TabView {
}
this._updateSelectedIndexOnItemsPropertyChanged(data.newValue);
// Style properties such as fonts need to re-applied on the newwly created native TextViews
this.style._syncNativeProperties();
}
public _updateTabForItem(item: TabViewItem) {
@@ -348,7 +351,6 @@ export class TabView extends common.TabView {
}
}
}
}
export class TabViewStyler implements style.Styler {
@@ -358,40 +360,34 @@ export class TabViewStyler implements style.Styler {
var tab = <definition.TabView>v;
var fontValue = <font.Font>newValue;
var typeface = fontValue.getAndroidTypeface();
var tabLayout = tab._getAndroidTabView();
let tabCount = tabLayout.getItemCount();
for (var i = 0; i < tabCount; i++) {
let tv = tabLayout.getTextViewForItemAt(i);
if (typeface) {
tv.setTypeface(typeface);
}
else if (nativeValue) {
tv.setTypeface(nativeValue.typeface);
}
if (tab.items && tab.items.length > 0) {
var tabLayout = tab._getAndroidTabView();
for (var i = 0; i < tab.items.length; i++) {
let tv = tabLayout.getTextViewForItemAt(i);
if (typeface) {
tv.setTypeface(typeface);
}
else {
tv.setTypeface(nativeValue.typeface);
}
if (fontValue.fontSize) {
tv.setTextSize(fontValue.fontSize);
}
else {
tv.setTextSize(android.util.TypedValue.COMPLEX_UNIT_PX, nativeValue.size);
}
if (fontValue.fontSize) {
tv.setTextSize(fontValue.fontSize);
}
else if (nativeValue) {
tv.setTextSize(android.util.TypedValue.COMPLEX_UNIT_PX, nativeValue.size);
}
}
}
private static resetFontInternalProperty(v: view.View, nativeValue: any) {
var tab = <definition.TabView>v;
if (tab.items && tab.items.length > 0) {
var tabLayout = tab._getAndroidTabView();
for (var i = 0; i < tab.items.length; i++) {
let tv = tabLayout.getTextViewForItemAt(i);
tv.setTypeface(nativeValue.typeface);
tv.setTextSize(android.util.TypedValue.COMPLEX_UNIT_PX, nativeValue.size);
}
var tabLayout = tab._getAndroidTabView();
let tabCount = tabLayout.getItemCount();
for (var i = 0; i < tabCount; i++) {
let tv = tabLayout.getTextViewForItemAt(i);
tv.setTypeface(nativeValue.typeface);
tv.setTextSize(android.util.TypedValue.COMPLEX_UNIT_PX, nativeValue.size);
}
}

9
tns-core-modules/ui/tab-view/tab-view.ios.ts
View File

@@ -430,7 +430,7 @@ export class TabView extends common.TabView {
return;
}
var tabBar = this.ios.tabBar;
var tabBar = <UITabBar>this.ios.tabBar;
var states = getTitleAttributesForStates(this);
for (var i = 0; i < tabBar.items.count; i++) {
var item = <UITabBarItem>tabBar.items[i];
@@ -496,12 +496,11 @@ export class TabViewStyler implements style.Styler {
}
private static getNativeFontValue(v: view.View) {
var tab = <definition.TabView>v;
var tabBar = <UITabBar>v.ios.tabBar;
let currentFont;
if (tab.ios && tab.ios.items && tab.ios.items.length > 0) {
let currentAttrs = tab.ios.items[0].titleTextAttributesForState(UIControlState.Normal);
if (tabBar.items.count > 0) {
let currentAttrs = tabBar.items[0].titleTextAttributesForState(UIControlState.Normal);
if (currentAttrs) {
currentFont = currentAttrs.objectForKey(NSFontAttributeName);
}

1
tns-platform-declarations/android/org.nativescript.widgets.d.ts vendored
View File

@@ -360,6 +360,7 @@
getTextViewForItemAt(index: number): android.widget.TextView;
getViewForItemAt(index: number): android.widget.LinearLayout;
getItemCount(): number;
}
export class TabItemSpec {