Skip to content

Commit

Permalink
[tokens][M3][NavigationRail] Added design tokens for M3 NavigationRai…
Browse files Browse the repository at this point in the history
…l Component.

PiperOrigin-RevId: 485968851
  • Loading branch information
raajkumars committed Nov 7, 2022
1 parent cb65cc6 commit d1b682f
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 9 deletions.
Expand Up @@ -26,11 +26,13 @@
<dimen name="mtrl_navigation_rail_icon_margin">14dp</dimen>
<dimen name="mtrl_navigation_rail_text_bottom_margin">16dp</dimen>

<dimen name="m3_navigation_rail_default_width">80dp</dimen>
<dimen name="m3_navigation_rail_elevation">@dimen/m3_comp_navigation_rail_container_elevation</dimen>
<dimen name="m3_navigation_rail_icon_size">@dimen/m3_comp_navigation_rail_icon_size</dimen>
<dimen name="m3_navigation_rail_default_width">@dimen/m3_comp_navigation_rail_container_width</dimen>
<dimen name="m3_navigation_rail_item_min_height">60dp</dimen>
<dimen name="m3_navigation_rail_item_padding_top">4dp</dimen>
<dimen name="m3_navigation_rail_item_padding_bottom">8dp</dimen>
<dimen name="m3_navigation_rail_item_active_indicator_width">56dp</dimen>
<dimen name="m3_navigation_rail_item_active_indicator_height">32dp</dimen>
<dimen name="m3_navigation_rail_item_active_indicator_width">@dimen/m3_comp_navigation_rail_active_indicator_width</dimen>
<dimen name="m3_navigation_rail_item_active_indicator_height">@dimen/m3_comp_navigation_rail_active_indicator_height</dimen>
<dimen name="m3_navigation_rail_item_active_indicator_margin_horizontal">4dp</dimen>
</resources>
Expand Up @@ -67,26 +67,27 @@
<!-- Styles for Material3 NavigationRailView. -->
<style name="Widget.Material3.NavigationRailView" parent="Widget.MaterialComponents.NavigationRailView">
<item name="android:minWidth">@dimen/m3_navigation_rail_default_width</item>
<item name="android:background">?attr/colorSurface</item>
<item name="android:background">@macro/m3_comp_navigation_rail_container_color</item>
<item name="backgroundTint">@null</item>
<item name="elevation">@dimen/m3_sys_elevation_level0</item>
<item name="elevation">@dimen/m3_navigation_rail_elevation</item>
<item name="itemActiveIndicatorStyle">@style/Widget.Material3.NavigationRailView.ActiveIndicator</item>
<item name="itemRippleColor">@color/m3_navigation_bar_ripple_color_selector</item>
<item name="itemIconSize">@dimen/m3_comp_navigation_rail_icon_size</item>
<item name="itemIconTint">@color/m3_navigation_bar_item_with_indicator_icon_tint</item>
<item name="itemTextColor">@color/m3_navigation_bar_item_with_indicator_label_tint</item>
<item name="itemPaddingTop">@dimen/m3_navigation_rail_item_padding_top</item>
<item name="itemPaddingBottom">@dimen/m3_navigation_rail_item_padding_bottom</item>
<item name="itemMinHeight">@dimen/m3_navigation_rail_item_min_height</item>
<item name="itemTextAppearanceInactive">?attr/textAppearanceTitleSmall</item>
<item name="itemTextAppearanceActive">?attr/textAppearanceTitleSmall</item>
<item name="itemTextAppearanceInactive">@macro/m3_comp_navigation_rail_label_text_type</item>
<item name="itemTextAppearanceActive">@macro/m3_comp_navigation_rail_label_text_type</item>
</style>

<style name="Widget.Material3.NavigationRailView.ActiveIndicator" parent="">
<item name="android:width">@dimen/m3_navigation_rail_item_active_indicator_width</item>
<item name="android:height">@dimen/m3_navigation_rail_item_active_indicator_height</item>
<item name="marginHorizontal">@dimen/m3_navigation_rail_item_active_indicator_margin_horizontal</item>
<item name="shapeAppearance">@style/ShapeAppearance.Material3.Corner.Full</item>
<item name="android:color">?attr/colorSecondaryContainer</item>
<item name="shapeAppearance">@style/ShapeAppearance.M3.Comp.NavigationRail.ActiveIndicator.Shape</item>
<item name="android:color">@macro/m3_comp_navigation_rail_active_indicator_color</item>
</style>

</resources>
@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2022 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<!-- AUTOGENERATED FILE. DO NOT MODIFY. -->
<!-- Version: v0.126 -->

<resources>
<!-- Generated from token set (md.comp.navigation-rail) in default context. -->
<!-- Enabled - Container -->
<macro name="m3_comp_navigation_rail_container_color">?attr/colorSurface</macro>
<dimen name="m3_comp_navigation_rail_container_width">80dp</dimen>
<dimen name="m3_comp_navigation_rail_container_elevation">@dimen/m3_sys_elevation_level0</dimen>
<!-- Enabled - Label text -->
<macro name="m3_comp_navigation_rail_label_text_type">?attr/textAppearanceLabelMedium</macro>
<!-- Enabled - Icon -->
<dimen name="m3_comp_navigation_rail_icon_size">24dp</dimen>
<!-- Enabled - Active indicator -->
<macro name="m3_comp_navigation_rail_active_indicator_color">?attr/colorSecondaryContainer</macro>
<dimen name="m3_comp_navigation_rail_active_indicator_height">32dp</dimen>
<style name="ShapeAppearance.M3.Comp.NavigationRail.ActiveIndicator.Shape" parent="ShapeAppearance.M3.Sys.Shape.Corner.Full"/>
<dimen name="m3_comp_navigation_rail_active_indicator_width">56dp</dimen>
</resources>

0 comments on commit d1b682f

Please sign in to comment.