Skip to content

Commit 02fcdf5

Browse files
pekingmeleticiarossi
pekingme
authored and
leticiarossi
committed
[BottomNav] Migrated to new token sets.
PiperOrigin-RevId: 749087804
1 parent 9fc00e8 commit 02fcdf5

File tree

6 files changed

+75
-80
lines changed

6 files changed

+75
-80
lines changed

‎lib/java/com/google/android/material/bottomnavigation/res/color/m3_navigation_bar_item_with_indicator_icon_tint.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,21 @@
1616
-->
1717
<selector xmlns:android="http://schemas.android.com/apk/res/android">
1818
<!-- Active item -->
19-
<item android:color="@macro/m3_comp_navigation_bar_active_pressed_icon_color"
19+
<item android:color="?attr/colorOnSecondaryContainer"
2020
android:state_pressed="true" android:state_checked="true"/>
21-
<item android:color="@macro/m3_comp_navigation_bar_active_focus_icon_color"
21+
<item android:color="?attr/colorOnSecondaryContainer"
2222
android:state_focused="true" android:state_checked="true"/>
23-
<item android:color="@macro/m3_comp_navigation_bar_active_hover_icon_color"
23+
<item android:color="?attr/colorOnSecondaryContainer"
2424
android:state_hovered="true" android:state_checked="true"/>
25-
<item android:color="@macro/m3_comp_navigation_bar_active_icon_color"
25+
<item android:color="?attr/colorOnSecondaryContainer"
2626
android:state_checked="true"/>
2727

2828
<!-- Inactive item -->
29-
<item android:color="@macro/m3_comp_navigation_bar_inactive_pressed_icon_color"
29+
<item android:color="?attr/colorOnSurface"
3030
android:state_pressed="true"/>
31-
<item android:color="@macro/m3_comp_navigation_bar_inactive_focus_icon_color"
31+
<item android:color="?attr/colorOnSurface"
3232
android:state_focused="true"/>
33-
<item android:color="@macro/m3_comp_navigation_bar_inactive_hover_icon_color"
33+
<item android:color="?attr/colorOnSurface"
3434
android:state_hovered="true"/>
35-
<item android:color="@macro/m3_comp_navigation_bar_inactive_icon_color"/>
35+
<item android:color="?attr/colorOnSurfaceVariant"/>
3636
</selector>

‎lib/java/com/google/android/material/bottomnavigation/res/color/m3_navigation_bar_item_with_indicator_label_tint.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,21 @@
1616
-->
1717
<selector xmlns:android="http://schemas.android.com/apk/res/android">
1818
<!-- Active item -->
19-
<item android:color="@macro/m3_comp_navigation_bar_active_pressed_label_text_color"
19+
<item android:color="?attr/colorOnSurface"
2020
android:state_pressed="true" android:state_checked="true"/>
21-
<item android:color="@macro/m3_comp_navigation_bar_active_focus_label_text_color"
21+
<item android:color="?attr/colorOnSurface"
2222
android:state_focused="true" android:state_checked="true"/>
23-
<item android:color="@macro/m3_comp_navigation_bar_active_hover_label_text_color"
23+
<item android:color="?attr/colorOnSurface"
2424
android:state_hovered="true" android:state_checked="true"/>
25-
<item android:color="@macro/m3_comp_navigation_bar_active_label_text_color"
25+
<item android:color="?attr/colorOnSurface"
2626
android:state_checked="true"/>
2727

2828
<!-- Inactive item -->
29-
<item android:color="@macro/m3_comp_navigation_bar_inactive_pressed_label_text_color"
29+
<item android:color="?attr/colorOnSurface"
3030
android:state_pressed="true"/>
31-
<item android:color="@macro/m3_comp_navigation_bar_inactive_focus_label_text_color"
31+
<item android:color="?attr/colorOnSurface"
3232
android:state_focused="true"/>
33-
<item android:color="@macro/m3_comp_navigation_bar_inactive_hover_label_text_color"
33+
<item android:color="?attr/colorOnSurface"
3434
android:state_hovered="true"/>
35-
<item android:color="@macro/m3_comp_navigation_bar_inactive_label_text_color"/>
35+
<item android:color="?attr/colorOnSurfaceVariant"/>
3636
</selector>

