Generate sorted statements (#27)

* Generate sorted statement * Run build on 3 os * Rm windows * Show generated files diff
FlutterGen · Sep 8, 2020 · ca7ccb7 · ca7ccb7
1 parent f5be67a
commit ca7ccb7
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 39 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,2 @@
+example/lib/gen/* linguist-generated=false
+test_resources/actual_data/* linguist-generated=false
diff --git a/.github/workflows/flutter-ci.yml b/.github/workflows/flutter-ci.yml
@@ -10,7 +10,10 @@ on:
 
 jobs:
   build:
-    runs-on: macos-latest
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
       - uses: subosito/flutter-action@v1

diff --git a/example/lib/gen/assets.gen.dart b/example/lib/gen/assets.gen.dart
@@ -16,13 +16,13 @@ class $PicturesGen {
 class $AssetsImagesGen {
   const $AssetsImagesGen();
 
-  AssetGenImage get chip2 => const AssetGenImage('assets/images/chip2.jpg');
   AssetGenImage get chip1 => const AssetGenImage('assets/images/chip1.jpg');
-  AssetGenImage get logo => const AssetGenImage('assets/images/logo.png');
-  AssetGenImage get profile => const AssetGenImage('assets/images/profile.jpg');
+  AssetGenImage get chip2 => const AssetGenImage('assets/images/chip2.jpg');
   $AssetsImagesChip3Gen get chip3 => const $AssetsImagesChip3Gen();
   $AssetsImagesChip4Gen get chip4 => const $AssetsImagesChip4Gen();
   $AssetsImagesIconsGen get icons => const $AssetsImagesIconsGen();
+  AssetGenImage get logo => const AssetGenImage('assets/images/logo.png');
+  AssetGenImage get profile => const AssetGenImage('assets/images/profile.jpg');
 }
 
 class $AssetsJsonGen {

diff --git a/example/lib/gen/colors.gen.dart b/example/lib/gen/colors.gen.dart
@@ -9,10 +9,11 @@ import 'package:flutter/material.dart';
 class ColorName {
   ColorName._();
 
-  static const Color white = Color(0xFFFFFFFF);
   static const Color black = Color(0xFF000000);
-  static const Color gray70 = Color(0xFFEEEEEE);
-  static const Color gray410 = Color(0xFF979797);
+  static const Color black30 = Color(0x4D000000);
+  static const Color black40 = Color(0x66000000);
+  static const Color black50 = Color(0x80000000);
+  static const Color black60 = Color(0x99000000);
   static const MaterialColor crimsonRed = MaterialColor(
     0xFFCF2A2A,
     <int, Color>{
@@ -28,6 +29,9 @@ class ColorName {
       900: Color(0xFFB20F0F),
     },
   );
+  static const Color gray410 = Color(0xFF979797);
+  static const Color gray70 = Color(0xFFEEEEEE);
+  static const Color white = Color(0xFFFFFFFF);
   static const MaterialColor yellowOcher = MaterialColor(
     0xFFDF9527,
     <int, Color>{
@@ -43,8 +47,4 @@ class ColorName {
       900: Color(0xFFCA670E),
     },
   );
-  static const Color black30 = Color(0x4D000000);
-  static const Color black40 = Color(0x66000000);
-  static const Color black50 = Color(0x80000000);
-  static const Color black60 = Color(0x99000000);
 }
diff --git a/lib/src/generators/colors_generator.dart b/lib/src/generators/colors_generator.dart
@@ -43,7 +43,8 @@ String generateColors(
   });
 
   colorList
-      .distinctBy((color) => color.hex)
+      .distinctBy((color) => color.name)
+      .sortedBy((color) => color.name)
       .map(_colorStatement)
       .forEach(buffer.writeln);
 

diff --git a/lib/src/generators/fonts_generator.dart b/lib/src/generators/fonts_generator.dart
@@ -4,6 +4,7 @@ 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';
+import 'package:dartx/dartx.dart';
 
 String generateFonts(DartFormatter formatter, FlutterFonts fonts) {
   assert(fonts != null && fonts.hasFonts,
@@ -18,7 +19,8 @@ String generateFonts(DartFormatter formatter, FlutterFonts fonts) {
   fonts.fonts
       .cast<YamlMap>()
       .map((element) => safeCast<String>(element['family']))
-      .toSet() // to Set<> for remove duplicated item
+      .distinct()
+      .sorted()
       .forEach((family) {
     buffer
         .writeln("  static const String ${family.camelCase()} = \'$family\';");

diff --git a/lib/src/settings/asset_type.dart b/lib/src/settings/asset_type.dart
@@ -1,5 +1,6 @@
 import 'package:mime/mime.dart';
 import 'package:path/path.dart';
+import 'package:dartx/dartx.dart';
 
 /// https://github.com/dart-lang/mime/blob/master/lib/src/default_extension_map.dart
 class AssetType {
@@ -32,7 +33,7 @@ class AssetType {
 
   String get baseName => basenameWithoutExtension(path);
 
-  List<AssetType> get children => _children;
+  List<AssetType> get children => _children.sortedBy((e) => e.path);
 
   void addChild(AssetType type) {
     _children.add(type);

diff --git a/lib/src/settings/color_path.dart b/lib/src/settings/color_path.dart
@@ -14,16 +14,4 @@ class ColorPath {
 
   /// https://api.flutter.dev/flutter/widgets/Image-class.html
   bool get isXml => mime == 'application/xml';
-
-  @override
-  // ignore: avoid_equals_and_hash_code_on_mutable_classes
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      other is ColorPath &&
-          runtimeType == other.runtimeType &&
-          path == other.path;
-
-  @override
-  // ignore: avoid_equals_and_hash_code_on_mutable_classes
-  int get hashCode => path.hashCode;
 }
diff --git a/test_resources/actual_data/assets.gen.dart b/test_resources/actual_data/assets.gen.dart
@@ -16,13 +16,13 @@ class $PicturesGen {
 class $AssetsImagesGen {
   const $AssetsImagesGen();
 
-  AssetGenImage get chip2 => const AssetGenImage('assets/images/chip2.jpg');
   AssetGenImage get chip1 => const AssetGenImage('assets/images/chip1.jpg');
-  AssetGenImage get logo => const AssetGenImage('assets/images/logo.png');
-  AssetGenImage get profile => const AssetGenImage('assets/images/profile.jpg');
+  AssetGenImage get chip2 => const AssetGenImage('assets/images/chip2.jpg');
   $AssetsImagesChip3Gen get chip3 => const $AssetsImagesChip3Gen();
   $AssetsImagesChip4Gen get chip4 => const $AssetsImagesChip4Gen();
   $AssetsImagesIconsGen get icons => const $AssetsImagesIconsGen();
+  AssetGenImage get logo => const AssetGenImage('assets/images/logo.png');
+  AssetGenImage get profile => const AssetGenImage('assets/images/profile.jpg');
 }
 
 class $AssetsJsonGen {

diff --git a/test_resources/actual_data/assets_no_integrations.gen.dart b/test_resources/actual_data/assets_no_integrations.gen.dart
@@ -14,13 +14,13 @@ class $PicturesGen {
 class $AssetsImagesGen {
   const $AssetsImagesGen();
 
-  AssetGenImage get chip2 => const AssetGenImage('assets/images/chip2.jpg');
   AssetGenImage get chip1 => const AssetGenImage('assets/images/chip1.jpg');
-  AssetGenImage get logo => const AssetGenImage('assets/images/logo.png');
-  AssetGenImage get profile => const AssetGenImage('assets/images/profile.jpg');
+  AssetGenImage get chip2 => const AssetGenImage('assets/images/chip2.jpg');
   $AssetsImagesChip3Gen get chip3 => const $AssetsImagesChip3Gen();
   $AssetsImagesChip4Gen get chip4 => const $AssetsImagesChip4Gen();
   $AssetsImagesIconsGen get icons => const $AssetsImagesIconsGen();
+  AssetGenImage get logo => const AssetGenImage('assets/images/logo.png');
+  AssetGenImage get profile => const AssetGenImage('assets/images/profile.jpg');
 }
 
 class $AssetsJsonGen {

diff --git a/test_resources/actual_data/colors.gen.dart b/test_resources/actual_data/colors.gen.dart
@@ -9,10 +9,11 @@ import 'package:flutter/material.dart';
 class ColorName {
   ColorName._();
 
-  static const Color white = Color(0xFFFFFFFF);
   static const Color black = Color(0xFF000000);
-  static const Color gray70 = Color(0xFFEEEEEE);
-  static const Color gray410 = Color(0xFF979797);
+  static const Color black30 = Color(0x4D000000);
+  static const Color black40 = Color(0x66000000);
+  static const Color black50 = Color(0x80000000);
+  static const Color black60 = Color(0x99000000);
   static const MaterialColor crimsonRed = MaterialColor(
     0xFFCF2A2A,
     <int, Color>{
@@ -28,6 +29,9 @@ class ColorName {
       900: Color(0xFFB20F0F),
     },
   );
+  static const Color gray410 = Color(0xFF979797);
+  static const Color gray70 = Color(0xFFEEEEEE);
+  static const Color white = Color(0xFFFFFFFF);
   static const MaterialColor yellowOcher = MaterialColor(
     0xFFDF9527,
     <int, Color>{
@@ -43,8 +47,4 @@ class ColorName {
       900: Color(0xFFCA670E),
     },
   );
-  static const Color black30 = Color(0x4D000000);
-  static const Color black40 = Color(0x66000000);
-  static const Color black50 = Color(0x80000000);
-  static const Color black60 = Color(0x99000000);
 }