From 53b30013969e14c7aaafb808b4bdda7502684622 Mon Sep 17 00:00:00 2001
From: rightnao <rightnao@google.com>
Date: Fri, 8 Jul 2022 10:30:41 -0700
Subject: [PATCH] [BottomAppBar] Changing default Material3 theme to follow M3
 specs

PiperOrigin-RevId: 459785651
---
 .../bottomappbar/res/values/dimens.xml        |  2 +-
 .../bottomappbar/res/values/styles.xml        | 32 ++++++++++++++++++-
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/lib/java/com/google/android/material/bottomappbar/res/values/dimens.xml b/lib/java/com/google/android/material/bottomappbar/res/values/dimens.xml
index 6020d0e0832..46f56edf62a 100644
--- a/lib/java/com/google/android/material/bottomappbar/res/values/dimens.xml
+++ b/lib/java/com/google/android/material/bottomappbar/res/values/dimens.xml
@@ -27,7 +27,7 @@
   <dimen name="m3_bottomappbar_fab_cradle_margin">6dp</dimen>
   <dimen name="m3_bottomappbar_fab_cradle_rounded_corner_radius">4dp</dimen>
   <dimen name="m3_bottomappbar_fab_cradle_vertical_offset">12dp</dimen>
+  <dimen name="m3_bottomappbar_fab_end_margin">16dp</dimen>
 
   <dimen name="m3_bottomappbar_height">@dimen/m3_comp_bottom_app_bar_container_height</dimen>
-
 </resources>
diff --git a/lib/java/com/google/android/material/bottomappbar/res/values/styles.xml b/lib/java/com/google/android/material/bottomappbar/res/values/styles.xml
index 4d1bad11ede..42cb7ba871f 100644
--- a/lib/java/com/google/android/material/bottomappbar/res/values/styles.xml
+++ b/lib/java/com/google/android/material/bottomappbar/res/values/styles.xml
@@ -30,6 +30,9 @@
     <item name="paddingBottomSystemWindowInsets">true</item>
     <item name="paddingLeftSystemWindowInsets">true</item>
     <item name="paddingRightSystemWindowInsets">true</item>
+    <item name="fabAnchorMode">cradle</item>
+    <item name="fabAlignmentMode">center</item>
+    <item name="menuAlignmentMode">auto</item>
   </style>
 
   <style name="Widget.MaterialComponents.BottomAppBar.Colored" parent="Widget.MaterialComponents.BottomAppBar">
@@ -52,8 +55,14 @@
   <!-- M3 Styles -->
 
   <style name="Widget.Material3.BottomAppBar" parent="Widget.MaterialComponents.BottomAppBar">
+    <item name="android:minHeight">@dimen/m3_bottomappbar_height</item>
+    <item name="maxButtonHeight">@dimen/m3_bottomappbar_height</item>
     <item name="fabAnimationMode">slide</item>
-    <item name="fabAnchorMode">cradle</item>
+    <item name="fabAnchorMode">embed</item>
+    <item name="removeEmbeddedFabElevation">true</item>
+    <item name="fabAlignmentMode">end</item>
+    <item name="menuAlignmentMode">start</item>
+    <item name="fabAlignmentModeEndMargin">@dimen/m3_bottomappbar_fab_end_margin</item>
     <item name="fabCradleMargin">@dimen/m3_bottomappbar_fab_cradle_margin</item>
     <item name="fabCradleRoundedCornerRadius">
       @dimen/m3_bottomappbar_fab_cradle_rounded_corner_radius
@@ -73,4 +82,25 @@
     <item name="actionMenuTextColor">?attr/colorOnSurface</item>
   </style>
 
+  <style name="Widget.Material3.BottomAppBar.Legacy" parent="Widget.MaterialComponents.BottomAppBar">
+    <item name="fabAnimationMode">slide</item>
+    <item name="fabAnchorMode">cradle</item>
+    <item name="removeEmbeddedFabElevation">false</item>
+    <item name="fabAlignmentMode">center</item>
+    <item name="menuAlignmentMode">auto</item>
+    <item name="fabAlignmentModeEndMargin">@null</item>
+    <item name="fabCradleMargin">@dimen/m3_bottomappbar_fab_cradle_margin</item>
+    <item name="fabCradleRoundedCornerRadius">
+      @dimen/m3_bottomappbar_fab_cradle_rounded_corner_radius
+    </item>
+    <item name="fabCradleVerticalOffset">
+      @dimen/m3_bottomappbar_fab_cradle_vertical_offset
+    </item>
+    <item name="elevation">@dimen/m3_comp_bottom_app_bar_container_elevation</item>
+
+    <item name="backgroundTint">@macro/m3_comp_bottom_app_bar_container_color</item>
+    <item name="navigationIconTint">?attr/colorOnSurfaceVariant</item>
+    <item name="materialThemeOverlay">@style/ThemeOverlay.Material3.BottomAppBar</item>
+  </style>
+
 </resources>