‎lib/java/com/google/android/material/bottomnavigation/res/color/m3_navigation_bar_ripple_color_selector.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,25 @@
1717
<selector xmlns:android="http://schemas.android.com/apk/res/android">
1818

1919
<!-- Selected. -->
20-
<item android:alpha="@dimen/m3_comp_navigation_bar_pressed_state_layer_opacity"
21-
android:color="@macro/m3_comp_navigation_bar_active_pressed_state_layer_color"
20+
<item android:alpha="@dimen/m3_sys_state_pressed_state_layer_opacity"
21+
android:color="?attr/colorOnSurface"
2222
android:state_pressed="true" android:state_selected="true"/>
23-
<item android:alpha="@dimen/m3_comp_navigation_bar_focus_state_layer_opacity"
24-
android:color="@macro/m3_comp_navigation_bar_active_focus_state_layer_color"
23+
<item android:alpha="@dimen/m3_sys_state_focus_state_layer_opacity"
24+
android:color="?attr/colorOnSurface"
2525
android:state_focused="true" android:state_selected="true"/>
26-
<item android:alpha="@dimen/m3_comp_navigation_bar_hover_state_layer_opacity"
27-
android:color="@macro/m3_comp_navigation_bar_active_hover_state_layer_color"
26+
<item android:alpha="@dimen/m3_sys_state_hover_state_layer_opacity"
27+
android:color="?attr/colorOnSurface"
2828
android:state_hovered="true" android:state_selected="true"/>
2929

3030
<!-- Unselected. -->
31-
<item android:alpha="@dimen/m3_comp_navigation_bar_pressed_state_layer_opacity"
32-
android:color="@macro/m3_comp_navigation_bar_inactive_pressed_state_layer_color"
31+
<item android:alpha="@dimen/m3_sys_state_pressed_state_layer_opacity"
32+
android:color="?attr/colorOnSurface"
3333
android:state_pressed="true"/>
34-
<item android:alpha="@dimen/m3_comp_navigation_bar_focus_state_layer_opacity"
35-
android:color="@macro/m3_comp_navigation_bar_inactive_focus_state_layer_color"
34+
<item android:alpha="@dimen/m3_sys_state_focus_state_layer_opacity"
35+
android:color="?attr/colorOnSurface"
3636
android:state_focused="true"/>
37-
<item android:alpha="@dimen/m3_comp_navigation_bar_hover_state_layer_opacity"
38-
android:color="@macro/m3_comp_navigation_bar_inactive_hover_state_layer_color"
37+
<item android:alpha="@dimen/m3_sys_state_hover_state_layer_opacity"
38+
android:color="?attr/colorOnSurface"
3939
android:state_hovered="true"/>
4040
<item android:color="@android:color/transparent"/>
4141
</selector>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@
2929
<dimen name="design_bottom_navigation_active_item_max_width">168dp</dimen>
3030
<dimen name="design_bottom_navigation_active_item_min_width">96dp</dimen>
3131

32-
<dimen name="m3_bottom_nav_min_height">@dimen/m3_comp_navigation_bar_container_height</dimen>
32+
<dimen name="m3_bottom_nav_min_height">80dp</dimen>
3333
<dimen name="m3_bottom_nav_item_padding_top">12dp</dimen>
3434
<dimen name="m3_bottom_nav_item_padding_bottom">16dp</dimen>
3535

36-
<dimen name="m3_bottom_nav_item_active_indicator_width">@dimen/m3_comp_navigation_bar_active_indicator_width</dimen>
37-
<dimen name="m3_bottom_nav_item_active_indicator_height">@dimen/m3_comp_navigation_bar_active_indicator_height</dimen>
36+
<dimen name="m3_bottom_nav_item_active_indicator_width">64dp</dimen>
37+
<dimen name="m3_bottom_nav_item_active_indicator_height">32dp</dimen>
3838
<dimen name="m3_bottom_nav_item_active_indicator_margin_horizontal">4dp</dimen>
3939

