Skip to content
This repository has been archived by the owner on Jun 13, 2024. It is now read-only.

Flutter format #477

Merged
merged 2 commits into from
Apr 16, 2021
Merged

Flutter format #477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9ddd85
flutter format
shihaohong Apr 16, 2021
3ca1eef
Code segments
shihaohong Apr 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 17 additions & 12 deletions lib/codeviewer/code_segments.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7003,61 +7003,64 @@ class CodeSegments {
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
TextSpan(
style: codeStyle.baseStyle,
text: 'tappable\u000a '),
text: 'tappable\u000a '),
TextSpan(style: codeStyle.punctuationStyle, text: '?'),
TextSpan(style: codeStyle.baseStyle, text: ' '),
TextSpan(
style: codeStyle.classStyle, text: 'TappableTravelDestinationItem'),
TextSpan(style: codeStyle.punctuationStyle, text: '('),
TextSpan(style: codeStyle.baseStyle, text: 'destination'),
TextSpan(
style: codeStyle.baseStyle,
text: '\u000a destination'),
TextSpan(style: codeStyle.punctuationStyle, text: ':'),
TextSpan(style: codeStyle.baseStyle, text: ' destination'),
TextSpan(style: codeStyle.punctuationStyle, text: ')'),
TextSpan(style: codeStyle.baseStyle, text: '\u000a '),
TextSpan(
style: codeStyle.baseStyle, text: '\u000a '),
TextSpan(style: codeStyle.punctuationStyle, text: ':'),
TextSpan(style: codeStyle.baseStyle, text: ' '),
TextSpan(
style: codeStyle.classStyle, text: 'SelectableTravelDestinationItem'),
TextSpan(style: codeStyle.punctuationStyle, text: '('),
TextSpan(
style: codeStyle.baseStyle,
text: '\u000a destination'),
text: '\u000a destination'),
TextSpan(style: codeStyle.punctuationStyle, text: ':'),
TextSpan(style: codeStyle.baseStyle, text: ' destination'),
TextSpan(style: codeStyle.punctuationStyle, text: ','),
TextSpan(
style: codeStyle.baseStyle,
text: '\u000a isSelected'),
text: '\u000a isSelected'),
TextSpan(style: codeStyle.punctuationStyle, text: ':'),
TextSpan(style: codeStyle.baseStyle, text: ' _isSelected'),
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
TextSpan(style: codeStyle.baseStyle, text: 'value'),
TextSpan(style: codeStyle.punctuationStyle, text: ','),
TextSpan(
style: codeStyle.baseStyle,
text: '\u000a onSelected'),
text: '\u000a onSelected'),
TextSpan(style: codeStyle.punctuationStyle, text: ':'),
TextSpan(style: codeStyle.baseStyle, text: ' '),
TextSpan(style: codeStyle.punctuationStyle, text: '()'),
TextSpan(style: codeStyle.baseStyle, text: ' '),
TextSpan(style: codeStyle.punctuationStyle, text: '{'),
TextSpan(
style: codeStyle.baseStyle,
text: '\u000a print'),
text: '\u000a print'),
TextSpan(style: codeStyle.punctuationStyle, text: '('),
TextSpan(
style: codeStyle.stringStyle,
text: '\u0027Selectable card state changed\u0027'),
TextSpan(style: codeStyle.punctuationStyle, text: ');'),
TextSpan(
style: codeStyle.baseStyle,
text: '\u000a setState'),
text: '\u000a setState'),
TextSpan(style: codeStyle.punctuationStyle, text: '(()'),
TextSpan(style: codeStyle.baseStyle, text: ' '),
TextSpan(style: codeStyle.punctuationStyle, text: '{'),
TextSpan(
style: codeStyle.baseStyle,
text: '\u000a _isSelected'),
text: '\u000a _isSelected'),
TextSpan(style: codeStyle.punctuationStyle, text: '.'),
TextSpan(style: codeStyle.baseStyle, text: 'value '),
TextSpan(style: codeStyle.punctuationStyle, text: '='),
Expand All @@ -7068,13 +7071,15 @@ class CodeSegments {
TextSpan(style: codeStyle.baseStyle, text: 'value'),
TextSpan(style: codeStyle.punctuationStyle, text: ';'),
TextSpan(
style: codeStyle.baseStyle, text: '\u000a '),
style: codeStyle.baseStyle,
text: '\u000a '),
TextSpan(style: codeStyle.punctuationStyle, text: '});'),
TextSpan(
style: codeStyle.baseStyle, text: '\u000a '),
style: codeStyle.baseStyle,
text: '\u000a '),
TextSpan(style: codeStyle.punctuationStyle, text: '},'),
TextSpan(
style: codeStyle.baseStyle, text: '\u000a '),
style: codeStyle.baseStyle, text: '\u000a '),
TextSpan(style: codeStyle.punctuationStyle, text: '),'),
TextSpan(style: codeStyle.baseStyle, text: '\u000a '),
TextSpan(style: codeStyle.punctuationStyle, text: '),'),
Expand Down
23 changes: 12 additions & 11 deletions lib/demos/material/cards_demo.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,17 +409,18 @@ class _CardsDemoState extends State<CardsDemo> with RestorationMixin {
child: (destination.cardType == CardType.standard)
? TravelDestinationItem(destination: destination)
: destination.cardType == CardType.tappable
? TappableTravelDestinationItem(destination: destination)
: SelectableTravelDestinationItem(
destination: destination,
isSelected: _isSelected.value,
onSelected: () {
print('Selectable card state changed');
setState(() {
_isSelected.value = !_isSelected.value;
});
},
),
? TappableTravelDestinationItem(
destination: destination)
: SelectableTravelDestinationItem(
destination: destination,
isSelected: _isSelected.value,
onSelected: () {
print('Selectable card state changed');
setState(() {
_isSelected.value = !_isSelected.value;
});
},
),
),
],
),
Expand Down
4 changes: 2 additions & 2 deletions lib/studies/crane/backdrop.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ class _FrontLayerState extends State<_FrontLayer> {
final crossAxisCount = isSmallDesktop
? 2
: isDesktop
? 4
: 1;
? 4
: 1;

return FocusTraversalGroup(
policy: ReadingOrderTraversalPolicy(),
Expand Down
124 changes: 62 additions & 62 deletions lib/studies/reply/adaptive_nav.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -851,72 +851,72 @@ class _BottomAppBarActionItems extends StatelessWidget {
),
)
: onMailView
? Row(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.end,
children: [
IconButton(
key: const ValueKey('star_email_button'),
icon: ImageIcon(
const AssetImage(
'$_iconAssetLocation/twotone_star.png',
package: _assetsPackage,
? Row(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.end,
children: [
IconButton(
key: const ValueKey('star_email_button'),
icon: ImageIcon(
const AssetImage(
'$_iconAssetLocation/twotone_star.png',
package: _assetsPackage,
),
color: starIconColor,
),
onPressed: () {
final currentEmail = model.currentEmail;
if (model.isCurrentEmailStarred) {
model.unstarEmail(currentEmail.id);
} else {
model.starEmail(currentEmail.id);
}
if (model.selectedMailboxPage ==
MailboxPageType.starred) {
mobileMailNavKey.currentState.pop();
model.selectedEmailId = -1;
}
},
color: ReplyColors.white50,
),
color: starIconColor,
),
onPressed: () {
final currentEmail = model.currentEmail;
if (model.isCurrentEmailStarred) {
model.unstarEmail(currentEmail.id);
} else {
model.starEmail(currentEmail.id);
}
if (model.selectedMailboxPage ==
MailboxPageType.starred) {
mobileMailNavKey.currentState.pop();
model.selectedEmailId = -1;
}
},
color: ReplyColors.white50,
),
IconButton(
icon: const ImageIcon(
AssetImage(
'$_iconAssetLocation/twotone_delete.png',
package: _assetsPackage,
IconButton(
icon: const ImageIcon(
AssetImage(
'$_iconAssetLocation/twotone_delete.png',
package: _assetsPackage,
),
),
onPressed: () {
model.deleteEmail(
model.selectedEmailId,
);

mobileMailNavKey.currentState.pop();
model.selectedEmailId = -1;
},
color: ReplyColors.white50,
),
IconButton(
icon: const Icon(Icons.more_vert),
onPressed: () {},
color: ReplyColors.white50,
),
],
)
: Align(
alignment: Alignment.centerRight,
child: IconButton(
key: const ValueKey('ReplySearch'),
icon: const Icon(Icons.search),
color: ReplyColors.white50,
onPressed: () {
Provider.of<EmailStore>(
context,
listen: false,
).onSearchPage = true;
},
),
onPressed: () {
model.deleteEmail(
model.selectedEmailId,
);

mobileMailNavKey.currentState.pop();
model.selectedEmailId = -1;
},
color: ReplyColors.white50,
),
IconButton(
icon: const Icon(Icons.more_vert),
onPressed: () {},
color: ReplyColors.white50,
),
],
)
: Align(
alignment: Alignment.centerRight,
child: IconButton(
key: const ValueKey('ReplySearch'),
icon: const Icon(Icons.search),
color: ReplyColors.white50,
onPressed: () {
Provider.of<EmailStore>(
context,
listen: false,
).onSearchPage = true;
},
),
),
);
},
);
Expand Down
8 changes: 4 additions & 4 deletions lib/studies/reply/mailbox_body.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ class MailboxBody extends StatelessWidget {
final startPadding = isTablet
? 60.0
: isDesktop
? 120.0
: 4.0;
? 120.0
: 4.0;
final endPadding = isTablet
? 30.0
: isDesktop
? 60.0
: 4.0;
? 60.0
: 4.0;

return Consumer<EmailStore>(
builder: (context, model, child) {
Expand Down
4 changes: 2 additions & 2 deletions lib/studies/shrine/backdrop.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@ class _BackdropTitle extends AnimatedWidget {
final menuButtonTooltip = animation.isCompleted
? GalleryLocalizations.of(context).shrineTooltipOpenMenu
: animation.isDismissed
? GalleryLocalizations.of(context).shrineTooltipCloseMenu
: null;
? GalleryLocalizations.of(context).shrineTooltipCloseMenu
: null;

return DefaultTextStyle(
style: Theme.of(context).primaryTextTheme.headline6,
Expand Down