Skip to content

Commit

Permalink
[Tokens] Added formatting to break long lines and differentiate diffe…
Browse files Browse the repository at this point in the history
…rent comments.

PiperOrigin-RevId: 605684816
(cherry picked from commit ee7b4bd)
  • Loading branch information
pekingme authored and hunterstich committed Mar 21, 2024
1 parent 396c64e commit 857d6a2
Show file tree
Hide file tree
Showing 38 changed files with 387 additions and 379 deletions.
Expand Up @@ -20,32 +20,32 @@
<resources>

<!-- Generated from token set (md.comp.top-app-bar.small) in context (platform=android, audience=3p). -->
<!-- Enabled - Container -->
<!-- Group: Enabled - Container -->
<macro name="m3_comp_top_app_bar_small_container_color">?attr/colorSurface</macro>
<macro name="m3_comp_top_app_bar_small_on_scroll_container_color">?attr/colorSurfaceContainer</macro>
<dimen name="m3_comp_top_app_bar_small_container_height">64dp</dimen>
<dimen name="m3_comp_top_app_bar_small_container_elevation">@dimen/m3_sys_elevation_level0</dimen>
<!-- Enabled - Leading icon -->
<!-- Group: Enabled - Leading icon -->
<macro name="m3_comp_top_app_bar_small_leading_icon_color">?attr/colorOnSurface</macro>
<!-- Enabled - Trailing icon -->
<!-- Group: Enabled - Trailing icon -->
<macro name="m3_comp_top_app_bar_small_trailing_icon_color">?attr/colorOnSurfaceVariant</macro>
<!-- Enabled - Headline -->
<!-- Group: Enabled - Headline -->
<macro name="m3_comp_top_app_bar_small_headline_type">?attr/textAppearanceTitleLarge</macro>
<macro name="m3_comp_top_app_bar_small_headline_color">?attr/colorOnSurface</macro>
<!-- Enabled - On scroll -->
<!-- Group: Enabled - On scroll -->
<dimen name="m3_comp_top_app_bar_small_on_scroll_container_elevation">@dimen/m3_sys_elevation_level2</dimen>

<!-- Generated from token set (md.comp.top-app-bar.medium) in context (platform=android, audience=3p). -->
<!-- Enabled - Container -->
<!-- Group: Enabled - Container -->
<dimen name="m3_comp_top_app_bar_medium_container_height">112dp</dimen>
<!-- Enabled - Headline -->
<!-- Group: Enabled - Headline -->
<macro name="m3_comp_top_app_bar_medium_headline_type">?attr/textAppearanceHeadlineSmall</macro>
<macro name="m3_comp_top_app_bar_medium_headline_color">?attr/colorOnSurface</macro>

<!-- Generated from token set (md.comp.top-app-bar.large) in context (platform=android, audience=3p). -->
<!-- Enabled - Container -->
<!-- Group: Enabled - Container -->
<dimen name="m3_comp_top_app_bar_large_container_height">152dp</dimen>
<!-- Enabled - Headline -->
<!-- Group: Enabled - Headline -->
<macro name="m3_comp_top_app_bar_large_headline_type">?attr/textAppearanceHeadlineMedium</macro>
<macro name="m3_comp_top_app_bar_large_headline_color">?attr/colorOnSurface</macro>

Expand Down
Expand Up @@ -20,13 +20,13 @@
<resources>

<!-- Generated from token set (md.comp.badge) in context (platform=android, audience=3p). -->
<!-- Enabled - Container -->
<!-- Group: Enabled - Container -->
<macro name="m3_comp_badge_color">?attr/colorError</macro>
<style name="ShapeAppearance.M3.Comp.Badge.Shape" parent="ShapeAppearance.M3.Sys.Shape.Corner.Full"/>
<dimen name="m3_comp_badge_size">6dp</dimen>
<style name="ShapeAppearance.M3.Comp.Badge.Large.Shape" parent="ShapeAppearance.M3.Sys.Shape.Corner.Full"/>
<dimen name="m3_comp_badge_large_size">16dp</dimen>
<!-- Enabled - Label text -->
<!-- Group: Enabled - Label text -->
<macro name="m3_comp_badge_large_label_text_color">?attr/colorOnError</macro>
<macro name="m3_comp_badge_large_label_text_type">?attr/textAppearanceLabelSmall</macro>

Expand Down
Expand Up @@ -20,7 +20,7 @@
<resources>