4040
<dimen name="m3_bottom_nav_item_expanded_active_indicator_height">40dp</dimen>

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,21 @@
1919
<!-- Styles for M3 BottomNavigationView. -->
2020

2121
<style name="Base.Widget.Material3.BottomNavigationView" parent="Widget.MaterialComponents.BottomNavigationView">
22-
<item name="android:background">@macro/m3_comp_navigation_bar_container_color</item>
22+
<item name="android:background">@macro/m3_comp_nav_bar_container_color</item>
2323
<item name="backgroundTint">@null</item>
24-
<item name="elevation">@dimen/m3_comp_navigation_bar_container_elevation</item>
24+
<item name="elevation">@dimen/m3_comp_nav_bar_container_elevation</item>
2525
<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>
26+
<item name="itemTextAppearanceInactive">@macro/m3_comp_nav_bar_item_horizontal_label_text_font</item>
27+
<item name="itemTextAppearanceActive">@macro/m3_comp_nav_bar_item_horizontal_label_text_font</item>
2828
<item name="itemRippleColor">@color/m3_navigation_bar_ripple_color_selector</item>
29-
<item name="itemIconSize">@dimen/m3_comp_navigation_bar_icon_size</item>
29+
<item name="itemIconSize">@dimen/m3_comp_nav_bar_item_icon_size</item>
3030
<item name="itemIconTint">@color/m3_navigation_bar_item_with_indicator_icon_tint</item>
3131
<item name="itemTextColor">@color/m3_navigation_bar_item_with_indicator_label_tint</item>
3232
<item name="itemPaddingTop">@dimen/m3_bottom_nav_item_padding_top</item>
3333
<item name="itemPaddingBottom">@dimen/m3_bottom_nav_item_padding_bottom</item>
3434
<item name="android:minHeight">@dimen/m3_bottom_nav_min_height</item>
3535
<item name="materialThemeOverlay">@style/ThemeOverlay.Material3.BottomNavigationView</item>
36-
<item name="shapeAppearance">@style/ShapeAppearance.M3.Comp.NavigationBar.Container.Shape</item>
36+
<item name="shapeAppearance">@style/ShapeAppearance.M3.Comp.NavBar.Container.Shape</item>
3737
<item name="activeIndicatorLabelPadding">@dimen/m3_navigation_item_active_indicator_label_padding</item>
3838
<item name="iconLabelHorizontalSpacing">@dimen/m3_navigation_item_active_indicator_label_padding</item>
3939
</style>
@@ -52,8 +52,8 @@
5252
<item name="android:width">@dimen/m3_bottom_nav_item_active_indicator_width</item>
5353
<item name="android:height">@dimen/m3_bottom_nav_item_active_indicator_height</item>
5454
<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>
55+
<item name="shapeAppearance">@style/ShapeAppearance.M3.Comp.NavBar.Item.ActiveIndicator.Shape</item>
56+
<item name="android:color">@macro/m3_comp_nav_bar_item_active_indicator_color</item>
5757
<item name="expandedHeight">@dimen/m3_bottom_nav_item_expanded_active_indicator_height</item>
5858
</style>
5959

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

Lines changed: 36 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -19,46 +19,41 @@
1919

2020
<resources>
2121

