Skip to content

Commit 7e63ca1

Browse files
pekingmepaulfthomas
pekingme
authored and
paulfthomas
committed
[FAB] Integrated to new token sets.
PiperOrigin-RevId: 733388697
1 parent 2c2a26c commit 7e63ca1

File tree

3 files changed

+60
-64
lines changed

3 files changed

+60
-64
lines changed

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,11 @@
1515
~ limitations under the License.
1616
-->
1717
<selector xmlns:android="http://schemas.android.com/apk/res/android">
18-
<item android:alpha="@dimen/m3_comp_fab_primary_pressed_state_layer_opacity" android:color="?attr/colorOnContainer" android:state_pressed="true"/>
19-
<item android:alpha="@dimen/m3_comp_fab_primary_focus_state_layer_opacity" android:color="?attr/colorOnContainer" android:state_focused="true"/>
20-
<item android:alpha="@dimen/m3_comp_fab_primary_hover_state_layer_opacity" android:color="?attr/colorOnContainer" android:state_hovered="true"/>
18+
<item android:alpha="@dimen/m3_comp_fab_primary_container_pressed_state_layer_opacity"
19+
android:color="?attr/colorOnContainer" android:state_pressed="true"/>
20+
<item android:alpha="@dimen/m3_comp_fab_primary_container_focused_state_layer_opacity"
21+
android:color="?attr/colorOnContainer" android:state_focused="true"/>
22+
<item android:alpha="@dimen/m3_comp_fab_primary_container_hovered_state_layer_opacity"
23+
android:color="?attr/colorOnContainer" android:state_hovered="true"/>
2124
<item android:alpha="@dimen/m3_ripple_default_alpha" android:color="?attr/colorOnContainer"/>
2225
</selector>

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

Lines changed: 36 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -15,56 +15,49 @@
1515
~ limitations under the License.
1616
-->
1717
<!-- AUTOGENERATED FILE. DO NOT MODIFY. -->
18-
<!-- Version: 6.1.0 (LOCKED) -->
19-
<!-- NOT BEING UPGRADED DUE TO PENDING MIGRATION. -->
18+
<!-- Version: 15.0.26 -->
2019

2120
<resources>
2221

23-
<!-- Generated from token set (md.comp.fab.primary) in context (platform=android, audience=3p). -->
24-
<!-- Group: Enabled - Container -->
25-
<macro name="m3_comp_fab_primary_container_color">?attr/colorPrimaryContainer</macro>
26-
<macro name="m3_comp_fab_primary_container_shape">?attr/shapeAppearanceCornerLarge</macro>
27-
<dimen name="m3_comp_fab_primary_container_height">56dp</dimen>
28-
<dimen name="m3_comp_fab_primary_container_elevation">@dimen/m3_sys_elevation_level3</dimen>
29-
<!-- Group: Enabled - Icon -->
30-
<dimen name="m3_comp_fab_primary_icon_size">24dp</dimen>
31-
<macro name="m3_comp_fab_primary_icon_color">?attr/colorOnPrimaryContainer</macro>
32-
<!-- Group: Hovered - Container -->
33-
<dimen name="m3_comp_fab_primary_hover_container_elevation">@dimen/m3_sys_elevation_level4</dimen>
34-
<!-- Group: Hovered - State layer -->
35-
<dimen name="m3_comp_fab_primary_hover_state_layer_opacity">@dimen/m3_sys_state_hover_state_layer_opacity</dimen>
36-
<!-- Group: Focused - State layer -->
37-
<dimen name="m3_comp_fab_primary_focus_state_layer_opacity">@dimen/m3_sys_state_focus_state_layer_opacity</dimen>
38-
<!-- Group: Pressed (ripple) - Container -->
39-
<dimen name="m3_comp_fab_primary_pressed_container_elevation">@dimen/m3_sys_elevation_level3</dimen>
40-
<!-- Group: Pressed (ripple) - State layer -->
41-
<dimen name="m3_comp_fab_primary_pressed_state_layer_opacity">@dimen/m3_sys_state_pressed_state_layer_opacity</dimen>
22+
<!-- Generated from token set (md.comp.fab) in context (platform=android, audience=3p). -->
23+
<dimen name="m3_comp_fab_container_height">56dp</dimen>
24+
<dimen name="m3_comp_fab_icon_size">24dp</dimen>
25+
<macro name="m3_comp_fab_container_shape">?attr/shapeAppearanceCornerLarge</macro>
4226

43-
<!-- Generated from token set (md.comp.fab.primary.small) in context (platform=android, audience=3p). -->
44-
<!-- Group: Enabled - Container -->
45-
<macro name="m3_comp_fab_primary_small_container_shape">?attr/shapeAppearanceCornerMedium</macro>
46-
<dimen name="m3_comp_fab_primary_small_container_height">40dp</dimen>
47-
<!-- Group: Enabled - Icon -->
48-
<dimen name="m3_comp_fab_primary_small_icon_size">24dp</dimen>
27+
<!-- Generated from token set (md.comp.fab.small) in context (platform=android, audience=3p). -->
28+
<dimen name="m3_comp_fab_small_container_height">40dp</dimen>
29+
<dimen name="m3_comp_fab_small_icon_size">24dp</dimen>
30+
<macro name="m3_comp_fab_small_container_shape">?attr/shapeAppearanceCornerMedium</macro>
4931