<!-- Generated from token set (md.comp.bottom-app-bar) in context (platform=android, audience=3p). -->
<!-- Enabled - Container -->
<!-- Group: Enabled - Container -->
<macro name="m3_comp_bottom_app_bar_container_color">?attr/colorSurfaceContainer</macro>
<style name="ShapeAppearance.M3.Comp.BottomAppBar.Container.Shape" parent="ShapeAppearance.M3.Sys.Shape.Corner.None"/>
<dimen name="m3_comp_bottom_app_bar_container_elevation">@dimen/m3_sys_elevation_level2</dimen>
Expand Down
Expand Up @@ -20,12 +20,12 @@
<resources>

<!-- Generated from token set (md.comp.navigation-bar) in context (platform=android, audience=3p). -->
<!-- Enabled - Container -->
<!-- Group: Enabled - Container -->
<macro name="m3_comp_navigation_bar_container_color">?attr/colorSurfaceContainer</macro>
<style name="ShapeAppearance.M3.Comp.NavigationBar.Container.Shape" parent="ShapeAppearance.M3.Sys.Shape.Corner.None"/>
<dimen name="m3_comp_navigation_bar_container_height">80dp</dimen>
<dimen name="m3_comp_navigation_bar_container_elevation">@dimen/m3_sys_elevation_level2</dimen>
<!-- Enabled - Label text -->
<!-- Group: Enabled - Label text -->
<macro name="m3_comp_navigation_bar_label_text_type">?attr/textAppearanceLabelMedium</macro>
<macro name="m3_comp_navigation_bar_active_label_text_color">?attr/colorOnSurface</macro>
<macro name="m3_comp_navigation_bar_inactive_label_text_color">?attr/colorOnSurfaceVariant</macro>
Expand All @@ -35,7 +35,7 @@
<macro name="m3_comp_navigation_bar_inactive_focus_label_text_color">?attr/colorOnSurface</macro>
<macro name="m3_comp_navigation_bar_active_pressed_label_text_color">?attr/colorOnSurface</macro>
<macro name="m3_comp_navigation_bar_inactive_pressed_label_text_color">?attr/colorOnSurface</macro>
<!-- Enabled - Icon -->
<!-- Group: Enabled - Icon -->
<dimen name="m3_comp_navigation_bar_icon_size">24dp</dimen>
<macro name="m3_comp_navigation_bar_active_icon_color">?attr/colorOnSecondaryContainer</macro>
<macro name="m3_comp_navigation_bar_inactive_icon_color">?attr/colorOnSurfaceVariant</macro>
Expand All @@ -45,12 +45,12 @@
<macro name="m3_comp_navigation_bar_inactive_focus_icon_color">?attr/colorOnSurface</macro>
<macro name="m3_comp_navigation_bar_active_pressed_icon_color">?attr/colorOnSecondaryContainer</macro>
<macro name="m3_comp_navigation_bar_inactive_pressed_icon_color">?attr/colorOnSurface</macro>
<!-- Enabled - Active indicator -->
<!-- Group: Enabled - Active indicator -->
<macro name="m3_comp_navigation_bar_active_indicator_color">?attr/colorSecondaryContainer</macro>
<dimen name="m3_comp_navigation_bar_active_indicator_height">32dp</dimen>
<dimen name="m3_comp_navigation_bar_active_indicator_width">64dp</dimen>
<style name="ShapeAppearance.M3.Comp.NavigationBar.ActiveIndicator.Shape" parent="ShapeAppearance.M3.Sys.Shape.Corner.Full"/>
<!-- Enabled - State layer -->
<!-- Group: Enabled - State layer -->
<macro name="m3_comp_navigation_bar_active_hover_state_layer_color">?attr/colorOnSurface</macro>
<macro name="m3_comp_navigation_bar_inactive_hover_state_layer_color">?attr/colorOnSurface</macro>
<dimen name="m3_comp_navigation_bar_hover_state_layer_opacity">@dimen/m3_sys_state_hover_state_layer_opacity</dimen>
Expand Down
Expand Up @@ -20,14 +20,14 @@
<resources>

