Verify typography subsystem is complete for Bottom Navigation

PiperOrigin-RevId: 204798141

Author: ymarian

lib/java/com/google/android/material/bottomnavigation/BottomNavigationView.java

@@ -140,7 +140,9 @@ public BottomNavigationView(Context context, AttributeSet attrs, int defStyleAtt
             attrs,
             R.styleable.BottomNavigationView,
             defStyleAttr,
-            R.style.Widget_Design_BottomNavigationView);
+            R.style.Widget_Design_BottomNavigationView,
+            R.styleable.BottomNavigationView_itemTextAppearanceInactive,
+            R.styleable.BottomNavigationView_itemTextAppearanceActive);
 
     if (a.hasValue(R.styleable.BottomNavigationView_itemIconTint)) {
       menuView.setIconTintList(a.getColorStateList(R.styleable.BottomNavigationView_itemIconTint));

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

@@ -18,25 +18,23 @@
 
   <style name="Widget.Design.BottomNavigationView" parent="">
     <item name="elevation">@dimen/design_bottom_navigation_elevation</item>
-    <item name="labelVisibilityMode">auto</item>
     <item name="itemBackground">?attr/selectableItemBackgroundBorderless</item>
     <item name="itemHorizontalTranslationEnabled">true</item>
     <item name="itemIconSize">@dimen/design_bottom_navigation_icon_size</item>
+    <item name="labelVisibilityMode">auto</item>
   </style>
 
   <!-- Default style for BottomNavigationViews.
        Use the default style to get the default bottom navigation bar with a white background and
        colorPrimary for the icon and text colors. -->
   <style name="Widget.MaterialComponents.BottomNavigationView" parent="Widget.Design.BottomNavigationView">
     <item name="android:background">@android:color/white</item>
+    <item name="enforceTextAppearance">true</item>
     <item name="itemHorizontalTranslationEnabled">false</item>
     <item name="itemIconTint">@color/mtrl_bottom_nav_item_tint</item>
-    <item name="itemTextAppearanceInactive">
-      @style/TextAppearance.MaterialComponents.BottomNavigationView
-    </item>
-    <item name="itemTextAppearanceActive">
-      @style/TextAppearance.MaterialComponents.BottomNavigationView.Active
-    </item>
+    <item name="itemTextAppearanceInactive">?attr/textAppearanceCaption</item>
+    <item name="itemTextAppearanceActive">?attr/textAppearanceCaption</item>
+    <item name="itemTextColor">@color/mtrl_bottom_nav_item_tint</item>
   </style>
 
   <!-- Colored style for Bottom NavigationViews.
@@ -45,24 +43,9 @@
   <style name="Widget.MaterialComponents.BottomNavigationView.Colored">
     <item name="android:background">?attr/colorPrimary</item>
     <item name="itemIconTint">@color/mtrl_bottom_nav_colored_item_tint</item>
-    <item name="itemTextAppearanceInactive">
-      @style/TextAppearance.MaterialComponents.BottomNavigationView.Colored
-    </item>
-    <item name="itemTextAppearanceActive">
-      @style/TextAppearance.MaterialComponents.BottomNavigationView.Colored.Active
-    </item>
-  </style>
-
-  <style name="TextAppearance.MaterialComponents.BottomNavigationView" parent="TextAppearance.AppCompat.Caption">
-    <item name="android:textColor">@color/mtrl_bottom_nav_item_tint</item>
+    <item name="itemTextAppearanceInactive">?attr/textAppearanceCaption</item>
+    <item name="itemTextAppearanceActive">?attr/textAppearanceCaption</item>
+    <item name="itemTextColor">@color/mtrl_bottom_nav_colored_item_tint</item>
   </style>
 
-  <style name="TextAppearance.MaterialComponents.BottomNavigationView.Active"/>
-
-  <style name="TextAppearance.MaterialComponents.BottomNavigationView.Colored">
-    <item name="android:textColor">@color/mtrl_bottom_nav_colored_item_tint</item>
-  </style>
-
-  <style name="TextAppearance.MaterialComponents.BottomNavigationView.Colored.Active"/>
-
 </resources>