Skip to content

Commit 8da4e4c

Browse files
t0mb3rrt0mb3rr
committed
+Update dependencies
1 parent 814feef commit 8da4e4c

File tree

5 files changed

+39
-61
lines changed

5 files changed

+39
-61
lines changed

‎lib/src/generate_screen.dart‎

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ Future<void> generateScreen(
3333
Log.enableReleaseAsserts = true;
3434
final parser = CliParser(
3535
title: 'dev-cetera.com',
36-
description:
37-
'A tool for generating screen/page files for Flutter projects.',
36+
description: 'A tool for generating screen/page files for Flutter projects.',
3837
example: 'df_generate_screen -i .',
3938
additional:
4039
'For contributions, error reports and information, visit: https://github.com/dev-cetera.',
@@ -63,7 +62,7 @@ Future<void> generateScreen(
6362

6463
final help = argResults.flag(DefaultFlags.HELP.name);
6564
if (help) {
66-
_print(Log.printCyan, parser.getInfo(argParser));
65+
Log.printCyan(parser.getInfo(argParser));
6766
exit(ExitCodes.SUCCESS.code);
6867
}
6968

@@ -77,32 +76,27 @@ Future<void> generateScreen(
7776
templates = argResults.multiOption(DefaultMultiOptions.TEMPLATES.name);
7877
outputPath = argResults.option(DefaultOptionParams.OUTPUT_PATH.name)!;
7978
} catch (_) {
80-
_print(
81-
Log.printRed,
82-
'Missing required args! Use --help flag for more information.',
83-
);
79+
Log.printRed('Missing required args! Use --help flag for more information.');
8480
exit(ExitCodes.FAILURE.code);
8581
}
8682

8783
// ---------------------------------------------------------------------------
8884

8985
final templateData = <String, String>{};
9086
for (final template in templates) {
91-
_print(Log.printWhite, 'Reading template at: $template...');
92-
final result = await MdTemplateUtility.i
93-
.readTemplateFromPathOrUrl(template)
94-
.value;
87+
Log.printWhite('Reading template at: $template...');
88+
final result = await MdTemplateUtility.i.readTemplateFromPathOrUrl(template).value;
9589

9690
if (result.isErr()) {
97-
_print(Log.printRed, ' Failed to read template!');
91+
Log.printRed(' Failed to read template!');
9892
exit(ExitCodes.FAILURE.code);
9993
}
10094
templateData[template] = result.unwrap();
10195
}
10296

10397
// ---------------------------------------------------------------------------
10498

105-
_print(Log.printWhite, 'Generating...');
99+
Log.printWhite('Generating...');
106100

107101
for (final entry in templateData.entries) {
108102
final fileName = p.basename(entry.key).replaceAll('.md', '');
@@ -118,11 +112,5 @@ Future<void> generateScreen(
118112
}
119113

120114
// ---------------------------------------------------------------------------
121-
_print(Log.printGreen, 'Done!');
122-
}
123-
124-
// ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
125-
126-
void _print(void Function(String) print, String message) {
127-
print('[gen-screen] $message');
115+
Log.printGreen('Done!');
128116
}

‎lib/src/generate_screen_access.dart‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Future<void> generateScreenAccess(
5858

5959
final help = argResults.flag(DefaultFlags.HELP.name);
6060
if (help) {
61-
_print(Log.printCyan, parser.getInfo(argParser));
61+
Log.printCyan(parser.getInfo(argParser));
6262
exit(ExitCodes.SUCCESS.code);
6363
}
6464

@@ -82,15 +82,13 @@ Future<void> generateScreenAccess(
8282
// ---------------------------------------------------------------------------
8383

8484
final analysisContextCollection = createDartAnalysisContextCollection(
85-
{
86-
inputPath,
87-
},
85+
{inputPath},
8886
dartSdk, //
8987
);
9088

9189
// ---------------------------------------------------------------------------
9290

93-
_print(Log.printWhite, 'Looking for files..');
91+
Log.printWhite('Looking for files..');
9492
final filePathStream0 = PathExplorer(inputPath).exploreFiles();
9593
final filePathStream1 = filePathStream0.where(
9694
(e) => _isAllowedFileName(e.path),
@@ -99,31 +97,31 @@ Future<void> generateScreenAccess(
9997
try {
10098
findings = await filePathStream1.toList();
10199
} catch (e) {
102-
_print(Log.printRed, 'Failed to read file tree!');
100+
Log.printRed('Failed to read file tree!');
103101
exit(ExitCodes.FAILURE.code);
104102
}
105103
if (findings.isEmpty) {
106-
_print(Log.printYellow, 'No files found in $inputPath!');
104+
Log.printYellow('No files found in $inputPath!');
107105
exit(ExitCodes.SUCCESS.code);
108106
}
109107

110108
// ---------------------------------------------------------------------------
111109

112110
final templateData = <String, String>{};
113111
for (final template in templates) {
114-
_print(Log.printWhite, 'Reading template at: $template...');
112+
Log.printWhite('Reading template at: $template...');
115113
final result = await MdTemplateUtility.i.readTemplateFromPathOrUrl(template).value;
116114

117115
if (result.isErr()) {
118-
_print(Log.printRed, ' Failed to read template!');
116+
Log.printRed(' Failed to read template!');
119117
exit(ExitCodes.FAILURE.code);
120118
}
121119
templateData[template] = result.unwrap();
122120
}
123121

124122
// ---------------------------------------------------------------------------
125123

126-
_print(Log.printWhite, 'Generating...');
124+
Log.printWhite('Generating...');
127125

128126
for (final entry in templateData.entries) {
129127
final fileName = p.basename(entry.key).replaceAll('.md', '');
@@ -141,30 +139,30 @@ Future<void> generateScreenAccess(
141139
final output = _interpolator.interpolate(template, insights, ',');
142140
final outputFilePath = p.join(inputPath, fileName);
143141
await FileSystemUtility.i.writeLocalFile(outputFilePath, output);
144-
Log.printWhite('[gen-screen-access] ✔ Generated $fileName');
142+
Log.printWhite('✔ Generated $fileName');
145143
} catch (e) {
146-
_print(Log.printRed, '✘ One or more files failed to generate!');
144+
Log.printRed('✘ One or more files failed to generate!');
147145
exit(ExitCodes.FAILURE.code);
148146
}
149147
}
150148

151149
// ---------------------------------------------------------------------------
152150

153-
_print(Log.printWhite, 'Fixing generated files..');
151+
Log.printWhite('Fixing generated files..');
154152
await fixDartFile(inputPath);
155153

156-
_print(Log.printWhite, 'Formatting generated files..');
154+
Log.printWhite('Formatting generated files..');
157155
await fmtDartFile(inputPath);
158156

159157
// ---------------------------------------------------------------------------
160158

161-
_print(Log.printGreen, 'Done!');
159+
Log.printGreen('Done!');
162160
}
163161

164162
// ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
165163

166164
void _print(void Function(String) print, String message) {
167-
print('[gen-screen-access] $message');
165+
print('$message');
168166
}
169167

170168
bool _isAllowedFileName(String e) {

‎lib/src/generate_screen_bindings.dart‎

Lines changed: 15 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Future<void> generateScreenBindings(
5656

5757
final help = argResults.flag(DefaultFlags.HELP.name);
5858
if (help) {
59-
_print(Log.printCyan, parser.getInfo(argParser));
59+
Log.printCyan(parser.getInfo(argParser));
6060
exit(ExitCodes.SUCCESS.code);
6161
}
6262

@@ -70,25 +70,21 @@ Future<void> generateScreenBindings(
7070
templates = argResults.multiOption(DefaultMultiOptions.TEMPLATES.name);
7171
dartSdk = argResults.option(DefaultOptionParams.DART_SDK.name);
7272
} catch (_) {
73-
_print(
74-
Log.printRed,
75-
'Missing required args! Use --help flag for more information.',
76-
);
73+
Log.printRed('Missing required args! Use --help flag for more information.');
74+
7775
exit(ExitCodes.FAILURE.code);
7876
}
7977

8078
// ---------------------------------------------------------------------------
8179

8280
final analysisContextCollection = createDartAnalysisContextCollection(
83-
{
84-
inputPath,
85-
},
81+
{inputPath},
8682
dartSdk, //
8783
);
8884

8985
// ---------------------------------------------------------------------------
9086

91-
_print(Log.printWhite, 'Looking for Dart files..');
87+
Log.printWhite('Looking for Dart files..');
9288
final filePathStream0 = PathExplorer(inputPath).exploreFiles();
9389
final filePathStream1 = filePathStream0.where(
9490
(e) => _isAllowedFileName(e.path),
@@ -97,31 +93,31 @@ Future<void> generateScreenBindings(
9793
try {
9894
findings = await filePathStream1.toList();
9995
} catch (e) {
100-
_print(Log.printRed, 'Failed to read file tree!');
96+
Log.printRed('Failed to read file tree!');
10197
exit(ExitCodes.FAILURE.code);
10298
}
10399
if (findings.isEmpty) {
104-
_print(Log.printYellow, 'No files found in $inputPath!');
100+
Log.printYellow('No files found in $inputPath!');
105101
exit(ExitCodes.SUCCESS.code);
106102
}
107103

108104
// ---------------------------------------------------------------------------
109105

110106
final templateData = <String, String>{};
111107
for (final template in templates) {
112-
_print(Log.printWhite, 'Reading template at: $template...');
108+
Log.printWhite('Reading template at: $template...');
113109
final result = await MdTemplateUtility.i.readTemplateFromPathOrUrl(template).value;
114110

115111
if (result.isErr()) {
116-
_print(Log.printRed, ' Failed to read template!');
112+
Log.printRed(' Failed to read template!');
117113
exit(ExitCodes.FAILURE.code);
118114
}
119115
templateData[template] = result.unwrap();
120116
}
121117

122118
// ---------------------------------------------------------------------------
123119

124-
_print(Log.printWhite, 'Generating...');
120+
Log.printWhite('Generating...');
125121

126122
for (final entry in templateData.entries) {
127123
final fileName = p.basename(entry.key).replaceAll('.md', '');
@@ -140,34 +136,30 @@ Future<void> generateScreenBindings(
140136
fileName,
141137
);
142138
await FileSystemUtility.i.writeLocalFile(outputFilePath, output);
143-
Log.printWhite('[gen-screen-bindings] ✔ Generated $fileName');
139+
Log.printWhite('✔ Generated $fileName');
144140
}
145141
}
146142
} catch (e) {
147-
_print(Log.printRed, '✘ One or more files failed to generate!');
143+
Log.printRed('✘ One or more files failed to generate!');
148144
exit(ExitCodes.FAILURE.code);
149145
}
150146
}
151147

152148
// ---------------------------------------------------------------------------
153149

154-
_print(Log.printWhite, 'Fixing generated files..');
150+
Log.printWhite('Fixing generated files..');
155151
await fixDartFile(inputPath);
156152

157-
_print(Log.printWhite, 'Formatting generated files..');
153+
Log.printWhite('Formatting generated files..');
158154
await fmtDartFile(inputPath);
159155

160156
// ---------------------------------------------------------------------------
161157

162-
_print(Log.printGreen, 'Done!');
158+
Log.printGreen('Done!');
163159
}
164160

165161
// ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
166162

167-
void _print(void Function(String) print, String message) {
168-
print('[gen-screen-bindings] $message');
169-
}
170-
171163
bool _isAllowedFileName(String e) {
172164
final lc = e.toLowerCase();
173165
return !lc.endsWith('.g.dart') && lc.endsWith('.dart');

‎pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ repository: https://github.com/robmllze/df_generate_screen
1616
funding:
1717
- https://www.buymeacoffee.com/dev_cetera
1818
description: A tool to generate ready-made screen templates for your Flutter app (uses df_sceen)
19-
version: 0.8.0
19+
version: 0.8.1
2020
topics:
2121
- source-gen
2222
- build-runner

‎templates/v2/_access.g.dart.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ final routeBuilders = [
5757
builder: (context, state) => const SizedBox.shrink(),
5858
);
5959
},
60-
)
60+
),
6161
___ROUTE_BUILDERS___,
6262
];
6363
```

0 commit comments

Comments
 (0)