Merge "Remove unnecessary bottom sheet theme attribute"

Author: hunterstich

app/src/main/res/anim/bottom_sheet_slide_in.xml

@@ -16,11 +16,6 @@
 
     <!--Motion-->
 
-    <style name="Animation.Reply.BottomSheet.Modal" parent="Animation.AppCompat.Dialog">
-        <item name="android:windowEnterAnimation">@anim/bottom_sheet_slide_in</item>
-        <item name="android:windowExitAnimation">@anim/bottom_sheet_slide_out</item>
-    </style>
-
     <integer name="reply_motion_default_duration">350</integer>
     <integer name="reply_motion_short_duration">250</integer>
     <integer name="reply_motion_micro_duration">175</integer>

app/src/main/res/anim/bottom_sheet_slide_out.xml

@@ -31,23 +31,14 @@
         <item name="cornerSize">@dimen/reply_large_component_corner_radius</item>
     </style>
 
-    <!--ShapeAppearance overlay to square bottom corners on views which align to the -->
-    <!--bottom of the screen-->
-    <style name="ShapeAppearanceOverlay.Reply.BottomSheet" parent="">
-        <item name="cornerSizeBottomLeft">0dp</item>
-        <item name="cornerSizeBottomRight">0dp</item>
-    </style>
-
     <!--ShapeAppearance overlay for components which can be 'marked' by rounding their top left -->
     <!--corner - ie. email cards which have been starred-->
     <style name="ShapeAppearanceOverlay.Reply.MediumComponent.Marked" parent="">
-        <item name="cornerSizeTopLeft">@dimen/medium_component_marked_corner_radius</item>
+        <item name="cornerSizeTopLeft">@dimen/reply_small_component_corner_radius</item>
     </style>
 
     <dimen name="reply_small_component_corner_radius">24dp</dimen>
     <dimen name="reply_medium_component_corner_radius">0dp</dimen>
     <dimen name="reply_large_component_corner_radius">12dp</dimen>
 
-    <dimen name="medium_component_marked_corner_radius">24dp</dimen>
-
 </resources>

app/src/main/res/values/motion.xml

@@ -16,14 +16,6 @@
 
     <!--Components-->
 
-    <!--Bottom Sheets-->
-    <style name="Widget.Reply.BottomSheet.Modal" parent="Widget.MaterialComponents.BottomSheet.Modal">
-        <item name="enforceMaterialTheme">true</item>
-        <item name="shapeAppearance">?shapeAppearanceLargeComponent</item>
-        <item name="shapeAppearanceOverlay">@style/ShapeAppearanceOverlay.Reply.BottomSheet</item>
-        <item name="backgroundTint">?colorSurface</item>
-    </style>
-
     <style name="Widget.Reply.NavigationView" parent="Widget.MaterialComponents.NavigationView">
         <!--Remove any scrim insets applied by NavigationView for system bars-->
         <item name="insetForeground">@android:color/transparent</item>

app/src/main/res/values/shape.xml

@@ -66,24 +66,12 @@
 
         <!--Styles-->
         <item name="bottomAppBarStyle">@style/Widget.MaterialComponents.BottomAppBar.Colored</item>
-        <item name="bottomSheetStyle">@style/Widget.Reply.BottomSheet.Modal</item>
-        <item name="bottomSheetDialogTheme">@style/Base.ThemeOverlay.Reply.BottomSheetDialog</item>
+        <item name="bottomSheetStyle">@style/Widget.MaterialComponents.BottomSheet.Modal</item>
         <item name="navigationViewStyle">@style/Widget.Reply.NavigationView</item>
         <item name="chipStyle">@style/Widget.Reply.Chip.Entry</item>
 
         <!--System/Platform attributes-->
         <item name="android:windowBackground">?android:colorBackground</item>
         <item name="android:windowLightStatusBar" tools:ignore="NewApi">true</item>
     </style>
-
-    <style name="Base.ThemeOverlay.Reply.BottomSheetDialog" parent="ThemeOverlay.MaterialComponents.Dialog">
-        <item name="android:windowIsFloating">false</item>
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="bottomSheetStyle">@style/Widget.Reply.BottomSheet.Modal</item>
-        <item name="android:windowAnimationStyle">@style/Animation.Reply.BottomSheet.Modal</item>
-        <item name="android:navigationBarColor">?colorSurface</item>
-        <item name="android:windowLightNavigationBar" tools:ignore="newApi">true</item>
-    </style>
-
 </resources>