Skip to content

Commit bf188c7

Browse files
pekingmeraajkumars
authored andcommitted
[IconButton] Integrated tokens.
Icon size is changed from 20dp to 24dp. PiperOrigin-RevId: 500988634
1 parent f0053fd commit bf188c7

File tree

2 files changed

+54
-4
lines changed

2 files changed

+54
-4
lines changed
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
~ Copyright (C) 2022 The Android Open Source Project
4+
~
5+
~ Licensed under the Apache License, Version 2.0 (the "License");
6+
~ you may not use this file except in compliance with the License.
7+
~ You may obtain a copy of the License at
8+
~
9+
~ http://www.apache.org/licenses/LICENSE-2.0
10+
~
11+
~ Unless required by applicable law or agreed to in writing, software
12+
~ distributed under the License is distributed on an "AS IS" BASIS,
13+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
~ See the License for the specific language governing permissions and
15+
~ limitations under the License.
16+
-->
17+
<!-- AUTOGENERATED FILE. DO NOT MODIFY. -->
18+
<!-- Version: v0.147 -->
19+
20+
<resources>
21+
22+
<!-- Generated from token set (md.comp.icon-button) in context (platform=android, audience=3p). -->
23+
<!-- Enabled - Icon -->
24+
<macro name="m3_comp_icon_button_unselected_icon_color">?attr/colorOnSurfaceVariant</macro>
25+
<macro name="m3_comp_icon_button_selected_icon_color">?attr/colorPrimary</macro>
26+
27+
<!-- Generated from token set (md.comp.filled-icon-button) in context (platform=android, audience=3p). -->
28+
<!-- Enabled - Container -->
29+
<macro name="m3_comp_filled_icon_button_container_color">?attr/colorPrimary</macro>
30+
<!-- Enabled - Icon -->
31+
<macro name="m3_comp_filled_icon_button_toggle_unselected_icon_color">?attr/colorPrimary</macro>
32+
<macro name="m3_comp_filled_icon_button_toggle_selected_icon_color">?attr/colorOnPrimary</macro>
33+
34+
<!-- Generated from token set (md.comp.filled-tonal-icon-button) in context (platform=android, audience=3p). -->
35+
<!-- Enabled - Container -->
36+
<macro name="m3_comp_filled_tonal_icon_button_container_color">?attr/colorSecondaryContainer</macro>
37+
<!-- Enabled - Icon -->
38+
<macro name="m3_comp_filled_tonal_icon_button_toggle_unselected_icon_color">?attr/colorOnSurfaceVariant</macro>
39+
<macro name="m3_comp_filled_tonal_icon_button_toggle_selected_icon_color">?attr/colorOnSecondaryContainer</macro>
40+
41+
<!-- Generated from token set (md.comp.outlined-icon-button) in context (platform=android, audience=3p). -->
42+
<!-- Enabled - Outline -->
43+
<dimen name="m3_comp_outlined_icon_button_unselected_outline_width">1dp</dimen>
44+
45+
</resources>

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@
290290

291291
<style name="Widget.Material3.Button.IconButton.Outlined">
292292
<item name="strokeColor">@color/m3_button_outline_color_selector</item>
293-
<item name="strokeWidth">@dimen/m3_btn_stroke_size</item>
293+
<item name="strokeWidth">@dimen/m3_comp_outlined_icon_button_unselected_outline_width</item>
294294
</style>
295295

296296
<!-- DEPRECATED -->
@@ -328,17 +328,22 @@
328328

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

334335
<style name="ThemeOverlay.Material3.Button.IconButton.Filled" parent="ThemeOverlay.Material3.Button">
335336
<!-- The colors used by the color selectors -->
336-
<item name="colorOnContainerUnchecked">?attr/colorPrimary</item>
337+
<item name="colorOnContainer">@macro/m3_comp_filled_icon_button_toggle_selected_icon_color</item>
338+
<item name="colorOnContainerUnchecked">@macro/m3_comp_filled_icon_button_toggle_unselected_icon_color</item>
339+
<item name="colorContainer">@macro/m3_comp_filled_icon_button_container_color</item>
337340
</style>
338341

339342
<style name="ThemeOverlay.Material3.Button.IconButton.Filled.Tonal" parent="ThemeOverlay.Material3.Button.TonalButton">
340343
<!-- The colors used by the color selectors -->
341-
<item name="colorOnContainerUnchecked">?attr/colorOnSurfaceVariant</item>
344+
<item name="colorOnContainer">@macro/m3_comp_filled_tonal_icon_button_toggle_selected_icon_color</item>
345+
<item name="colorOnContainerUnchecked">@macro/m3_comp_filled_tonal_icon_button_toggle_unselected_icon_color</item>
346+
<item name="colorContainer">@macro/m3_comp_filled_tonal_icon_button_container_color</item>
342347
</style>
343348

344349
</resources>

0 commit comments

Comments
 (0)