github/flutter
7
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2025-06-03 00:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update FAB M3 token template class to new naming scheme and fix a typo in card.dart (#102654)

Browse Source
This commit is contained in:
Taha Tesser 2022-04-30 00:09:07 +03:00 committed by GitHub
parent dd65b6ba5b
commit a8c16a7059
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dev/tools/gen_defaults/lib/fab_template.dart
View File

@ -13,8 +13,8 @@ class FABTemplate extends TokenTemplate {
@override
String generate() => '''
// Generated version ${tokens["version"]}
class _M3Defaults extends FloatingActionButtonThemeData {
_M3Defaults(this.context, this.type, this.hasChild)
class _TokenDefaultsM3 extends FloatingActionButtonThemeData {
_TokenDefaultsM3(this.context, this.type, this.hasChild)
: super(
elevation: ${elevation("md.comp.fab.primary.container")},
focusElevation: ${elevation("md.comp.fab.primary.focus.container")},

4
packages/flutter/lib/src/material/card.dart
View File

@ -90,8 +90,8 @@ class Card extends StatelessWidget {
/// The color used as an overlay on [color] to indicate elevation.
///
/// If this is null, no overlay will be applied. Otherwise the this
/// color will be composited on top of [color] with an opacity related
/// If this is null, no overlay will be applied. Otherwise this color
/// will be composited on top of [color] with an opacity related
/// to [elevation] and used to paint the background of the card.
///
/// The default is null.

6
packages/flutter/lib/src/material/floating_action_button.dart
View File

@ -509,7 +509,7 @@ class FloatingActionButton extends StatelessWidget {
final ThemeData theme = Theme.of(context);
final FloatingActionButtonThemeData floatingActionButtonTheme = theme.floatingActionButtonTheme;
final FloatingActionButtonThemeData defaults = theme.useMaterial3
? _M3Defaults(context, _floatingActionButtonType, child != null)
? _TokenDefaultsM3(context, _floatingActionButtonType, child != null)
: _M2Defaults(context, _floatingActionButtonType, child != null);
final Color foregroundColor = this.foregroundColor
@ -783,8 +783,8 @@ class _M2Defaults extends FloatingActionButtonThemeData {
// database by the script dev/tools/gen_defaults/bin/gen_defaults.dart.
// Generated version v0_92
class _M3Defaults extends FloatingActionButtonThemeData {
_M3Defaults(this.context, this.type, this.hasChild)
class _TokenDefaultsM3 extends FloatingActionButtonThemeData {
_TokenDefaultsM3(this.context, this.type, this.hasChild)
: super(
elevation: 6.0,
focusElevation: 6.0,