Skip to content

Commit 9fc00e8

Browse files
pekingmeleticiarossi
pekingme
authored and
leticiarossi
committed
[NavRail] Reorganized styles.
PiperOrigin-RevId: 749087459
1 parent a28f0e0 commit 9fc00e8

File tree

1 file changed

+45
-42
lines changed
  • lib/java/com/google/android/material/navigationrail/res/values

1 file changed

+45
-42
lines changed

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

Lines changed: 45 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,51 @@
1616
-->
1717
<resources>
1818

19+
<!-- Styles for M3 NavigationRailView. -->
20+
21+
<style name="Widget.Material3.NavigationRailView" parent="Widget.MaterialComponents.NavigationRailView">
22+
<item name="android:minWidth">@dimen/m3_navigation_rail_default_width</item>
23+
<item name="android:background">@macro/m3_comp_navigation_rail_container_color</item>
24+
<item name="backgroundTint">@null</item>
25+
<item name="elevation">@dimen/m3_navigation_rail_elevation</item>
26+
<item name="shapeAppearance">@style/ShapeAppearance.M3.Comp.NavigationRail.Container.Shape</item>
27+
<item name="itemActiveIndicatorStyle">@style/Widget.Material3.NavigationRailView.ActiveIndicator</item>
28+
<item name="itemRippleColor">@color/m3_navigation_rail_ripple_color_selector</item>
29+
<item name="itemIconSize">@dimen/m3_comp_navigation_rail_icon_size</item>
30+
<item name="itemIconTint">@color/m3_navigation_rail_item_with_indicator_icon_tint</item>
31+
<item name="itemTextColor">@color/m3_navigation_rail_item_with_indicator_label_tint</item>
32+
<item name="itemPaddingTop">@dimen/m3_navigation_rail_item_padding_top</item>
33+
<item name="itemPaddingBottom">@dimen/m3_navigation_rail_item_padding_bottom</item>
34+
<item name="itemMinHeight">@dimen/m3_navigation_rail_item_min_height</item>
35+
<item name="itemTextAppearanceInactive">@macro/m3_comp_navigation_rail_label_text_type</item>
36+
<item name="itemTextAppearanceActive">@macro/m3_comp_navigation_rail_label_text_type</item>
37+
<item name="materialThemeOverlay">@style/ThemeOverlay.Material3.NavigationRailView</item>
38+
<item name="activeIndicatorLabelPadding">@dimen/m3_navigation_rail_icon_label_padding</item>
39+
<item name="iconLabelHorizontalSpacing">@dimen/m3_navigation_rail_icon_label_horizontal_padding</item>
40+
</style>
41+
42+
<style name="Widget.Material3.NavigationRailView.ActiveIndicator" parent="">
43+
<item name="android:width">@dimen/m3_navigation_rail_item_active_indicator_width</item>
44+
<item name="android:height">@dimen/m3_navigation_rail_item_active_indicator_height</item>
45+
<item name="marginHorizontal">@dimen/m3_navigation_rail_item_active_indicator_margin_horizontal</item>
46+
<item name="shapeAppearance">@style/ShapeAppearance.M3.Comp.NavigationRail.ActiveIndicator.Shape</item>
47+
<item name="android:color">@macro/m3_comp_navigation_rail_active_indicator_color</item>
48+
<item name="expandedWidth">wrap_content</item>
49+
<item name="expandedHeight">@dimen/m3_navigation_rail_expanded_active_indicator_height</item>
50+
<item name="expandedMarginHorizontal">@dimen/m3_navigation_rail_expanded_leading_trailing_space</item>
51+
</style>
52+
53+
<style name="ThemeOverlay.Material3.NavigationRailView" parent="">
54+
<item name="badgeStyle">@style/Widget.Material3.NavigationRailView.Badge</item>
55+
</style>
56+
57+
<style name="Widget.Material3.NavigationRailView.Badge" parent="Widget.Material3.Badge">
58+
<item name="largeFontVerticalOffsetAdjustment">@dimen/m3_large_text_vertical_offset_adjustment</item>
59+
<item name="verticalOffsetWithText">@dimen/m3_nav_badge_with_text_vertical_offset</item>
60+
</style>
61+
62+
<!-- Styles for M2 NavigationRailView. -->
63+
1964
<!-- Default style for NavigationRailViews.
2065
Use the default style to get the default navigation rail view with a colorSurface background
2166
and colorPrimary for the icon and text colors. -->
@@ -68,46 +113,4 @@
68113
<style name="Widget.MaterialComponents.NavigationRailView.PrimarySurface"
69114
parent="Widget.MaterialComponents.NavigationRailView.Colored"/>
70115

