Effective dart (#18)

* Folder snake case

* No unnecessary getter

* Group flutter and flutter_gen to their own package

* Move color to colors_generator

* Reset pubspec.lock

Author: lcdsmao

lib/src/generators/assets_generator.dart

@@ -6,8 +6,8 @@ import 'package:flutter_gen/src/generators/generator_helper.dart';
 import 'package:flutter_gen/src/generators/integrations/integration.dart';
 import 'package:flutter_gen/src/generators/integrations/svg_integration.dart';
 import 'package:flutter_gen/src/settings/asset_type.dart';
-import 'package:flutter_gen/src/settings/flutter/flutter_assets.dart';
-import 'package:flutter_gen/src/settings/flutterGen/flutter_gen.dart';
+import 'package:flutter_gen/src/settings/flutter.dart';
+import 'package:flutter_gen/src/settings/flutter_gen.dart';
 import 'package:flutter_gen/src/utils/camel_case.dart';
 import 'package:path/path.dart';
 

lib/src/generators/colors_generator.dart

@@ -4,8 +4,7 @@ import 'package:dart_style/dart_style.dart';
 import 'package:dartx/dartx.dart';
 import 'package:flutter_gen/src/generators/generator_helper.dart';
 import 'package:flutter_gen/src/settings/color_path.dart';
-import 'package:flutter_gen/src/settings/color_set.dart';
-import 'package:flutter_gen/src/settings/flutterGen/flutter_gen_colors.dart';
+import 'package:flutter_gen/src/settings/flutter_gen.dart';
 import 'package:flutter_gen/src/utils/camel_case.dart';
 import 'package:flutter_gen/src/utils/color.dart';
 import 'package:path/path.dart';
@@ -27,7 +26,7 @@ String generateColors(
   buffer.writeln('  ColorName._();');
   buffer.writeln();
 
-  final colorList = <Color>[];
+  final colorList = <_Color>[];
   colors.inputs
       .cast<String>()
       .map((file) => ColorPath(join(pubspecFile.parent.path, file)))
@@ -36,7 +35,7 @@ String generateColors(
     if (colorFile.isXml) {
       colorList.addAll(
           XmlDocument.parse(data).findAllElements('color').map((element) {
-        return Color.fromXmlElement(element);
+        return _Color.fromXmlElement(element);
       }));
     } else {
       throw 'Not supported file type ${colorFile.mime}.';
@@ -45,14 +44,14 @@ String generateColors(
 
   colorList
       .distinctBy((color) => color.hex)
-      .map(_colorToStatement)
+      .map(_colorStatement)
       .forEach(buffer.writeln);
 
   buffer.writeln('}');
   return formatter.format(buffer.toString());
 }
 
-String _colorToStatement(Color color) {
+String _colorStatement(_Color color) {
   final hex = colorFromHex(color.hex);
   if (color.type == 'material') {
     final swatch = swatchFromPrimaryHex(hex);
@@ -68,3 +67,24 @@ String _colorToStatement(Color color) {
   }
   throw 'Not supported color type ${color.type}.';
 }
+
+class _Color {
+  const _Color(
+    this.name,
+    this.type,
+    this.hex,
+  );
+
+  _Color.fromXmlElement(XmlElement element)
+      : this(
+          element.getAttribute('name'),
+          element.getAttribute('type'),
+          element.text,
+        );
+
+  final String name;
+
+  final String hex;
+
+  final String type;
+}

lib/src/generators/fonts_generator.dart

@@ -1,6 +1,6 @@
 import 'package:dart_style/dart_style.dart';
 import 'package:flutter_gen/src/generators/generator_helper.dart';
-import 'package:flutter_gen/src/settings/flutter/flutter_fonts.dart';
+import 'package:flutter_gen/src/settings/flutter.dart';
 import 'package:flutter_gen/src/utils/camel_case.dart';
 import 'package:flutter_gen/src/utils/cast.dart';
 import 'package:yaml/yaml.dart';

lib/src/settings/asset_type.dart

@@ -3,17 +3,15 @@ import 'package:path/path.dart';
 
 /// https://github.com/dart-lang/mime/blob/master/lib/src/default_extension_map.dart
 class AssetType {
-  AssetType(this._path);
+  AssetType(this.path);
 
-  final String _path;
+  final String path;
 
   final List<AssetType> _children = List.empty(growable: true);
 
-  String get path => _path;
+  bool get isDefaultAssetsDirectory => path == 'assets' || path == 'asset';
 
-  bool get isDefaultAssetsDirectory => _path == 'assets' || _path == 'asset';
-
-  String get mime => lookupMimeType(_path);
+  String get mime => lookupMimeType(path);
 
   /// https://api.flutter.dev/flutter/widgets/Image-class.html
   bool get isSupportedImage {
@@ -32,7 +30,7 @@ class AssetType {
 
   bool get isUnKnownMime => mime == null;
 
-  String get baseName => basenameWithoutExtension(_path);
+  String get baseName => basenameWithoutExtension(path);
 
   List<AssetType> get children => _children;
 

lib/src/settings/color_path.dart

@@ -4,15 +4,13 @@ import 'package:mime/mime.dart';
 
 /// https://github.com/dart-lang/mime/blob/master/lib/src/default_extension_map.dart
 class ColorPath {
-  const ColorPath(this._path);
+  const ColorPath(this.path);
 
-  final String _path;
+  final String path;
 
-  String get path => _path;
+  File get file => File(path);
 
-  File get file => File(_path);
-
-  String get mime => lookupMimeType(_path);
+  String get mime => lookupMimeType(path);
 
   /// https://api.flutter.dev/flutter/widgets/Image-class.html
   bool get isXml => mime == 'application/xml';
@@ -23,9 +21,9 @@ class ColorPath {
       identical(this, other) ||
       other is ColorPath &&
           runtimeType == other.runtimeType &&
-          _path == other._path;
+          path == other.path;
 
   @override
   // ignore: avoid_equals_and_hash_code_on_mutable_classes
-  int get hashCode => _path.hashCode;
+  int get hashCode => path.hashCode;
 }

lib/src/settings/color_set.dart

@@ -1,7 +1,7 @@
 import 'dart:io';
 
-import 'package:flutter_gen/src/settings/flutter/flutter.dart';
-import 'package:flutter_gen/src/settings/flutterGen/flutter_gen.dart';
+import 'package:flutter_gen/src/settings/flutter.dart';
+import 'package:flutter_gen/src/settings/flutter_gen.dart';
 import 'package:flutter_gen/src/utils/cast.dart';
 import 'package:path/path.dart';
 import 'package:yaml/yaml.dart';

lib/src/settings/config.dart

@@ -0,0 +1,43 @@
+import 'package:flutter_gen/src/utils/cast.dart';
+import 'package:yaml/yaml.dart';
+
+class Flutter {
+  Flutter(YamlMap flutterMap) {
+    if (flutterMap != null) {
+      assets = FlutterAssets(safeCast<YamlList>(flutterMap['assets']));
+      fonts = FlutterFonts(safeCast<YamlList>(flutterMap['fonts']));
+    }
+  }
+
+  FlutterAssets assets;
+
+  FlutterFonts fonts;
+
+  bool get hasAssets => assets != null && assets.hasAssets;
+
+  bool get hasFonts => fonts != null && fonts.hasFonts;
+}
+
+class FlutterAssets {
+  FlutterAssets(YamlList assets) {
+    if (assets != null) {
+      this.assets = assets.cast<String>();
+    }
+  }
+
+  List<String> assets;
+
+  bool get hasAssets => assets != null && assets.isNotEmpty;
+}
+
+class FlutterFonts {
+  FlutterFonts(YamlList fonts) {
+    if (fonts != null) {
+      this.fonts = fonts.cast<String>();
+    }
+  }
+
+  List<String> fonts;
+
+  bool get hasFonts => fonts != null && fonts.isNotEmpty;
+}

lib/src/settings/flutter.dart

@@ -1,19 +1,17 @@
 import 'dart:io';
 
 import 'package:flutter_gen/src/settings/config.dart';
-import 'package:flutter_gen/src/settings/flutterGen/flutter_gen_colors.dart';
-import 'package:flutter_gen/src/settings/flutterGen/flutter_gen_integrations.dart';
 import 'package:flutter_gen/src/utils/cast.dart';
 import 'package:yaml/yaml.dart';
 
 class FlutterGen {
   FlutterGen(YamlMap flutterGenMap) {
     if (flutterGenMap != null) {
       _output = safeCast<String>(flutterGenMap['output']);
-      _integrations = FlutterGenIntegrations(
+      integrations = FlutterGenIntegrations(
           safeCast<YamlMap>(flutterGenMap['integrations']));
       _lineLength = safeCast<int>(flutterGenMap['lineLength']);
-      _colors = FlutterGenColors(safeCast<YamlMap>(flutterGenMap['colors']));
+      colors = FlutterGenColors(safeCast<YamlMap>(flutterGenMap['colors']));
     }
   }
 
@@ -28,15 +26,37 @@ class FlutterGen {
 
   int get lineLength => _lineLength ?? Config.DEFAULT_LINE_LENGTH;
 
-  FlutterGenIntegrations _integrations;
-
-  FlutterGenIntegrations get integrations => _integrations;
+  FlutterGenIntegrations integrations;
 
   bool get hasIntegrations => integrations != null;
 
-  FlutterGenColors _colors;
-
-  FlutterGenColors get colors => _colors;
+  FlutterGenColors colors;
 
   bool get hasColors => colors != null;
 }
+
+class FlutterGenColors {
+  FlutterGenColors(YamlMap flutterGenMap) {
+    if (flutterGenMap != null) {
+      inputs = safeCast<YamlList>(flutterGenMap['inputs']);
+    }
+  }
+
+  YamlList inputs;
+
+  bool get hasInputs => inputs != null && inputs.isNotEmpty;
+}
+
+class FlutterGenIntegrations {
+  FlutterGenIntegrations(YamlMap flutterGenMap) {
+    if (flutterGenMap != null) {
+      _flutterSvg = safeCast<bool>(flutterGenMap['flutter_svg']);
+    }
+  }
+
+  bool _flutterSvg;
+
+  bool get flutterSvg => _flutterSvg ?? false;
+
+  bool get hasFlutterSvg => flutterSvg;
+}