fix: some shape fixes

farfromrefug · farfromrefug · commit d3c73dcafc20 · 2021-07-30T15:56:50.000+02:00
diff --git a/src/button/button.android.ts b/src/button/button.android.ts
@@ -90,9 +90,19 @@ export class Button extends ButtonBase {
         const color = !value || value instanceof Color ? value : new Color(value);
         this.nativeViewProtected.setRippleColor(color ? getColorStateList(color.android) : null);
     }
+    defaultAppearanceModel;
     [shapeProperty.setNative](shape: string) {
         const appearanceModel = themer.getShape(shape);
-        this.nativeViewProtected.setShapeAppearanceModel(appearanceModel);
+        if (!shape) {
+            if (this.defaultAppearanceModel) {
+                this.nativeViewProtected.setShapeAppearanceModel(this.defaultAppearanceModel);
+            }
+        } else {
+            if (!this.defaultAppearanceModel) {
+                this.defaultAppearanceModel = this.nativeViewProtected.getShapeAppearanceModel();
+            }
+            this.nativeViewProtected.setShapeAppearanceModel(appearanceModel);
+        }
     }
 
     getDefaultElevation(): number {
diff --git a/src/cardview/cardview.android.ts b/src/cardview/cardview.android.ts
@@ -323,10 +323,19 @@ export class CardView extends CardViewBase {
             }
         }
     }
-
+    defaultAppearanceModel;
     [shapeProperty.setNative](shape: string) {
         const appearanceModel = themer.getShape(shape);
-        this.nativeViewProtected.setShapeAppearanceModel(appearanceModel);
+        if (!shape) {
+            if (this.defaultAppearanceModel) {
+                this.nativeViewProtected.setShapeAppearanceModel(this.defaultAppearanceModel);
+            }
+        } else {
+            if (!this.defaultAppearanceModel) {
+                this.defaultAppearanceModel = this.nativeViewProtected.getShapeAppearanceModel();
+            }
+            this.nativeViewProtected.setShapeAppearanceModel(appearanceModel);
+        }
     }
 
     [elevationProperty.setNative](value: number) {
diff --git a/src/core/index.android.ts b/src/core/index.android.ts
@@ -1,4 +1,16 @@
-import { Application, Background, Button, Color, Length, View, androidDynamicElevationOffsetProperty, androidElevationProperty, backgroundInternalProperty, profile, PercentLength } from '@nativescript/core';
+import {
+    Application,
+    Background,
+    Button,
+    Color,
+    Length,
+    PercentLength,
+    View,
+    androidDynamicElevationOffsetProperty,
+    androidElevationProperty,
+    backgroundInternalProperty,
+    profile
+} from '@nativescript/core';
 import { createRippleDrawable, createStateListAnimator, getAttrColor, getColorStateList, handleClearFocus, isPostLollipop, isPostLollipopMR1, isPostMarshmallow } from './android/utils';
 import { CornerFamily, applyMixins } from './index.common';
 import { cssProperty, dynamicElevationOffsetProperty, elevationProperty, rippleColorProperty } from './cssproperties';
@@ -133,7 +145,7 @@ export class Themer {
                     builder.setAllCornerSizes(PercentLength.toDevicePixels(options.cornerSize));
                 }
             } else {
-                builder.setAllCornerSizes(options.cornerSize);
+                builder.setAllCornerSizes(PercentLength.toDevicePixels(options.cornerSize));
             }
         }
         if (options.cornerSizeBottomLeft !== undefined) {
@@ -144,7 +156,7 @@ export class Themer {
                     builder.setBottomLeftCornerSize(PercentLength.toDevicePixels(options.cornerSizeBottomLeft));
                 }
             } else {
-                builder.setBottomLeftCornerSize(options.cornerSizeBottomLeft);
+                builder.setBottomLeftCornerSize(PercentLength.toDevicePixels(options.cornerSizeBottomLeft));
             }
         }
         if (options.cornerSizeBottomRight !== undefined) {
@@ -155,7 +167,7 @@ export class Themer {
                     builder.setBottomRightCornerSize(PercentLength.toDevicePixels(options.cornerSizeBottomRight));
                 }
             } else {
-                builder.setBottomRightCornerSize(options.cornerSizeBottomRight);
+                builder.setBottomRightCornerSize(PercentLength.toDevicePixels(options.cornerSizeBottomRight));
             }
         }
         if (options.cornerSizeTopRight !== undefined) {
@@ -166,7 +178,7 @@ export class Themer {
                     builder.setTopRightCornerSize(PercentLength.toDevicePixels(options.cornerSizeTopRight));
                 }
             } else {
-                builder.setTopRightCornerSize(options.cornerSizeTopRight);
+                builder.setTopRightCornerSize(PercentLength.toDevicePixels(options.cornerSizeTopRight));
             }
         }
         if (options.cornerSizeTopLeft !== undefined) {
@@ -177,7 +189,7 @@ export class Themer {
                     builder.setTopLeftCornerSize(PercentLength.toDevicePixels(options.cornerSizeTopLeft));
                 }
             } else {
-                builder.setTopLeftCornerSize(options.cornerSizeTopLeft);
+                builder.setTopLeftCornerSize(PercentLength.toDevicePixels(options.cornerSizeTopLeft));
             }
         }
         this._shapes[key] = builder.build();