<!-- Generated from token set (md.comp.sheet.bottom) in context (platform=android, audience=3p). -->
<!-- Enabled - Container -->
<!-- Group: Enabled - Container -->
<macro name="m3_comp_sheet_bottom_docked_container_color">?attr/colorSurfaceContainerLow</macro>
<dimen name="m3_comp_sheet_bottom_docked_modal_container_elevation">@dimen/m3_sys_elevation_level1</dimen>
<dimen name="m3_comp_sheet_bottom_docked_standard_container_elevation">@dimen/m3_sys_elevation_level1</dimen>
<!-- Please use the resource below in shapeAppearance
and @style/ShapeAppearanceOverlay.Material3.Corner.Top in shapeAppearanceOverlay. -->
<!-- Please use the resource below in shapeAppearance and
@style/ShapeAppearanceOverlay.Material3.Corner.Top in shapeAppearanceOverlay. -->
<macro name="m3_comp_sheet_bottom_docked_container_shape">?attr/shapeAppearanceCornerExtraLarge</macro>
<!-- Enabled - Drag handle -->
<!-- Group: Enabled - Drag handle -->
<macro name="m3_comp_sheet_bottom_docked_drag_handle_color">?attr/colorOnSurfaceVariant</macro>
<dimen name="m3_comp_sheet_bottom_docked_drag_handle_width">32dp</dimen>
<dimen name="m3_comp_sheet_bottom_docked_drag_handle_height">4dp</dimen>
Expand Down
Expand Up @@ -20,26 +20,27 @@
<resources>

<!-- Generated from token set (md.comp.icon-button) in context (platform=android, audience=3p). -->
<!-- Enabled - Icon -->
<!-- Group: Enabled - Icon -->
<macro name="m3_comp_icon_button_unselected_icon_color">?attr/colorOnSurfaceVariant</macro>
<macro name="m3_comp_icon_button_selected_icon_color">?attr/colorPrimary</macro>

<!-- Generated from token set (md.comp.filled-icon-button) in context (platform=android, audience=3p). -->
<!-- Enabled - Container -->
<!-- Group: Enabled - Container -->
<macro name="m3_comp_filled_icon_button_container_color">?attr/colorPrimary</macro>
<!-- Enabled - Icon -->
<!-- Group: Enabled - Icon -->
<macro name="m3_comp_filled_icon_button_toggle_unselected_icon_color">?attr/colorPrimary</macro>
<macro name="m3_comp_filled_icon_button_toggle_selected_icon_color">?attr/colorOnPrimary</macro>

<!-- Generated from token set (md.comp.filled-tonal-icon-button) in context (platform=android, audience=3p). -->
<!-- Enabled - Container -->
<!-- Generated from token set (md.comp.filled-tonal-icon-button) in context (platform=android,
audience=3p). -->
<!-- Group: Enabled - Container -->
<macro name="m3_comp_filled_tonal_icon_button_container_color">?attr/colorSecondaryContainer</macro>
<!-- Enabled - Icon -->
<!-- Group: Enabled - Icon -->
<macro name="m3_comp_filled_tonal_icon_button_toggle_unselected_icon_color">?attr/colorOnSurfaceVariant</macro>
<macro name="m3_comp_filled_tonal_icon_button_toggle_selected_icon_color">?attr/colorOnSecondaryContainer</macro>

<!-- Generated from token set (md.comp.outlined-icon-button) in context (platform=android, audience=3p). -->
<!-- Enabled - Outline -->
<!-- Group: Enabled - Outline -->
<dimen name="m3_comp_outlined_icon_button_unselected_outline_width">1dp</dimen>

</resources>
34 changes: 17 additions & 17 deletions lib/java/com/google/android/material/button/res/values/tokens.xml
Expand Up @@ -20,57 +20,57 @@
<resources>

<!-- Generated from token set (md.comp.filled-button) in context (platform=android, audience=3p). -->
<!-- Enabled - Container -->
<!-- Group: Enabled - Container -->
<style name="ShapeAppearance.M3.Comp.FilledButton.Container.Shape" parent="ShapeAppearance.M3.Sys.Shape.Corner.Full"/>
<dimen name="m3_comp_filled_button_container_elevation">@dimen/m3_sys_elevation_level0</dimen>
<macro name="m3_comp_filled_button_container_color">?attr/colorPrimary</macro>
<!-- Enabled - Label text -->
<!-- Group: Enabled - Label text -->
<macro name="m3_comp_filled_button_label_text_type">?attr/textAppearanceLabelLarge</macro>
<macro name="m3_comp_filled_button_label_text_color">?attr/colorOnPrimary</macro>
<!-- Enabled - Icon -->
<!-- Group: Enabled - Icon -->
<dimen name="m3_comp_filled_button_with_icon_icon_size">18dp</dimen>

<!-- Generated from token set (md.comp.filled-tonal-button) in context (platform=android, audience=3p). -->
<!-- Enabled - Container -->
<!-- Group: Enabled - Container -->
<macro name="m3_comp_filled_tonal_button_container_color">?attr/colorSecondaryContainer</macro>
<!-- Enabled - Label text -->
<!-- Group: Enabled - Label text -->
<macro name="m3_comp_filled_tonal_button_label_text_color">?attr/colorOnSecondaryContainer</macro>

