Skip to content

Commit 2719859

Browse files
pekingmehunterstich
pekingme
authored and
hunterstich
committed
[Tokens][exFAB] Integrate component tokens.
PiperOrigin-RevId: 459541412
1 parent be8e4e2 commit 2719859

File tree

7 files changed

+216
-18
lines changed

7 files changed

+216
-18
lines changed

‎lib/java/com/google/android/material/floatingactionbutton/res/animator/m3_extended_fab_state_list_animator.xml‎

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,109 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
Copyright 2019 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+
18+
<set xmlns:android="http://schemas.android.com/apk/res/android">
19+
<selector>
20+
21+
<!-- Pressed state -->
22+
<item
23+
android:state_enabled="true"
24+
android:state_pressed="true">
25+
<set>
26+
<objectAnimator
27+
android:duration="@integer/mtrl_btn_anim_duration_ms"
28+
android:propertyName="translationZ"
29+
android:valueTo="@dimen/m3_comp_extended_fab_primary_pressed_container_elevation"
30+
android:valueType="floatType"/>
31+
<objectAnimator
32+
android:duration="0"
33+
android:propertyName="elevation"
34+
android:valueTo="@dimen/m3_comp_extended_fab_primary_container_elevation"
35+
android:valueType="floatType"/>
36+
</set>
37+
</item>
38+
39+
<!-- Hover state. This is triggered via mouse. -->
40+
<item
41+
android:state_enabled="true"
42+
android:state_hovered="true">
43+
<set>
44+
<objectAnimator
45+
android:duration="@integer/mtrl_btn_anim_duration_ms"
46+
android:propertyName="translationZ"
47+
android:valueTo="@dimen/m3_comp_extended_fab_primary_hover_container_elevation"
48+
android:valueType="floatType"/>
49+
<objectAnimator
50+
android:duration="0"
51+
android:propertyName="elevation"
52+
android:valueTo="@dimen/m3_comp_extended_fab_primary_container_elevation"
53+
android:valueType="floatType"/>
54+
</set>
55+
</item>
56+
57+
<!-- Focused state. This is triggered via keyboard. -->
58+
<item
59+
android:state_enabled="true"
60+
android:state_focused="true">
61+
<set>
62+
<objectAnimator
63+
android:duration="@integer/mtrl_btn_anim_duration_ms"
64+
android:propertyName="translationZ"
65+
android:valueTo="@dimen/m3_comp_extended_fab_primary_focus_container_elevation"
66+
android:valueType="floatType"/>
67+
<objectAnimator
68+
android:duration="0"
69+
android:propertyName="elevation"
70+
android:valueTo="@dimen/m3_comp_extended_fab_primary_container_elevation"
71+
android:valueType="floatType"/>
72+
</set>
73+
</item>
74+
75+
<!-- Base state (enabled, not pressed) -->
76+
<item android:state_enabled="true">
77+
<set>
78+
<objectAnimator
79+
android:duration="@integer/mtrl_btn_anim_duration_ms"
80+
android:propertyName="translationZ"
81+
android:startDelay="@integer/mtrl_btn_anim_delay_ms"
82+
android:valueTo="@dimen/mtrl_extended_fab_translation_z_base"
83+
android:valueType="floatType"/>
84+
<objectAnimator
85+
android:duration="0"
86+
android:propertyName="elevation"
87+
android:valueTo="@dimen/m3_comp_extended_fab_primary_container_elevation"
88+
android:valueType="floatType"/>
89+
</set>
90+
</item>
91+
92+
<!-- Disabled state -->
93+
<item>
94+
<set>
95+
<objectAnimator
96+
android:duration="0"
97+
android:propertyName="translationZ"
98+
android:valueTo="@dimen/mtrl_extended_fab_disabled_translation_z"
99+
android:valueType="floatType"/>
100+
<objectAnimator
101+
android:duration="0"
102+
android:propertyName="elevation"
103+
android:valueTo="@dimen/mtrl_extended_fab_disabled_elevation"
104+
android:valueType="floatType"/>
105+
</set>
106+
</item>
107+
108+
</selector>
109+
</set>

‎lib/java/com/google/android/material/floatingactionbutton/res/color/m3_efab_ripple_color_selector.xml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
~ Copyright (C) 2021 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+
<selector xmlns:android="http://schemas.android.com/apk/res/android">
18+
<item android:alpha="@dimen/m3_comp_extended_fab_primary_pressed_state_layer_opacity" android:color="?attr/colorOnContainer" android:state_pressed="true"/>
19+
<item android:alpha="@dimen/m3_comp_extended_fab_primary_focus_state_layer_opacity" android:color="?attr/colorOnContainer" android:state_focused="true"/>
20+
<item android:alpha="@dimen/m3_comp_extended_fab_primary_hover_state_layer_opacity" android:color="?attr/colorOnContainer" android:state_hovered="true"/>
21+
<item android:alpha="@dimen/m3_ripple_default_alpha" android:color="?attr/colorOnContainer"/>
22+
</selector>

