chore: Fix issues

Author: robmllze

lib/src/_generator_converger.dart

@@ -10,6 +10,7 @@
 import 'package:df_gen_core/df_gen_core.dart';
 import 'package:df_log/df_log.dart';
 import 'package:df_config/df_config.dart';
+import 'package:df_string/df_string.dart';
 
 import 'package:path/path.dart' as p;
 
@@ -44,7 +45,8 @@ final generatorConverger = _GeneratorConverger(
         );
 
         // Determine the output file path.
-        final outputFilePath = p.join(replacement.insight.path, fileName);
+        final folderName = replacement.insight.screenClassName.toSnakeCase();
+        final outputFilePath = p.join(replacement.insight.path, folderName, fileName);
 
         // Write the generated Dart file.
         await writeFile(outputFilePath, output);

lib/src/_insight.dart

@@ -20,7 +20,6 @@ class Insight {
   final Map<String, String> internalParameters;
   final Set<String> queryParameters;
   final String path;
-  final String makeup;
   final String title;
   final Set<String> partFileDirs;
 
@@ -37,7 +36,6 @@ class Insight {
     required this.internalParameters,
     required this.queryParameters,
     required this.path,
-    required this.makeup,
     required this.title,
     required this.partFileDirs,
   });

lib/src/_insight_mappers.dart

