Skip to content
This repository was archived by the owner on Nov 21, 2024. It is now read-only.

Commit 333df2f

Browse files
committed
Remove unnecessary bottom sheet theme attribute
- bottomSheetStyle is still used and picked up by BottomNavDrawerFragment to construct its MaterialShapeDrawable backgrounds. - Removed no longer needed motion style defs and bottom sheet anims Change-Id: I74c6c132dfeb90478acd3543c7389f8884c5a822
1 parent c3bc0bd commit 333df2f

File tree

6 files changed

+2
-90
lines changed

6 files changed

+2
-90
lines changed

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

Lines changed: 0 additions & 27 deletions
This file was deleted.

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

Lines changed: 0 additions & 27 deletions
This file was deleted.

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,6 @@
1616

1717
<!--Motion-->
1818

19-
<style name="Animation.Reply.BottomSheet.Modal" parent="Animation.AppCompat.Dialog">
20-
<item name="android:windowEnterAnimation">@anim/bottom_sheet_slide_in</item>
21-
<item name="android:windowExitAnimation">@anim/bottom_sheet_slide_out</item>
22-
</style>
23-
2419
<integer name="reply_motion_default_duration">350</integer>
2520
<integer name="reply_motion_short_duration">250</integer>
2621
<integer name="reply_motion_micro_duration">175</integer>

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,23 +31,14 @@
3131
<item name="cornerSize">@dimen/reply_large_component_corner_radius</item>
3232
</style>
3333

34-
<!--ShapeAppearance overlay to square bottom corners on views which align to the -->
35-
<!--bottom of the screen-->
36-
<style name="ShapeAppearanceOverlay.Reply.BottomSheet" parent="">
37-
<item name="cornerSizeBottomLeft">0dp</item>
38-
<item name="cornerSizeBottomRight">0dp</item>
39-
</style>
40-
4134
<!--ShapeAppearance overlay for components which can be 'marked' by rounding their top left -->
4235
<!--corner - ie. email cards which have been starred-->
4336
<style name="ShapeAppearanceOverlay.Reply.MediumComponent.Marked" parent="">
44-
<item name="cornerSizeTopLeft">@dimen/medium_component_marked_corner_radius</item>
37+
<item name="cornerSizeTopLeft">@dimen/reply_small_component_corner_radius</item>
4538
</style>
4639

4740
<dimen name="reply_small_component_corner_radius">24dp</dimen>
4841
<dimen name="reply_medium_component_corner_radius">0dp</dimen>
4942
<dimen name="reply_large_component_corner_radius">12dp</dimen>
5043

51-
<dimen name="medium_component_marked_corner_radius">24dp</dimen>
52-
5344
</resources>

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,6 @@
1616

1717
<!--Components-->
1818

19-
<!--Bottom Sheets-->
20-
<style name="Widget.Reply.BottomSheet.Modal" parent="Widget.MaterialComponents.BottomSheet.Modal">
21-
<item name="enforceMaterialTheme">true</item>
22-
<item name="shapeAppearance">?shapeAppearanceLargeComponent</item>
23-
<item name="shapeAppearanceOverlay">@style/ShapeAppearanceOverlay.Reply.BottomSheet</item>
24-
<item name="backgroundTint">?colorSurface</item>
25-
</style>
26-
2719
<style name="Widget.Reply.NavigationView" parent="Widget.MaterialComponents.NavigationView">
2820
<!--Remove any scrim insets applied by NavigationView for system bars-->
2921
<item name="insetForeground">@android:color/transparent</item>

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

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -66,24 +66,12 @@
6666

6767
<!--Styles-->
6868
<item name="bottomAppBarStyle">@style/Widget.MaterialComponents.BottomAppBar.Colored</item>
69-
<item name="bottomSheetStyle">@style/Widget.Reply.BottomSheet.Modal</item>
70-
<item name="bottomSheetDialogTheme">@style/Base.ThemeOverlay.Reply.BottomSheetDialog</item>
69+
<item name="bottomSheetStyle">@style/Widget.MaterialComponents.BottomSheet.Modal</item>
7170
<item name="navigationViewStyle">@style/Widget.Reply.NavigationView</item>
7271
<item name="chipStyle">@style/Widget.Reply.Chip.Entry</item>
7372

7473
<!--System/Platform attributes-->
7574
<item name="android:windowBackground">?android:colorBackground</item>
7675
<item name="android:windowLightStatusBar" tools:ignore="NewApi">true</item>
7776
</style>
78-
79-
<style name="Base.ThemeOverlay.Reply.BottomSheetDialog" parent="ThemeOverlay.MaterialComponents.Dialog">
80-
<item name="android:windowIsFloating">false</item>
81-
<item name="android:windowBackground">@android:color/transparent</item>
82-
<item name="android:statusBarColor">@android:color/transparent</item>
83-
<item name="bottomSheetStyle">@style/Widget.Reply.BottomSheet.Modal</item>
84-
<item name="android:windowAnimationStyle">@style/Animation.Reply.BottomSheet.Modal</item>
85-
<item name="android:navigationBarColor">?colorSurface</item>
86-
<item name="android:windowLightNavigationBar" tools:ignore="newApi">true</item>
87-
</style>
88-
8977
</resources>

0 commit comments

Comments
 (0)