Skip to content

Commit 195a5bc

Browse files
committed
Update
1 parent c7278c5 commit 195a5bc

File tree

4 files changed

+18
-17
lines changed

4 files changed

+18
-17
lines changed

bin/generate_screen.dart

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,13 @@
1111

1212
import 'package:df_generate_screen/df_generate_screen.dart';
1313
import 'package:df_log/df_log.dart';
14+
import 'package:df_string/df_string.dart';
1415

1516
// ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
1617

1718
void main(List<String> args) async {
1819
DebugLog.debugOnly = false;
19-
await runGenerateScreensApp(args);
20-
await runGenerateScreenBindingsApp([]);
20+
final argsChecker = await runGenerateScreensApp(args);
21+
final r = argsChecker.screenName?.toSnakeCase() ?? '.';
22+
await runGenerateScreenBindingsApp(['-r', r]);
2123
}

bin/pubspec.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,4 @@ dependencies:
2121
df_generate_screen:
2222
path: ../
2323
df_log: ^0.1.2
24+
df_string: ^0.1.2

lib/src/generate_screen/app.dart

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ import '../../df_generate_screen.dart';
1515
// ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
1616

1717
/// A tool to generate ready-made screen templates for your Flutter app (uses df_sceen)
18-
Future<void> runGenerateScreensApp(List<String> args) async {
18+
Future<_ArgsChecker> runGenerateScreensApp(List<String> args) async {
19+
late _ArgsChecker argsChecker;
1920
await runCommandLineApp(
2021
title: 'Generate Screens',
2122
description: 'A command line app for generating screens',
@@ -106,17 +107,14 @@ Future<void> runGenerateScreensApp(List<String> args) async {
106107
})
107108
.nonNulls
108109
.toSet();
109-
return entries != null
110-
? Map<String, String>.fromEntries(entries)
111-
: null;
110+
return entries != null ? Map<String, String>.fromEntries(entries) : null;
112111
}
113112

114113
bool toBool(String option) {
115-
return results[option]?.toString().toLowerCase().trim() ==
116-
true.toString();
114+
return results[option]?.toString().toLowerCase().trim() == true.toString();
117115
}
118116

119-
return _ArgsChecker(
117+
return argsChecker = _ArgsChecker(
120118
fallbackDartSdkPath: results['dart-sdk'],
121119
outputDirPath: results['output'],
122120
screenName: results['class-name'],
@@ -147,8 +145,7 @@ Future<void> runGenerateScreensApp(List<String> args) async {
147145
viewTemplateFilePath: args.stateTemplateFilePath,
148146
path: args.path!,
149147
isAccessibleOnlyIfLoggedIn: args.isAccessibleOnlyIfLoggedIn ?? false,
150-
isAccessibleOnlyIfLoggedInAndVerified:
151-
args.isAccessibleOnlyIfLoggedInAndVerified ?? false,
148+
isAccessibleOnlyIfLoggedInAndVerified: args.isAccessibleOnlyIfLoggedInAndVerified ?? false,
152149
isAccessibleOnlyIfLoggedOut: args.isAccessibleOnlyIfLoggedOut ?? false,
153150
isRedirectable: args.isRedirectable ?? false,
154151
internalParameters: args.internalParameters ?? const {},
@@ -158,6 +155,7 @@ Future<void> runGenerateScreensApp(List<String> args) async {
158155
);
159156
},
160157
);
158+
return argsChecker;
161159
}
162160

163161
// ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
@@ -219,10 +217,8 @@ class _ArgsChecker extends ValidArgsChecker {
219217
if (controllerTemplateFilePath != null) controllerTemplateFilePath,
220218
if (screenTemplateFilePath != null) screenTemplateFilePath,
221219
if (stateTemplateFilePath != null) stateTemplateFilePath,
222-
if (configurationTemplateFilePath != null)
223-
configurationTemplateFilePath,
224-
if (isAccessibleOnlyIfLoggedInAndVerified != null)
225-
isAccessibleOnlyIfLoggedInAndVerified,
220+
if (configurationTemplateFilePath != null) configurationTemplateFilePath,
221+
if (isAccessibleOnlyIfLoggedInAndVerified != null) isAccessibleOnlyIfLoggedInAndVerified,
226222
if (isAccessibleOnlyIfLoggedIn != null) isAccessibleOnlyIfLoggedIn,
227223
if (isAccessibleOnlyIfLoggedOut != null) isAccessibleOnlyIfLoggedOut,
228224
if (isRedirectable != null) isRedirectable,

lib/src/generate_screen_bindings/app.dart

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ import 'generate.dart';
1616
// ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
1717

1818
/// A command line app for generating screen bindings.
19-
Future<void> runGenerateScreenBindingsApp(List<String> args) async {
19+
Future<_ArgsChecker> runGenerateScreenBindingsApp(List<String> args) async {
20+
late _ArgsChecker argsChecker;
2021
await runCommandLineApp(
2122
title: 'Generate Screen Bindings',
2223
description: 'A command line app for generating screens bindings',
@@ -54,7 +55,7 @@ Future<void> runGenerateScreenBindingsApp(List<String> args) async {
5455
help: 'Dart SDK path.',
5556
),
5657
onResults: (parser, results) {
57-
return _ArgsChecker(
58+
return argsChecker = _ArgsChecker(
5859
fallbackDartSdkPath: results['dart-sdk'],
5960
templateFilePath: results['template'],
6061
rootPaths: splitArg(results['roots'])?.toSet(),
@@ -72,6 +73,7 @@ Future<void> runGenerateScreenBindingsApp(List<String> args) async {
7273
);
7374
},
7475
);
76+
return argsChecker;
7577
}
7678

7779
// ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░

0 commit comments

Comments
 (0)