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
ce942668
Unverified
Commit
ce942668
authored
Jan 14, 2021
by
Shi-Hao Hong
Committed by
GitHub
Jan 14, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Apply ListTile colors to leading and trailing text widgets (#73925)
parent
3cd837fc
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
133 additions
and
7 deletions
+133
-7
list_tile.dart
packages/flutter/lib/src/material/list_tile.dart
+24
-7
list_tile_test.dart
packages/flutter/test/material/list_tile_test.dart
+109
-0
No files found.
packages/flutter/lib/src/material/list_tile.dart
View file @
ce942668
...
@@ -1076,6 +1076,12 @@ class ListTile extends StatelessWidget {
...
@@ -1076,6 +1076,12 @@ class ListTile extends StatelessWidget {
:
style
.
copyWith
(
color:
color
);
:
style
.
copyWith
(
color:
color
);
}
}
TextStyle
_trailingAndLeadingTextStyle
(
ThemeData
theme
,
ListTileTheme
?
tileTheme
)
{
final
TextStyle
style
=
theme
.
textTheme
.
bodyText2
!;
final
Color
?
color
=
_textColor
(
theme
,
tileTheme
,
style
.
color
);
return
style
.
copyWith
(
color:
color
);
}
Color
_tileBackgroundColor
(
ListTileTheme
?
tileTheme
)
{
Color
_tileBackgroundColor
(
ListTileTheme
?
tileTheme
)
{
if
(!
selected
)
{
if
(!
selected
)
{
if
(
tileColor
!=
null
)
if
(
tileColor
!=
null
)
...
@@ -1101,14 +1107,21 @@ class ListTile extends StatelessWidget {
...
@@ -1101,14 +1107,21 @@ class ListTile extends StatelessWidget {
final
ListTileTheme
tileTheme
=
ListTileTheme
.
of
(
context
);
final
ListTileTheme
tileTheme
=
ListTileTheme
.
of
(
context
);
IconThemeData
?
iconThemeData
;
IconThemeData
?
iconThemeData
;
if
(
leading
!=
null
||
trailing
!=
null
)
TextStyle
?
leadingAndTrailingTextStyle
;
if
(
leading
!=
null
||
trailing
!=
null
)
{
iconThemeData
=
IconThemeData
(
color:
_iconColor
(
theme
,
tileTheme
));
iconThemeData
=
IconThemeData
(
color:
_iconColor
(
theme
,
tileTheme
));
leadingAndTrailingTextStyle
=
_trailingAndLeadingTextStyle
(
theme
,
tileTheme
);
}
Widget
?
leadingIcon
;
Widget
?
leadingIcon
;
if
(
leading
!=
null
)
{
if
(
leading
!=
null
)
{
leadingIcon
=
IconTheme
.
merge
(
leadingIcon
=
AnimatedDefaultTextStyle
(
style:
leadingAndTrailingTextStyle
!,
duration:
kThemeChangeDuration
,
child:
IconTheme
.
merge
(
data:
iconThemeData
!,
data:
iconThemeData
!,
child:
leading
!,
child:
leading
!,
),
);
);
}
}
...
@@ -1132,9 +1145,13 @@ class ListTile extends StatelessWidget {
...
@@ -1132,9 +1145,13 @@ class ListTile extends StatelessWidget {
Widget
?
trailingIcon
;
Widget
?
trailingIcon
;
if
(
trailing
!=
null
)
{
if
(
trailing
!=
null
)
{
trailingIcon
=
IconTheme
.
merge
(
trailingIcon
=
AnimatedDefaultTextStyle
(
style:
leadingAndTrailingTextStyle
!,
duration:
kThemeChangeDuration
,
child:
IconTheme
.
merge
(
data:
iconThemeData
!,
data:
iconThemeData
!,
child:
trailing
!,
child:
trailing
!,
),
);
);
}
}
...
...
packages/flutter/test/material/list_tile_test.dart
View file @
ce942668
...
@@ -2083,4 +2083,113 @@ void main() {
...
@@ -2083,4 +2083,113 @@ void main() {
expect
(
tester
.
getSize
(
find
.
byType
(
ListTile
)),
const
Size
(
800.0
,
56.0
));
expect
(
tester
.
getSize
(
find
.
byType
(
ListTile
)),
const
Size
(
800.0
,
56.0
));
expect
(
right
(
'title'
),
708.0
);
expect
(
right
(
'title'
),
708.0
);
});
});
testWidgets
(
'colors are applied to leading and trailing text widgets'
,
(
WidgetTester
tester
)
async
{
final
Key
leadingKey
=
UniqueKey
();
final
Key
trailingKey
=
UniqueKey
();
late
ThemeData
theme
;
Widget
buildFrame
({
bool
enabled
=
true
,
bool
selected
=
false
,
})
{
return
MaterialApp
(
home:
Material
(
child:
Center
(
child:
Builder
(
builder:
(
BuildContext
context
)
{
theme
=
Theme
.
of
(
context
);
return
ListTile
(
enabled:
enabled
,
selected:
selected
,
leading:
TestText
(
'leading'
,
key:
leadingKey
),
title:
const
TestText
(
'title'
),
trailing:
TestText
(
'trailing'
,
key:
trailingKey
),
);
},
),
),
),
);
}
Color
textColor
(
Key
key
)
=>
tester
.
state
<
TestTextState
>(
find
.
byKey
(
key
)).
textStyle
.
color
!;
await
tester
.
pumpWidget
(
buildFrame
());
// Enabled color should be default bodyText2 color.
expect
(
textColor
(
leadingKey
),
theme
.
textTheme
.
bodyText2
!.
color
);
expect
(
textColor
(
trailingKey
),
theme
.
textTheme
.
bodyText2
!.
color
);
await
tester
.
pumpWidget
(
buildFrame
(
selected:
true
));
// Wait for text color to animate.
await
tester
.
pumpAndSettle
();
// Selected color should be ThemeData.primaryColor by default.
expect
(
textColor
(
leadingKey
),
theme
.
primaryColor
);
expect
(
textColor
(
trailingKey
),
theme
.
primaryColor
);
await
tester
.
pumpWidget
(
buildFrame
(
enabled:
false
));
// Wait for text color to animate.
await
tester
.
pumpAndSettle
();
// Disabled color should be ThemeData.disabledColor by default.
expect
(
textColor
(
leadingKey
),
theme
.
disabledColor
);
expect
(
textColor
(
trailingKey
),
theme
.
disabledColor
);
});
testWidgets
(
'ListTileTheme colors are applied to leading and trailing text widgets'
,
(
WidgetTester
tester
)
async
{
final
Key
leadingKey
=
UniqueKey
();
final
Key
trailingKey
=
UniqueKey
();
const
Color
selectedColor
=
Colors
.
orange
;
const
Color
defaultColor
=
Colors
.
black
;
late
ThemeData
theme
;
Widget
buildFrame
({
bool
enabled
=
true
,
bool
selected
=
false
,
})
{
return
MaterialApp
(
home:
Material
(
child:
Center
(
child:
ListTileTheme
(
selectedColor:
selectedColor
,
textColor:
defaultColor
,
child:
Builder
(
builder:
(
BuildContext
context
)
{
theme
=
Theme
.
of
(
context
);
return
ListTile
(
enabled:
enabled
,
selected:
selected
,
leading:
TestText
(
'leading'
,
key:
leadingKey
),
title:
const
TestText
(
'title'
),
trailing:
TestText
(
'trailing'
,
key:
trailingKey
),
);
},
),
),
),
),
);
}
Color
textColor
(
Key
key
)
=>
tester
.
state
<
TestTextState
>(
find
.
byKey
(
key
)).
textStyle
.
color
!;
await
tester
.
pumpWidget
(
buildFrame
());
// Enabled color should use ListTileTheme.textColor.
expect
(
textColor
(
leadingKey
),
defaultColor
);
expect
(
textColor
(
trailingKey
),
defaultColor
);
await
tester
.
pumpWidget
(
buildFrame
(
selected:
true
));
// Wait for text color to animate.
await
tester
.
pumpAndSettle
();
// Selected color should use ListTileTheme.selectedColor.
expect
(
textColor
(
leadingKey
),
selectedColor
);
expect
(
textColor
(
trailingKey
),
selectedColor
);
await
tester
.
pumpWidget
(
buildFrame
(
enabled:
false
));
// Wait for text color to animate.
await
tester
.
pumpAndSettle
();
// Disabled color should be ThemeData.disabledColor.
expect
(
textColor
(
leadingKey
),
theme
.
disabledColor
);
expect
(
textColor
(
trailingKey
),
theme
.
disabledColor
);
});
}
}
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