Skip to content

Commit bc2592a

Browse files
pekingmedsn5ft
pekingme
authored and
dsn5ft
committed
[FAB] Reorganized the FAB and exFAB styles in the order of most recent first.
PiperOrigin-RevId: 741661629
1 parent 04c56f6 commit bc2592a

File tree

1 file changed

+86
-80
lines changed
  • lib/java/com/google/android/material/floatingactionbutton/res/values

1 file changed

+86
-80
lines changed

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

Lines changed: 86 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -16,82 +16,7 @@
1616
-->
1717
<resources xmlns:tools="http://schemas.android.com/tools">
1818

19-
<style name="Widget.Design.FloatingActionButton" parent="android:Widget">
20-
<item name="android:background">@drawable/design_fab_background</item>
21-
<item name="android:clickable">true</item>
22-
<item name="android:focusable">true</item>
23-
<item name="backgroundTint">?attr/colorAccent</item>
24-
<item name="fabSize">auto</item>
25-
<item name="elevation">@dimen/design_fab_elevation</item>
26-
<item name="hoveredFocusedTranslationZ">@dimen/design_fab_translation_z_hovered_focused</item>
27-
<item name="pressedTranslationZ">@dimen/design_fab_translation_z_pressed</item>
28-
<item name="rippleColor">?attr/colorControlHighlight</item>
29-
<item name="borderWidth">@dimen/design_fab_border_width</item>
30-
<item name="maxImageSize">@dimen/design_fab_image_size</item>
31-
<item name="showMotionSpec">@animator/design_fab_show_motion_spec</item>
32-
<item name="hideMotionSpec">@animator/design_fab_hide_motion_spec</item>
33-
</style>
34-
35-
<style name="Widget.MaterialComponents.FloatingActionButton" parent="Widget.Design.FloatingActionButton">
36-
<item name="android:background">@null</item>
37-
<item name="enforceMaterialTheme">true</item>
38-
<item name="ensureMinTouchTargetSize">true</item>
39-
<item name="elevation">@dimen/mtrl_fab_elevation</item>
40-
<item name="backgroundTint">@color/mtrl_fab_bg_color_selector</item>
41-
<item name="tint">@color/mtrl_fab_icon_text_color_selector</item>
42-
<item name="hoveredFocusedTranslationZ">@dimen/mtrl_fab_translation_z_hovered_focused</item>
43-
<item name="pressedTranslationZ">@dimen/mtrl_fab_translation_z_pressed</item>
44-
<item name="rippleColor">@color/mtrl_fab_ripple_color</item>
45-
<item name="showMotionSpec">@animator/mtrl_fab_show_motion_spec</item>
46-
<item name="hideMotionSpec">@animator/mtrl_fab_hide_motion_spec</item>
47-
<item name="shapeAppearance">?attr/shapeAppearanceSmallComponent</item>
48-
<item name="shapeAppearanceOverlay">
49-
@style/ShapeAppearanceOverlay.MaterialComponents.FloatingActionButton
50-
</item>
51-
</style>
52-
53-
<style name="ShapeAppearanceOverlay.MaterialComponents.FloatingActionButton" parent="">
54-
<item name="cornerSize">50%</item>
55-
</style>
56-
57-
<style name="Widget.MaterialComponents.ExtendedFloatingActionButton" parent="Widget.MaterialComponents.Button">
58-
<item name="android:insetTop">0dp</item>
59-
<item name="android:insetBottom">0dp</item>
60-
<item name="android:maxLines">1</item>
61-
<item name="android:minHeight">@dimen/mtrl_extended_fab_min_height</item>
62-
<item name="android:minWidth">@dimen/mtrl_extended_fab_min_width</item>
63-
<item name="android:paddingTop">@dimen/mtrl_extended_fab_top_padding</item>
64-
<item name="android:paddingBottom">@dimen/mtrl_extended_fab_bottom_padding</item>
65-
<item name="android:paddingStart">@dimen/mtrl_extended_fab_start_padding</item>
66-
<item name="android:paddingEnd">@dimen/mtrl_extended_fab_end_padding</item>
67-
<item name="android:paddingLeft">@dimen/mtrl_extended_fab_start_padding</item>
68-
<item name="android:paddingRight">@dimen/mtrl_extended_fab_end_padding</item>
69-
<item name="android:stateListAnimator">@animator/mtrl_extended_fab_state_list_animator</item>
70-
<item name="android:textColor">@color/mtrl_fab_icon_text_color_selector</item>
71-
<item name="backgroundTint">@color/mtrl_fab_bg_color_selector</item>
72-
<item name="elevation">@dimen/mtrl_extended_fab_elevation</item>
73-
<item name="extendStrategy">wrap_content</item>
74-
<item name="iconPadding">@dimen/mtrl_extended_fab_icon_text_spacing</item>
75-
<item name="iconSize">@dimen/mtrl_extended_fab_icon_size</item>
76-
<item name="iconTint">@color/mtrl_fab_icon_text_color_selector</item>
77-
<item name="rippleColor">@color/mtrl_fab_ripple_color</item>
78-
<item name="shapeAppearanceOverlay">
79-
@style/ShapeAppearanceOverlay.MaterialComponents.ExtendedFloatingActionButton
80-
</item>
81-
<item name="collapsedSize">@dimen/design_fab_size_normal</item>
82-
</style>
83-
84-
<style name="ShapeAppearanceOverlay.MaterialComponents.ExtendedFloatingActionButton" parent="">
85-
<item name="cornerSize">@null</item>
86-
</style>
87-
88-
<style name="Widget.MaterialComponents.ExtendedFloatingActionButton.Icon" parent="Widget.MaterialComponents.ExtendedFloatingActionButton">
89-
<item name="android:gravity">start|center_vertical</item>
90-
<item name="android:paddingStart">@dimen/mtrl_extended_fab_start_padding_icon</item>
91-
<item name="android:paddingEnd">@dimen/mtrl_extended_fab_end_padding_icon</item>
92-
<item name="android:paddingLeft">@dimen/mtrl_extended_fab_start_padding_icon</item>
93-
<item name="android:paddingRight">@dimen/mtrl_extended_fab_end_padding_icon</item>
94-
</style>
19+
<!-- Styles for M3 FABs. -->
9520