<!-- Generated from token set (md.comp.text-button) in context (platform=android, audience=3p). -->
<!-- Enabled - Container -->
<!-- Group: Enabled - Container -->
<style name="ShapeAppearance.M3.Comp.TextButton.Container.Shape" parent="ShapeAppearance.M3.Sys.Shape.Corner.Full"/>
<!-- Enabled - Label text -->
<!-- Group: Enabled - Label text -->
<macro name="m3_comp_text_button_label_text_type">?attr/textAppearanceLabelLarge</macro>
<macro name="m3_comp_text_button_label_text_color">?attr/colorPrimary</macro>
<!-- Hovered - State layer -->
<!-- Group: Hovered - State layer -->
<macro name="m3_comp_text_button_hover_state_layer_color">?attr/colorPrimary</macro>
<dimen name="m3_comp_text_button_hover_state_layer_opacity">@dimen/m3_sys_state_hover_state_layer_opacity</dimen>
<!-- Focused - State layer -->
<!-- Group: Focused - State layer -->
<macro name="m3_comp_text_button_focus_state_layer_color">?attr/colorPrimary</macro>
<dimen name="m3_comp_text_button_focus_state_layer_opacity">@dimen/m3_sys_state_focus_state_layer_opacity</dimen>
<!-- Pressed (ripple) - State layer -->
<!-- Group: Pressed (ripple) - State layer -->
<macro name="m3_comp_text_button_pressed_state_layer_color">?attr/colorPrimary</macro>
<dimen name="m3_comp_text_button_pressed_state_layer_opacity">@dimen/m3_sys_state_pressed_state_layer_opacity</dimen>

<!-- Generated from token set (md.comp.outlined-button) in context (platform=android, audience=3p). -->
<!-- Enabled - Outline -->
<!-- Group: Enabled - Outline -->
<macro name="m3_comp_outlined_button_outline_color">?attr/colorOutline</macro>
<dimen name="m3_comp_outlined_button_outline_width">1dp</dimen>
<!-- Disabled - Outline -->
<!-- Group: Disabled - Outline -->
<macro name="m3_comp_outlined_button_disabled_outline_color">?attr/colorOnSurface</macro>
<item name="m3_comp_outlined_button_disabled_outline_opacity" format="float" type="dimen">0.12</item>
<!-- Hovered - Outline -->
<!-- Group: Hovered - Outline -->
<macro name="m3_comp_outlined_button_hover_outline_color">?attr/colorOutline</macro>
<!-- Focused - Outline -->
<!-- Group: Focused - Outline -->
<macro name="m3_comp_outlined_button_focus_outline_color">?attr/colorPrimary</macro>
<!-- Pressed (ripple) - Outline -->
<!-- Group: Pressed (ripple) - Outline -->
<macro name="m3_comp_outlined_button_pressed_outline_color">?attr/colorOutline</macro>

<!-- Generated from token set (md.comp.elevated-button) in context (platform=android, audience=3p). -->
<!-- Enabled - Container -->
<!-- Group: Enabled - Container -->
<dimen name="m3_comp_elevated_button_container_elevation">@dimen/m3_sys_elevation_level1</dimen>
<macro name="m3_comp_elevated_button_container_color">?attr/colorSurfaceContainerLow</macro>
<!-- Disabled - Container -->
<!-- Group: Disabled - Container -->
<dimen name="m3_comp_elevated_button_disabled_container_elevation">@dimen/m3_sys_elevation_level0</dimen>

</resources>
32 changes: 16 additions & 16 deletions lib/java/com/google/android/material/card/res/values/tokens.xml
Expand Up @@ -20,49 +20,49 @@
<resources>

<!-- Generated from token set (md.comp.filled-card) in context (platform=android, audience=3p). -->
<!-- Enabled - Container -->
<!-- Group: Enabled - Container -->
<macro name="m3_comp_filled_card_container_color">?attr/colorSurfaceContainerHighest</macro>
<dimen name="m3_comp_filled_card_container_elevation">@dimen/m3_sys_elevation_level0</dimen>
<macro name="m3_comp_filled_card_container_shape">?attr/shapeAppearanceCornerMedium</macro>
<!-- Enabled - Icon -->
<!-- Group: Enabled - Icon -->
<dimen name="m3_comp_filled_card_icon_size">24dp</dimen>
<!-- Hovered - State layer -->
<!-- Group: Hovered - State layer -->
<dimen name="m3_comp_filled_card_hover_state_layer_opacity">@dimen/m3_sys_state_hover_state_layer_opacity</dimen>
<!-- Focused - State layer -->
<!-- Group: Focused - State layer -->
<dimen name="m3_comp_filled_card_focus_state_layer_opacity">@dimen/m3_sys_state_focus_state_layer_opacity</dimen>
<!-- Pressed (ripple) - State layer -->
<!-- Group: Pressed (ripple) - State layer -->
<dimen name="m3_comp_filled_card_pressed_state_layer_opacity">@dimen/m3_sys_state_pressed_state_layer_opacity</dimen>
<!-- Dragged - State layer -->
<!-- Group: Dragged - State layer -->
<dimen name="m3_comp_filled_card_dragged_state_layer_opacity">@dimen/m3_sys_state_dragged_state_layer_opacity</dimen>