lib/java/com/google/android/material/floatingactionbutton/res/color/m3_fab_background_color_selector.xml renamed to lib/java/com/google/android/material/floatingactionbutton/res/color/m3_fab_efab_background_color_selector.xml

File renamed without changes.

lib/java/com/google/android/material/floatingactionbutton/res/color/m3_fab_foreground_color_selector.xml renamed to lib/java/com/google/android/material/floatingactionbutton/res/color/m3_fab_efab_foreground_color_selector.xml

File renamed without changes.

‎lib/java/com/google/android/material/floatingactionbutton/res/values/efab_tokens.xml‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
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.99 -->
19+
20+
<resources>
21+
<!-- Generated from token set (md.comp.extended-fab.primary) in default context. -->
22+
<!-- Enabled - Container -->
23+
<macro name="m3_comp_extended_fab_primary_container_color">?attr/colorPrimaryContainer</macro>
24+
<macro name="m3_comp_extended_fab_primary_container_shape">?attr/shapeAppearanceCornerLarge</macro>
25+
<dimen name="m3_comp_extended_fab_primary_container_height">56dp</dimen>
26+
<dimen name="m3_comp_extended_fab_primary_container_elevation">@dimen/m3_sys_elevation_level3</dimen>
27+
<!-- Enabled - Label text -->
28+
<macro name="m3_comp_extended_fab_primary_label_text_type">?attr/textAppearanceLabelLarge</macro>
29+
<!-- Enabled - Icon -->
30+
<dimen name="m3_comp_extended_fab_primary_icon_size">24dp</dimen>
31+
<macro name="m3_comp_extended_fab_primary_icon_color">?attr/colorOnPrimaryContainer</macro>
32+
<!-- Hovered - Container -->
33+
<dimen name="m3_comp_extended_fab_primary_hover_container_elevation">@dimen/m3_sys_elevation_level4</dimen>
34+
<!-- Hovered - State layer -->
35+
<dimen name="m3_comp_extended_fab_primary_hover_state_layer_opacity">@dimen/m3_sys_state_hover_state_layer_opacity</dimen>
36+
<!-- Focused - Container -->
37+
<dimen name="m3_comp_extended_fab_primary_focus_container_elevation">@dimen/m3_sys_elevation_level3</dimen>
38+
<!-- Focused - State layer -->
39+
<dimen name="m3_comp_extended_fab_primary_focus_state_layer_opacity">@dimen/m3_sys_state_focus_state_layer_opacity</dimen>
40+
<!-- Pressed (rippple) - Container -->
41+
<dimen name="m3_comp_extended_fab_primary_pressed_container_elevation">@dimen/m3_sys_elevation_level3</dimen>
42+
<!-- Pressed (rippple) - State layer -->
43+
<dimen name="m3_comp_extended_fab_primary_pressed_state_layer_opacity">@dimen/m3_sys_state_pressed_state_layer_opacity</dimen>
44+
45+
<!-- Generated from token set (md.comp.extended-fab.secondary) in default context. -->
46+
<!-- Enabled - Container -->
47+
<macro name="m3_comp_extended_fab_secondary_container_color">?attr/colorSecondaryContainer</macro>
48+
<!-- Enabled - Icon -->
49+
<macro name="m3_comp_extended_fab_secondary_icon_color">?attr/colorOnSecondaryContainer</macro>
50+
51+
<!-- Generated from token set (md.comp.extended-fab.tertiary) in default context. -->
52+
<!-- Enabled - Container -->
53+
<macro name="m3_comp_extended_fab_tertiary_container_color">?attr/colorTertiaryContainer</macro>
54+
<!-- Enabled - Icon -->
55+
<macro name="m3_comp_extended_fab_tertiary_icon_color">?attr/colorOnTertiaryContainer</macro>
56+
57+
<!-- Generated from token set (md.comp.extended-fab.surface) in default context. -->
58+
<!-- Enabled - Container -->
59+
<macro name="m3_comp_extended_fab_surface_container_color">?attr/colorSurface</macro>
60+
<!-- Enabled - Icon -->
61+
<macro name="m3_comp_extended_fab_surface_icon_color">?attr/colorPrimary</macro>
62+
</resources>

lib/java/com/google/android/material/floatingactionbutton/res/values/tokens.xml renamed to lib/java/com/google/android/material/floatingactionbutton/res/values/fab_tokens.xml

File renamed without changes.

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

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@
105105
<!-- M3 Regular FABs -->
106106

