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 #3404 from NativeScript/font

Browse Source 
Fix font on Android
This commit is contained in:
Rossen Hristov
2017-01-04 14:19:55 +02:00
committed by GitHub
parent fb4ab6cdb0 9d6f6cca79
commit a1073341a4
4 changed files with 34 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tns-core-modules/ui/search-bar/search-bar.android.ts
View File

@@ -138,16 +138,18 @@ export class SearchBar extends SearchBarBase {
set [fontInternalProperty.native](value: Font | { typeface: android.graphics.Typeface, fontSize: number }) {
let textView = this._getTextView();
let typeface: android.graphics.Typeface;
if (value instanceof Font) {
typeface = value.getAndroidTypeface();
textView.setTextSize(value.fontSize);
} else {
typeface = value.typeface;
// Set value
textView.setTypeface(value.getAndroidTypeface());
if (value.fontSize !== undefined){
textView.setTextSize(value.fontSize);
}
}
else {
// Reset value
textView.setTypeface(value.typeface);
textView.setTextSize(android.util.TypedValue.COMPLEX_UNIT_PX, value.fontSize);
}
textView.setTypeface(typeface);
}
get [backgroundInternalProperty.native](): Font {

17
tns-core-modules/ui/segmented-bar/segmented-bar.android.ts
View File

@@ -94,13 +94,18 @@ export class SegmentedBarItem extends SegmentedBarItemBase {
};
}
set [fontInternalProperty.native](value: Font | { typeface: android.graphics.Typeface, fontSize: number }) {
let tv = this._textView;
let textView = this._textView;
if (value instanceof Font) {
tv.setTypeface(value.getAndroidTypeface());
tv.setTextSize(value.fontSize);
} else {
tv.setTypeface(value.typeface);
tv.setTextSize(android.util.TypedValue.COMPLEX_UNIT_PX, value.fontSize);
// Set value
textView.setTypeface(value.getAndroidTypeface());
if (value.fontSize !== undefined){
textView.setTextSize(value.fontSize);
}
}
else {
// Reset value
textView.setTypeface(value.typeface);
textView.setTextSize(android.util.TypedValue.COMPLEX_UNIT_PX, value.fontSize);
}
}

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

@@ -384,7 +384,8 @@ export class TabView extends TabViewBase {
if (value instanceof Font) {
isFont = true;
typeface = value.getAndroidTypeface();
} else {
}
else {
typeface = value.typeface;
}
@@ -397,7 +398,9 @@ export class TabView extends TabViewBase {
tv.setTypeface(typeface);
if (isFont) {
tv.setTextSize(fontSize);
if (fontSize !== undefined){
tv.setTextSize(fontSize);
}
}
else {
tv.setTextSize(android.util.TypedValue.COMPLEX_UNIT_PX, fontSize);

17
tns-core-modules/ui/text-base/text-base.android.ts
View File

@@ -52,17 +52,18 @@ export class TextBase extends TextBaseCommon {
}
set [fontInternalProperty.native](value: Font | { typeface: android.graphics.Typeface, fontSize: number }) {
let textView = this._nativeView;
let typeface: android.graphics.Typeface;
if (value instanceof Font) {
typeface = value.getAndroidTypeface();
textView.setTextSize(value.fontSize);
} else {
typeface = value.typeface;
// Set value
textView.setTypeface(value.getAndroidTypeface());
if (value.fontSize !== undefined){
textView.setTextSize(value.fontSize);
}
}
else {
// Reset value
textView.setTypeface(value.typeface);
textView.setTextSize(android.util.TypedValue.COMPLEX_UNIT_PX, value.fontSize);
}
textView.setTypeface(typeface);
}
//TextAlignment