Refactor (#231)

* chore: upgrade sdk versions

* chore: update sample codes

* refactor: delete unneeded files

Author: wasabeef

.vscode/settings.json

@@ -1,4 +1,4 @@
 {
-    "dart.flutterSdkPath": "~/.asdf/installs/flutter/2.5.3-stable",
-    "dart.sdkPath": "~/.asdf/installs/dart/2.14.4/dart-sdk"
+    "dart.flutterSdkPath": "~/.asdf/installs/flutter/3.0.1-stable",
+    "dart.sdkPath": "~/.asdf/installs/dart/2.17.1/dart-sdk"
 }

example/pubspec.yaml

@@ -17,6 +17,11 @@ dependencies:
   flare_flutter: ^3.0.2
   rive: ^0.8.1
 
+  # Dependency check
+  collection: ^1.15.0
+  crypto: ^3.0.0
+  glob: ^2.0.0
+
   json_annotation: ^4.5.0
   freezed_annotation: ^2.0.3
 

example_resources/assets/color/colors.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="white">#FFFFFF</color>
+    <color name="black">#000000</color>
+    <color name="gray_70">#EEEEEE</color>
+    <color name="gray_410">#979797</color>
+</resources>

example_resources/lib/gen/colors.gen.dart

@@ -30,6 +30,15 @@ flutter_gen:
     enabled: true
     package_parameter_enabled: true
 
+  fonts:
+    enabled: true
+
+  colors:
+    enabled: true
+    inputs:
+      - assets/color/colors.xml
+
+
 flutter:
   assets:
     - assets/images/

example_resources/pubspec.yaml

@@ -1,7 +1,6 @@
 import 'dart:io';
 
 import 'package:dart_style/dart_style.dart';
-import 'package:flutter_gen_core/utils/version.dart';
 import 'package:path/path.dart';
 
 import 'generators/assets_generator.dart';
@@ -41,10 +40,7 @@ class FlutterGenerator {
   }
 
   Future<void> build({Config? config}) async {
-    stdout.writeln(flutterGenVersion);
-
     config ??= await getConfig();
-
     if (config == null) return;
 
     final flutter = config.pubspec.flutter;

packages/core/lib/flutter_generator.dart

@@ -1,5 +1,6 @@
 import 'dart:io';
 
+import 'package:flutter_gen_core/utils/version.dart';
 import 'package:path/path.dart';
 import 'package:yaml/yaml.dart';
 
@@ -14,7 +15,7 @@ class Config {
 }
 
 Future<Config> loadPubspecConfig(File pubspecFile) async {
-  stdout.writeln('FlutterGen Loading ... '
+  stdout.writeln('$flutterGenVersion Loading ... '
       '${normalize(join(
     basename(pubspecFile.parent.path),
     basename(pubspecFile.path),

packages/core/lib/settings/config.dart

@@ -1,7 +1,82 @@
+import 'dart:collection';
+import 'dart:io';
+
 import 'package:build/build.dart';
+import 'package:collection/collection.dart';
+import 'package:crypto/crypto.dart';
+import 'package:flutter_gen_core/flutter_generator.dart';
+import 'package:flutter_gen_core/settings/config.dart';
+
+import 'package:glob/glob.dart';
+
+Builder build(BuilderOptions options) => FlutterGenBuilder();
+
+class FlutterGenBuilder extends Builder {
+  final FlutterGenerator generator = FlutterGenerator(File('pubspec.yaml'));
+  _FlutterGenBuilderState? _currentState;
+
+  @override
+  Future<void> build(BuildStep buildStep) async {
+    final config = await generator.getConfig();
+    if (config == null) return;
+
+    final state = await _createState(config, buildStep);
+    if (_currentState != null && _currentState!.equals(state)) return;
+    _currentState = state;
+
+    await generator.build(config: config);
+  }
+
+  @override
+  Map<String, List<String>> get buildExtensions => {
+        "\$package\$": ['.gen.dart']
+      };
+
+  Future<_FlutterGenBuilderState> _createState(
+      Config config, BuildStep buildStep) async {
+    final pubspec = config.pubspec;
+
+    final HashSet<String> assets = HashSet();
+    if (pubspec.flutterGen.assets.enabled) {
+      for (var assetInput in pubspec.flutter.assets) {
+        if (assetInput.isEmpty) continue;
+        if (assetInput.endsWith("/")) assetInput += "*";
+        await for (var assetId in buildStep.findAssets(Glob(assetInput))) {
+          assets.add(assetId.path);
+        }
+      }
+    }
+
+    final HashMap<String, Digest> colors = HashMap();
+    if (pubspec.flutterGen.colors.enabled) {
+      for (var colorInput in pubspec.flutterGen.colors.inputs) {
+        if (colorInput.isEmpty) continue;
+        await for (var assetId in buildStep.findAssets(Glob(colorInput))) {
+          final digest = await buildStep.digest(assetId);
+          colors[assetId.path] = digest;
+        }
+      }
+    }
+
+    final pubspecAsset =
+        await buildStep.findAssets(Glob(config.pubspecFile.path)).single;
+
+    final pubspecDigest = await buildStep.digest(pubspecAsset);
+
+    return _FlutterGenBuilderState(pubspecDigest, assets, colors);
+  }
+}
+
+class _FlutterGenBuilderState {
+  final Digest pubspecDigest;
+  final HashSet<String> assets;
+  final HashMap<String, Digest> colors;
 
-import 'flutter_gen_builder.dart';
+  _FlutterGenBuilderState(this.pubspecDigest, this.assets, this.colors);
 
-Builder build(BuilderOptions options) {
-  return FlutterGenBuilder();
+  bool equals(_FlutterGenBuilderState state) {
+    return pubspecDigest == state.pubspecDigest &&
+        const SetEquality().equals(assets, state.assets) &&
+        const MapEquality().equals(colors, state.colors);
+  }
 }

packages/runner/lib/flutter_gen_builder.dart

@@ -13,11 +13,10 @@ environment:
 dependencies:
   flutter_gen_core: ^4.1.6
   build: '>=2.0.0 <3.0.0'
-  collection: ^1.15.0
+  collection: ^1.16.0
   crypto: ^3.0.2
   glob: ^2.0.2
 
 dev_dependencies:
   flutter_lints: ^2.0.1
   build_test: '>=2.0.0 <3.0.0'
-  flutter_lints: '>=1.0.4 <2.0.0'