Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
a8c16a70
Unverified
Commit
a8c16a70
authored
Apr 29, 2022
by
Taha Tesser
Committed by
GitHub
Apr 29, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update FAB M3 token template class to new naming scheme and fix a typo in `card.dart` (#102654)
parent
dd65b6ba
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
7 deletions
+7
-7
fab_template.dart
dev/tools/gen_defaults/lib/fab_template.dart
+2
-2
card.dart
packages/flutter/lib/src/material/card.dart
+2
-2
floating_action_button.dart
...ages/flutter/lib/src/material/floating_action_button.dart
+3
-3
No files found.
dev/tools/gen_defaults/lib/fab_template.dart
View file @
a8c16a70
...
...
@@ -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")}
,
...
...
packages/flutter/lib/src/material/card.dart
View file @
a8c16a70
...
...
@@ -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 th
e this
///
color
will be composited on top of [color] with an opacity related
/// If this is null, no overlay will be applied. Otherwise th
is 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.
...
...
packages/flutter/lib/src/material/floating_action_button.dart
View file @
a8c16a70
...
...
@@ -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
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment