Skip to content

Commit aaed88a

Browse files
jtmcdolejtmcdole
authored
Format code (#257)
1 parent e547a8e commit aaed88a

35 files changed

+688
-740
lines changed

‎bin/generate.dart

Lines changed: 26 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -167,13 +167,12 @@ class DiagramGenerator {
167167
filters.add(temporaryDirectory.absolute.path);
168168
late final List<String> filterArgs;
169169
if (deviceTargetPlatform.startsWith('android')) {
170-
filterArgs =
171-
filters.isNotEmpty
172-
? <String>[
173-
'--route',
174-
'args:${Uri.encodeComponent(filters.join(' '))}',
175-
]
176-
: <String>[];
170+
filterArgs = filters.isNotEmpty
171+
? <String>[
172+
'--route',
173+
'args:${Uri.encodeComponent(filters.join(' '))}',
174+
]
175+
: <String>[];
177176
} else {
178177
filterArgs = <String>[];
179178
for (final String arg in filters) {
@@ -205,8 +204,8 @@ class DiagramGenerator {
205204
) ||
206205
(entry['id'] as String) == device) {
207206
deviceId = entry['id'] as String;
208-
deviceTargetPlatform =
209-
(entry['targetPlatform'] as String).toLowerCase();
207+
deviceTargetPlatform = (entry['targetPlatform'] as String)
208+
.toLowerCase();
210209
return true;
211210
}
212211
}
@@ -420,10 +419,9 @@ class DiagramGenerator {
420419
}
421420

422421
Future<List<File>> _combineAnimations(List<File> inputFiles) async {
423-
final List<File> errorFiles =
424-
inputFiles
425-
.where((File input) => path.basename(input.path) == 'error.log')
426-
.toList();
422+
final List<File> errorFiles = inputFiles
423+
.where((File input) => path.basename(input.path) == 'error.log')
424+
.toList();
427425

428426
if (errorFiles.length != 1) {
429427
throw GeneratorException('Subprocess did not complete cleanly!');
@@ -442,10 +440,9 @@ class DiagramGenerator {
442440
throw GeneratorException('Failed with errors (see $errorsFileName).');
443441
}
444442

445-
final List<File> metadataFiles =
446-
inputFiles
447-
.where((File input) => path.extension(input.path) == '.json')
448-
.toList();
443+
final List<File> metadataFiles = inputFiles
444+
.where((File input) => path.extension(input.path) == '.json')
445+
.toList();
449446

450447
// Collect all the animation frames that are in the metadata files so that
451448
// we can eliminate them from the other files that were transferred.
@@ -468,19 +465,18 @@ class DiagramGenerator {
468465
metadata.frameFiles.map((File file) => file.absolute.path),
469466
);
470467
}
471-
final List<File> staticFiles =
472-
inputFiles.where((File input) {
473-
if (!input.isAbsolute) {
474-
input = File(
475-
path.normalize(
476-
path.join(temporaryDirectory.absolute.path, input.path),
477-
),
478-
);
479-
} else {
480-
input = File(path.normalize(input.path));
481-
}
482-
return !animationFiles.contains(input.absolute.path);
483-
}).toList();
468+
final List<File> staticFiles = inputFiles.where((File input) {
469+
if (!input.isAbsolute) {
470+
input = File(
471+
path.normalize(
472+
path.join(temporaryDirectory.absolute.path, input.path),
473+
),
474+
);
475+
} else {
476+
input = File(path.normalize(input.path));
477+
}
478+
return !animationFiles.contains(input.absolute.path);
479+
}).toList();
484480
final List<File> convertedFiles = await _buildMoviesFromMetadata(
485481
metadataList,
486482
);

‎bin/test/generate_test.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,9 @@ void main() {
7373
'packages',
7474
'diagram_generator',
7575
),
76-
): <ProcessResult>[ProcessResult(0, 0, '', '')],
76+
): <ProcessResult>[
77+
ProcessResult(0, 0, '', ''),
78+
],
7779
FakeInvocationRecord(<String>[
7880
'optipng',
7981
'-zc1-9',

‎packages/animation_metadata/lib/animation_metadata.dart

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,11 @@ class AnimationMetadata {
2929
final Map<String, Object?> metadata =
3030
json.decode(metadataFile.readAsStringSync()) as Map<String, dynamic>;
3131
final String baseDir = path.dirname(metadataFile.absolute.path);
32-
final List<File> frameFiles =
33-
(metadata[_frameFilesKey]! as List<dynamic>).map<File>((dynamic name) {
32+
final List<File> frameFiles = (metadata[_frameFilesKey]! as List<dynamic>)
33+
.map<File>((dynamic name) {
3434
return File(path.normalize(path.join(baseDir, name.toString())));
35-
}).toList();
35+
})
36+
.toList();
3637
final Duration duration = Duration(
3738
milliseconds: metadata[_durationMsKey]! as int,
3839
);
@@ -66,13 +67,12 @@ class AnimationMetadata {
6667
_videoFormatKey: videoFormat.name,
6768
_frameRateKey: frameRate,
6869
_widthKey: width,
69-
_frameFilesKey:
70-
frameFiles.map<String>((File file) {
71-
return path.relative(
72-
file.path,
73-
from: path.dirname(metadataFile.absolute.path),
74-
);
75-
}).toList(),
70+
_frameFilesKey: frameFiles.map<String>((File file) {
71+
return path.relative(
72+
file.path,
73+
from: path.dirname(metadataFile.absolute.path),
74+
);
75+
}).toList(),
7676
};
7777
const JsonEncoder encoder = JsonEncoder.withIndent(' ');
7878
final String jsonMetadata = encoder.convert(metadata);

‎packages/diagram_capture/lib/diagram_capture.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -444,8 +444,9 @@ class DiagramController {
444444
milliseconds: 1000 ~/ framerate,
445445
);
446446
while (timestamp != Duration.zero) {
447-
final Duration advanceBy =
448-
timestamp > framerateDuration ? framerateDuration : timestamp;
447+
final Duration advanceBy = timestamp > framerateDuration
448+
? framerateDuration
449+
: timestamp;
449450
timestamp -= advanceBy;
450451
await advanceTime(advanceBy);
451452
}

‎packages/diagram_capture/test/diagram_capture_test.dart

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ void main() {
9090
screenDimensions: const Size(100.0, 100.0),
9191
);
9292

93-
controller.builder =
94-
(BuildContext context) => TestAnimatedDiagram(key: key, size: 50.0);
93+
controller.builder = (BuildContext context) =>
94+
TestAnimatedDiagram(key: key, size: 50.0);
9595
final List<ui.Image> outputImages = await controller
9696
.drawAnimatedDiagramToImages(
9797
end: const Duration(milliseconds: 1200),
@@ -115,8 +115,8 @@ void main() {
115115
screenDimensions: const Size(100.0, 100.0),
116116
);
117117

118-
controller.builder =
119-
(BuildContext context) => TestAnimatedDiagram(key: key, size: 50.0);
118+
controller.builder = (BuildContext context) =>
119+
TestAnimatedDiagram(key: key, size: 50.0);
120120
final File outputFile = await controller.drawAnimatedDiagramToFiles(
121121
end: const Duration(milliseconds: 1200),
122122
frameRate: 5.0,
@@ -177,8 +177,9 @@ void main() {
177177
expect(decodedImage.width, equals(300));
178178
expect(decodedImage.height, equals(150));
179179
expect(decodedImage.length, equals(45000));
180-
final image.Pixel testPixel =
181-
decodedImage.getRange(150, 20, 1, 1).current;
180+
final image.Pixel testPixel = decodedImage
181+
.getRange(150, 20, 1, 1)
182+
.current;
182183
expect(testPixel.a, equals(0xfe));
183184
expect(testPixel.r, equals(0xed));
184185
expect(testPixel.g, equals(0xbe));

‎packages/diagram_generator/lib/main.dart

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,11 @@ Future<void> main(List<String> args) async {
4141
DiagramFlutterBinding.ensureInitialized();
4242
late final List<String> arguments;
4343
if (platform.isAndroid) {
44-
arguments =
45-
PlatformDispatcher.instance.defaultRouteName.length > 5
46-
? Uri.decodeComponent(
47-
PlatformDispatcher.instance.defaultRouteName.substring(5),
48-
).split(' ')
49-
: <String>[];
44+
arguments = PlatformDispatcher.instance.defaultRouteName.length > 5
45+
? Uri.decodeComponent(
46+
PlatformDispatcher.instance.defaultRouteName.substring(5),
47+
).split(' ')
48+
: <String>[];
5049
} else {
5150
arguments = args;
5251
}
@@ -72,16 +71,15 @@ Future<void> main(List<String> args) async {
7271
final List<String> categories = flags['category'] as List<String>;
7372
final List<String> names = flags['name'] as List<String>;
7473
final List<String> steps = flags['step'] as List<String>;
75-
final Set<DiagramPlatform> platforms =
76-
(flags['platform'] as List<String>).map<DiagramPlatform>((
77-
String platformStr,
78-
) {
74+
final Set<DiagramPlatform> platforms = (flags['platform'] as List<String>)
75+
.map<DiagramPlatform>((String platformStr) {
7976
assert(
8077
diagramStepPlatformNames.containsKey(platformStr),
8178
'Invalid platform $platformStr',
8279
);
8380
return diagramStepPlatformNames[platformStr]!;
84-
}).toSet();
81+
})
82+
.toSet();
8583

8684
print(
8785
'Filters:\n categories: $categories\n names: $names\n steps: $steps',
@@ -102,17 +100,18 @@ Future<void> main(List<String> args) async {
102100
Zone.current
103101
.fork(
104102
specification: ZoneSpecification(
105-
handleUncaughtError: (
106-
Zone self,
107-
ZoneDelegate parent,
108-
Zone zone,
109-
Object error,
110-
StackTrace stackTrace,
111-
) {
112-
print('Exception! $error\n$stackTrace');
113-
errorLog.writeln(error);
114-
errorLog.writeln(stackTrace);
115-
},
103+
handleUncaughtError:
104+
(
105+
Zone self,
106+
ZoneDelegate parent,
107+
Zone zone,
108+
Object error,
109+
StackTrace stackTrace,
110+
) {
111+
print('Exception! $error\n$stackTrace');
112+
errorLog.writeln(error);
113+
errorLog.writeln(stackTrace);
114+
},
116115
),
117116
)
118117
.runGuarded(() async {

‎packages/diagram_viewer/lib/pages/diagram_catalog.dart

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,9 @@ class CatalogTile extends StatelessWidget {
104104
child: Text(
105105
name,
106106
style: TextStyle(
107-
color:
108-
Theme.of(context).brightness == Brightness.light
109-
? Colors.white
110-
: Colors.black,
107+
color: Theme.of(context).brightness == Brightness.light
108+
? Colors.white
109+
: Colors.black,
111110
fontWeight: FontWeight.bold,
112111
fontSize: 16.0,
113112
),
@@ -136,9 +135,8 @@ class StepTile extends StatelessWidget {
136135
final List<DiagramMetadata> diagrams = await step.diagrams;
137136
Navigator.of(context).push(
138137
MaterialPageRoute<void>(
139-
builder:
140-
(BuildContext context) =>
141-
DiagramViewerPage(step: step, diagrams: diagrams),
138+
builder: (BuildContext context) =>
139+
DiagramViewerPage(step: step, diagrams: diagrams),
142140
),
143141
);
144142
}
@@ -148,16 +146,15 @@ class StepTile extends StatelessWidget {
148146
return ListTile(
149147
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20.0)),
150148
title: Text(step.runtimeType.toString()),
151-
trailing:
152-
step.platforms.containsAll(DiagramPlatform.values)
153-
? null
154-
: Row(
155-
mainAxisSize: MainAxisSize.min,
156-
children: <Widget>[
157-
for (final DiagramPlatform platform in step.platforms)
158-
Chip(label: Text(platform.name)),
159-
],
160-
),
149+
trailing: step.platforms.containsAll(DiagramPlatform.values)
150+
? null
151+
: Row(
152+
mainAxisSize: MainAxisSize.min,
153+
children: <Widget>[
154+
for (final DiagramPlatform platform in step.platforms)
155+
Chip(label: Text(platform.name)),
156+
],
157+
),
161158
visualDensity: const VisualDensity(vertical: -4),
162159
onTap: () => openDiagramStepViewer(context, step),
163160
);

‎packages/diagram_viewer/lib/pages/diagram_viewer.dart

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,9 @@ class _DiagramViewerPageState extends State<DiagramViewerPage>
112112
padding: const EdgeInsets.all(8.0),
113113
child: Material(
114114
shape: const StadiumBorder(),
115-
color:
116-
theme.brightness == Brightness.light
117-
? theme.primaryColor
118-
: theme.colorScheme.surface,
115+
color: theme.brightness == Brightness.light
116+
? theme.primaryColor
117+
: theme.colorScheme.surface,
119118
elevation: 4,
120119
),
121120
),

‎packages/diagram_viewer/test/diagram_viewer_test.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,9 @@ void main() {
9898
final DiagramStep step = TestDiagramStep();
9999
final List<DiagramMetadata> diagrams = await step.diagrams;
100100
await tester.pumpWidget(
101-
DiagramViewerApp(home: DiagramViewerPage(step: step, diagrams: diagrams)),
101+
DiagramViewerApp(
102+
home: DiagramViewerPage(step: step, diagrams: diagrams),
103+
),
102104
);
103105
await tester.pump(const Duration(minutes: 1));
104106
for (final DiagramMetadata diagram in diagrams) {

‎packages/diagrams/lib/src/alert_dialog.dart

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -61,26 +61,27 @@ class _AlertDialogDiagramState extends State<AlertDialogDiagram>
6161
initialRoute: '/',
6262
onGenerateRoute: (RouteSettings settings) {
6363
return PageRouteBuilder<void>(
64-
pageBuilder: (
65-
BuildContext context,
66-
Animation<double> animation,
67-
Animation<double> secondaryAnimation,
68-
) {
69-
return Scaffold(
70-
appBar: AppBar(title: const Text('AlertDialog Demo')),
71-
body: Center(
72-
child: Builder(
73-
builder: (BuildContext context) {
74-
return OutlinedButton(
75-
key: _openDialogKey,
76-
child: const Text('Show Dialog'),
77-
onPressed: () => _neverSatisfied(context),
78-
);
79-
},
80-
),
81-
),
82-
);
83-
},
64+
pageBuilder:
65+
(
66+
BuildContext context,
67+
Animation<double> animation,
68+
Animation<double> secondaryAnimation,
69+
) {
70+
return Scaffold(
71+
appBar: AppBar(title: const Text('AlertDialog Demo')),
72+
body: Center(
73+
child: Builder(
74+
builder: (BuildContext context) {
75+
return OutlinedButton(
76+
key: _openDialogKey,
77+
child: const Text('Show Dialog'),
78+
onPressed: () => _neverSatisfied(context),
79+
);
80+
},
81+
),
82+
),
83+
);
84+
},
8485
);
8586
},
8687
),

0 commit comments

Comments
 (0)