Skip to content

Commit 7f0db1a

Browse files
pekingmeraajkumars
pekingme
authored and
raajkumars
committed
[RadioButton] Integrated tokens.
Unselected icon color is changed from colorOnSurface to colorOnSurfaceVariant. PiperOrigin-RevId: 501869216
1 parent d5a3701 commit 7f0db1a

File tree

3 files changed

+94
-11
lines changed

3 files changed

+94
-11
lines changed

‎lib/java/com/google/android/material/radiobutton/res/color/m3_radiobutton_button_tint.xml‎

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,30 @@
1616
-->
1717
<selector xmlns:android="http://schemas.android.com/apk/res/android">
1818
<!-- Disabled -->
19-
<item android:alpha="@dimen/material_emphasis_disabled" android:color="?attr/colorOnSurface" android:state_enabled="false"/>
19+
<item android:alpha="@dimen/m3_comp_radio_button_disabled_unselected_icon_opacity"
20+
android:color="@macro/m3_comp_radio_button_disabled_unselected_icon_color"
21+
android:state_enabled="false"/>
22+
<item android:alpha="@dimen/m3_comp_radio_button_disabled_selected_icon_opacity"
23+
android:color="@macro/m3_comp_radio_button_disabled_selected_icon_color"
24+
android:state_enabled="false" android:state_pressed="true"/>
2025

2126
<!-- Checked -->
22-
<item android:color="?attr/colorPrimary" android:state_checked="true"/>
27+
<item android:color="@macro/m3_comp_radio_button_selected_pressed_icon_color"
28+
android:state_pressed="true" android:state_checked="true"/>
29+
<item android:color="@macro/m3_comp_radio_button_selected_focus_icon_color"
30+
android:state_focused="true" android:state_checked="true"/>
31+
<item android:color="@macro/m3_comp_radio_button_selected_hover_icon_color"
32+
android:state_hovered="true" android:state_checked="true"/>
33+
<item android:color="@macro/m3_comp_radio_button_selected_icon_color"
34+
android:state_checked="true"/>
2335

2436
<!-- Unchecked -->
25-
<item android:color="?attr/colorOnSurface" android:state_checked="false"/>
37+
<item android:color="@macro/m3_comp_radio_button_unselected_pressed_icon_color"
38+
android:state_pressed="true" android:state_checked="true"/>
39+
<item android:color="@macro/m3_comp_radio_button_unselected_focus_icon_color"
40+
android:state_focused="true" android:state_checked="true"/>
41+
<item android:color="@macro/m3_comp_radio_button_unselected_hover_icon_color"
42+
android:state_hovered="true" android:state_checked="true"/>
43+
<item android:color="@macro/m3_comp_radio_button_unselected_icon_color"
44+
android:state_checked="false"/>
2645
</selector>

‎lib/java/com/google/android/material/radiobutton/res/color/m3_radiobutton_ripple_tint.xml‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,25 +19,33 @@
1919
<!-- Checked. -->
2020

2121
<!-- Uses the primary state layer since tapping a checked radiobutton keeps it checked. -->
22-
<item android:alpha="@dimen/m3_ripple_pressed_alpha" android:color="?attr/colorPrimary"
22+
<item android:alpha="@dimen/m3_comp_radio_button_selected_pressed_state_layer_opacity"
23+
android:color="@macro/m3_comp_radio_button_selected_pressed_state_layer_color"
2324
android:state_pressed="true" android:state_checked="true"/>
24-
<item android:alpha="@dimen/m3_ripple_focused_alpha" android:color="?attr/colorPrimary"
25+
<item android:alpha="@dimen/m3_comp_radio_button_selected_focus_state_layer_opacity"
26+
android:color="@macro/m3_comp_radio_button_selected_focus_state_layer_color"
2527
android:state_focused="true" android:state_checked="true"/>
26-
<item android:alpha="@dimen/m3_ripple_hovered_alpha" android:color="?attr/colorPrimary"
28+
<item android:alpha="@dimen/m3_comp_radio_button_selected_hover_state_layer_opacity"
29+
android:color="@macro/m3_comp_radio_button_selected_hover_state_layer_color"
2730
android:state_hovered="true" android:state_checked="true"/>
28-
<item android:alpha="@dimen/m3_ripple_default_alpha" android:color="?attr/colorPrimary"
31+
<item android:alpha="@dimen/m3_ripple_default_alpha"
32+
android:color="?attr/colorPrimary"
2933
android:state_checked="true"/>
3034

3135
<!-- Unchecked. -->
3236