50-
<!-- Generated from token set (md.comp.fab.primary.large) in context (platform=android, audience=3p). -->
51-
<!-- Group: Enabled - Container -->
52-
<macro name="m3_comp_fab_primary_large_container_shape">?attr/shapeAppearanceCornerExtraLarge</macro>
53-
<dimen name="m3_comp_fab_primary_large_container_height">96dp</dimen>
54-
<!-- Group: Enabled - Icon -->
55-
<dimen name="m3_comp_fab_primary_large_icon_size">36dp</dimen>
32+
<!-- Generated from token set (md.comp.fab.large) in context (platform=android, audience=3p). -->
33+
<dimen name="m3_comp_fab_large_container_height">96dp</dimen>
34+
<dimen name="m3_comp_fab_large_icon_size">36dp</dimen>
35+
<macro name="m3_comp_fab_large_container_shape">?attr/shapeAppearanceCornerExtraLarge</macro>
5636

57-
<!-- Generated from token set (md.comp.fab.secondary) in context (platform=android, audience=3p). -->
58-
<!-- Group: Enabled - Container -->
59-
<macro name="m3_comp_fab_secondary_container_color">?attr/colorSecondaryContainer</macro>
60-
<!-- Group: Enabled - Icon -->
61-
<macro name="m3_comp_fab_secondary_icon_color">?attr/colorOnSecondaryContainer</macro>
37+
<!-- Generated from token set (md.comp.fab.primary-container) in context (platform=android, audience=3p). -->
38+
<!-- Group: Enabled -->
39+
<macro name="m3_comp_fab_primary_container_container_color">?attr/colorPrimaryContainer</macro>
40+
<dimen name="m3_comp_fab_primary_container_container_elevation">@dimen/m3_sys_elevation_level3</dimen>
41+
<macro name="m3_comp_fab_primary_container_icon_color">?attr/colorOnPrimaryContainer</macro>
42+
<!-- Group: Hovered -->
43+
<dimen name="m3_comp_fab_primary_container_hovered_container_elevation">@dimen/m3_sys_elevation_level4</dimen>
44+
<dimen name="m3_comp_fab_primary_container_hovered_state_layer_opacity">@dimen/m3_sys_state_hover_state_layer_opacity</dimen>
45+
<!-- Group: Focused -->
46+
<dimen name="m3_comp_fab_primary_container_focused_state_layer_opacity">@dimen/m3_sys_state_focus_state_layer_opacity</dimen>
47+
<!-- Group: Pressed -->
48+
<dimen name="m3_comp_fab_primary_container_pressed_container_elevation">@dimen/m3_sys_elevation_level3</dimen>
49+
<dimen name="m3_comp_fab_primary_container_pressed_state_layer_opacity">@dimen/m3_sys_state_pressed_state_layer_opacity</dimen>
6250

63-
<!-- Generated from token set (md.comp.fab.tertiary) in context (platform=android, audience=3p). -->
64-
<!-- Group: Enabled - Container -->
65-
<macro name="m3_comp_fab_tertiary_container_color">?attr/colorTertiaryContainer</macro>
66-
<!-- Group: Enabled - Icon -->
67-
<macro name="m3_comp_fab_tertiary_icon_color">?attr/colorOnTertiaryContainer</macro>
51+
<!-- Generated from token set (md.comp.fab.secondary-container) in context (platform=android,
52+
audience=3p). -->
53+
<!-- Group: Enabled -->
54+
<macro name="m3_comp_fab_secondary_container_container_color">?attr/colorSecondaryContainer</macro>
55+
<macro name="m3_comp_fab_secondary_container_icon_color">?attr/colorOnSecondaryContainer</macro>
56+
57+
<!-- Generated from token set (md.comp.fab.tertiary-container) in context (platform=android, audience=3p). -->
58+
<!-- Group: Enabled -->
59+
<macro name="m3_comp_fab_tertiary_container_container_color">?attr/colorTertiaryContainer</macro>
60+
<macro name="m3_comp_fab_tertiary_container_icon_color">?attr/colorOnTertiaryContainer</macro>
6861

