Skip to content

Commit d0194fb

Browse files
pekingmeleticiarossi
pekingme
authored and
leticiarossi
committed
[BottomNav] Rearranged M3 styles.
PiperOrigin-RevId: 749071804
1 parent 6c7354a commit d0194fb

File tree

1 file changed

+43
-40
lines changed
  • lib/java/com/google/android/material/bottomnavigation/res/values

1 file changed

+43
-40
lines changed

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

Lines changed: 43 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,49 @@
1616
-->
1717
<resources>
1818

19+
<!-- Styles for M3 BottomNavigationView. -->
20+
21+
<style name="Base.Widget.Material3.BottomNavigationView" parent="Widget.MaterialComponents.BottomNavigationView">
22+
<item name="android:background">@macro/m3_comp_navigation_bar_container_color</item>
23+
<item name="backgroundTint">@null</item>
24+
<item name="elevation">@dimen/m3_comp_navigation_bar_container_elevation</item>
25+
<item name="itemActiveIndicatorStyle">@style/Widget.Material3.BottomNavigationView.ActiveIndicator</item>
26+
<item name="itemTextAppearanceInactive">@macro/m3_comp_navigation_bar_label_text_type</item>
27+
<item name="itemTextAppearanceActive">@macro/m3_comp_navigation_bar_label_text_type</item>
28+
<item name="itemRippleColor">@color/m3_navigation_bar_ripple_color_selector</item>
29+
<item name="itemIconSize">@dimen/m3_comp_navigation_bar_icon_size</item>
30+
<item name="itemIconTint">@color/m3_navigation_bar_item_with_indicator_icon_tint</item>
31+
<item name="itemTextColor">@color/m3_navigation_bar_item_with_indicator_label_tint</item>
32+
<item name="itemPaddingTop">@dimen/m3_bottom_nav_item_padding_top</item>
33+
<item name="itemPaddingBottom">@dimen/m3_bottom_nav_item_padding_bottom</item>
34+
<item name="android:minHeight">@dimen/m3_bottom_nav_min_height</item>
35+
<item name="materialThemeOverlay">@style/ThemeOverlay.Material3.BottomNavigationView</item>
36+
<item name="shapeAppearance">@style/ShapeAppearance.M3.Comp.NavigationBar.Container.Shape</item>
37+
<item name="activeIndicatorLabelPadding">@dimen/m3_navigation_item_active_indicator_label_padding</item>
38+
<item name="iconLabelHorizontalSpacing">@dimen/m3_navigation_item_active_indicator_label_padding</item>
39+
</style>
40+
41+
<style name="Widget.Material3.BottomNavigationView" parent="Base.Widget.Material3.BottomNavigationView"/>
42+
43+
<style name="ThemeOverlay.Material3.BottomNavigationView" parent="">
44+
<item name="badgeStyle">@style/Widget.Material3.BottomNavigation.Badge</item>
45+
</style>
46+
47+
<style name="Widget.Material3.BottomNavigation.Badge" parent="Widget.Material3.Badge">
48+
<item name="verticalOffsetWithText">@dimen/m3_nav_badge_with_text_vertical_offset</item>
49+
</style>
50+
51+
<style name="Widget.Material3.BottomNavigationView.ActiveIndicator" parent="">
52+
<item name="android:width">@dimen/m3_bottom_nav_item_active_indicator_width</item>
53+
<item name="android:height">@dimen/m3_bottom_nav_item_active_indicator_height</item>
54+
<item name="marginHorizontal">@dimen/m3_bottom_nav_item_active_indicator_margin_horizontal</item>
55+
<item name="shapeAppearance">@style/ShapeAppearance.M3.Comp.NavigationBar.ActiveIndicator.Shape</item>
56+
<item name="android:color">@macro/m3_comp_navigation_bar_active_indicator_color</item>
57+
<item name="expandedHeight">@dimen/m3_bottom_nav_item_expanded_active_indicator_height</item>
58+
</style>
59+
60+
<!-- Styles for M2 BottomNavigationView. -->
61+
1962
<style name="Widget.Design.BottomNavigationView" parent="">
2063
<item name="compatShadowEnabled">true</item>
2164
<item name="elevation">@dimen/design_bottom_navigation_elevation</item>
@@ -66,44 +109,4 @@
66109