<!-- Generated from token set (md.comp.outlined-card) in context (platform=android, audience=3p). -->
<!-- Enabled - Container -->
<!-- Group: Enabled - Container -->
<macro name="m3_comp_outlined_card_container_color">?attr/colorSurface</macro>
<dimen name="m3_comp_outlined_card_container_elevation">@dimen/m3_sys_elevation_level0</dimen>
<macro name="m3_comp_outlined_card_container_shape">?attr/shapeAppearanceCornerMedium</macro>
<!-- Enabled - Outline -->
<!-- Group: Enabled - Outline -->
<dimen name="m3_comp_outlined_card_outline_width">1dp</dimen>
<macro name="m3_comp_outlined_card_outline_color">?attr/colorOutlineVariant</macro>
<!-- Enabled - Icon -->
<!-- Group: Enabled - Icon -->
<dimen name="m3_comp_outlined_card_icon_size">24dp</dimen>
<!-- Disabled - Outline -->
<!-- Group: Disabled - Outline -->
<macro name="m3_comp_outlined_card_disabled_outline_color">?attr/colorOutline</macro>
<item name="m3_comp_outlined_card_disabled_outline_opacity" format="float" type="dimen">0.12</item>
<!-- Hovered - Outline -->
<!-- Group: Hovered - Outline -->
<macro name="m3_comp_outlined_card_hover_outline_color">?attr/colorOutlineVariant</macro>
<!-- Focused - Outline -->
<!-- Group: Focused - Outline -->
<macro name="m3_comp_outlined_card_focus_outline_color">?attr/colorOnSurface</macro>
<!-- Pressed (ripple) - Outline -->
<!-- Group: Pressed (ripple) - Outline -->
<macro name="m3_comp_outlined_card_pressed_outline_color">?attr/colorOutlineVariant</macro>
<!-- Dragged - Outline -->
<!-- Group: Dragged - Outline -->
<macro name="m3_comp_outlined_card_dragged_outline_color">?attr/colorOutlineVariant</macro>

<!-- Generated from token set (md.comp.elevated-card) in context (platform=android, audience=3p). -->
<!-- Enabled - Container -->
<!-- Group: Enabled - Container -->
<macro name="m3_comp_elevated_card_container_color">?attr/colorSurfaceContainerLow</macro>
<dimen name="m3_comp_elevated_card_container_elevation">@dimen/m3_sys_elevation_level1</dimen>
<macro name="m3_comp_elevated_card_container_shape">?attr/shapeAppearanceCornerMedium</macro>
<!-- Enabled - Icon -->
<!-- Group: Enabled - Icon -->
<dimen name="m3_comp_elevated_card_icon_size">24dp</dimen>

</resources>
Expand Up @@ -20,17 +20,17 @@
<resources>

<!-- Generated from token set (md.comp.checkbox) in context (platform=android, audience=3p). -->
<!-- Enabled - Container -->
<!-- Group: Enabled - Container -->
<macro name="m3_comp_checkbox_unselected_outline_color">?attr/colorOnSurfaceVariant</macro>
<macro name="m3_comp_checkbox_selected_container_color">?attr/colorPrimary</macro>
<macro name="m3_comp_checkbox_selected_error_container_color">?attr/colorError</macro>
<!-- Enabled - Icon -->
<!-- Group: Enabled - Icon -->
<macro name="m3_comp_checkbox_selected_icon_color">?attr/colorOnPrimary</macro>
<macro name="m3_comp_checkbox_selected_error_icon_color">?attr/colorOnError</macro>
<!-- Disabled - Container -->
<!-- Group: Disabled - Container -->
<macro name="m3_comp_checkbox_selected_disabled_container_color">?attr/colorOnSurface</macro>
<item name="m3_comp_checkbox_selected_disabled_container_opacity" format="float" type="dimen">0.38</item>
<!-- Disabled - Icon -->
<!-- Group: Disabled - Icon -->
<macro name="m3_comp_checkbox_selected_disabled_icon_color">?attr/colorSurface</macro>

</resources>

0 comments on commit 857d6a2

Please sign in to comment.