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

Font shorthand property

Browse Source
This commit is contained in:
vakrilov
2015-06-25 10:34:32 +03:00
parent 997dfd1639
commit 7803ba97b5
9 changed files with 297 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
apps/tests/ui/style/style-properties-tests.ts
View File

@@ -243,7 +243,7 @@ export function test_setting_margin_shorthand_property_sets_all_margins() {
test_margin_shorthand_property("10 20 30 40", 10, 20, 30, 40);
}
function test_margin_shorthand_property(short: string, top:number, right:number, bottom:number, left:number) {
function test_margin_shorthand_property(short: string, top: number, right: number, bottom: number, left: number) {
var testView = new buttonModule.Button();
testView.style.margin = short;
@@ -269,3 +269,23 @@ function test_padding_shorthand_property(short: string, top: number, right: numb
TKUnit.assertEqual(testView.style.paddingLeft, left, "left");
}
export function test_setting_font_shorthand_property() {
test_font_shorthand_property("15px Arial", "Arial", 15, "normal", "normal");
test_font_shorthand_property("bold 15px Arial", "Arial", 15, "normal", "bold");
test_font_shorthand_property("italic 15px Arial", "Arial", 15, "italic", "normal");
test_font_shorthand_property("bold italic 15px Arial", "Arial", 15, "italic", "bold");
test_font_shorthand_property("italic normal bold 15px Arial, serif", "Arial, serif", 15, "italic", "bold");
test_font_shorthand_property("small-caps normal bold 15px Arial", "Arial", 15, "normal", "bold");
test_font_shorthand_property("normal normal normal 15px Arial", "Arial", 15, "normal", "normal");
test_font_shorthand_property("normal normal normal 15px/30px Arial", "Arial", 15, "normal", "normal");
}
function test_font_shorthand_property(short: string, family: string, size: number, style: string, weight:string) {
var testView = new buttonModule.Button();
(<any>testView).style = "font: " + short;
TKUnit.assertEqual(testView.style.fontFamily, family, "style.fontFamily");
TKUnit.assertEqual(testView.style.fontStyle, style, "style.fontStyle");
TKUnit.assertEqual(testView.style.fontWeight, weight, "style.fontWeight");
TKUnit.assertEqual(testView.style.fontSize, size, "style.fontSize");
}

103
ui/styling/font-common.ts
View File

@@ -1,12 +1,14 @@
import enums = require("ui/enums");
import definitios = require("ui/styling/font");
import converters = require("ui/styling/converters");
export class Font implements definitios.Font {
public static default = new Font(undefined, enums.FontStyle.normal, enums.FontWeight.normal);
public static default = undefined;
private _fontFamily: string;
private _fontStyle: string;
private _fontWeight: string;
private _fontSize: number;
get fontFamily(): string {
return this._fontFamily;
@@ -29,6 +31,13 @@ export class Font implements definitios.Font {
throw new Error("fontWeight is read-only");
}
get fontSize(): number {
return this._fontSize;
}
set fontSize(value: number) {
throw new Error("fontSize is read-only");
}
get isBold(): boolean {
return this._fontWeight.toLowerCase() === enums.FontWeight.bold;;
}
@@ -43,20 +52,21 @@ export class Font implements definitios.Font {
throw new Error("isItalic is read-only");
}
get ios(): UIFontDescriptor {
return undefined;
}
get android(): android.graphics.Typeface {
return undefined;
}
constructor(family: string, style: string, weight: string) {
constructor(family: string, size: number, style: string, weight: string) {
this._fontFamily = family;
this._fontSize = size;
this._fontStyle = style;
this._fontWeight = weight;
}
public getAndroidTypeface(): android.graphics.Typeface {
return undefined;
}
public getUIFont(defaultFont: UIFont): UIFont {
return undefined;
}
public withFontFamily(family: string): Font {
throw new Error("This should be called on the derived class");
}
@@ -68,6 +78,25 @@ export class Font implements definitios.Font {
public withFontWeight(weight: string): Font {
throw new Error("This should be called on the derived class");
}
public withFontSize(size: number): Font {
throw new Error("This should be called on the derived class");
}
public static equals(value1: Font, value2: Font): boolean {
return value1.fontFamily === value2.fontFamily &&
value1.fontSize === value2.fontSize &&
value1.fontStyle === value2.fontStyle &&
value1.fontWeight === value2.fontWeight;
}
public static parse(cssValue: string): Font {
var parsed = parseFont(cssValue);
var size = converters.fontSizeConverter(parsed.fontSize);
size = !!size ? size : undefined;
return new Font(parsed.fontFamily, size, parsed.fontStyle, parsed.fontWeight);
}
}
export function parseFontFamily(value: string): Array<string> {
@@ -90,4 +119,58 @@ export module genericFontFamilies {
export var serif = "serif";
export var sansSerif = "sans-serif";
export var monospace = "monospace";
}
var styles = new Set();
["italic", "oblique"].forEach((val, i, a) => styles.add(val));
var weights = new Set();
["bold", "bolder", "lighter", "100", "200", "300", "400", "500", "600", "700", "800", "900"].forEach((val, i, a) => weights.add(val));
interface ParsedFont {
fontStyle?: string;
fontVariant?: string;
fontWeight?: string,
lineHeight?: string,
fontSize?: string,
fontFamily?: string
}
function parseFont(fontValue: string): ParsedFont {
var result: ParsedFont = {
fontStyle: "normal",
fontVariant: "normal",
fontWeight: "normal",
}
var parts = fontValue.split(/\s+/);
var part: string;
while (part = parts.shift()) {
if (part === "normal") {
// nothing to do here
}
else if (part === "small-caps") {
// The only supported font variant in shorthand font
result.fontVariant = part;
}
else if (styles.has(part)) {
result.fontStyle = part
}
else if (weights.has(part)) {
result.fontWeight = part;
}
else if (!result.fontSize) {
var sizes = part.split("/");
result.fontSize = sizes[0];
result.lineHeight = sizes.length > 1 ? sizes[1] : undefined;
}
else {
result.fontFamily = part;
if (parts.length) {
result.fontFamily += " " + parts.join(" ");
}
break;
}
}
return result;
}

52
ui/styling/font.android.ts
View File

@@ -9,11 +9,32 @@ var typefaceCache = new Map<string, android.graphics.Typeface>();
var appAssets: android.content.res.AssetManager;
export class Font extends common.Font {
public static default = new Font(undefined, enums.FontStyle.normal, enums.FontWeight.normal);
public static default = new Font(undefined, undefined, enums.FontStyle.normal, enums.FontWeight.normal);
private _android: android.graphics.Typeface;
get android(): android.graphics.Typeface {
if (!this._android) {
private _typeface: android.graphics.Typeface;
constructor(family: string, size: number, style: string, weight: string) {
super(family, size, style, weight);
}
public withFontFamily(family: string): Font {
return new Font(family, this.fontSize, this.fontStyle, this.fontWeight);
}
public withFontStyle(style: string): Font {
return new Font(this.fontFamily, this.fontSize, style, this.fontWeight);
}
public withFontWeight(weight: string): Font {
return new Font(this.fontFamily, this.fontSize, this.fontStyle, weight);
}
public withFontSize(size: number): Font {
return new Font(this.fontFamily, size, this.fontStyle, this.fontWeight);
}
public getAndroidTypeface(): android.graphics.Typeface {
if (!this._typeface) {
var style: number = 0;
if (this.isBold) {
@@ -25,25 +46,10 @@ export class Font extends common.Font {
}
var typeFace = this.getTypeFace(this.fontFamily);
this._android = android.graphics.Typeface.create(typeFace, style);
this._typeface = android.graphics.Typeface.create(typeFace, style);
}
return this._android;
}
constructor(family: string, style: string, weight: string) {
super(family, style, weight);
}
public withFontFamily(family: string): Font {
return new Font(family, this.fontStyle, this.fontWeight);
}
public withFontStyle(style: string): Font {
return new Font(this.fontFamily, style, this.fontWeight);
}
public withFontWeight(weight: string): Font {
return new Font(this.fontFamily, this.fontStyle, weight);
return this._typeface;
}
private getTypeFace(fontFamily: string): android.graphics.Typeface {
@@ -101,8 +107,8 @@ export class Font extends common.Font {
else {
trace.write("Could not find font file for " + fontFamily, trace.categories.Error, trace.messageType.error);
}
if (fontAssetPath){
if (fontAssetPath) {
try {
result = android.graphics.Typeface.createFromAsset(appAssets, fontAssetPath);
} catch (e) {

11
ui/styling/font.d.ts vendored
View File

@@ -5,17 +5,22 @@
public fontFamily: string;
public fontStyle: string;
public fontWeight: string;
public fontSize: number;
public isBold: boolean;
public isItalic: boolean;
public ios: UIFontDescriptor;
public android: android.graphics.Typeface;
constructor(family: string, size: number, style: string, weight: string);
constructor(family: string, style: string, weight: string);
public getAndroidTypeface(): android.graphics.Typeface;
public getUIFont(defaultFont: UIFont): UIFont;
public withFontFamily(family: string): Font;
public withFontStyle(style: string): Font;
public withFontWeight(weight: string): Font;
public withFontSize(size: number): Font;
public static equals(value1: Font, value2: Font): boolean;
public static parse(cssValue: string): Font;
}
}

40
ui/styling/font.ios.ts
View File

@@ -24,11 +24,16 @@ function initSystemFotns() {
initSystemFotns();
export class Font extends common.Font {
public static default = new Font(undefined, enums.FontStyle.normal, enums.FontWeight.normal);
public static default = new Font(undefined, undefined, enums.FontStyle.normal, enums.FontWeight.normal);
private _ios: UIFontDescriptor;
get ios(): UIFontDescriptor {
if (!this._ios) {
private _uiFont: UIFont;
constructor(family: string, size: number, style: string, weight: string) {
super(family, size, style, weight);
}
public getUIFont(defaultFont: UIFont): UIFont {
if (!this._uiFont) {
var symbolicTraits: number = 0;
if (this.isBold) {
symbolicTraits |= UIFontDescriptorSymbolicTraits.UIFontDescriptorTraitBold;
@@ -37,29 +42,32 @@ export class Font extends common.Font {
symbolicTraits |= UIFontDescriptorSymbolicTraits.UIFontDescriptorTraitItalic;
}
this._ios = resolveFontDescriptor(this.fontFamily, symbolicTraits);
if (!this._ios) {
this._ios = UIFontDescriptor.new().fontDescriptorWithSymbolicTraits(symbolicTraits);
var descriptor = resolveFontDescriptor(this.fontFamily, symbolicTraits);
if (!descriptor) {
descriptor = UIFontDescriptor.new().fontDescriptorWithSymbolicTraits(symbolicTraits);
}
}
return this._ios;
}
constructor(family: string, style: string, weight: string) {
super(family, style, weight);
var size = this.fontSize || defaultFont.pointSize;
this._uiFont = UIFont.fontWithDescriptorSize(descriptor, size);
}
return this._uiFont;
}
public withFontFamily(family: string): Font {
return new Font(family, this.fontStyle, this.fontWeight);
return new Font(family, this.fontSize, this.fontStyle, this.fontWeight);
}
public withFontStyle(style: string): Font {
return new Font(this.fontFamily, style, this.fontWeight);
return new Font(this.fontFamily, this.fontSize, style, this.fontWeight);
}
public withFontWeight(weight: string): Font {
return new Font(this.fontFamily, this.fontStyle, weight);
return new Font(this.fontFamily, this.fontSize, this.fontStyle, weight);
}
public withFontSize(size: number): Font {
return new Font(this.fontFamily, size, this.fontStyle, this.fontWeight);
}
}

63
ui/styling/style.ts
View File

@@ -97,6 +97,13 @@ export class Style extends observable.DependencyObservable implements styling.St
this._setValue(fontWeightProperty, value, observable.ValueSource.Local);
}
get font(): string {
return this._getValue(fontProperty);
}
set font(value: string) {
this._setValue(fontProperty, value, observable.ValueSource.Local);
}
get textAlignment(): string {
return this._getValue(textAlignmentProperty);
}
@@ -310,8 +317,8 @@ export class Style extends observable.DependencyObservable implements styling.St
}
else {
trace.write("Found handler for property: " + property.name + ", view:" + this._view, trace.categories.Style);
if (types.isUndefined(newValue)) {
if (types.isUndefined(newValue) || newValue === property.metadata.defaultValue) {
(<any>handler).resetProperty(property, this._view);
} else {
(<any>handler).applyProperty(property, this._view, newValue);
@@ -462,18 +469,23 @@ export var backgroundColorProperty = new styleProperty.Property("backgroundColor
new observable.PropertyMetadata(undefined, observable.PropertyMetadataSettings.None, undefined, undefined, color.Color.equals),
converters.colorConverter);
export var fontProperty = new styleProperty.Property("font", "font",
new observable.PropertyMetadata(undefined, observable.PropertyMetadataSettings.None, onFontChanged));
export var fontSizeProperty = new styleProperty.Property("fontSize", "font-size",
new observable.PropertyMetadata(undefined, observable.PropertyMetadataSettings.AffectsLayout | observable.PropertyMetadataSettings.Inheritable),
converters.fontSizeConverter);
new observable.PropertyMetadata(undefined, observable.PropertyMetadataSettings.Inheritable, onFontSizeChanged),converters.fontSizeConverter);
export var fontFamilyProperty = new styleProperty.Property("fontFamily", "font-family",
new observable.PropertyMetadata(undefined, observable.PropertyMetadataSettings.Inheritable, onFontFamilyChanged));
export var fontStyleProperty = new styleProperty.Property("fontStyle", "font-style",
new observable.PropertyMetadata(undefined, observable.PropertyMetadataSettings.Inheritable, onFontStyleChanged, isFontStyleValid));
new observable.PropertyMetadata(enums.FontStyle.normal, observable.PropertyMetadataSettings.Inheritable, onFontStyleChanged, isFontStyleValid));
export var fontWeightProperty = new styleProperty.Property("fontWeight", "font-weight",
new observable.PropertyMetadata(undefined, observable.PropertyMetadataSettings.Inheritable, onFontWeightChanged, isFontWeightValid));
new observable.PropertyMetadata(enums.FontWeight.normal, observable.PropertyMetadataSettings.Inheritable, onFontWeightChanged, isFontWeightValid));
export var fontInternalProperty = new styleProperty.Property("_fontInternal", "_fontInternal",
new observable.PropertyMetadata(font.Font.default, observable.PropertyMetadataSettings.AffectsLayout, null, null, font.Font.equals), font.Font.parse);
function isFontWeightValid(value: string): boolean {
return value === enums.FontWeight.normal || value === enums.FontWeight.bold;
@@ -486,26 +498,49 @@ function isFontStyleValid(value: string): boolean {
function onFontFamilyChanged(data: observable.PropertyChangeData) {
var style = <Style>data.object;
var currentFont = <font.Font>style._getValue(fontProperty);
style._setValue(fontProperty, currentFont.withFontFamily(data.newValue));
var currentFont = <font.Font>style._getValue(fontInternalProperty);
if (currentFont.fontFamily !== data.newValue) {
style._setValue(fontInternalProperty, currentFont.withFontFamily(data.newValue));
}
}
function onFontStyleChanged(data: observable.PropertyChangeData) {
var style = <Style>data.object;
var currentFont = <font.Font>style._getValue(fontProperty);
style._setValue(fontProperty, currentFont.withFontStyle(data.newValue));
var currentFont = <font.Font>style._getValue(fontInternalProperty);
if (currentFont.fontStyle !== data.newValue) {
style._setValue(fontInternalProperty, currentFont.withFontStyle(data.newValue));
}
}
function onFontWeightChanged(data: observable.PropertyChangeData) {
var style = <Style>data.object;
var currentFont = <font.Font>style._getValue(fontProperty);
style._setValue(fontProperty, currentFont.withFontWeight(data.newValue));
var currentFont = <font.Font>style._getValue(fontInternalProperty);
if (currentFont.fontWeight !== data.newValue) {
style._setValue(fontInternalProperty, currentFont.withFontWeight(data.newValue));
}
}
export var fontProperty = new styleProperty.Property("font", "font",
new observable.PropertyMetadata(font.Font.default, observable.PropertyMetadataSettings.AffectsLayout));
function onFontSizeChanged(data: observable.PropertyChangeData) {
var style = <Style>data.object;
var currentFont = <font.Font>style._getValue(fontInternalProperty);
if (currentFont.fontSize !== data.newValue) {
style._setValue(fontInternalProperty, currentFont.withFontSize(data.newValue));
}
}
function onFontChanged(data: observable.PropertyChangeData) {
var style = <Style>data.object;
var newFont = font.Font.parse(data.newValue);
var valueSource = style._getValueSource(fontProperty);
style._setValue(fontFamilyProperty, newFont.fontFamily, valueSource);
style._setValue(fontStyleProperty, newFont.fontStyle, valueSource);
style._setValue(fontWeightProperty, newFont.fontWeight, valueSource);
style._setValue(fontSizeProperty, newFont.fontSize, valueSource);
}
export var textAlignmentProperty = new styleProperty.Property("textAlignment", "text-align",
new observable.PropertyMetadata(undefined, observable.PropertyMetadataSettings.AffectsLayout | observable.PropertyMetadataSettings.Inheritable),

6
ui/styling/stylers-common.ts
View File

@@ -6,12 +6,12 @@ import types = require("utils/types");
var _defaultNativeValuesCache = {};
export class StylePropertyChangedHandler {
private _applyProperty: (view: view.View, newValue: any) => void;
private _applyProperty: (view: view.View, newValue: any, defaultValue?: any) => void;
private _resetProperty: (view: view.View, nativeValue: any) => void;
private _getNativeValue: (view: view.View) => any;
constructor(
applyCallback: (view: view.View, newValue: any) => void,
applyCallback: (view: view.View, newValue: any, defaultValue?: any) => void,
resetCallback: (view: view.View, nativeValue: any) => void,
getNativeValue?: (view: view.View) => any) {
@@ -33,7 +33,7 @@ export class StylePropertyChangedHandler {
newValue = newValue.ios ? newValue.ios : newValue;
}
this._applyProperty(view, newValue);
this._applyProperty(view, newValue, _defaultNativeValuesCache[className + property.id]);
}
public resetProperty(property: dependencyObservable.Property, view: view.View) {

84
ui/styling/stylers.android.ts
View File

@@ -10,6 +10,7 @@ import enums = require("ui/enums");
import utils = require("utils/utils");
import styleModule = require("ui/styling/style");
import imageSource = require("image-source");
import font = require("ui/styling/font");
// merge the exports of the common file with the exports of this file
declare var exports;
@@ -289,31 +290,39 @@ export class TextViewStyler implements definition.stylers.Styler {
return (<android.widget.TextView>view.android).getTextColors().getDefaultColor();
}
// font-size
private static setFontSizeProperty(view: view.View, newValue: any) {
(<android.widget.TextView>view.android).setTextSize(newValue);
}
private static resetFontSizeProperty(view: view.View, nativeValue: any) {
(<android.widget.TextView>view.android).setTextSize(android.util.TypedValue.COMPLEX_UNIT_PX, nativeValue);
}
private static getNativeFontSizeValue(view: view.View): any {
return (<android.widget.TextView>view.android).getTextSize();
}
// font
private static setFontProperty(view: view.View, newValue: any) {
var typeface = <android.graphics.Typeface>newValue;
(<android.widget.TextView>view.android).setTypeface(typeface);
private static setFontInternalProperty(view: view.View, newValue: any, nativeValue: any) {
var tv = <android.widget.TextView>view.android;
var fontValue = <font.Font>newValue;
var typeface = fontValue.getAndroidTypeface();
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);
}
}
private static resetFontProperty(view: view.View, nativeValue: any) {
(<android.widget.TextView>view.android).setTypeface(nativeValue);
private static resetFontInternalProperty(view: view.View, nativeValue: any) {
var tv: android.widget.TextView = <android.widget.TextView>view.android;
tv.setTypeface(nativeValue.typeface);
tv.setTextSize(android.util.TypedValue.COMPLEX_UNIT_PX, nativeValue.size);
}
private static getNativeFontValue(view: view.View): any {
return (<android.widget.TextView>view.android).getTypeface();
private static getNativeFontInternalValue(view: view.View): any {
var tv: android.widget.TextView = <android.widget.TextView>view.android;
return {
typeface: tv.getTypeface(),
size: tv.getTextSize()
};
}
// text-align
@@ -346,22 +355,35 @@ export class TextViewStyler implements definition.stylers.Styler {
style.registerHandler(style.colorProperty, new stylersCommon.StylePropertyChangedHandler(
TextViewStyler.setColorProperty,
TextViewStyler.resetColorProperty,
TextViewStyler.getNativeColorValue));
TextViewStyler.getNativeColorValue), "TextBase");
style.registerHandler(style.fontSizeProperty, new stylersCommon.StylePropertyChangedHandler(
TextViewStyler.setFontSizeProperty,
TextViewStyler.resetFontSizeProperty,
TextViewStyler.getNativeFontSizeValue));
style.registerHandler(style.fontProperty, new stylersCommon.StylePropertyChangedHandler(
TextViewStyler.setFontProperty,
TextViewStyler.resetFontProperty,
TextViewStyler.getNativeFontValue));
style.registerHandler(style.fontInternalProperty, new stylersCommon.StylePropertyChangedHandler(
TextViewStyler.setFontInternalProperty,
TextViewStyler.resetFontInternalProperty,
TextViewStyler.getNativeFontInternalValue), "TextBase");
style.registerHandler(style.textAlignmentProperty, new stylersCommon.StylePropertyChangedHandler(
TextViewStyler.setTextAlignmentProperty,
TextViewStyler.resetTextAlignmentProperty,
TextViewStyler.getNativeTextAlignmentValue));
TextViewStyler.getNativeTextAlignmentValue), "TextBase");
// Register the same stylers for Button.
// It also derives from TextView but is not under TextBase in our View hierarchy.
style.registerHandler(style.colorProperty, new stylersCommon.StylePropertyChangedHandler(
TextViewStyler.setColorProperty,
TextViewStyler.resetColorProperty,
TextViewStyler.getNativeColorValue), "Button");
style.registerHandler(style.fontInternalProperty, new stylersCommon.StylePropertyChangedHandler(
TextViewStyler.setFontInternalProperty,
TextViewStyler.resetFontInternalProperty,
TextViewStyler.getNativeFontInternalValue), "Button");
style.registerHandler(style.textAlignmentProperty, new stylersCommon.StylePropertyChangedHandler(
TextViewStyler.setTextAlignmentProperty,
TextViewStyler.resetTextAlignmentProperty,
TextViewStyler.getNativeTextAlignmentValue), "Button");
}
}

75
ui/styling/stylers.ios.ts
View File

@@ -3,6 +3,7 @@ import style = require("ui/styling/style");
import definition = require("ui/styling");
import stylersCommon = require("ui/styling/stylers-common");
import enums = require("ui/enums");
import font = require("ui/styling/font");
// merge the exports of the common file with the exports of this file
declare var exports;
@@ -180,34 +181,18 @@ export class ButtonStyler implements definition.stylers.Styler {
return btn.titleColorForState(UIControlState.UIControlStateNormal);
}
// font size
private static setFontSizeProperty(view: view.View, newValue: any) {
var btn: UIButton = <UIButton>view._nativeView;
btn.titleLabel.font = btn.titleLabel.font.fontWithSize(newValue);
}
private static resetFontSizeProperty(view: view.View, nativeValue: any) {
var btn: UIButton = <UIButton>view._nativeView;
btn.titleLabel.font = btn.titleLabel.font.fontWithSize(nativeValue);
}
private static getNativeFontSizeValue(view: view.View): any {
var btn: UIButton = <UIButton>view._nativeView;
return btn.titleLabel.font.pointSize;
}
// font
private static setFontProperty(view: view.View, newValue: any) {
private static setFontInternalProperty(view: view.View, newValue: any, nativeValue: any) {
var btn: UIButton = <UIButton>view._nativeView;
btn.titleLabel.font = UIFont.fontWithDescriptorSize(newValue, btn.titleLabel.font.pointSize);
btn.titleLabel.font = (<font.Font>newValue).getUIFont(nativeValue);
}
private static resetFontProperty(view: view.View, nativeValue: any) {
private static resetFontInternalProperty(view: view.View, nativeValue: any) {
var btn: UIButton = <UIButton>view._nativeView;
btn.titleLabel.font = nativeValue;
}
private static getNativeFontValue(view: view.View): any {
private static getNativeFontInternalValue(view: view.View): any {
var btn: UIButton = <UIButton>view._nativeView;
return btn.titleLabel.font;
}
@@ -253,15 +238,10 @@ export class ButtonStyler implements definition.stylers.Styler {
ButtonStyler.resetColorProperty,
ButtonStyler.getNativeColorValue), "Button");
style.registerHandler(style.fontSizeProperty, new stylersCommon.StylePropertyChangedHandler(
ButtonStyler.setFontSizeProperty,
ButtonStyler.resetFontSizeProperty,
ButtonStyler.getNativeFontSizeValue), "Button");
style.registerHandler(style.fontProperty, new stylersCommon.StylePropertyChangedHandler(
ButtonStyler.setFontProperty,
ButtonStyler.resetFontProperty,
ButtonStyler.getNativeFontValue), "Button");
style.registerHandler(style.fontInternalProperty, new stylersCommon.StylePropertyChangedHandler(
ButtonStyler.setFontInternalProperty,
ButtonStyler.resetFontInternalProperty,
ButtonStyler.getNativeFontInternalValue), "Button");
style.registerHandler(style.textAlignmentProperty, new stylersCommon.StylePropertyChangedHandler(
ButtonStyler.setTextAlignmentProperty,
@@ -271,34 +251,18 @@ export class ButtonStyler implements definition.stylers.Styler {
}
export class TextBaseStyler implements definition.stylers.Styler {
// font-size
private static setFontSizeProperty(view: view.View, newValue: any) {
var ios: TextUIView = <TextUIView>view._nativeView;
ios.font = ios.font.fontWithSize(newValue);
}
private static resetFontSizeProperty(view: view.View, nativeValue: any) {
var ios: TextUIView = <TextUIView>view._nativeView;
ios.font = ios.font.fontWithSize(nativeValue);
}
private static getNativeFontSizeValue(view: view.View): any {
var ios: TextUIView = <TextUIView>view._nativeView;
ios.font.pointSize;
}
// font
private static setFontProperty(view: view.View, newValue: any) {
private static setFontInternalProperty(view: view.View, newValue: any, nativeValue: any) {
var ios: TextUIView = <TextUIView>view._nativeView;
ios.font = UIFont.fontWithDescriptorSize(newValue, ios.font.pointSize);
ios.font = (<font.Font>newValue).getUIFont(nativeValue);
}
private static resetFontProperty(view: view.View, nativeValue: any) {
private static resetFontInternalProperty(view: view.View, nativeValue: any) {
var ios: TextUIView = <TextUIView>view._nativeView;
ios.font = nativeValue;
}
private static getNativeFontValue(view: view.View): any {
private static getNativeFontInternalValue(view: view.View): any {
var ios: TextUIView = <TextUIView>view._nativeView;
return ios.font;
}
@@ -335,15 +299,10 @@ export class TextBaseStyler implements definition.stylers.Styler {
}
public static registerHandlers() {
style.registerHandler(style.fontSizeProperty, new stylersCommon.StylePropertyChangedHandler(
TextBaseStyler.setFontSizeProperty,
TextBaseStyler.resetFontSizeProperty,
TextBaseStyler.getNativeFontSizeValue), "TextBase");
style.registerHandler(style.fontProperty, new stylersCommon.StylePropertyChangedHandler(
TextBaseStyler.setFontProperty,
TextBaseStyler.resetFontProperty,
TextBaseStyler.getNativeFontValue), "TextBase");
style.registerHandler(style.fontInternalProperty, new stylersCommon.StylePropertyChangedHandler(
TextBaseStyler.setFontInternalProperty,
TextBaseStyler.resetFontInternalProperty,
TextBaseStyler.getNativeFontInternalValue), "TextBase");
style.registerHandler(style.textAlignmentProperty, new stylersCommon.StylePropertyChangedHandler(
TextBaseStyler.setTextAlignmentProperty,