3337
<!-- Uses the primary state layer since tapping an unchecked radiobutton will turn it blue
3438
(checked). -->
35-
<item android:alpha="@dimen/m3_ripple_selectable_pressed_alpha" android:color="?attr/colorPrimary"
39+
<item android:alpha="@dimen/m3_comp_radio_button_unselected_pressed_state_layer_opacity"
40+
android:color="@macro/m3_comp_radio_button_unselected_pressed_state_layer_color"
3641
android:state_pressed="true"/>
37-
<item android:alpha="@dimen/m3_ripple_focused_alpha" android:color="?attr/colorOnSurface"
42+
<item android:alpha="@dimen/m3_comp_radio_button_unselected_focus_state_layer_opacity"
43+
android:color="@macro/m3_comp_radio_button_unselected_focus_state_layer_color"
3844
android:state_focused="true"/>
39-
<item android:alpha="@dimen/m3_ripple_hovered_alpha" android:color="?attr/colorOnSurface"
45+
<item android:alpha="@dimen/m3_comp_radio_button_unselected_hover_state_layer_opacity"
46+
android:color="@macro/m3_comp_radio_button_unselected_hover_state_layer_color"
4047
android:state_hovered="true"/>
41-
<item android:alpha="@dimen/m3_ripple_default_alpha" android:color="?attr/colorOnSurface"/>
48+
<item android:alpha="@dimen/m3_ripple_default_alpha"
49+
android:color="?attr/colorOnSurface"/>
4250

4351
</selector>

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

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
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.radio-button) in context (platform=android, audience=3p). -->
23+
<!-- Enabled - Icon -->
24+
<macro name="m3_comp_radio_button_selected_icon_color">?attr/colorPrimary</macro>
25+
<macro name="m3_comp_radio_button_unselected_icon_color">?attr/colorOnSurfaceVariant</macro>
26+
<!-- Disabled - Icon -->
27+
<macro name="m3_comp_radio_button_disabled_selected_icon_color">?attr/colorOnSurface</macro>
28+
<item name="m3_comp_radio_button_disabled_selected_icon_opacity" format="float" type="dimen">0.38</item>
29+
<macro name="m3_comp_radio_button_disabled_unselected_icon_color">?attr/colorOnSurface</macro>
30+
<item name="m3_comp_radio_button_disabled_unselected_icon_opacity" format="float" type="dimen">0.38</item>
31+
<!-- Hovered - State layer -->
32+
<macro name="m3_comp_radio_button_selected_hover_state_layer_color">?attr/colorPrimary</macro>
33+
<dimen name="m3_comp_radio_button_selected_hover_state_layer_opacity">@dimen/m3_sys_state_hover_state_layer_opacity</dimen>
34+
<macro name="m3_comp_radio_button_unselected_hover_state_layer_color">?attr/colorOnSurface</macro>
35+
<dimen name="m3_comp_radio_button_unselected_hover_state_layer_opacity">@dimen/m3_sys_state_hover_state_layer_opacity</dimen>
36+
<!-- Hovered - Icon -->
37+
<macro name="m3_comp_radio_button_selected_hover_icon_color">?attr/colorPrimary</macro>
38+
<macro name="m3_comp_radio_button_unselected_hover_icon_color">?attr/colorOnSurface</macro>
39+
<!-- Focused - State layer -->
40+
<macro name="m3_comp_radio_button_selected_focus_state_layer_color">?attr/colorPrimary</macro>
41+
<dimen name="m3_comp_radio_button_selected_focus_state_layer_opacity">@dimen/m3_sys_state_focus_state_layer_opacity</dimen>
42+
<macro name="m3_comp_radio_button_unselected_focus_state_layer_color">?attr/colorOnSurface</macro>
43+
<dimen name="m3_comp_radio_button_unselected_focus_state_layer_opacity">@dimen/m3_sys_state_focus_state_layer_opacity</dimen>
44+
<!-- Focused - Icon -->
45+
<macro name="m3_comp_radio_button_selected_focus_icon_color">?attr/colorPrimary</macro>
46+
<macro name="m3_comp_radio_button_unselected_focus_icon_color">?attr/colorOnSurface</macro>
47+
<!-- Pressed (rippple) - State layer -->
48+
<macro name="m3_comp_radio_button_selected_pressed_state_layer_color">?attr/colorOnSurface</macro>
49+
<dimen name="m3_comp_radio_button_selected_pressed_state_layer_opacity">@dimen/m3_sys_state_pressed_state_layer_opacity</dimen>
50+
<macro name="m3_comp_radio_button_unselected_pressed_state_layer_color">?attr/colorPrimary</macro>
51+
<dimen name="m3_comp_radio_button_unselected_pressed_state_layer_opacity">@dimen/m3_sys_state_pressed_state_layer_opacity</dimen>
52+
<!-- Pressed (rippple) - Icon -->
53+
<macro name="m3_comp_radio_button_selected_pressed_icon_color">?attr/colorPrimary</macro>
54+
<macro name="m3_comp_radio_button_unselected_pressed_icon_color">?attr/colorOnSurface</macro>
55+
56+
</resources>

0 commit comments

Comments
 (0)