Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -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"
}
5 changes: 5 additions & 0 deletions example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
7 changes: 7 additions & 0 deletions example_resources/assets/color/colors.xml
Original file line number Diff line number Diff line change
@@ -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>
27 changes: 27 additions & 0 deletions example_resources/lib/gen/colors.gen.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions example_resources/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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/
4 changes: 0 additions & 4 deletions packages/core/lib/flutter_generator.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion packages/core/lib/settings/config.dart
Original file line number Diff line number Diff line change
@@ -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';

Expand All @@ -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),
Expand Down
83 changes: 0 additions & 83 deletions packages/runner/lib/flutter_gen_builder.dart

This file was deleted.

81 changes: 78 additions & 3 deletions packages/runner/lib/flutter_gen_runner.dart
Original file line number Diff line number Diff line change
@@ -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);
}
}
3 changes: 1 addition & 2 deletions packages/runner/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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'