9621
<!-- M3 Regular FABs -->
9722

@@ -178,7 +103,7 @@
178103
<item name="materialThemeOverlay">@style/ThemeOverlay.Material3.ExtendedFloatingActionButton.Surface</item>
179104
</style>
180105

181-
<!-- FAB Overlays -->
106+
<!-- M3 FAB Theme Overlays for different color variants. -->
182107

183108
<style name="ThemeOverlay.Material3.FloatingActionButton.Primary" parent="">
184109
<item name="colorContainer">@macro/m3_comp_fab_primary_container_container_color</item>
@@ -209,7 +134,7 @@
209134
<item name="cornerSize">@dimen/m3_fab_corner_size</item>
210135
</style>
211136

212-
<!-- M3 Extended FABs -->
137+
<!-- Styles for M3 Extended FABs. -->
213138

214139
<style name="Base.Widget.Material3.ExtendedFloatingActionButton" parent="Widget.MaterialComponents.ExtendedFloatingActionButton">
215140
<item name="backgroundTint">@color/m3_fab_efab_background_color_selector</item>
@@ -246,7 +171,7 @@
246171
<item name="materialThemeOverlay">@style/ThemeOverlay.Material3.ExtendedFloatingActionButton.Surface</item>
247172
</style>
248173

249-
<!-- M3 Icon Extended FABs -->
174+
<!-- M3 Extended FABs with icons -->
250175

251176
<style name="Base.Widget.Material3.ExtendedFloatingActionButton.Icon" parent="Base.Widget.Material3.ExtendedFloatingActionButton">
252177
<item name="android:paddingStart">@dimen/m3_extended_fab_start_padding</item>
@@ -274,7 +199,7 @@
274199
<item name="materialThemeOverlay">@style/ThemeOverlay.Material3.ExtendedFloatingActionButton.Surface</item>
275200
</style>
276201

277-
<!-- Extended FAB Overlays -->
202+
<!-- M3 Extended FAB Theme Overlays for different color variants. -->
278203

