From 7bd97240786ad84eae6bdaac6b4fde767910022b Mon Sep 17 00:00:00 2001
From: rightnao <rightnao@google.com>
Date: Mon, 17 Apr 2023 12:30:56 -0700
Subject: [PATCH] [BottomNavigationView] Integrate tokens and add shape
 appearance support

PiperOrigin-RevId: 524919091
---
 .../android/material/bottomnavigation/res/values/attrs.xml | 5 +++++
 .../material/bottomnavigation/res/values/styles.xml        | 1 +
 .../material/bottomnavigation/res/values/tokens.xml        | 1 +
 .../android/material/navigation/NavigationBarView.java     | 7 +++++--
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/lib/java/com/google/android/material/bottomnavigation/res/values/attrs.xml b/lib/java/com/google/android/material/bottomnavigation/res/values/attrs.xml
index 269e1af3f02..4ab2250db41 100644
--- a/lib/java/com/google/android/material/bottomnavigation/res/values/attrs.xml
+++ b/lib/java/com/google/android/material/bottomnavigation/res/values/attrs.xml
@@ -26,6 +26,11 @@
     <attr name="android:minHeight" />
     <!-- Whether or not to add a shadow with a divider that is compatible across pre-21 legacy backgrounds. -->
     <attr name="compatShadowEnabled" format="boolean"/>
+    <!-- Shape appearance style reference for BottomNavigationView. Attribute declaration is in the Shape package. -->
+    <attr name="shapeAppearance"/>
+    <!-- Shape appearance overlay style reference for BottomNavigationView. To be used to augment
+         attributes declared in the shapeAppearance. Attribute declaration is in the Shape package. -->
+    <attr name="shapeAppearanceOverlay"/>
   </declare-styleable>
 
 </resources>
diff --git a/lib/java/com/google/android/material/bottomnavigation/res/values/styles.xml b/lib/java/com/google/android/material/bottomnavigation/res/values/styles.xml
index 29239856a42..1ab341beb70 100644
--- a/lib/java/com/google/android/material/bottomnavigation/res/values/styles.xml
+++ b/lib/java/com/google/android/material/bottomnavigation/res/values/styles.xml
@@ -79,6 +79,7 @@
     <item name="itemPaddingBottom">@dimen/m3_bottom_nav_item_padding_bottom</item>
     <item name="android:minHeight">@dimen/m3_bottom_nav_min_height</item>
     <item name="materialThemeOverlay">@style/ThemeOverlay.Material3.BottomNavigationView</item>
+    <item name="shapeAppearance">@style/ShapeAppearance.M3.Comp.NavigationBar.Container.Shape</item>
   </style>
 
   <style name="Widget.Material3.BottomNavigationView" parent="Base.Widget.Material3.BottomNavigationView">
diff --git a/lib/java/com/google/android/material/bottomnavigation/res/values/tokens.xml b/lib/java/com/google/android/material/bottomnavigation/res/values/tokens.xml
index eacb706a72e..c035d39b096 100644
--- a/lib/java/com/google/android/material/bottomnavigation/res/values/tokens.xml
+++ b/lib/java/com/google/android/material/bottomnavigation/res/values/tokens.xml
@@ -22,6 +22,7 @@
   <!-- Generated from token set (md.comp.navigation-bar) in context (platform=android, audience=3p). -->
   <!-- Enabled - Container -->
   <macro name="m3_comp_navigation_bar_container_color">?attr/colorSurface</macro>
+  <style name="ShapeAppearance.M3.Comp.NavigationBar.Container.Shape" parent="ShapeAppearance.M3.Sys.Shape.Corner.None"/>
   <dimen name="m3_comp_navigation_bar_container_height">80dp</dimen>
   <dimen name="m3_comp_navigation_bar_container_elevation">@dimen/m3_sys_elevation_level2</dimen>
   <!-- Enabled - Label text -->
diff --git a/lib/java/com/google/android/material/navigation/NavigationBarView.java b/lib/java/com/google/android/material/navigation/NavigationBarView.java
index e516a256268..33579e7e6b7 100644
--- a/lib/java/com/google/android/material/navigation/NavigationBarView.java
+++ b/lib/java/com/google/android/material/navigation/NavigationBarView.java
@@ -193,7 +193,8 @@ public NavigationBarView(
 
     if (getBackground() == null || getBackground() instanceof ColorDrawable) {
       // Add a MaterialShapeDrawable as background that supports tinting in every API level.
-      ViewCompat.setBackground(this, createMaterialShapeDrawableBackground(context));
+      ViewCompat.setBackground(this, createMaterialShapeDrawableBackground(context,
+          ShapeAppearanceModel.builder(context, attrs, defStyleAttr, defStyleRes).build()));
     }
 
     if (attributes.hasValue(R.styleable.NavigationBarView_itemPaddingTop)) {
@@ -297,7 +298,8 @@ public void onMenuModeChange(MenuBuilder menu) {}
   }
 
   @NonNull
-  private MaterialShapeDrawable createMaterialShapeDrawableBackground(Context context) {
+  private MaterialShapeDrawable createMaterialShapeDrawableBackground(
+      Context context, ShapeAppearanceModel shapeAppearanceModel) {
     MaterialShapeDrawable materialShapeDrawable = new MaterialShapeDrawable();
     Drawable originalBackground = getBackground();
     if (originalBackground instanceof ColorDrawable) {
@@ -305,6 +307,7 @@ private MaterialShapeDrawable createMaterialShapeDrawableBackground(Context cont
           ColorStateList.valueOf(((ColorDrawable) originalBackground).getColor()));
     }
     materialShapeDrawable.initializeElevationOverlay(context);
+    materialShapeDrawable.setShapeAppearanceModel(shapeAppearanceModel);
     return materialShapeDrawable;
   }