Skip to content

Commit 53b3001

Browse files
imhappihunterstich
authored andcommittedJul 8, 2022
[BottomAppBar] Changing default Material3 theme to follow M3 specs
PiperOrigin-RevId: 459785651
1 parent 9b1a74b commit 53b3001

File tree

2 files changed

+32
-2
lines changed

2 files changed

+32
-2
lines changed
 

‎lib/java/com/google/android/material/bottomappbar/res/values/dimens.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<dimen name="m3_bottomappbar_fab_cradle_margin">6dp</dimen>
2828
<dimen name="m3_bottomappbar_fab_cradle_rounded_corner_radius">4dp</dimen>
2929
<dimen name="m3_bottomappbar_fab_cradle_vertical_offset">12dp</dimen>
30+
<dimen name="m3_bottomappbar_fab_end_margin">16dp</dimen>
3031

3132
<dimen name="m3_bottomappbar_height">@dimen/m3_comp_bottom_app_bar_container_height</dimen>
32-
3333
</resources>

‎lib/java/com/google/android/material/bottomappbar/res/values/styles.xml

+31-1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@
3030
<item name="paddingBottomSystemWindowInsets">true</item>
3131
<item name="paddingLeftSystemWindowInsets">true</item>
3232
<item name="paddingRightSystemWindowInsets">true</item>
33+
<item name="fabAnchorMode">cradle</item>
34+
<item name="fabAlignmentMode">center</item>
35+
<item name="menuAlignmentMode">auto</item>
3336
</style>
3437

3538
<style name="Widget.MaterialComponents.BottomAppBar.Colored" parent="Widget.MaterialComponents.BottomAppBar">
@@ -52,8 +55,14 @@
5255
<!-- M3 Styles -->
5356

5457
<style name="Widget.Material3.BottomAppBar" parent="Widget.MaterialComponents.BottomAppBar">
58+
<item name="android:minHeight">@dimen/m3_bottomappbar_height</item>
59+
<item name="maxButtonHeight">@dimen/m3_bottomappbar_height</item>
5560
<item name="fabAnimationMode">slide</item>
56-
<item name="fabAnchorMode">cradle</item>
61+
<item name="fabAnchorMode">embed</item>
62+
<item name="removeEmbeddedFabElevation">true</item>
63+
<item name="fabAlignmentMode">end</item>
64+
<item name="menuAlignmentMode">start</item>
65+
<item name="fabAlignmentModeEndMargin">@dimen/m3_bottomappbar_fab_end_margin</item>
5766
<item name="fabCradleMargin">@dimen/m3_bottomappbar_fab_cradle_margin</item>
5867
<item name="fabCradleRoundedCornerRadius">
5968
@dimen/m3_bottomappbar_fab_cradle_rounded_corner_radius
@@ -73,4 +82,25 @@
7382
<item name="actionMenuTextColor">?attr/colorOnSurface</item>
7483
</style>
7584

85+
<style name="Widget.Material3.BottomAppBar.Legacy" parent="Widget.MaterialComponents.BottomAppBar">
86+
<item name="fabAnimationMode">slide</item>
87+
<item name="fabAnchorMode">cradle</item>
88+
<item name="removeEmbeddedFabElevation">false</item>
89+
<item name="fabAlignmentMode">center</item>
90+
<item name="menuAlignmentMode">auto</item>
91+
<item name="fabAlignmentModeEndMargin">@null</item>
92+
<item name="fabCradleMargin">@dimen/m3_bottomappbar_fab_cradle_margin</item>
93+
<item name="fabCradleRoundedCornerRadius">
94+
@dimen/m3_bottomappbar_fab_cradle_rounded_corner_radius
95+
</item>
96+
<item name="fabCradleVerticalOffset">
97+
@dimen/m3_bottomappbar_fab_cradle_vertical_offset
98+
</item>
99+
<item name="elevation">@dimen/m3_comp_bottom_app_bar_container_elevation</item>
100+
101+
<item name="backgroundTint">@macro/m3_comp_bottom_app_bar_container_color</item>
102+
<item name="navigationIconTint">?attr/colorOnSurfaceVariant</item>
103+
<item name="materialThemeOverlay">@style/ThemeOverlay.Material3.BottomAppBar</item>
104+
</style>
105+
76106
</resources>

0 commit comments

Comments
 (0)
Please sign in to comment.