Implement the BorderDrawable class used in background.android.ts in Java

hamorphis · hamorphis · commit 559a7c816ec5 · 2016-06-20T11:30:52.000+03:00
Resolves NativeScript#2318
diff --git a/tests/app/ui/button/button-tests-native.android.ts b/tests/app/ui/button/button-tests-native.android.ts
@@ -23,8 +23,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)
diff --git a/tests/app/ui/label/label-tests-native.android.ts b/tests/app/ui/label/label-tests-native.android.ts
@@ -23,8 +23,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)
diff --git a/tests/app/ui/label/label-tests.ts b/tests/app/ui/label/label-tests.ts
@@ -261,8 +261,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);
         }
diff --git a/tests/app/ui/text-field/text-field-tests-native.android.ts b/tests/app/ui/text-field/text-field-tests-native.android.ts
@@ -28,8 +28,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)
diff --git a/tests/app/ui/text-view/text-view-tests-native.android.ts b/tests/app/ui/text-view/text-view-tests-native.android.ts
@@ -32,8 +32,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)
diff --git a/tests/app/ui/view/view-tests.android.ts b/tests/app/ui/view/view-tests.android.ts
@@ -269,33 +269,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;
diff --git a/tns-core-modules/org.nativescript.widgets.d.ts b/tns-core-modules/org.nativescript.widgets.d.ts
@@ -1,6 +1,44 @@
 ﻿declare module org {
     module nativescript {
         module widgets {
+            export class BorderDrawable extends android.graphics.drawable.ColorDrawable {
+                constructor(density: number);
+                public refresh(
+                    borderWidth: number,
+                    borderColor: number,
+                    borderRadius: number,
+                    clipPath: string,
+                    backgroundColor: number,
+                    backgroundImage: android.graphics.Bitmap,
+                    backgroundImageWidth: number,
+                    backgroundImageHeight: number,
+                    backgroundRepeat: string,
+                    backgroundPosition: string,
+                    backgroundPositionParsedCSSValues: native.Array<CSSValue>,
+                    backgroundSize: string,
+                    backgroundSizeParsedCSSValues: native.Array<CSSValue>
+                );
+                public getBorderWidth(): number;
+                public getBorderColor(): number;
+                public getBorderRadius(): number;
+                public getClipPath(): string;
+                public getBackgroundColor(): number;
+                public getBackgroundImage(): android.graphics.Bitmap;
+                public getBackgroundImageWidth(): number;
+                public getBackgroundImageHeight(): number;
+                public getBackgroundRepeat(): string;
+                public getBackgroundPosition(): string;
+                public getBackgroundSize(): string;
+            }
+            
+            export class CSSValue {
+                constructor(type: string, str: string, unit: string, value: number);
+                public getType(): string;
+                public getString(): string;
+                public getUnit(): string;
+                public getValue(): number;
+            }
+            
             export class CommonLayoutParams extends android.widget.FrameLayout.LayoutParams {
                 constructor();
 
diff --git a/tns-core-modules/ui/styling/background.android.ts b/tns-core-modules/ui/styling/background.android.ts

Original file line number	Diff line number	Diff line change
`@@ -269,33 +269,33 @@ export var test_StylePropertiesDefaultValuesCache = function () {`
`269`	`269`	`}`
`270`	`270`
`271`	`271`	`export function getNativeBorderWidth(v: view.View): number {`
`272`		`- var bkg = <any>(<android.view.View>v.android).getBackground();`
	`272`	`+ var bkg = <org.nativescript.widgets.BorderDrawable>v.android.getBackground();`
`273`	`273`
`274`		`- return bkg ? bkg.borderWidth : -1;`
	`274`	`+ return bkg ? bkg.getBorderWidth() : -1;`
`275`	`275`	`}`
`276`	`276`
`277`	`277`	`export function getNativeCornerRadius(v: view.View): number {`
`278`		`- var bkg = <any>(<android.view.View>v.android).getBackground();`
	`278`	`+ var bkg = <org.nativescript.widgets.BorderDrawable>v.android.getBackground();`
`279`	`279`
`280`		`- return bkg ? bkg.cornerRadius : -1;`
	`280`	`+ return bkg ? bkg.getBorderRadius() : -1;`
`281`	`281`	`}`
`282`	`282`
`283`	`283`	`export function checkNativeBorderColor(v: view.View): boolean {`
`284`		`- var bkg = <background.ad.BorderDrawable>(<android.view.View>v.android).getBackground();`
	`284`	`+ var bkg = <org.nativescript.widgets.BorderDrawable>(<android.view.View>v.android).getBackground();`
`285`	`285`
`286`		`- return v.borderColor && bkg && bkg.borderColor === v.borderColor.android;`
	`286`	`+ return v.borderColor && bkg && bkg.getBorderColor() === v.borderColor.android;`
`287`	`287`	`}`
`288`	`288`
`289`	`289`	`export function checkNativeBackgroundColor(v: view.View): boolean {`
`290`		`- var bkg = <background.ad.BorderDrawable>(<android.view.View>v.android).getBackground();`
	`290`	`+ var bkg = <org.nativescript.widgets.BorderDrawable>(<android.view.View>v.android).getBackground();`
`291`	`291`
`292`		`- return v.backgroundColor && bkg && bkg.background && bkg.background.color.equals(v.backgroundColor);`
	`292`	`+ return v.backgroundColor && bkg && bkg.getBackgroundColor() === v.backgroundColor.android;`
`293`	`293`	`}`
`294`	`294`
`295`	`295`	`export function checkNativeBackgroundImage(v: view.View): boolean {`
`296`		`- var bkg = <background.ad.BorderDrawable>(<android.view.View>v.android).getBackground();`
	`296`	`+ var bkg = <org.nativescript.widgets.BorderDrawable>(<android.view.View>v.android).getBackground();`
`297`	`297`
`298`		`- return bkg && bkg.background && !types.isNullOrUndefined(bkg.background.image);`
	`298`	`+ return bkg && !types.isNullOrUndefined(bkg.getBackgroundImage());`
`299`	`299`	`}`
`300`	`300`
`301`	`301`	`let SDK: number;`