67110
<style name="Widget.MaterialComponents.BottomNavigationView.PrimarySurface" parent="Widget.MaterialComponents.BottomNavigationView.Colored"/>
68111

69-
<!-- Style for Material 3 Bottom Navigation View. -->
70-
<style name="Base.Widget.Material3.BottomNavigationView" parent="Widget.MaterialComponents.BottomNavigationView">
71-
<item name="android:background">@macro/m3_comp_navigation_bar_container_color</item>
72-
<item name="backgroundTint">@null</item>
73-
<item name="elevation">@dimen/m3_comp_navigation_bar_container_elevation</item>
74-
<item name="itemActiveIndicatorStyle">@style/Widget.Material3.BottomNavigationView.ActiveIndicator</item>
75-
<item name="itemTextAppearanceInactive">@macro/m3_comp_navigation_bar_label_text_type</item>
76-
<item name="itemTextAppearanceActive">@macro/m3_comp_navigation_bar_label_text_type</item>
77-
<item name="itemRippleColor">@color/m3_navigation_bar_ripple_color_selector</item>
78-
<item name="itemIconSize">@dimen/m3_comp_navigation_bar_icon_size</item>
79-
<item name="itemIconTint">@color/m3_navigation_bar_item_with_indicator_icon_tint</item>
80-
<item name="itemTextColor">@color/m3_navigation_bar_item_with_indicator_label_tint</item>
81-
<item name="itemPaddingTop">@dimen/m3_bottom_nav_item_padding_top</item>
82-
<item name="itemPaddingBottom">@dimen/m3_bottom_nav_item_padding_bottom</item>
83-
<item name="android:minHeight">@dimen/m3_bottom_nav_min_height</item>
84-
<item name="materialThemeOverlay">@style/ThemeOverlay.Material3.BottomNavigationView</item>
85-
<item name="shapeAppearance">@style/ShapeAppearance.M3.Comp.NavigationBar.Container.Shape</item>
86-
<item name="activeIndicatorLabelPadding">@dimen/m3_navigation_item_active_indicator_label_padding</item>
87-
<item name="iconLabelHorizontalSpacing">@dimen/m3_navigation_item_active_indicator_label_padding</item>
88-
</style>
89-
90-
<style name="Widget.Material3.BottomNavigationView" parent="Base.Widget.Material3.BottomNavigationView"/>
91-
92-
<style name="ThemeOverlay.Material3.BottomNavigationView" parent="">
93-
<item name="badgeStyle">@style/Widget.Material3.BottomNavigation.Badge</item>
94-
</style>
95-
96-
<style name="Widget.Material3.BottomNavigation.Badge" parent="Widget.Material3.Badge">
97-
<item name="verticalOffsetWithText">@dimen/m3_nav_badge_with_text_vertical_offset</item>
98-
</style>
99-
100-
101-
<style name="Widget.Material3.BottomNavigationView.ActiveIndicator" parent="">
102-
<item name="android:width">@dimen/m3_bottom_nav_item_active_indicator_width</item>
103-
<item name="android:height">@dimen/m3_bottom_nav_item_active_indicator_height</item>
104-
<item name="marginHorizontal">@dimen/m3_bottom_nav_item_active_indicator_margin_horizontal</item>
105-
<item name="shapeAppearance">@style/ShapeAppearance.M3.Comp.NavigationBar.ActiveIndicator.Shape</item>
106-
<item name="android:color">@macro/m3_comp_navigation_bar_active_indicator_color</item>
107-
<item name="expandedHeight">@dimen/m3_bottom_nav_item_expanded_active_indicator_height</item>
108-
</style>
109112
</resources>

0 commit comments

Comments
 (0)