279204
<style name="ThemeOverlay.Material3.ExtendedFloatingActionButton.Primary" parent="">
280205
<item name="colorContainer">@macro/m3_comp_extended_fab_primary_container_container_color</item>
@@ -295,6 +220,87 @@
295220
<item name="colorContainer">@macro/m3_comp_extended_fab_surface_container_color</item>
296221
<item name="colorOnContainer">@macro/m3_comp_extended_fab_surface_icon_color</item>
297222
</style>
223+
224+
<!-- Styles of M2 FABs. -->
225+
226+
<style name="Widget.Design.FloatingActionButton" parent="android:Widget">
227+
<item name="android:background">@drawable/design_fab_background</item>
228+
<item name="android:clickable">true</item>
229+
<item name="android:focusable">true</item>
230+
<item name="backgroundTint">?attr/colorAccent</item>
231+
<item name="fabSize">auto</item>
232+
<item name="elevation">@dimen/design_fab_elevation</item>
233+
<item name="hoveredFocusedTranslationZ">@dimen/design_fab_translation_z_hovered_focused</item>
234+
<item name="pressedTranslationZ">@dimen/design_fab_translation_z_pressed</item>
235+
<item name="rippleColor">?attr/colorControlHighlight</item>
236+
<item name="borderWidth">@dimen/design_fab_border_width</item>
237+
<item name="maxImageSize">@dimen/design_fab_image_size</item>
238+
<item name="showMotionSpec">@animator/design_fab_show_motion_spec</item>
239+
<item name="hideMotionSpec">@animator/design_fab_hide_motion_spec</item>
240+
</style>
241+
242+
<style name="Widget.MaterialComponents.FloatingActionButton" parent="Widget.Design.FloatingActionButton">
243+
<item name="android:background">@null</item>
244+
<item name="enforceMaterialTheme">true</item>
245+
<item name="ensureMinTouchTargetSize">true</item>
246+
<item name="elevation">@dimen/mtrl_fab_elevation</item>
247+
<item name="backgroundTint">@color/mtrl_fab_bg_color_selector</item>
248+
<item name="tint">@color/mtrl_fab_icon_text_color_selector</item>
249+
<item name="hoveredFocusedTranslationZ">@dimen/mtrl_fab_translation_z_hovered_focused</item>
250+
<item name="pressedTranslationZ">@dimen/mtrl_fab_translation_z_pressed</item>
251+
<item name="rippleColor">@color/mtrl_fab_ripple_color</item>
252+
<item name="showMotionSpec">@animator/mtrl_fab_show_motion_spec</item>
253+
<item name="hideMotionSpec">@animator/mtrl_fab_hide_motion_spec</item>
254+
<item name="shapeAppearance">?attr/shapeAppearanceSmallComponent</item>
255+
<item name="shapeAppearanceOverlay">
256+
@style/ShapeAppearanceOverlay.MaterialComponents.FloatingActionButton
257+
</item>
258+
</style>
259+
260+
<style name="ShapeAppearanceOverlay.MaterialComponents.FloatingActionButton" parent="">
261+
<item name="cornerSize">50%</item>
262+
</style>
263+
264+
<!-- Styles of M2 Extended FABs. -->
265+
266+
<style name="Widget.MaterialComponents.ExtendedFloatingActionButton" parent="Widget.MaterialComponents.Button">
267+
<item name="android:insetTop">0dp</item>
268+
<item name="android:insetBottom">0dp</item>
269+
<item name="android:maxLines">1</item>
270+
<item name="android:minHeight">@dimen/mtrl_extended_fab_min_height</item>
271+
<item name="android:minWidth">@dimen/mtrl_extended_fab_min_width</item>
272+
<item name="android:paddingTop">@dimen/mtrl_extended_fab_top_padding</item>
273+
<item name="android:paddingBottom">@dimen/mtrl_extended_fab_bottom_padding</item>
274+
<item name="android:paddingStart">@dimen/mtrl_extended_fab_start_padding</item>
275+
<item name="android:paddingEnd">@dimen/mtrl_extended_fab_end_padding</item>
276+
<item name="android:paddingLeft">@dimen/mtrl_extended_fab_start_padding</item>
277+
<item name="android:paddingRight">@dimen/mtrl_extended_fab_end_padding</item>
278+
<item name="android:stateListAnimator">@animator/mtrl_extended_fab_state_list_animator</item>
279+
<item name="android:textColor">@color/mtrl_fab_icon_text_color_selector</item>
280+
<item name="backgroundTint">@color/mtrl_fab_bg_color_selector</item>
281+
<item name="elevation">@dimen/mtrl_extended_fab_elevation</item>
282+
<item name="extendStrategy">wrap_content</item>
283+
<item name="iconPadding">@dimen/mtrl_extended_fab_icon_text_spacing</item>
284+
<item name="iconSize">@dimen/mtrl_extended_fab_icon_size</item>
285+
<item name="iconTint">@color/mtrl_fab_icon_text_color_selector</item>
286+
<item name="rippleColor">@color/mtrl_fab_ripple_color</item>
287+
<item name="shapeAppearanceOverlay">
288+
@style/ShapeAppearanceOverlay.MaterialComponents.ExtendedFloatingActionButton
289+
</item>
290+
<item name="collapsedSize">@dimen/design_fab_size_normal</item>
291+
</style>
292+
293+
<style name="ShapeAppearanceOverlay.MaterialComponents.ExtendedFloatingActionButton" parent="">
294+
<item name="cornerSize">@null</item>
295+
</style>
296+
297+
<style name="Widget.MaterialComponents.ExtendedFloatingActionButton.Icon" parent="Widget.MaterialComponents.ExtendedFloatingActionButton">
298+
<item name="android:gravity">start|center_vertical</item>
299+
<item name="android:paddingStart">@dimen/mtrl_extended_fab_start_padding_icon</item>
300+
<item name="android:paddingEnd">@dimen/mtrl_extended_fab_end_padding_icon</item>
301+
<item name="android:paddingLeft">@dimen/mtrl_extended_fab_start_padding_icon</item>
302+
<item name="android:paddingRight">@dimen/mtrl_extended_fab_end_padding_icon</item>
303+
</style>
298304

299305
</resources>
300306

0 commit comments

Comments
 (0)