diff --git a/package.json b/package.json index bf5e2133d..cdd1da1ba 100644 --- a/package.json +++ b/package.json @@ -1,4 +1,7 @@ { + "name": "NativeScript", + "description": "Telerik NativeScript Core Modules", + "homepage": "https://www.nativescript.org", "repository": { "type": "git", "url": "https://github.com/NativeScript/NativeScript" @@ -42,4 +45,4 @@ "test-ios": "tns run ios --path tests --justlaunch", "test": "npm run test-android && npm run test-ios" } -} +} \ No newline at end of file diff --git a/tests/app/ui/button/button-tests.ts b/tests/app/ui/button/button-tests.ts index 48be06de7..9b1da062b 100644 --- a/tests/app/ui/button/button-tests.ts +++ b/tests/app/ui/button/button-tests.ts @@ -310,7 +310,7 @@ export function test_IntegrationTest_Transform_Decoration_Spacing_WithoutFormatt TKUnit.assertEqual(view.style.textTransform, enums.TextTransform.uppercase, "TextTransform"); TKUnit.assertEqual(view.style.textDecoration, enums.TextDecoration.underline, "TextDecoration"); - TKUnit.assertEqual(view.style.letterSpacing, 10, "LetterSpacing"); + TKUnit.assertEqual(view.style.letterSpacing, 1, "LetterSpacing"); }); } @@ -323,6 +323,6 @@ export function test_IntegrationTest_Transform_Decoration_Spacing_WithFormattedT TKUnit.assertEqual(view.style.textTransform, enums.TextTransform.uppercase, "TextTransform"); TKUnit.assertEqual(view.style.textDecoration, enums.TextDecoration.underline, "TextDecoration"); - TKUnit.assertEqual(view.style.letterSpacing, 10, "LetterSpacing"); + TKUnit.assertEqual(view.style.letterSpacing, 1, "LetterSpacing"); }); } \ No newline at end of file diff --git a/tests/app/ui/label/label-tests.ts b/tests/app/ui/label/label-tests.ts index 383079855..ff84ea191 100644 --- a/tests/app/ui/label/label-tests.ts +++ b/tests/app/ui/label/label-tests.ts @@ -605,7 +605,7 @@ export function test_IntegrationTest_Transform_Decoration_Spacing_WithoutFormatt TKUnit.assertEqual(view.style.textTransform, enums.TextTransform.uppercase, "TextTransform"); TKUnit.assertEqual(view.style.textDecoration, enums.TextDecoration.underline, "TextDecoration"); - TKUnit.assertEqual(view.style.letterSpacing, 10, "LetterSpacing"); + TKUnit.assertEqual(view.style.letterSpacing, 1, "LetterSpacing"); }); } @@ -618,6 +618,6 @@ export function test_IntegrationTest_Transform_Decoration_Spacing_WithFormattedT TKUnit.assertEqual(view.style.textTransform, enums.TextTransform.uppercase, "TextTransform"); TKUnit.assertEqual(view.style.textDecoration, enums.TextDecoration.underline, "TextDecoration"); - TKUnit.assertEqual(view.style.letterSpacing, 10, "LetterSpacing"); + TKUnit.assertEqual(view.style.letterSpacing, 1, "LetterSpacing"); }); } \ No newline at end of file diff --git a/tests/app/ui/text-field/text-field-tests.ts b/tests/app/ui/text-field/text-field-tests.ts index 58cacbdeb..ecfeba172 100644 --- a/tests/app/ui/text-field/text-field-tests.ts +++ b/tests/app/ui/text-field/text-field-tests.ts @@ -549,7 +549,7 @@ export function test_IntegrationTest_Transform_Decoration_Spacing_WithoutFormatt TKUnit.assertEqual(view.style.textTransform, enums.TextTransform.uppercase, "TextTransform"); TKUnit.assertEqual(view.style.textDecoration, enums.TextDecoration.underline, "TextDecoration"); - TKUnit.assertEqual(view.style.letterSpacing, 10, "LetterSpacing"); + TKUnit.assertEqual(view.style.letterSpacing, 1, "LetterSpacing"); }); } @@ -562,6 +562,6 @@ export function test_IntegrationTest_Transform_Decoration_Spacing_WithFormattedT TKUnit.assertEqual(view.style.textTransform, enums.TextTransform.uppercase, "TextTransform"); TKUnit.assertEqual(view.style.textDecoration, enums.TextDecoration.underline, "TextDecoration"); - TKUnit.assertEqual(view.style.letterSpacing, 10, "LetterSpacing"); + TKUnit.assertEqual(view.style.letterSpacing, 1, "LetterSpacing"); }); } \ No newline at end of file diff --git a/tests/app/ui/text-view/text-view-tests.ts b/tests/app/ui/text-view/text-view-tests.ts index d004da692..f8a4044d9 100644 --- a/tests/app/ui/text-view/text-view-tests.ts +++ b/tests/app/ui/text-view/text-view-tests.ts @@ -503,7 +503,7 @@ export function test_IntegrationTest_Transform_Decoration_Spacing_WithoutFormatt TKUnit.assertEqual(view.style.textTransform, enums.TextTransform.uppercase, "TextTransform"); TKUnit.assertEqual(view.style.textDecoration, enums.TextDecoration.underline, "TextDecoration"); - TKUnit.assertEqual(view.style.letterSpacing, 10, "LetterSpacing"); + TKUnit.assertEqual(view.style.letterSpacing, 1, "LetterSpacing"); }); } @@ -516,6 +516,6 @@ export function test_IntegrationTest_Transform_Decoration_Spacing_WithFormattedT TKUnit.assertEqual(view.style.textTransform, enums.TextTransform.uppercase, "TextTransform"); TKUnit.assertEqual(view.style.textDecoration, enums.TextDecoration.underline, "TextDecoration"); - TKUnit.assertEqual(view.style.letterSpacing, 10, "LetterSpacing"); + TKUnit.assertEqual(view.style.letterSpacing, 1, "LetterSpacing"); }); } \ No newline at end of file diff --git a/tns-core-modules/ui/button/button.android.ts b/tns-core-modules/ui/button/button.android.ts index 363879be8..372ace91c 100644 --- a/tns-core-modules/ui/button/button.android.ts +++ b/tns-core-modules/ui/button/button.android.ts @@ -3,6 +3,7 @@ import utils = require("utils/utils") import dependencyObservable = require("ui/core/dependency-observable"); import style = require("ui/styling/style"); import { TextBaseStyler as TBS } from "ui/text-base/text-base-styler"; +import {device} from "platform"; global.moduleMerge(common, exports); @@ -32,12 +33,12 @@ export class Button extends common.Button { return that.get(); }, - onClick: function(v) { + onClick: function (v) { if (this.owner) { this.owner._emit(common.Button.tapEvent); } } - })); + })); this._android.setOnTouchListener(new android.view.View.OnTouchListener( { @@ -45,7 +46,7 @@ export class Button extends common.Button { return that.get(); }, - onTouch: function(v, ev) { + onTouch: function (v, ev) { if (ev.getAction() === 0) { // down this.owner._goToVisualState("highlighted"); } @@ -120,10 +121,12 @@ export class ButtonStyler implements style.Styler { TextBaseStyler.setWhiteSpaceProperty, TextBaseStyler.resetWhiteSpaceProperty), "Button"); - style.registerHandler(style.letterSpacingProperty, new style.StylePropertyChangedHandler( - TextBaseStyler.setLetterSpacingProperty, - TextBaseStyler.resetLetterSpacingProperty, - TextBaseStyler.getLetterSpacingProperty), "Button"); + if (parseInt(device.sdkVersion, 10) >= 21) { + style.registerHandler(style.letterSpacingProperty, new style.StylePropertyChangedHandler( + TextBaseStyler.setLetterSpacingProperty, + TextBaseStyler.resetLetterSpacingProperty, + TextBaseStyler.getLetterSpacingProperty), "Button"); + } } } diff --git a/tns-core-modules/ui/text-base/text-base-styler.android.ts b/tns-core-modules/ui/text-base/text-base-styler.android.ts index a377ae913..5482faf11 100644 --- a/tns-core-modules/ui/text-base/text-base-styler.android.ts +++ b/tns-core-modules/ui/text-base/text-base-styler.android.ts @@ -3,6 +3,7 @@ import utils = require("utils/utils"); import style = require("ui/styling/style"); import font = require("ui/styling/font"); import enums = require("ui/enums"); +import {device} from "platform"; export class TextBaseStyler implements style.Styler { // color @@ -109,20 +110,16 @@ export class TextBaseStyler implements style.Styler { } // letter-spacing - private static getLetterSpacingProperty(view: view.View) : any { - return view.android.getLetterSpacing ? view.android.getLetterSpacing() : 0; + private static getLetterSpacingProperty(view: view.View): any { + return view.android.getLetterSpacing(); } private static setLetterSpacingProperty(view: view.View, newValue: any) { - if(view.android.setLetterSpacing) { - view.android.setLetterSpacing(newValue); - } + view.android.setLetterSpacing(newValue); } private static resetLetterSpacingProperty(view: view.View, nativeValue: any) { - if(view.android.setLetterSpacing) { - view.android.setLetterSpacing(nativeValue); - } + view.android.setLetterSpacing(nativeValue); } public static registerHandlers() { @@ -153,14 +150,16 @@ export class TextBaseStyler implements style.Styler { TextBaseStyler.setWhiteSpaceProperty, TextBaseStyler.resetWhiteSpaceProperty), "TextBase"); - style.registerHandler(style.letterSpacingProperty, new style.StylePropertyChangedHandler( - TextBaseStyler.setLetterSpacingProperty, - TextBaseStyler.resetLetterSpacingProperty, - TextBaseStyler.getLetterSpacingProperty), "TextBase"); + if (parseInt(device.sdkVersion, 10) >= 21) { + style.registerHandler(style.letterSpacingProperty, new style.StylePropertyChangedHandler( + TextBaseStyler.setLetterSpacingProperty, + TextBaseStyler.resetLetterSpacingProperty, + TextBaseStyler.getLetterSpacingProperty), "TextBase"); + } // !!! IMPORTANT !!! Button registrations were moved to button.android.ts to make sure they // are executed when there is a Button on the page: https://github.com/NativeScript/NativeScript/issues/1902 // If there is no TextBase on the Page, the TextBaseStyler.registerHandlers // method was never called because the file it is called from was never required. } -} +} \ No newline at end of file