|
63 | 63 | </style>
|
64 | 64 |
|
65 | 65 | <style name="Widget.Material3.FloatingActionButton.Small.Primary" parent="Base.Widget.Material3.FloatingActionButton.Small">
|
66 |
| - <item name="materialThemeOverlay">@style/ThemeOverlay.Material3.ExtendedFloatingActionButton.Primary</item> |
| 66 | + <item name="materialThemeOverlay">@style/ThemeOverlay.Material3.FloatingActionButton.Primary</item> |
67 | 67 | </style>
|
68 | 68 |
|
69 | 69 | <style name="Widget.Material3.FloatingActionButton.Small.Secondary" parent="Base.Widget.Material3.FloatingActionButton.Small">
|
70 |
| - <item name="materialThemeOverlay">@style/ThemeOverlay.Material3.ExtendedFloatingActionButton.Secondary</item> |
| 70 | + <item name="materialThemeOverlay">@style/ThemeOverlay.Material3.FloatingActionButton.Secondary</item> |
71 | 71 | </style>
|
72 | 72 |
|
73 | 73 | <style name="Widget.Material3.FloatingActionButton.Small.Tertiary" parent="Base.Widget.Material3.FloatingActionButton.Small">
|
74 |
| - <item name="materialThemeOverlay">@style/ThemeOverlay.Material3.ExtendedFloatingActionButton.Tertiary</item> |
| 74 | + <item name="materialThemeOverlay">@style/ThemeOverlay.Material3.FloatingActionButton.Tertiary</item> |
75 | 75 | </style>
|
76 | 76 |
|
77 | 77 | <style name="Widget.Material3.FloatingActionButton.Small.Surface" parent="Base.Widget.Material3.FloatingActionButton.Small">
|
78 |
| - <item name="materialThemeOverlay">@style/ThemeOverlay.Material3.ExtendedFloatingActionButton.Surface</item> |
| 78 | + <item name="materialThemeOverlay">@style/ThemeOverlay.Material3.FloatingActionButton.Surface</item> |
| 79 | + </style> |
| 80 | + |
| 81 | + <!-- M3 Medium FAB --> |
| 82 | + |
| 83 | + <style name="Base.Widget.Material3.FloatingActionButton.Medium" parent="Base.Widget.Material3.FloatingActionButton"> |
| 84 | + <item name="fabCustomSize">@dimen/m3_comp_fab_medium_container_height</item> |
| 85 | + <item name="maxImageSize">@dimen/m3_comp_fab_medium_icon_size</item> |
| 86 | + <item name="shapeAppearance">@macro/m3_comp_fab_medium_container_shape</item> |
| 87 | + <item name="shapeAppearanceOverlay">@null</item> |
| 88 | + </style> |
| 89 | + |
| 90 | + <style name="Widget.Material3.FloatingActionButton.Medium" parent="Base.Widget.Material3.FloatingActionButton.Medium"> |
| 91 | + <item name="materialThemeOverlay">@style/ThemeOverlay.Material3.FloatingActionButton.Primary</item> |
79 | 92 | </style>
|
80 | 93 |
|
81 | 94 | <!-- M3 Large FABs -->
|
|
88 | 101 | </style>
|
89 | 102 |
|
90 | 103 | <style name="Widget.Material3.FloatingActionButton.Large.Primary" parent="Base.Widget.Material3.FloatingActionButton.Large">
|
91 |
| - <item name="materialThemeOverlay">@style/ThemeOverlay.Material3.ExtendedFloatingActionButton.Primary</item> |
| 104 | + <item name="materialThemeOverlay">@style/ThemeOverlay.Material3.FloatingActionButton.Primary</item> |
92 | 105 | </style>
|
93 | 106 |
|
94 | 107 | <style name="Widget.Material3.FloatingActionButton.Large.Secondary" parent="Base.Widget.Material3.FloatingActionButton.Large">
|
95 |
| - <item name="materialThemeOverlay">@style/ThemeOverlay.Material3.ExtendedFloatingActionButton.Secondary</item> |
| 108 | + <item name="materialThemeOverlay">@style/ThemeOverlay.Material3.FloatingActionButton.Secondary</item> |
96 | 109 | </style>
|
97 | 110 |
|
98 | 111 | <style name="Widget.Material3.FloatingActionButton.Large.Tertiary" parent="Base.Widget.Material3.FloatingActionButton.Large">
|
99 |
| - <item name="materialThemeOverlay">@style/ThemeOverlay.Material3.ExtendedFloatingActionButton.Tertiary</item> |
| 112 | + <item name="materialThemeOverlay">@style/ThemeOverlay.Material3.FloatingActionButton.Tertiary</item> |
100 | 113 | </style>
|
101 | 114 |
|
102 | 115 | <style name="Widget.Material3.FloatingActionButton.Large.Surface" parent="Base.Widget.Material3.FloatingActionButton.Large">
|
103 |
| - <item name="materialThemeOverlay">@style/ThemeOverlay.Material3.ExtendedFloatingActionButton.Surface</item> |
| 116 | + <item name="materialThemeOverlay">@style/ThemeOverlay.Material3.FloatingActionButton.Surface</item> |
104 | 117 | </style>
|
105 | 118 |
|
106 | 119 | <!-- M3 FAB Theme Overlays for different color variants. -->
|
|
145 | 158 | <item name="elevation">@dimen/m3_comp_extended_fab_primary_container_container_elevation</item>
|
146 | 159 | <item name="android:stateListAnimator">@animator/m3_extended_fab_state_list_animator</item>
|
147 | 160 | <item name="iconSize">@dimen/m3_comp_extended_fab_small_icon_size</item>
|
148 |
| - <item name="android:textAppearance">@macro/m3_comp_extended_fab_small_label_text</item> |
| 161 | + <!-- Hardcoded, since token is updated for Expressive eFABs. --> |
| 162 | + <item name="android:textAppearance">?attr/textAppearanceLabelLarge</item> |
149 | 163 | <item name="shapeAppearance">@macro/m3_comp_extended_fab_small_container_shape</item>
|
150 | 164 | <item name="shapeAppearanceOverlay">@null</item>
|
151 | 165 | <item name="enforceMaterialTheme">true</item>
|
|
199 | 213 | <item name="materialThemeOverlay">@style/ThemeOverlay.Material3.ExtendedFloatingActionButton.Surface</item>
|
200 | 214 | </style>
|
201 | 215 |
|
| 216 | + <!-- M3 Expressive Extended Small FABs --> |
| 217 | + <style name="Base.Widget.Material3.ExtendedFloatingActionButton.Small" parent="Base.Widget.Material3.ExtendedFloatingActionButton"> |
| 218 | + <item name="android:minWidth">@dimen/m3_comp_extended_fab_small_container_height</item> |
| 219 | + <item name="android:minHeight">@dimen/m3_comp_extended_fab_small_container_height</item> |
| 220 | + <item name="android:paddingLeft">@dimen/m3_comp_extended_fab_small_leading_space</item> |
| 221 | + <item name="android:paddingStart">@dimen/m3_comp_extended_fab_small_leading_space</item> |
| 222 | + <item name="android:paddingRight">@dimen/m3_comp_extended_fab_small_trailing_space</item> |
| 223 | + <item name="android:paddingEnd">@dimen/m3_comp_extended_fab_small_trailing_space</item> |
| 224 | + <item name="android:textAppearance">@macro/m3_comp_extended_fab_small_label_text</item> |
| 225 | + <item name="iconPadding">@dimen/m3_comp_extended_fab_small_icon_label_space</item> |
| 226 | + <item name="shapeAppearance">@macro/m3_comp_extended_fab_small_container_shape</item> |
| 227 | + <item name="collapsedSize">@dimen/m3_comp_fab_container_height</item> |
| 228 | + </style> |
| 229 | + <style name="Widget.Material3.ExtendedFloatingActionButton.Small" parent="Base.Widget.Material3.ExtendedFloatingActionButton.Small"> |
| 230 | + <item name="materialThemeOverlay">@style/ThemeOverlay.Material3.ExtendedFloatingActionButton.Primary</item> |
| 231 | + </style> |
| 232 | + |
| 233 | + <!-- M3 Expressive Extended Medium FABs --> |
| 234 | + <style name="Base.Widget.Material3.ExtendedFloatingActionButton.Medium" parent="Base.Widget.Material3.ExtendedFloatingActionButton"> |
| 235 | + <item name="android:minWidth">@dimen/m3_comp_extended_fab_medium_container_height</item> |
| 236 | + <item name="android:minHeight">@dimen/m3_comp_extended_fab_medium_container_height</item> |
| 237 | + <item name="android:paddingLeft">@dimen/m3_comp_extended_fab_medium_leading_space</item> |
| 238 | + <item name="android:paddingStart">@dimen/m3_comp_extended_fab_medium_leading_space</item> |
| 239 | + <item name="android:paddingRight">@dimen/m3_comp_extended_fab_medium_trailing_space</item> |
| 240 | + <item name="android:paddingEnd">@dimen/m3_comp_extended_fab_medium_trailing_space</item> |
| 241 | + <item name="android:textAppearance">@macro/m3_comp_extended_fab_medium_label_text</item> |
| 242 | + <item name="iconPadding">@dimen/m3_comp_extended_fab_medium_icon_label_space</item> |
| 243 | + <item name="iconSize">@dimen/m3_comp_extended_fab_medium_icon_size</item> |
| 244 | + <item name="shapeAppearance">@macro/m3_comp_extended_fab_medium_container_shape</item> |
| 245 | + <item name="collapsedSize">@dimen/m3_comp_fab_medium_container_height</item> |
| 246 | + </style> |
| 247 | + <style name="Widget.Material3.ExtendedFloatingActionButton.Medium" parent="Base.Widget.Material3.ExtendedFloatingActionButton.Medium"> |
| 248 | + <item name="materialThemeOverlay">@style/ThemeOverlay.Material3.ExtendedFloatingActionButton.Primary</item> |
| 249 | + </style> |
| 250 | + |
| 251 | + <!-- M3 Expressive Extended Large FABs --> |
| 252 | + <style name="Base.Widget.Material3.ExtendedFloatingActionButton.Large" parent="Base.Widget.Material3.ExtendedFloatingActionButton"> |
| 253 | + <item name="android:minWidth">@dimen/m3_comp_extended_fab_large_container_height</item> |
| 254 | + <item name="android:minHeight">@dimen/m3_comp_extended_fab_large_container_height</item> |
| 255 | + <item name="android:paddingLeft">@dimen/m3_comp_extended_fab_large_leading_space</item> |
| 256 | + <item name="android:paddingStart">@dimen/m3_comp_extended_fab_large_leading_space</item> |
| 257 | + <item name="android:paddingRight">@dimen/m3_comp_extended_fab_large_trailing_space</item> |
| 258 | + <item name="android:paddingEnd">@dimen/m3_comp_extended_fab_large_trailing_space</item> |
| 259 | + <item name="android:textAppearance">@macro/m3_comp_extended_fab_large_label_text</item> |
| 260 | + <item name="iconPadding">@dimen/m3_comp_extended_fab_large_icon_label_space</item> |
| 261 | + <item name="iconSize">@dimen/m3_comp_extended_fab_large_icon_size</item> |
| 262 | + <item name="shapeAppearance">@macro/m3_comp_extended_fab_large_container_shape</item> |
| 263 | + <item name="collapsedSize">@dimen/m3_comp_fab_large_container_height</item> |
| 264 | + </style> |
| 265 | + <style name="Widget.Material3.ExtendedFloatingActionButton.Large" parent="Base.Widget.Material3.ExtendedFloatingActionButton.Large"> |
| 266 | + <item name="materialThemeOverlay">@style/ThemeOverlay.Material3.ExtendedFloatingActionButton.Primary</item> |
| 267 | + </style> |
| 268 | + |
202 | 269 | <!-- M3 Extended FAB Theme Overlays for different color variants. -->
|
203 | 270 |
|
204 | 271 | <style name="ThemeOverlay.Material3.ExtendedFloatingActionButton.Primary" parent="">
|
|
0 commit comments