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

Merge pull request #3261 from NativeScript/issue-3147

Browse Source 
Fix: Setting `setTypeface()` to null object
This commit is contained in:
Rossen Hristov
2017-01-03 10:24:41 +02:00
committed by GitHub
parent 876752257d ae68368d29
commit 2970ad54fc
8 changed files with 112 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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);
}