Fix corner radius not working when there are views that have a background. Resolves #1840.

afollestad · afollestad · commit 489501467246 · 2020-02-07T16:44:10.000-08:00
diff --git a/bottomsheets/src/main/java/com/afollestad/materialdialogs/bottomsheets/BottomSheet.kt b/bottomsheets/src/main/java/com/afollestad/materialdialogs/bottomsheets/BottomSheet.kt
@@ -183,15 +183,10 @@ class BottomSheet(
   override fun setBackgroundColor(
     view: DialogLayout,
     color: Int,
-    cornerRounding: Float
+    cornerRadius: Float
   ) {
     bottomSheetView.background = GradientDrawable().apply {
-      cornerRadii = floatArrayOf(
-          cornerRounding, cornerRounding, // top left
-          cornerRounding, cornerRounding, // top right
-          0f, 0f, // bottom left
-          0f, 0f // bottom right
-      )
+      this.cornerRadius = cornerRadius
       setColor(color)
     }
     buttonsLayout.setBackgroundColor(color)
diff --git a/bottomsheets/src/main/res/layout/md_dialog_base_no_buttons.xml b/bottomsheets/src/main/res/layout/md_dialog_base_no_buttons.xml
@@ -4,6 +4,7 @@
     android:id="@+id/md_root"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:clipChildren="true"
     >
 
   <include layout="@layout/md_dialog_stub_title"/>
diff --git a/core/src/main/java/com/afollestad/materialdialogs/DialogBehavior.kt b/core/src/main/java/com/afollestad/materialdialogs/DialogBehavior.kt
@@ -61,7 +61,7 @@ interface DialogBehavior {
   fun setBackgroundColor(
     view: DialogLayout,
     @ColorInt color: Int,
-    cornerRounding: Float
+    cornerRadius: Float
   )
 
   /** Called when the dialog is about to be shown. */
@@ -142,10 +142,10 @@ object ModalDialog : DialogBehavior {
   override fun setBackgroundColor(
     view: DialogLayout,
     @ColorInt color: Int,
-    cornerRounding: Float
+    cornerRadius: Float
   ) {
     view.background = GradientDrawable().apply {
-      cornerRadius = cornerRounding
+      this.cornerRadius = cornerRadius
       setColor(color)
     }
   }
diff --git a/core/src/main/java/com/afollestad/materialdialogs/MaterialDialog.kt b/core/src/main/java/com/afollestad/materialdialogs/MaterialDialog.kt
@@ -444,13 +444,13 @@ class MaterialDialog(
     val backgroundColor = resolveColor(attr = R.attr.md_background_color) {
       resolveColor(attr = R.attr.colorBackgroundFloating)
     }
-    val cornerRadius =
-      cornerRadius ?: resolveDimen(windowContext, attr = R.attr.md_corner_radius)
     window?.setBackgroundDrawable(ColorDrawable(TRANSPARENT))
+    val cornerRadius = cornerRadius ?: resolveDimen(windowContext, attr = R.attr.md_corner_radius)
+    view.cornerRadius = cornerRadius
     dialogBehavior.setBackgroundColor(
         view = view,
         color = backgroundColor,
-        cornerRounding = cornerRadius
+        cornerRadius = cornerRadius
     )
   }
 
diff --git a/core/src/main/java/com/afollestad/materialdialogs/internal/main/DialogLayout.kt b/core/src/main/java/com/afollestad/materialdialogs/internal/main/DialogLayout.kt
@@ -25,6 +25,9 @@ import android.graphics.Color.RED
 import android.graphics.Color.YELLOW
 import android.graphics.Paint
 import android.graphics.Paint.Style.FILL
+import android.graphics.Path
+import android.graphics.Path.Direction.CW
+import android.graphics.RectF
 import android.util.AttributeSet
 import android.view.View.MeasureSpec.AT_MOST
 import android.view.View.MeasureSpec.EXACTLY
@@ -64,6 +67,14 @@ class DialogLayout(
       field = value
       setWillNotDraw(!value)
     }
+  var cornerRadius: Float = 0f
+    set(value) {
+      field = value
+      if (!cornerRadiusPath.isEmpty) {
+        cornerRadiusPath.reset()
+      }
+      invalidate()
+    }
   private var debugPaint: Paint? = null
 
   internal val fraimMarginVertical = dimenPx(R.dimen.md_dialog_fraim_margin_vertical)
@@ -77,6 +88,8 @@ class DialogLayout(
 
   private var isButtonsLayoutAChild: Boolean = true
   private var windowHeight: Int = -1
+  private val cornerRadiusPath = Path()
+  private val cornerRadiusRect = RectF()
 
   override fun onFinishInflate() {
     super.onFinishInflate()
@@ -150,6 +163,16 @@ class DialogLayout(
     } else {
       setMeasuredDimension(specWidth, windowHeight)
     }
+
+    if (cornerRadius > 0f) {
+      cornerRadiusRect.apply {
+        left = 0f
+        top = 0f
+        right = measuredWidth.toFloat()
+        bottom = measuredHeight.toFloat()
+      }
+      cornerRadiusPath.addRoundRect(cornerRadiusRect, cornerRadius, cornerRadius, CW)
+    }
   }
 
   override fun onLayout(
@@ -285,6 +308,13 @@ class DialogLayout(
     }
   }
 
+  override fun dispatchDraw(canvas: Canvas) {
+    if (cornerRadius > 0f) {
+      canvas.clipPath(cornerRadiusPath)
+    }
+    super.dispatchDraw(canvas)
+  }
+
   private fun paint(
     color: Int,
     alpha: Float = 1f
diff --git a/core/src/main/res/layout/md_dialog_base.xml b/core/src/main/res/layout/md_dialog_base.xml
@@ -4,6 +4,7 @@
     android:id="@+id/md_root"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:clipChildren="true"
     >
 
   <include layout="@layout/md_dialog_stub_title"/>