@@ -57,9 +57,8 @@ final insightMappers = [
   _InsightMapper(
     placeholder: Placeholders.I1,
     mapInsights: (insight) async {
-      final q1 = insight.queryParameters
-          .map((e) => 'late final $e = this.configuration.$e;')
-          .join('\n');
+      final q1 =
+          insight.queryParameters.map((e) => 'late final $e = this.configuration.$e;').join('\n');
       return q1;
     },
   ),
@@ -83,18 +82,13 @@ final insightMappers = [
       final generateScreenBindingsArgs = [
         if (insight.path.isNotEmpty) "path: '${insight.path}'",
         if (insight.title.isNotEmpty) "defaultTitle: '${insight.title}'",
-        if (insight.makeup.isNotEmpty) "makeup: '${insight.makeup}'",
-        if (insight.isAccessibleOnlyIfLoggedIn)
-          'isAccessibleOnlyIfLoggedIn: true',
+        if (insight.isAccessibleOnlyIfLoggedIn) 'isAccessibleOnlyIfLoggedIn: true',
         if (insight.isAccessibleOnlyIfLoggedInAndVerified)
           'isAccessibleOnlyIfLoggedInAndVerified: true',
-        if (insight.isAccessibleOnlyIfLoggedOut)
-          'isAccessibleOnlyIfLoggedOut: true',
+        if (insight.isAccessibleOnlyIfLoggedOut) 'isAccessibleOnlyIfLoggedOut: true',
         if (insight.isRedirectable) 'isRedirectable: true',
-        if (insight.internalParameters.isNotEmpty && a.isNotEmpty)
-          'internalParameters: {$a,}',
-        if (insight.queryParameters.isNotEmpty && b.isNotEmpty)
-          'queryParameters: {$b,}',
+        if (insight.internalParameters.isNotEmpty && a.isNotEmpty) 'internalParameters: {$a,}',
+        if (insight.queryParameters.isNotEmpty && b.isNotEmpty) 'queryParameters: {$b,}',
       ].join(',');
       return generateScreenBindingsArgs;
     },

lib/src/generate_screen.dart

@@ -32,7 +32,6 @@ Future<void> generateScreen({
   bool isRedirectable = false,
   Map<String, String> internalParameters = const {},
   Set<String> queryParameters = const {},
-  String makeup = '',
   String title = '',
   Set<String> partFileDirs = const {},
 }) async {
@@ -42,7 +41,7 @@ Future<void> generateScreen({
   final controllerTemplate = extractCodeFromMarkdown(
     await loadFileFromGitHub(
       username: 'robmllze',
-      repo: 'df_generate_dart_models_core',
+      repo: 'df_generate_screen',
       filePath: [
         controllerTemplateFilePath ?? 'templates/controller.dart.md',
       ].join('/'),
@@ -52,7 +51,7 @@ Future<void> generateScreen({
   final screenTemplate = extractCodeFromMarkdown(
     await loadFileFromGitHub(
       username: 'robmllze',
-      repo: 'df_generate_dart_models_core',
+      repo: 'df_generate_screen',
       filePath: [
         screenTemplateFilePath ?? 'templates/screen.dart.md',
       ].join('/'),
@@ -62,7 +61,7 @@ Future<void> generateScreen({
   final viewTemplate = extractCodeFromMarkdown(
     await loadFileFromGitHub(
       username: 'robmllze',
-      repo: 'df_generate_dart_models_core',
+      repo: 'df_generate_screen',
       filePath: [
         viewTemplateFilePath ?? 'templates/view.dart.md',
       ].join('/'),
@@ -72,7 +71,7 @@ Future<void> generateScreen({
   final bindingsTemplate = extractCodeFromMarkdown(
     await loadFileFromGitHub(
       username: 'robmllze',
-      repo: 'df_generate_dart_models_core',
+      repo: 'df_generate_screen',
       filePath: [
         bindingsTemplateFilePath ?? 'templates/bindings.dart.md',
       ].join('/'),
@@ -82,20 +81,18 @@ Future<void> generateScreen({
   final screenClassKey = screenName.toSnakeCase();
 
   final insight = Insight(
-    screenClassName: screenName.toSnakeCase(),
+    screenClassName: screenName.toPascalCase(),
     bindingsFileName: '_bindings.g.dart',
     controllerFileName: '_controller.dart',
     screenFileName: '$screenClassKey.dart',
     viewFileName: '_view.dart',
     isAccessibleOnlyIfLoggedIn: isAccessibleOnlyIfLoggedIn,
-    isAccessibleOnlyIfLoggedInAndVerified:
-        isAccessibleOnlyIfLoggedInAndVerified,
+    isAccessibleOnlyIfLoggedInAndVerified: isAccessibleOnlyIfLoggedInAndVerified,
     isAccessibleOnlyIfLoggedOut: isAccessibleOnlyIfLoggedOut,
     isRedirectable: isRedirectable,
     internalParameters: internalParameters,
     queryParameters: queryParameters,
     path: path,
-    makeup: makeup,
     title: title,
     partFileDirs: partFileDirs,
   );

lib/src/run_generate_screens_app.dart

@@ -35,6 +35,7 @@ Future<void> runGenerateScreensApp(List<String> args) async {
       )
       ..addOption(
         'class-name',
+        abbr: 'n',
         help: 'Screen name.',
         defaultsTo: 'ScreenExample',
       )
@@ -87,11 +88,6 @@ Future<void> runGenerateScreensApp(List<String> args) async {
         help: 'Is screen redirectable?',
         defaultsTo: false.toString(),
       )
-      ..addOption(
-        'makeup',
-        help: 'Screen makeup.',
-        defaultsTo: '',
-      )
       ..addOption('default-title', help: 'Screen title.', defaultsTo: 'Title')
       ..addOption(
         'part-file-dirs',
@@ -110,14 +106,11 @@ Future<void> runGenerateScreensApp(List<String> args) async {
             })
             .nonNulls
             .toSet();
-        return entries != null
-            ? Map<String, String>.fromEntries(entries)
-            : null;
+        return entries != null ? Map<String, String>.fromEntries(entries) : null;
       }
 
       bool toBool(String option) {
-        return results[option]?.toString().toLowerCase().trim() ==
-            true.toString();
+        return results[option]?.toString().toLowerCase().trim() == true.toString();
       }
 
       return _ArgsChecker(
@@ -136,7 +129,6 @@ Future<void> runGenerateScreensApp(List<String> args) async {
         isRedirectable: toBool('is-redirectable'),
         internalParameters: toOptionsMap('internal-parameters'),
         queryParameters: splitArg(results['query-parameters'])?.toSet(),
-        makeup: results['makeup'],
         title: results['default-title'],
         partFileDirs: splitArg(results['part-file-dirs'])?.toSet(),
       );
@@ -152,13 +144,11 @@ Future<void> runGenerateScreensApp(List<String> args) async {
         viewTemplateFilePath: args.stateTemplateFilePath,
         path: args.path!,
         isAccessibleOnlyIfLoggedIn: args.isAccessibleOnlyIfLoggedIn ?? false,
-        isAccessibleOnlyIfLoggedInAndVerified:
-            args.isAccessibleOnlyIfLoggedInAndVerified ?? false,
+        isAccessibleOnlyIfLoggedInAndVerified: args.isAccessibleOnlyIfLoggedInAndVerified ?? false,
         isAccessibleOnlyIfLoggedOut: args.isAccessibleOnlyIfLoggedOut ?? false,
         isRedirectable: args.isRedirectable ?? false,
         internalParameters: args.internalParameters ?? const {},
         queryParameters: args.queryParameters ?? const {},
-        makeup: args.makeup ?? '',
         title: args.title ?? '',
         partFileDirs: args.partFileDirs ?? {},
       );
@@ -187,7 +177,6 @@ class _ArgsChecker extends ValidArgsChecker {
   final bool? isRedirectable;
   final Map<String, String>? internalParameters;
   final Set<String>? queryParameters;
-  final String? makeup;
   final String? title;
   final Set<String>? partFileDirs;
 
@@ -210,7 +199,6 @@ class _ArgsChecker extends ValidArgsChecker {
     required this.isRedirectable,
     required this.internalParameters,
     required this.queryParameters,
-    required this.makeup,
     required this.title,
     required this.partFileDirs,
   });
@@ -227,14 +215,11 @@ class _ArgsChecker extends ValidArgsChecker {
         if (controllerTemplateFilePath != null) controllerTemplateFilePath,
         if (screenTemplateFilePath != null) screenTemplateFilePath,
         if (stateTemplateFilePath != null) stateTemplateFilePath,
-        if (configurationTemplateFilePath != null)
-          configurationTemplateFilePath,
-        if (isAccessibleOnlyIfLoggedInAndVerified != null)
-          isAccessibleOnlyIfLoggedInAndVerified,
+        if (configurationTemplateFilePath != null) configurationTemplateFilePath,
+        if (isAccessibleOnlyIfLoggedInAndVerified != null) isAccessibleOnlyIfLoggedInAndVerified,
         if (isAccessibleOnlyIfLoggedIn != null) isAccessibleOnlyIfLoggedIn,
         if (isAccessibleOnlyIfLoggedOut != null) isAccessibleOnlyIfLoggedOut,
         if (isRedirectable != null) isRedirectable,
-        if (makeup != null) makeup,
         if (title != null) title,
         if (partFileDirs != null) partFileDirs,
       ];

template/controller.dart.md

@@ -30,7 +30,7 @@ final class ___SCREEN_CLASS___Controller extends T___SCREEN_CLASS___Controller {
 
   ___Q1___
   ___I1___
-  final pCounter = Pod<int>(-1);
+  final pCounter = Pod<int>(-1)..bindWith(this);
 
   //
   //
@@ -49,17 +49,6 @@ final class ___SCREEN_CLASS___Controller extends T___SCREEN_CLASS___Controller {
     this.pCounter.set(0);
     super.initController();
   }
-
-  //
-  //
-  //
-
-  @override
-  void dispose() {
-    // Be sure to dispose all pods here.
-    this.pCounter.dispose();
-    super.dispose();
-  }
 }
 
 // ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░

template/screen.dart.md

@@ -8,7 +8,7 @@
 // ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
 //.title~
 
-import '/_common.dart';
+import 'package:df_screen/df_screen.dart';
 
 part '_bindings.g.dart';
 part '_controller.dart';

template/view.md

@@ -18,14 +18,8 @@ final class _View extends T___SCREEN_CLASS___View {
   //
 
   @override
-  Widget top(BuildContext context) {
-    return MyHeader(
-      breadCrumbBar: MyBreadCrumbBar(
-        routeManager: g.app.routeManager,
-      ),
-      title: this.widget.configuration?.title,
-      onBackButtonPressed: g.app.routeManager.goBack,
-    );
+  Widget topSide(BuildContext context, double topInsets) {
+    return const SizedBox.shrink();
   }
 
   //
@@ -56,7 +50,7 @@ final class _View extends T___SCREEN_CLASS___View {
 
   @override
   Widget bottomSide(BuildContext context, double bottomInsets) {
-    return bottomInsets == 0 ? const DcBottomNavigationControls() : const SizedBox();
+    return const SizedBox.shrink();
   }
 }