Merge pull request #3011 from NativeScript/issue-3007

hamorphis · web-flow · commit bb08cc1b496f · 2016-11-03T09:45:31.000+02:00
Fix: java.lang.NumberFormatException when applying clip-path with per…
diff --git a/apps/app/ui-tests-app/issues/issue-3007.css b/apps/app/ui-tests-app/issues/issue-3007.css
@@ -0,0 +1,11 @@
+.container {
+    width: 200; 
+    height: 200; 
+    clip-path: polygon(50% 3%, 3% 100%, 100% 100%);
+    background-color: black;
+}
+.elementStyle {
+    width: 200;
+    height: 200;
+    clip-path: polygon(50% 3%, 3% 100%, 100% 100%);
+}
diff --git a/apps/app/ui-tests-app/issues/issue-3007.xml b/apps/app/ui-tests-app/issues/issue-3007.xml
@@ -0,0 +1,10 @@
+<Page id="Page" xmlns="http://schemas.nativescript.org/tns.xsd">
+  <StackLayout id="StackLayout">
+    <Image id="Image" width="100" height="100" class="elementStyle" src="~/ui-tests-app/image-view/gravatar.png"/>
+    <Button id="Button" backgroundColor="blue" class="elementStyle" text="TAP"  />
+    <Label id="Label" backgroundColor="red" class="elementStyle" text="sample label" textWrap="true"/>
+    <TextField id="TextField" backgroundColor="green" class="elementStyle" hint="" text="Sample textfield" />
+    <TextView id="TextView" class="elementStyle" text="Sample text view" backgroundColor="yellow" editable="true" />
+    <AbsoluteLayout id="AbsoluteLayout" class="container"/>
+  </StackLayout>
+</Page>
diff --git a/apps/app/ui-tests-app/issues/main-page.ts b/apps/app/ui-tests-app/issues/main-page.ts
@@ -14,6 +14,7 @@ export function pageLoaded(args: EventData) {
     examples.set("2911", "issues/issue-2911");
     examples.set("2674", "issues/issue-2674");
     examples.set("2942", "issues/issue-2942");
+    examples.set("3007", "issues/issue-3007");
 
     let viewModel = new SubMianPageViewModel(wrapLayout, examples);
     page.bindingContext = viewModel;
diff --git a/tns-core-modules/ui/styling/background.android.ts b/tns-core-modules/ui/styling/background.android.ts
@@ -67,7 +67,7 @@ export module ad {
                     _defaultBackgrounds.set(viewClass, nativeView.getBackground());
                 }
                 
-                backgroundDrawable = new org.nativescript.widgets.BorderDrawable(density);
+                backgroundDrawable = new org.nativescript.widgets.BorderDrawable(density, v.toString());
                 refreshBorderDrawable(v, <org.nativescript.widgets.BorderDrawable>backgroundDrawable);
                 nativeView.setBackground(backgroundDrawable);
             }
@@ -116,6 +116,7 @@ export module ad {
 }
 
 function refreshBorderDrawable(view: view.View, borderDrawable: org.nativescript.widgets.BorderDrawable){
+    //console.log(`>>> refreshBorderDrawable(${view})...`);
     let background = <background.Background>view.style._getValue(style.backgroundInternalProperty);
     if (background){
         let backgroundPositionParsedCSSValues: native.Array<org.nativescript.widgets.CSSValue> = null;
@@ -154,6 +155,7 @@ function refreshBorderDrawable(view: view.View, borderDrawable: org.nativescript
             background.size,
             backgroundSizeParsedCSSValues
         );
+        //console.log(`>>> ${borderDrawable.toDebugString()}`);
     }
 }
 
diff --git a/tns-platform-declarations/android/org.nativescript.widgets.d.ts b/tns-platform-declarations/android/org.nativescript.widgets.d.ts
@@ -47,6 +47,7 @@
 
             export class BorderDrawable extends android.graphics.drawable.ColorDrawable {
                 constructor(density: number);
+                constructor(density: number, id: string);
                 public refresh(
                     borderTopColor: number,
                     borderRightColor: number,
@@ -104,6 +105,8 @@
                 public hasUniformBorderWidth(): boolean;
                 public hasUniformBorderRadius(): boolean;
                 public hasUniformBorder(): boolean;
+
+                public toDebugString(): string;
             }
 
             export class CSSValue {

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ export module ad {`
`67`	`67`	`_defaultBackgrounds.set(viewClass, nativeView.getBackground());`
`68`	`68`	`}`
`69`	`69`
`70`		`- backgroundDrawable = new org.nativescript.widgets.BorderDrawable(density);`
	`70`	`+ backgroundDrawable = new org.nativescript.widgets.BorderDrawable(density, v.toString());`
`71`	`71`	`refreshBorderDrawable(v, <org.nativescript.widgets.BorderDrawable>backgroundDrawable);`
`72`	`72`	`nativeView.setBackground(backgroundDrawable);`
`73`	`73`	`}`
`@@ -116,6 +116,7 @@ export module ad {`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`function refreshBorderDrawable(view: view.View, borderDrawable: org.nativescript.widgets.BorderDrawable){`
	`119`	+ //console.log(`>>> refreshBorderDrawable(${view})...`);
`119`	`120`	`let background = <background.Background>view.style._getValue(style.backgroundInternalProperty);`
`120`	`121`	`if (background){`
`121`	`122`	`let backgroundPositionParsedCSSValues: native.Array<org.nativescript.widgets.CSSValue> = null;`
`@@ -154,6 +155,7 @@ function refreshBorderDrawable(view: view.View, borderDrawable: org.nativescript`
`154`	`155`	`background.size,`
`155`	`156`	`backgroundSizeParsedCSSValues`
`156`	`157`	`);`
	`158`	+ //console.log(`>>> ${borderDrawable.toDebugString()}`);
`157`	`159`	`}`
`158`	`160`	`}`
`159`	`161`