Merge pull request #99 from zeoflow/bottom-sheet-full-corners

Fixed `BottomSheet` full corners radius
zeoflow · Jun 15, 2021 · 7756ce2 · 7756ce2
2 parents 7fd7162 + ff89b35
commit 7756ce2
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/material-elements/java/com/zeoflow/material/elements/bottomsheet/BottomDrawer.java b/material-elements/java/com/zeoflow/material/elements/bottomsheet/BottomDrawer.java
@@ -221,10 +221,10 @@ public void setHeaderData(@Nullable View headerRoot, int headerSize) {
 
     public void setSubmenuCorners(int submenuCorners) {
         if (marginSubHeader == 0) {
-            subContainerBackground.setCornerSize(0);
+            subContainerBackground.setTopCornerSize(0);
             return;
         }
-        subContainerBackground.setCornerSize(submenuCorners);
+        subContainerBackground.setTopCornerSize(submenuCorners);
     }
 
     public void addRootView(@NonNull View rootView) {

diff --git a/material-elements/java/com/zeoflow/material/elements/shape/MaterialShapeDrawable.java b/material-elements/java/com/zeoflow/material/elements/shape/MaterialShapeDrawable.java
@@ -460,6 +460,13 @@ public void setCornerSize(float cornerSize) {
         setShapeAppearanceModel(drawableState.shapeAppearanceModel.withCornerSize(cornerSize));
     }
 
+    /**
+     * Updates the corners for the given {@link CornerSize}.
+     */
+    public void setTopCornerSize(float cornerSize) {
+        setShapeAppearanceModel(drawableState.shapeAppearanceModel.withTopCornerSize(cornerSize));
+    }
+
     /**
      * Updates the corners for the given {@link CornerSize}.
      */

diff --git a/material-elements/java/com/zeoflow/material/elements/shape/ShapeAppearanceModel.java b/material-elements/java/com/zeoflow/material/elements/shape/ShapeAppearanceModel.java
@@ -393,6 +393,12 @@ public ShapeAppearanceModel withCornerSize(float cornerSize)
     return toBuilder().setAllCornerSizes(cornerSize).build();
   }
 
+  @NonNull
+  public ShapeAppearanceModel withTopCornerSize(float cornerSize)
+  {
+    return toBuilder().setTopLeftCornerSize(cornerSize).setTopRightCornerSize(cornerSize).build();
+  }
+
   @NonNull
   public ShapeAppearanceModel withCornerSize(@NonNull CornerSize cornerSize)
   {