From 8fc42ff917d3cb04cec836ea7747a496475b2a23 Mon Sep 17 00:00:00 2001 From: Eduardo Speroni Date: Mon, 6 May 2019 20:20:03 -0300 Subject: [PATCH] rename clickable to tappable in Span --- apps/app/ui-tests-app/css/main-page.ts | 2 +- .../{clickable-span.ts => tappable-span.ts} | 0 .../{clickable-span.xml => tappable-span.xml} | 4 ++-- tns-core-modules/text/span.d.ts | 8 +++---- tns-core-modules/text/span.ts | 20 ++++++++-------- .../ui/text-base/text-base.android.ts | 24 +++++++++---------- 6 files changed, 29 insertions(+), 29 deletions(-) rename apps/app/ui-tests-app/css/{clickable-span.ts => tappable-span.ts} (100%) rename apps/app/ui-tests-app/css/{clickable-span.xml => tappable-span.xml} (92%) diff --git a/apps/app/ui-tests-app/css/main-page.ts b/apps/app/ui-tests-app/css/main-page.ts index b43b01325..617bab3d8 100644 --- a/apps/app/ui-tests-app/css/main-page.ts +++ b/apps/app/ui-tests-app/css/main-page.ts @@ -44,6 +44,6 @@ export function loadExamples() { examples.set("background-shorthand", "css/background-shorthand"); examples.set("background-image-linear-gradient", "css/background-image-linear-gradient"); examples.set("background-image", "css/background-image"); - examples.set("clickable-span", "css/clickable-span"); + examples.set("tappable-span", "css/tappable-span"); return examples; } \ No newline at end of file diff --git a/apps/app/ui-tests-app/css/clickable-span.ts b/apps/app/ui-tests-app/css/tappable-span.ts similarity index 100% rename from apps/app/ui-tests-app/css/clickable-span.ts rename to apps/app/ui-tests-app/css/tappable-span.ts diff --git a/apps/app/ui-tests-app/css/clickable-span.xml b/apps/app/ui-tests-app/css/tappable-span.xml similarity index 92% rename from apps/app/ui-tests-app/css/clickable-span.xml rename to apps/app/ui-tests-app/css/tappable-span.xml index 6d90f0905..0730daf9a 100644 --- a/apps/app/ui-tests-app/css/clickable-span.xml +++ b/apps/app/ui-tests-app/css/tappable-span.xml @@ -5,9 +5,9 @@ - + - + diff --git a/tns-core-modules/text/span.d.ts b/tns-core-modules/text/span.d.ts index 399d040a3..9b2855e6f 100644 --- a/tns-core-modules/text/span.d.ts +++ b/tns-core-modules/text/span.d.ts @@ -52,14 +52,14 @@ export class Span extends ViewBase { public text: string; /** - * String value used when hooking to linkClicked event. + * String value used when hooking to linkTap event. */ - public static linkClickedEvent: string; + public static linkTapEvent: string; /** - * Gets if the span is clickable or not. + * Gets if the span is tappable or not. */ - public readonly clickable: boolean; + public readonly tappable: boolean; //@private /** diff --git a/tns-core-modules/text/span.ts b/tns-core-modules/text/span.ts index aeaf1427f..b184683c6 100644 --- a/tns-core-modules/text/span.ts +++ b/tns-core-modules/text/span.ts @@ -5,9 +5,9 @@ import { FontStyle, FontWeight, } from "../ui/styling/font"; import { TextDecoration, EventData } from "../ui/text-base"; export class Span extends ViewBase implements SpanDefinition { - static linkClickEvent = "linkClick"; + static linkTapEvent = "linkTap"; private _text: string; - private _clickable: boolean = false; + private _tappable: boolean = false; get fontFamily(): string { return this.style.fontFamily; @@ -70,28 +70,28 @@ export class Span extends ViewBase implements SpanDefinition { } } - get clickable(): boolean { - return this._clickable; + get tappable(): boolean { + return this._tappable; } addEventListener(arg: string, callback: (data: EventData) => void, thisArg?: any) { super.addEventListener(arg, callback, thisArg); - this._setClickable(this.hasListeners(Span.linkClickEvent)); + this._setTappable(this.hasListeners(Span.linkTapEvent)); } removeEventListener(arg: string, callback?: any, thisArg?: any) { super.removeEventListener(arg, callback, thisArg); - this._setClickable(this.hasListeners(Span.linkClickEvent)); + this._setTappable(this.hasListeners(Span.linkTapEvent)); } _setTextInternal(value: string): void { this._text = value; } - private _setClickable(value: boolean): void { - if (this._clickable !== value) { - this._clickable = value; - this.notifyPropertyChange("clickable", value); + private _setTappable(value: boolean): void { + if (this._tappable !== value) { + this._tappable = value; + this.notifyPropertyChange("tappable", value); } } } diff --git a/tns-core-modules/ui/text-base/text-base.android.ts b/tns-core-modules/ui/text-base/text-base.android.ts index 37db6e22f..9008a7176 100644 --- a/tns-core-modules/ui/text-base/text-base.android.ts +++ b/tns-core-modules/ui/text-base/text-base.android.ts @@ -72,7 +72,7 @@ function initializeClickableSpan(): void { onClick(view: android.view.View): void { const owner = this.owner.get(); if (owner) { - owner._emit(Span.linkClickEvent); + owner._emit(Span.linkTapEvent); } view.clearFocus(); view.invalidate(); @@ -94,7 +94,7 @@ export class TextBase extends TextBaseCommon { private _maxHeight: number; private _minLines: number; private _maxLines: number; - private _clickable: boolean = false; + private _tappable: boolean = false; private _defaultMovementMethod: android.text.method.MovementMethod; public initNativeView(): void { @@ -148,7 +148,7 @@ export class TextBase extends TextBaseCommon { if (!reset && this.formattedText) { return; } - this._setClickableState(false); + this._setTappableState(false); this._setNativeText(reset); } @@ -169,7 +169,7 @@ export class TextBase extends TextBaseCommon { const spannableStringBuilder = createSpannableStringBuilder(value); nativeView.setText(spannableStringBuilder); - this._setClickableState(isStringClickable(value)); + this._setTappableState(isStringTappable(value)); textProperty.nativeValueChange(this, (value === null || value === undefined) ? "" : value.toString()); @@ -353,10 +353,10 @@ export class TextBase extends TextBaseCommon { this.nativeTextViewProtected.setText(transformedText); } - _setClickableState(clickable: boolean) { - if (this._clickable !== clickable) { - this._clickable = clickable; - if (this._clickable) { + _setTappableState(tappable: boolean) { + if (this._tappable !== tappable) { + this._tappable = tappable; + if (this._tappable) { this.nativeViewProtected.setMovementMethod(android.text.method.LinkMovementMethod.getInstance()); this.nativeViewProtected.setHighlightColor(null); } @@ -396,13 +396,13 @@ export function getTransformedText(text: string, textTransform: TextTransform): } } -function isStringClickable(formattedString: FormattedString) { +function isStringTappable(formattedString: FormattedString) { if (!formattedString) { return false; } for (let i = 0, length = formattedString.spans.length; i < length; i++) { const span = formattedString.spans.getItem(i); - if (span.clickable) { + if (span.tappable) { return true; } } @@ -507,8 +507,8 @@ function setSpanModifiers(ssb: android.text.SpannableStringBuilder, span: Span, } } - const clickable = span.clickable; - if (clickable) { + const tappable = span.tappable; + if (tappable) { initializeClickableSpan(); ssb.setSpan(new ClickableSpan(span), start, end, android.text.Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); }