From 17c43c91888162d3c7675511ff910c46c3aa32fc Mon Sep 17 00:00:00 2001
From: Jonny Andrew <jonny.andrew@protonmail.com>
Date: Thu, 20 Oct 2022 16:13:18 +0100
Subject: [PATCH] Add rounded corners to bottom sheet dialog.

Note these are currently only visible in the collapsed state.
- [Google issue](https://issuetracker.google.com/issues/144859239)
- [Rejected PR](https://github.com/material-components/material-components-android/pull/437)
- [Github issue](https://github.com/material-components/material-components-android/issues/1278)
---
 .../src/main/res/values/styles_bottom_sheet.xml       | 11 +++++++++++
 .../layout/bottom_sheet_attachment_type_selector.xml  |  1 -
 .../res/layout/view_bottom_sheet_action_button.xml    |  3 +--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/library/ui-styles/src/main/res/values/styles_bottom_sheet.xml b/library/ui-styles/src/main/res/values/styles_bottom_sheet.xml
index f6c30040d9..7b704a6331 100644
--- a/library/ui-styles/src/main/res/values/styles_bottom_sheet.xml
+++ b/library/ui-styles/src/main/res/values/styles_bottom_sheet.xml
@@ -14,6 +14,7 @@
         <!-- Default color for text View -->
         <item name="android:textColorTertiary">@color/element_content_primary_light</item>
         <item name="android:textColorLink">@color/element_link_light</item>
+        <item name="bottomSheetStyle">@style/BottomSheetStyle</item>
     </style>
 
     <style name="Theme.Vector.BottomSheetDialog.Dark" parent="Theme.MaterialComponents.BottomSheetDialog">
@@ -28,6 +29,7 @@
         <!-- Default color for text View -->
         <item name="android:textColorTertiary">@color/element_content_primary_dark</item>
         <item name="android:textColorLink">@color/element_link_dark</item>
+        <item name="bottomSheetStyle">@style/BottomSheetStyle</item>
     </style>
 
     <style name="Theme.Vector.BottomSheetDialog.Black" parent="Theme.Vector.BottomSheetDialog.Dark">
@@ -35,6 +37,15 @@
     </style>
 
     <!-- BottomSheet style -->
+    <style name="BottomSheetStyle" parent="Widget.MaterialComponents.BottomSheet.Modal">
+        <item name="shapeAppearance">@style/BottomSheetShapeAppearance</item>
+    </style>
+
+    <style name="BottomSheetShapeAppearance" parent="">
+        <item name="cornerFamily">rounded</item>
+        <item name="cornerSize">20dp</item>
+    </style>
+
     <style name="BottomSheetItemTextMain">
         <item name="android:fontFamily">sans-serif-medium</item>
         <item name="android:layout_width">0dp</item>
diff --git a/vector/src/main/res/layout/bottom_sheet_attachment_type_selector.xml b/vector/src/main/res/layout/bottom_sheet_attachment_type_selector.xml
index 3aec5b5c20..559673716e 100644
--- a/vector/src/main/res/layout/bottom_sheet_attachment_type_selector.xml
+++ b/vector/src/main/res/layout/bottom_sheet_attachment_type_selector.xml
@@ -3,7 +3,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?colorSurface"
     android:orientation="vertical">
 
     <androidx.core.widget.NestedScrollView
diff --git a/vector/src/main/res/layout/view_bottom_sheet_action_button.xml b/vector/src/main/res/layout/view_bottom_sheet_action_button.xml
index f8521c7eba..05a99fe8ae 100644
--- a/vector/src/main/res/layout/view_bottom_sheet_action_button.xml
+++ b/vector/src/main/res/layout/view_bottom_sheet_action_button.xml
@@ -10,7 +10,6 @@
         android:id="@+id/bottomSheetActionClickableZone"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?colorSurface"
         android:clickable="true"
         android:focusable="true"
         android:foreground="?attr/selectableItemBackground"
@@ -93,4 +92,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</merge>
\ No newline at end of file
+</merge>