22-
<!-- Generated from token set (md.comp.navigation-bar) in context (platform=android, audience=3p). -->
23-
<!-- Group: [Deprecated] Enabled - [Deprecated] Container -->
24-
<macro name="m3_comp_navigation_bar_container_color">?attr/colorSurfaceContainer</macro>
25-
<style name="ShapeAppearance.M3.Comp.NavigationBar.Container.Shape" parent="ShapeAppearance.M3.Sys.Shape.Corner.None"/>
26-
<dimen name="m3_comp_navigation_bar_container_height">80dp</dimen>
27-
<dimen name="m3_comp_navigation_bar_container_elevation">@dimen/m3_sys_elevation_level2</dimen>
28-
<!-- Group: [Deprecated] Enabled - [Deprecated] Label text -->
29-
<macro name="m3_comp_navigation_bar_label_text_type">?attr/textAppearanceLabelMedium</macro>
30-
<macro name="m3_comp_navigation_bar_active_label_text_color">?attr/colorOnSurface</macro>
31-
<macro name="m3_comp_navigation_bar_inactive_label_text_color">?attr/colorOnSurfaceVariant</macro>
32-
<macro name="m3_comp_navigation_bar_active_hover_label_text_color">?attr/colorOnSurface</macro>
33-
<macro name="m3_comp_navigation_bar_inactive_hover_label_text_color">?attr/colorOnSurface</macro>
34-
<macro name="m3_comp_navigation_bar_active_focus_label_text_color">?attr/colorOnSurface</macro>
35-
<macro name="m3_comp_navigation_bar_inactive_focus_label_text_color">?attr/colorOnSurface</macro>
36-
<macro name="m3_comp_navigation_bar_active_pressed_label_text_color">?attr/colorOnSurface</macro>
37-
<macro name="m3_comp_navigation_bar_inactive_pressed_label_text_color">?attr/colorOnSurface</macro>
38-
<!-- Group: [Deprecated] Enabled - [Deprecated] Icon -->
39-
<dimen name="m3_comp_navigation_bar_icon_size">24dp</dimen>
40-
<macro name="m3_comp_navigation_bar_active_icon_color">?attr/colorOnSecondaryContainer</macro>
41-
<macro name="m3_comp_navigation_bar_inactive_icon_color">?attr/colorOnSurfaceVariant</macro>
42-
<macro name="m3_comp_navigation_bar_active_hover_icon_color">?attr/colorOnSecondaryContainer</macro>
43-
<macro name="m3_comp_navigation_bar_inactive_hover_icon_color">?attr/colorOnSurface</macro>
44-
<macro name="m3_comp_navigation_bar_active_focus_icon_color">?attr/colorOnSecondaryContainer</macro>
45-
<macro name="m3_comp_navigation_bar_inactive_focus_icon_color">?attr/colorOnSurface</macro>
46-
<macro name="m3_comp_navigation_bar_active_pressed_icon_color">?attr/colorOnSecondaryContainer</macro>
47-
<macro name="m3_comp_navigation_bar_inactive_pressed_icon_color">?attr/colorOnSurface</macro>
48-
<!-- Group: [Deprecated] Enabled - [Deprecated] Active indicator -->
49-
<macro name="m3_comp_navigation_bar_active_indicator_color">?attr/colorSecondaryContainer</macro>
50-
<dimen name="m3_comp_navigation_bar_active_indicator_height">32dp</dimen>
51-
<dimen name="m3_comp_navigation_bar_active_indicator_width">64dp</dimen>
52-
<style name="ShapeAppearance.M3.Comp.NavigationBar.ActiveIndicator.Shape" parent="ShapeAppearance.M3.Sys.Shape.Corner.Full"/>
53-
<!-- Group: [Deprecated] Enabled - [Deprecated] State layer -->
54-
<macro name="m3_comp_navigation_bar_active_hover_state_layer_color">?attr/colorOnSurface</macro>
55-
<macro name="m3_comp_navigation_bar_inactive_hover_state_layer_color">?attr/colorOnSurface</macro>
56-
<dimen name="m3_comp_navigation_bar_hover_state_layer_opacity">@dimen/m3_sys_state_hover_state_layer_opacity</dimen>
57-
<macro name="m3_comp_navigation_bar_active_focus_state_layer_color">?attr/colorOnSurface</macro>
58-
<macro name="m3_comp_navigation_bar_inactive_focus_state_layer_color">?attr/colorOnSurface</macro>
59-
<dimen name="m3_comp_navigation_bar_focus_state_layer_opacity">@dimen/m3_sys_state_focus_state_layer_opacity</dimen>
60-
<macro name="m3_comp_navigation_bar_active_pressed_state_layer_color">?attr/colorOnSurface</macro>
61-
<macro name="m3_comp_navigation_bar_inactive_pressed_state_layer_color">?attr/colorOnSurface</macro>
62-
<dimen name="m3_comp_navigation_bar_pressed_state_layer_opacity">@dimen/m3_sys_state_pressed_state_layer_opacity</dimen>
22+
<!-- Generated from token set (md.comp.nav-bar) in context (platform=android, audience=3p). -->
23+
<!-- Group: Color - Enabled -->
24+
<dimen name="m3_comp_nav_bar_container_elevation">@dimen/m3_sys_elevation_level2</dimen>
25+
<macro name="m3_comp_nav_bar_container_color">?attr/colorSurfaceContainer</macro>
26+
<macro name="m3_comp_nav_bar_item_active_indicator_color">?attr/colorSecondaryContainer</macro>
27+
<macro name="m3_comp_nav_bar_item_active_label_text_color">?attr/colorSecondary</macro>
28+
<macro name="m3_comp_nav_bar_item_inactive_label_text_color">?attr/colorOnSurfaceVariant</macro>
29+
<macro name="m3_comp_nav_bar_item_active_icon_color">?attr/colorOnSecondaryContainer</macro>
30+
<macro name="m3_comp_nav_bar_item_inactive_icon_color">?attr/colorOnSurfaceVariant</macro>
31+
<!-- Group: Color - Hovered -->
32+
<macro name="m3_comp_nav_bar_item_active_hovered_state_layer_color">?attr/colorOnSecondaryContainer</macro>
33+
<macro name="m3_comp_nav_bar_item_inactive_hovered_state_layer_color">?attr/colorOnSecondaryContainer</macro>
34+
<!-- Group: Color - Focused -->
35+
<macro name="m3_comp_nav_bar_item_active_focused_state_layer_color">?attr/colorOnSecondaryContainer</macro>
36+
<macro name="m3_comp_nav_bar_item_inactive_focused_state_layer_color">?attr/colorOnSecondaryContainer</macro>
37+
<!-- Group: Color - Pressed -->
38+
<macro name="m3_comp_nav_bar_item_active_pressed_state_layer_color">?attr/colorOnSecondaryContainer</macro>
39+
<macro name="m3_comp_nav_bar_item_inactive_pressed_state_layer_color">?attr/colorOnSecondaryContainer</macro>
40+
<!-- Group: Nav item -->
41+
<style name="ShapeAppearance.M3.Comp.NavBar.Item.ActiveIndicator.Shape" parent="ShapeAppearance.M3.Sys.Shape.Corner.Full"/>
42+
<dimen name="m3_comp_nav_bar_item_active_indicator_icon_label_space">4dp</dimen>
43+
<dimen name="m3_comp_nav_bar_item_icon_size">24dp</dimen>
44+
<!-- Group: Container -->
45+
<dimen name="m3_comp_nav_bar_container_height">64dp</dimen>
46+
<style name="ShapeAppearance.M3.Comp.NavBar.Container.Shape" parent="ShapeAppearance.M3.Sys.Shape.Corner.None"/>
47+
48+
<!-- Generated from token set (md.comp.nav-bar.item.horizontal) in context (platform=android,
49+
audience=3p). -->
50+
<macro name="m3_comp_nav_bar_item_horizontal_label_text_font">?attr/textAppearanceLabelMedium</macro>
51+
<dimen name="m3_comp_nav_bar_item_horizontal_active_indicator_height">40dp</dimen>
52+
53+
<!-- Generated from token set (md.comp.nav-bar.item.vertical) in context (platform=android, audience=3p). -->
54+
<macro name="m3_comp_nav_bar_item_vertical_label_text_font">?attr/textAppearanceLabelMedium</macro>
55+
<dimen name="m3_comp_nav_bar_item_vertical_active_indicator_height">32dp</dimen>
56+
<dimen name="m3_comp_nav_bar_item_vertical_active_indicator_width">56dp</dimen>
57+
<dimen name="m3_comp_nav_bar_item_vertical_container_between_space">6dp</dimen>
6358

6459
</resources>

0 commit comments

Comments
 (0)