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 #2339 from NativeScript/border-drawable

Browse Source 
Implement the BorderDrawable class used in background.android.ts in Java
This commit is contained in:
Rossen Hristov
2016-06-21 09:21:42 +03:00
committed by GitHub
parent e5ce0cc3df 345b2a8163
commit c94693da44
8 changed files with 98 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/app/ui/button/button-tests-native.android.ts
View File

@@ -2,7 +2,6 @@
import colorModule = require("color");
import utilsModule = require("utils/utils");
import enums = require("ui/enums");
import background = require("ui/styling/background");
export function getNativeText(button: buttonModule.Button): string {
return button.android.getText();
@@ -23,8 +22,8 @@ export function getNativeColor(button: buttonModule.Button): colorModule.Color {
export function getNativeBackgroundColor(button: buttonModule.Button): colorModule.Color {
var bkg = <any>button.android.getBackground();
if (bkg instanceof background.ad.BorderDrawable) {
return (<background.ad.BorderDrawable>bkg).background.color;
if (bkg instanceof org.nativescript.widgets.BorderDrawable) {
return new colorModule.Color((<org.nativescript.widgets.BorderDrawable>bkg).getBackgroundColor());
}
else {
return new colorModule.Color(bkg.backgroundColor)

5
tests/app/ui/label/label-tests-native.android.ts
View File

@@ -1,7 +1,6 @@
import labelModule = require("ui/label");
import enums = require("ui/enums");
import colorModule = require("color");
import background = require("ui/styling/background");
export function getNativeTextAlignment(label: labelModule.Label): string {
var gravity = label.android.getGravity();
@@ -23,8 +22,8 @@ export function getNativeTextAlignment(label: labelModule.Label): string {
export function getNativeBackgroundColor(label: labelModule.Label): colorModule.Color {
var bkg = <any>label.android.getBackground();
if (bkg instanceof background.ad.BorderDrawable) {
return (<background.ad.BorderDrawable>bkg).background.color;
if (bkg instanceof org.nativescript.widgets.BorderDrawable) {
return new colorModule.Color((<org.nativescript.widgets.BorderDrawable>bkg).getBackgroundColor());
}
else {
return new colorModule.Color(bkg.backgroundColor)

5
tests/app/ui/label/label-tests.ts
View File

@@ -15,7 +15,6 @@ import textBase = require("ui/text-base");
import enums = require("ui/enums");
import labelTestsNative = require("./label-tests-native");
import fs = require("file-system");
import background = require("ui/styling/background");
import {StackLayout} from "ui/layouts/stack-layout";
import {GridLayout} from "ui/layouts/grid-layout";
@@ -261,8 +260,8 @@ export class LabelTest extends testModule.UITest<LabelModule.Label> {
normalColor = actualColors.getDefaultColor()
TKUnit.assert(normalColor, "Expected: " + expColor + ", Actual: " + normalColor);
var bkg = (<background.ad.BorderDrawable>testLabel.android.getBackground());
actualBackgroundColor = bkg.background.color.android;
var bkg = (<org.nativescript.widgets.BorderDrawable>testLabel.android.getBackground());
actualBackgroundColor = bkg.getBackgroundColor();
expBackgroundColor = android.graphics.Color.parseColor(backgroundColor);
TKUnit.assertEqual(actualBackgroundColor, expBackgroundColor);
}

5
tests/app/ui/text-field/text-field-tests-native.android.ts
View File

@@ -2,7 +2,6 @@
import colorModule = require("color");
import utilsModule = require("utils/utils");
import enums = require("ui/enums");
import background = require("ui/styling/background");
export function getNativeText(textField: textFieldModule.TextField): string {
return textField.android.getText().toString();
@@ -28,8 +27,8 @@ export function getNativeColor(textField: textFieldModule.TextField): colorModul
export function getNativeBackgroundColor(textField: textFieldModule.TextField): colorModule.Color {
var bkg = <any>textField.android.getBackground();
if (bkg instanceof background.ad.BorderDrawable) {
return (<background.ad.BorderDrawable>bkg).background.color;
if (bkg instanceof org.nativescript.widgets.BorderDrawable) {
return new colorModule.Color((<org.nativescript.widgets.BorderDrawable>bkg).getBackgroundColor());
}
else {
return new colorModule.Color(bkg.backgroundColor)

5
tests/app/ui/text-view/text-view-tests-native.android.ts
View File

@@ -2,7 +2,6 @@
import colorModule = require("color");
import utilsModule = require("utils/utils");
import enums = require("ui/enums");
import background = require("ui/styling/background");
export function getNativeText(textView: textViewModule.TextView): string {
return textView.android.getText().toString();
@@ -32,8 +31,8 @@ export function getNativeColor(textView: textViewModule.TextView): colorModule.C
export function getNativeBackgroundColor(textView: textViewModule.TextView): colorModule.Color {
var bkg = <any>textView.android.getBackground();
if (bkg instanceof background.ad.BorderDrawable) {
return (<background.ad.BorderDrawable>bkg).background.color;
if (bkg instanceof org.nativescript.widgets.BorderDrawable) {
return new colorModule.Color((<org.nativescript.widgets.BorderDrawable>bkg).getBackgroundColor());
}
else {
return new colorModule.Color(bkg.backgroundColor)

21
tests/app/ui/view/view-tests.android.ts
View File

@@ -6,7 +6,6 @@ import button = require("ui/button");
import types = require("utils/types");
import stack = require("ui/layouts/stack-layout");
import labelModule = require("ui/label");
import background = require("ui/styling/background");
import frame = require("ui/frame");
import trace = require("trace");
// enable the trace, it is disabled by default
@@ -269,33 +268,33 @@ export var test_StylePropertiesDefaultValuesCache = function () {
}
export function getNativeBorderWidth(v: view.View): number {
var bkg = <any>(<android.view.View>v.android).getBackground();
var bkg = <org.nativescript.widgets.BorderDrawable>v.android.getBackground();
return bkg ? bkg.borderWidth : -1;
return bkg ? bkg.getBorderWidth() : -1;
}
export function getNativeCornerRadius(v: view.View): number {
var bkg = <any>(<android.view.View>v.android).getBackground();
var bkg = <org.nativescript.widgets.BorderDrawable>v.android.getBackground();
return bkg ? bkg.cornerRadius : -1;
return bkg ? bkg.getBorderRadius() : -1;
}
export function checkNativeBorderColor(v: view.View): boolean {
var bkg = <background.ad.BorderDrawable>(<android.view.View>v.android).getBackground();
var bkg = <org.nativescript.widgets.BorderDrawable>(<android.view.View>v.android).getBackground();
return v.borderColor && bkg && bkg.borderColor === v.borderColor.android;
return v.borderColor && bkg && bkg.getBorderColor() === v.borderColor.android;
}
export function checkNativeBackgroundColor(v: view.View): boolean {
var bkg = <background.ad.BorderDrawable>(<android.view.View>v.android).getBackground();
var bkg = <org.nativescript.widgets.BorderDrawable>(<android.view.View>v.android).getBackground();
return v.backgroundColor && bkg && bkg.background && bkg.background.color.equals(v.backgroundColor);
return v.backgroundColor && bkg && bkg.getBackgroundColor() === v.backgroundColor.android;
}
export function checkNativeBackgroundImage(v: view.View): boolean {
var bkg = <background.ad.BorderDrawable>(<android.view.View>v.android).getBackground();
var bkg = <org.nativescript.widgets.BorderDrawable>(<android.view.View>v.android).getBackground();
return bkg && bkg.background && !types.isNullOrUndefined(bkg.background.image);
return bkg && !types.isNullOrUndefined(bkg.getBackgroundImage());
}
let SDK: number;