Skip to content

Commit

Permalink
[IconButton] Integrated new tokens.
Browse files Browse the repository at this point in the history 
PiperOrigin-RevId: 669116200
  • Loading branch information
@pekingme @leticiarossi
pekingme authored and leticiarossi committed Aug 30, 2024
1 parent 7bccdc2 commit 5274e55
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 32 deletions.
35 changes: 12 additions & 23 deletions lib/java/com/google/android/material/button/res/values/icon_btn_tokens.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,33 +15,22 @@
~ limitations under the License.
-->
<!-- AUTOGENERATED FILE. DO NOT MODIFY. -->
<!-- Version: 6.1.0 (LOCKED) -->
<!-- NOT BEING UPGRADED DUE TO PENDING MIGRATION. -->
<!-- Version: 7.1.0 -->

<resources>

<!-- Generated from token set (md.comp.icon-button) in context (platform=android, audience=3p). -->
<!-- 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.icon-button.small) in context (platform=android, audience=3p). -->
<style name="ShapeAppearance.M3.Comp.IconButton.Small.Container.Shape.Round" parent="ShapeAppearance.M3.Sys.Shape.Corner.Full"/>
<dimen name="m3_comp_icon_button_small_outlined_outline_width">1dp</dimen>

<!-- Generated from token set (md.comp.filled-icon-button) in context (platform=android, audience=3p). -->
<!-- Group: Enabled - Container -->
<macro name="m3_comp_filled_icon_button_container_color">?attr/colorPrimary</macro>
<!-- 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.icon-button.filled) in context (platform=android, audience=3p). -->
<!-- Group: Enabled -->
<macro name="m3_comp_icon_button_filled_container_color">?attr/colorPrimary</macro>
<macro name="m3_comp_icon_button_filled_icon_color">?attr/colorOnPrimary</macro>

<!-- 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>
<!-- 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). -->
<!-- Group: Enabled - Outline -->
<dimen name="m3_comp_outlined_icon_button_unselected_outline_width">1dp</dimen>
<!-- Generated from token set (md.comp.icon-button.tonal) in context (platform=android, audience=3p). -->
<!-- Group: Enabled -->
<macro name="m3_comp_icon_button_tonal_container_color">?attr/colorSecondaryContainer</macro>
<macro name="m3_comp_icon_button_tonal_icon_color">?attr/colorOnSecondaryContainer</macro>

</resources>
19 changes: 10 additions & 9 deletions lib/java/com/google/android/material/button/res/values/styles.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,7 @@
<item name="iconSize">@dimen/m3_btn_icon_only_default_size</item>
<item name="iconTint">@color/m3_icon_button_icon_color_selector</item>
<item name="iconPadding">@dimen/m3_btn_icon_only_icon_padding</item>
<item name="shapeAppearance">@style/ShapeAppearance.M3.Comp.IconButton.Small.Container.Shape.Round</item>
<item name="materialThemeOverlay">@style/ThemeOverlay.Material3.Button.IconButton</item>
</style>

Expand All @@ -304,7 +305,7 @@

<style name="Widget.Material3.Button.IconButton.Outlined">
<item name="strokeColor">@color/m3_button_outline_color_selector</item>
<item name="strokeWidth">@dimen/m3_comp_outlined_icon_button_unselected_outline_width</item>
<item name="strokeWidth">@dimen/m3_comp_icon_button_small_outlined_outline_width</item>
</style>

<!-- DEPRECATED -->
Expand Down Expand Up @@ -353,22 +354,22 @@

<style name="ThemeOverlay.Material3.Button.IconButton" parent="ThemeOverlay.Material3.Button.TextButton">
<!-- The colors used by the color selectors -->
<item name="colorOnContainer">@macro/m3_comp_icon_button_selected_icon_color</item>
<item name="colorOnContainerUnchecked">@macro/m3_comp_icon_button_unselected_icon_color</item>
<item name="colorOnContainer">?attr/colorPrimary</item>
<item name="colorOnContainerUnchecked">?attr/colorOnSurfaceVariant</item>
</style>

<style name="ThemeOverlay.Material3.Button.IconButton.Filled" parent="ThemeOverlay.Material3.Button">
<!-- The colors used by the color selectors -->
<item name="colorOnContainer">@macro/m3_comp_filled_icon_button_toggle_selected_icon_color</item>
<item name="colorOnContainerUnchecked">@macro/m3_comp_filled_icon_button_toggle_unselected_icon_color</item>
<item name="colorContainer">@macro/m3_comp_filled_icon_button_container_color</item>
<item name="colorOnContainer">@macro/m3_comp_icon_button_filled_icon_color</item>
<item name="colorOnContainerUnchecked">?attr/colorPrimary</item>
<item name="colorContainer">@macro/m3_comp_icon_button_filled_container_color</item>
</style>

<style name="ThemeOverlay.Material3.Button.IconButton.Filled.Tonal" parent="ThemeOverlay.Material3.Button.TonalButton">
<!-- The colors used by the color selectors -->
<item name="colorOnContainer">@macro/m3_comp_filled_tonal_icon_button_toggle_selected_icon_color</item>
<item name="colorOnContainerUnchecked">@macro/m3_comp_filled_tonal_icon_button_toggle_unselected_icon_color</item>
<item name="colorContainer">@macro/m3_comp_filled_tonal_icon_button_container_color</item>
<item name="colorOnContainer">@macro/m3_comp_icon_button_tonal_icon_color</item>
<item name="colorOnContainerUnchecked">?attr/colorOnSurfaceVariant</item>
<item name="colorContainer">@macro/m3_comp_icon_button_tonal_container_color</item>
</style>

</resources>

0 comments on commit 5274e55

Please sign in to comment.