diff --git a/src/core/index.ios.ts b/src/core/index.ios.ts
@@ -45,9 +45,9 @@ function cornerTreatment(cornerFamily: CornerFamily, cornerSize: number | CoreTy
         }
     } else {
         if (cornerFamily === CornerFamily.ROUNDED) {
-            corner = MDCCornerTreatment.cornerWithCut(cornerSize);
+            corner = MDCCornerTreatment.cornerWithRadius(PercentLength.toDevicePixels(cornerSize));
         } else {
-            corner = MDCCornerTreatment.cornerWithRadius(cornerSize);
+            corner = MDCCornerTreatment.cornerWithCut(PercentLength.toDevicePixels(cornerSize));
         }
     }
     return corner;
@@ -177,18 +177,18 @@ export class Themer {
             shapeCategory.topLeftCorner = corner;
             shapeCategory.topRightCorner = corner;
         }
-        if (options.cornerFamilyBottomLeft && options.cornerSizeBottomLeft !== undefined) {
-            shapeCategory.bottomLeftCorner = cornerTreatment(options.cornerFamilyBottomLeft, options.cornerSizeBottomLeft);
+        if (options.cornerSizeBottomLeft !== undefined) {
+            shapeCategory.bottomLeftCorner = cornerTreatment(options.cornerFamilyBottomLeft || options.cornerFamily, options.cornerSizeBottomLeft);
         }
-        if (options.cornerFamilyBottomRight && options.cornerSizeBottomRight !== undefined) {
-            shapeCategory.bottomRightCorner = cornerTreatment(options.cornerFamilyBottomRight, options.cornerSizeBottomRight);
+        if (options.cornerSizeBottomRight !== undefined) {
+            shapeCategory.bottomRightCorner = cornerTreatment(options.cornerFamilyBottomRight || options.cornerFamily, options.cornerSizeBottomRight);
         }
 
-        if (options.cornerFamilyTopLeft && options.cornerSizeTopLeft !== undefined) {
-            shapeCategory.topLeftCorner = cornerTreatment(options.cornerFamilyTopLeft, options.cornerSizeTopLeft);
+        if (options.cornerSizeTopLeft !== undefined) {
+            shapeCategory.topLeftCorner = cornerTreatment(options.cornerFamilyTopLeft || options.cornerFamily, options.cornerSizeTopLeft);
         }
-        if (options.cornerFamilyTopRight && options.cornerSizeTopRight !== undefined) {
-            shapeCategory.topRightCorner = cornerTreatment(options.cornerFamilyTopRight, options.cornerSizeTopRight);
+        if (options.cornerSizeTopRight !== undefined) {
+            shapeCategory.topRightCorner = cornerTreatment(options.cornerFamilyTopRight || options.cornerFamily, options.cornerSizeTopRight);
         }
         shapeScheme.smallComponentShape = shapeCategory;
         shapeScheme.mediumComponentShape = shapeCategory;
diff --git a/src/floatingactionbutton/floatingactionbutton.android.ts b/src/floatingactionbutton/floatingactionbutton.android.ts
@@ -107,8 +107,18 @@ export class FloatingActionButton extends FloatingActionButtonBase {
             this.nativeViewProtected.shrink();
         }
     }
+    defaultAppearanceModel;
     [shapeProperty.setNative](shape: string) {
         const appearanceModel = themer.getShape(shape);
-        this.nativeViewProtected.setShapeAppearanceModel(appearanceModel);
+        if (!shape) {
+            if (this.defaultAppearanceModel) {
+                this.nativeViewProtected.setShapeAppearanceModel(this.defaultAppearanceModel);
+            }
+        } else {
+            if (!this.defaultAppearanceModel) {
+                this.defaultAppearanceModel = this.nativeViewProtected.getShapeAppearanceModel();
+            }
+            this.nativeViewProtected.setShapeAppearanceModel(appearanceModel);
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -323,10 +323,19 @@ export class CardView extends CardViewBase {`
`323`	`323`	`}`
`324`	`324`	`}`
`325`	`325`	`}`
`326`		`-`
	`326`	`+ defaultAppearanceModel;`
`327`	`327`	`[shapeProperty.setNative](shape: string) {`
`328`	`328`	`const appearanceModel = themer.getShape(shape);`
`329`		`- this.nativeViewProtected.setShapeAppearanceModel(appearanceModel);`
	`329`	`+ if (!shape) {`
	`330`	`+ if (this.defaultAppearanceModel) {`
	`331`	`+ this.nativeViewProtected.setShapeAppearanceModel(this.defaultAppearanceModel);`
	`332`	`+ }`
	`333`	`+ } else {`
	`334`	`+ if (!this.defaultAppearanceModel) {`
	`335`	`+ this.defaultAppearanceModel = this.nativeViewProtected.getShapeAppearanceModel();`
	`336`	`+ }`
	`337`	`+ this.nativeViewProtected.setShapeAppearanceModel(appearanceModel);`
	`338`	`+ }`
`330`	`339`	`}`
`331`	`340`
`332`	`341`	`[elevationProperty.setNative](value: number) {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,16 @@`
`1`		`-import { Application, Background, Button, Color, Length, View, androidDynamicElevationOffsetProperty, androidElevationProperty, backgroundInternalProperty, profile, PercentLength } from '@nativescript/core';`
	`1`	`+import {`
	`2`	`+ Application,`
	`3`	`+ Background,`
	`4`	`+ Button,`
	`5`	`+ Color,`
	`6`	`+ Length,`
	`7`	`+ PercentLength,`
	`8`	`+ View,`
	`9`	`+ androidDynamicElevationOffsetProperty,`
	`10`	`+ androidElevationProperty,`
	`11`	`+ backgroundInternalProperty,`
	`12`	`+ profile`
	`13`	`+} from '@nativescript/core';`
`2`	`14`	`import { createRippleDrawable, createStateListAnimator, getAttrColor, getColorStateList, handleClearFocus, isPostLollipop, isPostLollipopMR1, isPostMarshmallow } from './android/utils';`
`3`	`15`	`import { CornerFamily, applyMixins } from './index.common';`
`4`	`16`	`import { cssProperty, dynamicElevationOffsetProperty, elevationProperty, rippleColorProperty } from './cssproperties';`
`@@ -133,7 +145,7 @@ export class Themer {`
`133`	`145`	`builder.setAllCornerSizes(PercentLength.toDevicePixels(options.cornerSize));`
`134`	`146`	`}`
`135`	`147`	`} else {`
`136`		`- builder.setAllCornerSizes(options.cornerSize);`
	`148`	`+ builder.setAllCornerSizes(PercentLength.toDevicePixels(options.cornerSize));`
`137`	`149`	`}`
`138`	`150`	`}`
`139`	`151`	`if (options.cornerSizeBottomLeft !== undefined) {`
`@@ -144,7 +156,7 @@ export class Themer {`
`144`	`156`	`builder.setBottomLeftCornerSize(PercentLength.toDevicePixels(options.cornerSizeBottomLeft));`
`145`	`157`	`}`
`146`	`158`	`} else {`
`147`		`- builder.setBottomLeftCornerSize(options.cornerSizeBottomLeft);`
	`159`	`+ builder.setBottomLeftCornerSize(PercentLength.toDevicePixels(options.cornerSizeBottomLeft));`
`148`	`160`	`}`
`149`	`161`	`}`
`150`	`162`	`if (options.cornerSizeBottomRight !== undefined) {`
`@@ -155,7 +167,7 @@ export class Themer {`
`155`	`167`	`builder.setBottomRightCornerSize(PercentLength.toDevicePixels(options.cornerSizeBottomRight));`
`156`	`168`	`}`
`157`	`169`	`} else {`
`158`		`- builder.setBottomRightCornerSize(options.cornerSizeBottomRight);`
	`170`	`+ builder.setBottomRightCornerSize(PercentLength.toDevicePixels(options.cornerSizeBottomRight));`
`159`	`171`	`}`
`160`	`172`	`}`
`161`	`173`	`if (options.cornerSizeTopRight !== undefined) {`
`@@ -166,7 +178,7 @@ export class Themer {`
`166`	`178`	`builder.setTopRightCornerSize(PercentLength.toDevicePixels(options.cornerSizeTopRight));`
`167`	`179`	`}`
`168`	`180`	`} else {`
`169`		`- builder.setTopRightCornerSize(options.cornerSizeTopRight);`
	`181`	`+ builder.setTopRightCornerSize(PercentLength.toDevicePixels(options.cornerSizeTopRight));`
`170`	`182`	`}`
`171`	`183`	`}`
`172`	`184`	`if (options.cornerSizeTopLeft !== undefined) {`
`@@ -177,7 +189,7 @@ export class Themer {`
`177`	`189`	`builder.setTopLeftCornerSize(PercentLength.toDevicePixels(options.cornerSizeTopLeft));`
`178`	`190`	`}`
`179`	`191`	`} else {`
`180`		`- builder.setTopLeftCornerSize(options.cornerSizeTopLeft);`
	`192`	`+ builder.setTopLeftCornerSize(PercentLength.toDevicePixels(options.cornerSizeTopLeft));`
`181`	`193`	`}`
`182`	`194`	`}`
`183`	`195`	`this._shapes[key] = builder.build();`
Original file line number	Diff line number	Diff line change
`@@ -45,9 +45,9 @@ function cornerTreatment(cornerFamily: CornerFamily, cornerSize: number \| CoreTy`
`45`	`45`	`}`
`46`	`46`	`} else {`
`47`	`47`	`if (cornerFamily === CornerFamily.ROUNDED) {`
`48`		`- corner = MDCCornerTreatment.cornerWithCut(cornerSize);`
	`48`	`+ corner = MDCCornerTreatment.cornerWithRadius(PercentLength.toDevicePixels(cornerSize));`
`49`	`49`	`} else {`
`50`		`- corner = MDCCornerTreatment.cornerWithRadius(cornerSize);`
	`50`	`+ corner = MDCCornerTreatment.cornerWithCut(PercentLength.toDevicePixels(cornerSize));`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`	`return corner;`
`@@ -177,18 +177,18 @@ export class Themer {`
`177`	`177`	`shapeCategory.topLeftCorner = corner;`
`178`	`178`	`shapeCategory.topRightCorner = corner;`
`179`	`179`	`}`
`180`		`- if (options.cornerFamilyBottomLeft && options.cornerSizeBottomLeft !== undefined) {`
`181`		`- shapeCategory.bottomLeftCorner = cornerTreatment(options.cornerFamilyBottomLeft, options.cornerSizeBottomLeft);`
	`180`	`+ if (options.cornerSizeBottomLeft !== undefined) {`
	`181`	`+ shapeCategory.bottomLeftCorner = cornerTreatment(options.cornerFamilyBottomLeft \|\| options.cornerFamily, options.cornerSizeBottomLeft);`
`182`	`182`	`}`
`183`		`- if (options.cornerFamilyBottomRight && options.cornerSizeBottomRight !== undefined) {`
`184`		`- shapeCategory.bottomRightCorner = cornerTreatment(options.cornerFamilyBottomRight, options.cornerSizeBottomRight);`
	`183`	`+ if (options.cornerSizeBottomRight !== undefined) {`
	`184`	`+ shapeCategory.bottomRightCorner = cornerTreatment(options.cornerFamilyBottomRight \|\| options.cornerFamily, options.cornerSizeBottomRight);`
`185`	`185`	`}`
`186`	`186`
`187`		`- if (options.cornerFamilyTopLeft && options.cornerSizeTopLeft !== undefined) {`
`188`		`- shapeCategory.topLeftCorner = cornerTreatment(options.cornerFamilyTopLeft, options.cornerSizeTopLeft);`
	`187`	`+ if (options.cornerSizeTopLeft !== undefined) {`
	`188`	`+ shapeCategory.topLeftCorner = cornerTreatment(options.cornerFamilyTopLeft \|\| options.cornerFamily, options.cornerSizeTopLeft);`
`189`	`189`	`}`
`190`		`- if (options.cornerFamilyTopRight && options.cornerSizeTopRight !== undefined) {`
`191`		`- shapeCategory.topRightCorner = cornerTreatment(options.cornerFamilyTopRight, options.cornerSizeTopRight);`
	`190`	`+ if (options.cornerSizeTopRight !== undefined) {`
	`191`	`+ shapeCategory.topRightCorner = cornerTreatment(options.cornerFamilyTopRight \|\| options.cornerFamily, options.cornerSizeTopRight);`
`192`	`192`	`}`
`193`	`193`	`shapeScheme.smallComponentShape = shapeCategory;`
`194`	`194`	`shapeScheme.mediumComponentShape = shapeCategory;`
Original file line number	Diff line number	Diff line change
`@@ -107,8 +107,18 @@ export class FloatingActionButton extends FloatingActionButtonBase {`
`107`	`107`	`this.nativeViewProtected.shrink();`
`108`	`108`	`}`
`109`	`109`	`}`
	`110`	`+ defaultAppearanceModel;`
`110`	`111`	`[shapeProperty.setNative](shape: string) {`
`111`	`112`	`const appearanceModel = themer.getShape(shape);`
`112`		`- this.nativeViewProtected.setShapeAppearanceModel(appearanceModel);`
	`113`	`+ if (!shape) {`
	`114`	`+ if (this.defaultAppearanceModel) {`
	`115`	`+ this.nativeViewProtected.setShapeAppearanceModel(this.defaultAppearanceModel);`
	`116`	`+ }`
	`117`	`+ } else {`
	`118`	`+ if (!this.defaultAppearanceModel) {`
	`119`	`+ this.defaultAppearanceModel = this.nativeViewProtected.getShapeAppearanceModel();`
	`120`	`+ }`
	`121`	`+ this.nativeViewProtected.setShapeAppearanceModel(appearanceModel);`
	`122`	`+ }`
`113`	`123`	`}`
`114`	`124`	`}`