107107
<style name="Base.Widget.Material3.FloatingActionButton" parent="Widget.MaterialComponents.FloatingActionButton">
108-
<item name="backgroundTint">@color/m3_fab_background_color_selector</item>
109-
<item name="tint">@color/m3_fab_foreground_color_selector</item>
108+
<item name="backgroundTint">@color/m3_fab_efab_background_color_selector</item>
109+
<item name="tint">@color/m3_fab_efab_foreground_color_selector</item>
110110
<item name="rippleColor">@color/m3_fab_ripple_color_selector</item>
111111
<item name="enforceMaterialTheme">true</item>
112112
<item name="borderWidth">@dimen/m3_fab_border_width</item>
@@ -222,15 +222,20 @@
222222
<!-- M3 Extended FABs -->
223223

224224
<style name="Base.Widget.Material3.ExtendedFloatingActionButton" parent="Widget.MaterialComponents.ExtendedFloatingActionButton">
225-
<item name="android:minHeight">@dimen/m3_extended_fab_min_height</item>
226-
<item name="android:textAppearance">?attr/textAppearanceLabelLarge</item>
227-
<item name="android:textColor">@color/m3_button_foreground_color_selector</item>
228-
<item name="backgroundTint">@color/m3_button_background_color_selector</item>
229-
<item name="enforceMaterialTheme">true</item>
230-
<item name="iconTint">@color/m3_button_foreground_color_selector</item>
231-
<item name="rippleColor">@color/m3_button_ripple_color_selector</item>
232-
<item name="shapeAppearance">?attr/shapeAppearanceCornerLarge</item>
225+
<item name="backgroundTint">@color/m3_fab_efab_background_color_selector</item>
226+
<item name="iconTint">@color/m3_fab_efab_foreground_color_selector</item>
227+
<item name="android:textColor">@color/m3_fab_efab_foreground_color_selector</item>
228+
<item name="rippleColor">@color/m3_efab_ripple_color_selector</item>
229+
<item name="android:minHeight">@dimen/m3_comp_extended_fab_primary_container_height</item>
230+
<item name="elevation">@dimen/m3_comp_extended_fab_primary_container_elevation</item>
231+
<item name="android:stateListAnimator" tools:ignore="NewApi">
232+
@animator/m3_extended_fab_state_list_animator
233+
</item>
234+
<item name="iconSize">@dimen/m3_comp_extended_fab_primary_icon_size</item>
235+
<item name="android:textAppearance">@macro/m3_comp_extended_fab_primary_label_text_type</item>
236+
<item name="shapeAppearance">@macro/m3_comp_extended_fab_primary_container_shape</item>
233237
<item name="shapeAppearanceOverlay">@null</item>
238+
<item name="enforceMaterialTheme">true</item>
234239
<item name="showMotionSpec">@animator/m3_extended_fab_show_motion_spec</item>
235240
<item name="hideMotionSpec">@animator/m3_extended_fab_hide_motion_spec</item>
236241
</style>
@@ -286,23 +291,23 @@
286291
<!-- Extended FAB Overlays -->
287292

288293
<style name="ThemeOverlay.Material3.ExtendedFloatingActionButton.Primary" parent="">
289-
<item name="colorContainer">?attr/colorPrimaryContainer</item>
290-
<item name="colorOnContainer">?attr/colorOnPrimaryContainer</item>
294+
<item name="colorContainer">@macro/m3_comp_extended_fab_primary_container_color</item>
295+
<item name="colorOnContainer">@macro/m3_comp_extended_fab_primary_icon_color</item>
291296
</style>
292297

293298
<style name="ThemeOverlay.Material3.ExtendedFloatingActionButton.Secondary" parent="">
294-
<item name="colorContainer">?attr/colorSecondaryContainer</item>
295-
<item name="colorOnContainer">?attr/colorOnSecondaryContainer</item>
299+
<item name="colorContainer">@macro/m3_comp_extended_fab_secondary_container_color</item>
300+
<item name="colorOnContainer">@macro/m3_comp_extended_fab_secondary_icon_color</item>
296301
</style>
297302

298303
<style name="ThemeOverlay.Material3.ExtendedFloatingActionButton.Tertiary" parent="">
299-
<item name="colorContainer">?attr/colorTertiaryContainer</item>
300-
<item name="colorOnContainer">?attr/colorOnTertiaryContainer</item>
304+
<item name="colorContainer">@macro/m3_comp_extended_fab_tertiary_container_color</item>
305+
<item name="colorOnContainer">@macro/m3_comp_extended_fab_tertiary_icon_color</item>
301306
</style>
302307

303308
<style name="ThemeOverlay.Material3.ExtendedFloatingActionButton.Surface" parent="">
304-
<item name="colorContainer">?attr/colorSurface</item>
305-
<item name="colorOnContainer">?attr/colorPrimary</item>
309+
<item name="colorContainer">@macro/m3_comp_extended_fab_surface_container_color</item>
310+
<item name="colorOnContainer">@macro/m3_comp_extended_fab_surface_icon_color</item>
306311
</style>
307312

308313
</resources>

0 commit comments

Comments
 (0)