71-
<!-- Styles for Material3 NavigationRailView. -->
72-
<style name="Widget.Material3.NavigationRailView" parent="Widget.MaterialComponents.NavigationRailView">
73-
<item name="android:minWidth">@dimen/m3_navigation_rail_default_width</item>
74-
<item name="android:background">@macro/m3_comp_navigation_rail_container_color</item>
75-
<item name="backgroundTint">@null</item>
76-
<item name="elevation">@dimen/m3_navigation_rail_elevation</item>
77-
<item name="shapeAppearance">@style/ShapeAppearance.M3.Comp.NavigationRail.Container.Shape</item>
78-
<item name="itemActiveIndicatorStyle">@style/Widget.Material3.NavigationRailView.ActiveIndicator</item>
79-
<item name="itemRippleColor">@color/m3_navigation_rail_ripple_color_selector</item>
80-
<item name="itemIconSize">@dimen/m3_comp_navigation_rail_icon_size</item>
81-
<item name="itemIconTint">@color/m3_navigation_rail_item_with_indicator_icon_tint</item>
82-
<item name="itemTextColor">@color/m3_navigation_rail_item_with_indicator_label_tint</item>
83-
<item name="itemPaddingTop">@dimen/m3_navigation_rail_item_padding_top</item>
84-
<item name="itemPaddingBottom">@dimen/m3_navigation_rail_item_padding_bottom</item>
85-
<item name="itemMinHeight">@dimen/m3_navigation_rail_item_min_height</item>
86-
<item name="itemTextAppearanceInactive">@macro/m3_comp_navigation_rail_label_text_type</item>
87-
<item name="itemTextAppearanceActive">@macro/m3_comp_navigation_rail_label_text_type</item>
88-
<item name="materialThemeOverlay">@style/ThemeOverlay.Material3.NavigationRailView</item>
89-
<item name="activeIndicatorLabelPadding">@dimen/m3_navigation_rail_icon_label_padding</item>
90-
<item name="iconLabelHorizontalSpacing">@dimen/m3_navigation_rail_icon_label_horizontal_padding</item>
91-
</style>
92-
93-
<style name="Widget.Material3.NavigationRailView.ActiveIndicator" parent="">
94-
<item name="android:width">@dimen/m3_navigation_rail_item_active_indicator_width</item>
95-
<item name="android:height">@dimen/m3_navigation_rail_item_active_indicator_height</item>
96-
<item name="marginHorizontal">@dimen/m3_navigation_rail_item_active_indicator_margin_horizontal</item>
97-
<item name="shapeAppearance">@style/ShapeAppearance.M3.Comp.NavigationRail.ActiveIndicator.Shape</item>
98-
<item name="android:color">@macro/m3_comp_navigation_rail_active_indicator_color</item>
99-
<item name="expandedWidth">wrap_content</item>
100-
<item name="expandedHeight">@dimen/m3_navigation_rail_expanded_active_indicator_height</item>
101-
<item name="expandedMarginHorizontal">@dimen/m3_navigation_rail_expanded_leading_trailing_space</item>
102-
</style>
103-
104-
<style name="ThemeOverlay.Material3.NavigationRailView" parent="">
105-
<item name="badgeStyle">@style/Widget.Material3.NavigationRailView.Badge</item>
106-
</style>
107-
108-
<style name="Widget.Material3.NavigationRailView.Badge" parent="Widget.Material3.Badge">
109-
<item name="largeFontVerticalOffsetAdjustment">@dimen/m3_large_text_vertical_offset_adjustment</item>
110-
<item name="verticalOffsetWithText">@dimen/m3_nav_badge_with_text_vertical_offset</item>
111-
</style>
112-
113116
</resources>

0 commit comments

Comments
 (0)