6962
<!-- Generated from token set (md.comp.fab.surface) in context (platform=android, audience=3p). -->
7063
<!-- Group: Enabled - Container -->

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,12 @@
101101
<item name="rippleColor">@color/m3_fab_ripple_color_selector</item>
102102
<item name="enforceMaterialTheme">true</item>
103103
<item name="borderWidth">@dimen/m3_fab_border_width</item>
104-
<item name="elevation">@dimen/m3_comp_fab_primary_container_elevation</item>
105-
<item name="hoveredFocusedTranslationZ">@dimen/m3_comp_fab_primary_hover_container_elevation</item>
106-
<item name="pressedTranslationZ">@dimen/m3_comp_fab_primary_pressed_container_elevation</item>
107-
<item name="fabCustomSize">@dimen/m3_comp_fab_primary_container_height</item>
108-
<item name="maxImageSize">@dimen/m3_comp_fab_primary_icon_size</item>
109-
<item name="shapeAppearance">@macro/m3_comp_fab_primary_container_shape</item>
104+
<item name="elevation">@dimen/m3_comp_fab_primary_container_container_elevation</item>
105+
<item name="hoveredFocusedTranslationZ">@dimen/m3_comp_fab_primary_container_hovered_container_elevation</item>
106+
<item name="pressedTranslationZ">@dimen/m3_comp_fab_primary_container_pressed_container_elevation</item>
107+
<item name="fabCustomSize">@dimen/m3_comp_fab_container_height</item>
108+
<item name="maxImageSize">@dimen/m3_comp_fab_icon_size</item>
109+
<item name="shapeAppearance">@macro/m3_comp_fab_container_shape</item>
110110
<item name="shapeAppearanceOverlay">@null</item>
111111
<!--Remove the motion spec and allow FloatingActionButtonImpl to create a theme-based animation-->
112112
<item name="showMotionSpec">@null</item>
@@ -132,9 +132,9 @@
132132
<!-- M3 Small FABs -->
133133

134134
<style name="Base.Widget.Material3.FloatingActionButton.Small" parent="Base.Widget.Material3.FloatingActionButton">
135-
<item name="fabCustomSize">@dimen/m3_comp_fab_primary_small_container_height</item>
136-
<item name="maxImageSize">@dimen/m3_comp_fab_primary_small_icon_size</item>
137-
<item name="shapeAppearance">@macro/m3_comp_fab_primary_small_container_shape</item>
135+
<item name="fabCustomSize">@dimen/m3_comp_fab_small_container_height</item>
136+
<item name="maxImageSize">@dimen/m3_comp_fab_small_icon_size</item>
137+
<item name="shapeAppearance">@macro/m3_comp_fab_small_container_shape</item>
138138
<item name="shapeAppearanceOverlay">@null</item>
139139
</style>
140140

@@ -157,9 +157,9 @@
157157
<!-- M3 Large FABs -->
158158

159159
<style name="Base.Widget.Material3.FloatingActionButton.Large" parent="Base.Widget.Material3.FloatingActionButton">
160-
<item name="fabCustomSize">@dimen/m3_comp_fab_primary_large_container_height</item>
161-
<item name="maxImageSize">@dimen/m3_comp_fab_primary_large_icon_size</item>
162-
<item name="shapeAppearance">@macro/m3_comp_fab_primary_large_container_shape</item>
160+
<item name="fabCustomSize">@dimen/m3_comp_fab_large_container_height</item>
161+
<item name="maxImageSize">@dimen/m3_comp_fab_large_icon_size</item>
162+
<item name="shapeAppearance">@macro/m3_comp_fab_large_container_shape</item>
163163
<item name="shapeAppearanceOverlay">@null</item>
164164
</style>
165165

@@ -182,18 +182,18 @@
182182
<!-- FAB Overlays -->
183183

184184
<style name="ThemeOverlay.Material3.FloatingActionButton.Primary" parent="">
185-
<item name="colorContainer">@macro/m3_comp_fab_primary_container_color</item>
186-
<item name="colorOnContainer">@macro/m3_comp_fab_primary_icon_color</item>
185+
<item name="colorContainer">@macro/m3_comp_fab_primary_container_container_color</item>
186+
<item name="colorOnContainer">@macro/m3_comp_fab_primary_container_icon_color</item>
187187
</style>
188188

189189
<style name="ThemeOverlay.Material3.FloatingActionButton.Secondary" parent="">
190-
<item name="colorContainer">@macro/m3_comp_fab_secondary_container_color</item>
191-
<item name="colorOnContainer">@macro/m3_comp_fab_secondary_icon_color</item>
190+
<item name="colorContainer">@macro/m3_comp_fab_secondary_container_container_color</item>
191+
<item name="colorOnContainer">@macro/m3_comp_fab_secondary_container_icon_color</item>
192192
</style>
193193

194194
<style name="ThemeOverlay.Material3.FloatingActionButton.Tertiary" parent="">
195-
<item name="colorContainer">@macro/m3_comp_fab_tertiary_container_color</item>
196-
<item name="colorOnContainer">@macro/m3_comp_fab_tertiary_icon_color</item>
195+
<item name="colorContainer">@macro/m3_comp_fab_tertiary_container_container_color</item>
196+
<item name="colorOnContainer">@macro/m3_comp_fab_tertiary_container_icon_color</item>
197197
</style>
198198

199199
<style name="ThemeOverlay.Material3.FloatingActionButton.Surface" parent="">

0 commit comments

Comments
 (0)