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)