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 remote-tracking branch 'origin/master' into merge-release-in-master

Browse Source
This commit is contained in:
vakrilov
2019-12-03 15:51:59 +02:00
parent ab09064345 7b78f3b0c6
commit 6c24650c86
118 changed files with 3073 additions and 1813 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
nativescript-core/ui/text-base/text-base-common.ts
View File

@@ -1,13 +1,19 @@
// Definitions.
import { TextBase as TextBaseDefinition, TextAlignment, TextDecoration, TextTransform, WhiteSpace } from ".";
import { FontStyle, FontWeight } from "../styling/font";
import { PropertyChangeData } from "../../data/observable";
// Types
import { TextBase as TextBaseDefinition } from ".";
import { TextAlignment, TextDecoration, TextTransform, WhiteSpace } from "./text-base-interfaces";
import { Length, ViewBase } from "../core/view";
import { FontStyle, FontWeight } from "../styling/font-interfaces";
import { PropertyChangeData } from "../../data/observable/observable-interfaces";
// Types.
import { View, ViewBase, Property, CssProperty, InheritedCssProperty, Style, isAndroid, isIOS, Observable, makeValidator, makeParser, Length } from "../core/view";
// Requires.
import { FormattedString, Span } from "./formatted-string";
import {
View, Property, CssProperty, InheritedCssProperty, Style, isAndroid, isIOS, Observable,
makeValidator, makeParser
} from "../core/view";
export { FormattedString, Span };
export * from "./text-base-interfaces";
export * from "../core/view";
const CHILD_SPAN = "Span";

11
nativescript-core/ui/text-base/text-base-interfaces.ts Normal file
View File

@@ -0,0 +1,11 @@
// Types
import { TextBase } from "./text-base";
export interface TextTransformation {
new(owner: TextBase): any /* android.text.method.TransformationMethod */;
}
export type WhiteSpace = "initial" | "normal" | "nowrap";
export type TextAlignment = "initial" | "left" | "center" | "right";
export type TextTransform = "initial" | "none" | "capitalize" | "uppercase" | "lowercase";
export type TextDecoration = "none" | "underline" | "line-through" | "underline line-through";

9
nativescript-core/ui/text-base/text-base.android.ts
View File

@@ -1,4 +1,7 @@
import { TextDecoration, TextAlignment, TextTransform, WhiteSpace } from "./text-base";
// Types
import { TextTransformation, TextDecoration, TextAlignment, TextTransform, WhiteSpace } from "./text-base-common";
// Requires
import { Font } from "../styling/font";
import { backgroundColorProperty } from "../styling/style-properties";
import {
@@ -11,10 +14,6 @@ import { isString } from "../../utils/types";
export * from "./text-base-common";
interface TextTransformation {
new(owner: TextBase): android.text.method.TransformationMethod;
}
let TextTransformation: TextTransformation;
function initializeTextTransformation(): void {

10
nativescript-core/ui/text-base/text-base.ios.ts
View File

@@ -1,16 +1,18 @@
import { TextDecoration, TextAlignment, TextTransform } from "./text-base";
// Types
import { TextDecoration, TextAlignment, TextTransform } from "./text-base-common";
// Requires
import { Font } from "../styling/font";
import {
TextBaseCommon, textProperty, formattedTextProperty, textAlignmentProperty, textDecorationProperty,
textTransformProperty, letterSpacingProperty, colorProperty, fontInternalProperty, lineHeightProperty,
FormattedString, Span, Color, isBold, resetSymbol
} from "./text-base-common";
export * from "./text-base-common";
import { isString } from "../../utils/types";
import { ios } from "../../utils/utils";
export * from "./text-base-common";
const majorVersion = ios.MajorVersion;
export class TextBase extends TextBaseCommon {