[BottomAppBar] Adding the attr to set the color of navigation icon.

PiperOrigin-RevId: 370999656

Author: pekingme

docs/components/BottomAppBar.md

@@ -224,10 +224,10 @@ Element       | Attribute            | Related method(s)
 
 ### Navigation icon attributes
 
-Element   | Attribute            | Related method(s)                          | Default value
---------- | -------------------- | ------------------------------------------ | -------------
-**Icon**  | `app:navigationIcon` | `setNavigationIcon`<br>`getNavigationIcon` | `null`
-**Color** | N/A                  | N/A                                        | `?attr/colorControlNormal` (as `Drawable` tint)
+Element   | Attribute                | Related method(s)                          | Default value
+--------- | ------------------------ | ------------------------------------------ | -------------
+**Icon**  | `app:navigationIcon`     | `setNavigationIcon`<br>`getNavigationIcon` | `null`
+**Color** | `app:navigationIconTint` | `setNavigationIconTint`                    | `?attr/colorControlNormal` (as `Drawable` tint)
 
 ### FAB attributes
 

lib/java/com/google/android/material/appbar/res-public/values/public.xml

@@ -62,7 +62,6 @@
   <public name="scrimVisibleHeightTrigger" type="attr"/>
   <public name="titleEnabled" type="attr"/>
   <public name="maxLines" type="attr"/>
-  <public name="navigationIconTint" type="attr"/>
   <public name="titleCentered" type="attr"/>
   <public name="subtitleCentered" type="attr"/>
 </resources>

lib/java/com/google/android/material/appbar/res/values/attrs.xml

@@ -236,7 +236,7 @@
   <declare-styleable name="MaterialToolbar">
     <!-- The tint color for the navigation button icon drawable corresponding to
          the "app:navigationIcon" attribute. -->
-    <attr name="navigationIconTint" format="color" />
+    <attr name="navigationIconTint" />
     <!-- Whether the title text corresponding to the "app:title" attribute
          should be centered horizontally within the toolbar. Default is false.
     -->

lib/java/com/google/android/material/bottomappbar/BottomAppBar.java

@@ -31,6 +31,7 @@
 import android.graphics.Paint.Style;
 import android.graphics.Rect;
 import android.graphics.RectF;
+import android.graphics.drawable.Drawable;
 import android.os.Parcel;
 import android.os.Parcelable;
 import androidx.core.graphics.drawable.DrawableCompat;
@@ -44,6 +45,7 @@
 import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;
+import androidx.annotation.ColorInt;
 import androidx.annotation.Dimension;
 import androidx.annotation.IntDef;
 import androidx.annotation.MenuRes;
@@ -136,6 +138,7 @@ public class BottomAppBar extends Toolbar implements AttachedBehavior {
   @Retention(RetentionPolicy.SOURCE)
   public @interface FabAnimationMode {}
 
+  @Nullable private Integer navigationIconTint;
   private final int fabOffsetEndMode;
   private final MaterialShapeDrawable materialShapeDrawable = new MaterialShapeDrawable();
 
@@ -252,6 +255,10 @@ public BottomAppBar(@NonNull Context context, @Nullable AttributeSet attrs, int
     ColorStateList backgroundTint =
         MaterialResources.getColorStateList(context, a, R.styleable.BottomAppBar_backgroundTint);
 
+    if (a.hasValue(R.styleable.BottomAppBar_navigationIconTint)) {
+      setNavigationIconTint(a.getColor(R.styleable.BottomAppBar_navigationIconTint, -1));
+    }
+
     int elevation = a.getDimensionPixelSize(R.styleable.BottomAppBar_elevation, 0);
     float fabCradleMargin = a.getDimensionPixelOffset(R.styleable.BottomAppBar_fabCradleMargin, 0);
     float fabCornerRadius =
@@ -330,6 +337,25 @@ public WindowInsetsCompat onApplyWindowInsets(
         });
   }
 
+  @Override
+  public void setNavigationIcon(@Nullable Drawable drawable) {
+    super.setNavigationIcon(maybeTintNavigationIcon(drawable));
+  }
+
+  /**
+   * Sets the color of the toolbar's navigation icon.
+   *
+   * @see #setNavigationIcon
+   */
+  public void setNavigationIconTint(@ColorInt int navigationIconTint) {
+    this.navigationIconTint = navigationIconTint;
+    Drawable navigationIcon = getNavigationIcon();
+    if (navigationIcon != null) {
+      // Causes navigation icon to be tinted if needed.
+      setNavigationIcon(navigationIcon);
+    }
+  }
+
   /**
    * Returns the current fabAlignmentMode, either {@link #FAB_ALIGNMENT_MODE_CENTER} or {@link
    * #FAB_ALIGNMENT_MODE_END}.
@@ -663,6 +689,17 @@ private void createFabTranslationXAnimation(
     animators.add(animator);
   }
 
+  @Nullable
+  private Drawable maybeTintNavigationIcon(@Nullable Drawable navigationIcon) {
+    if (navigationIcon != null && navigationIconTint != null) {
+      Drawable wrappedNavigationIcon = DrawableCompat.wrap(navigationIcon);
+      DrawableCompat.setTint(wrappedNavigationIcon, navigationIconTint);
+      return wrappedNavigationIcon;
+    } else {
+      return navigationIcon;
+    }
+  }
+
   private void maybeAnimateMenuView(@FabAlignmentMode int targetMode, boolean newFabAttached) {
     if (!ViewCompat.isLaidOut(this)) {
       menuAnimatingWithFabAlignmentMode = false;

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

@@ -18,6 +18,9 @@
   <declare-styleable name="BottomAppBar">
     <!-- Background for the BottomAppBar. -->
     <attr name="backgroundTint"/>
+    <!-- The tint color for the navigation button icon drawable corresponding to
+         the "app:navigationIcon" attribute. -->
+    <attr name="navigationIconTint"/>
     <!-- Elevation for the BottomAppBar. -->
     <attr name="elevation"/>
     <!-- The alignment of the fab relative to the BottomAppBar. -->

lib/java/com/google/android/material/resources/res-public/values/public.xml

@@ -27,6 +27,7 @@
   <public name="strokeWidth" type="attr" />
   <public name="ensureMinTouchTargetSize" type="attr" />
   <public name="trackColor" type="attr" />
+  <public name="navigationIconTint" type="attr" />
 
   <!-- Navigation and datepicker -->
   <public name="headerLayout" type="attr"/>

lib/java/com/google/android/material/resources/res/values/attrs.xml

@@ -25,6 +25,7 @@
   <attr name="strokeWidth" format="dimension" />
   <attr name="ensureMinTouchTargetSize" format="boolean" />
   <attr name="trackColor" format="color" />
+  <attr name="navigationIconTint" format="color"/>
 
   <!-- Navigation and Pickers -->
   <attr name="headerLayout" format="reference"/>