Refactor (#282)

* refactor: move exluce property to asset scope * chore: upgrade sdk for development
FlutterGen · Aug 22, 2022 · 2fa5eb0 · 2fa5eb0
1 parent 2167b0d
commit 2fa5eb0
Show file tree

Hide file tree

Showing 11 changed files with 35 additions and 44 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,4 +1,4 @@
 {
-    "dart.flutterSdkPath": "~/.asdf/installs/flutter/3.0.1-stable",
-    "dart.sdkPath": "~/.asdf/installs/dart/2.17.1/dart-sdk"
+    "dart.flutterSdkPath": "~/.asdf/installs/flutter/3.0.5-stable",
+    "dart.sdkPath": "~/.asdf/installs/dart/2.17.6/dart-sdk"
 }
diff --git a/example/lib/gen/assets.gen.dart b/example/lib/gen/assets.gen.dart
@@ -14,13 +14,6 @@ import 'package:flare_flutter/flare_actor.dart';
 import 'package:flare_flutter/flare_controller.dart';
 import 'package:rive/rive.dart';
 
-class $PicturesGen {
-  const $PicturesGen();
-
-  /// File path: pictures/chip5.jpg
-  AssetGenImage get chip5 => const AssetGenImage('pictures/chip5.jpg');
-}
-
 class $AssetsFlareGen {
   const $AssetsFlareGen();
 
@@ -37,7 +30,6 @@ class $AssetsImagesGen {
   /// File path: assets/images/chip2.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();
 
@@ -87,14 +79,6 @@ class $AssetsUnknownGen {
   String get unknownMimeType => 'assets/unknown/unknown_mime_type.bk';
 }
 
-class $AssetsImagesChip3Gen {
-  const $AssetsImagesChip3Gen();
-
-  /// File path: assets/images/chip3/chip3.jpg
-  AssetGenImage get chip3 =>
-      const AssetGenImage('assets/images/chip3/chip3.jpg');
-}
-
 class $AssetsImagesChip4Gen {
   const $AssetsImagesChip4Gen();
 
@@ -130,7 +114,6 @@ class Assets {
   static const $AssetsMovieGen movie = $AssetsMovieGen();
   static const $AssetsRiveGen rive = $AssetsRiveGen();
   static const $AssetsUnknownGen unknown = $AssetsUnknownGen();
-  static const $PicturesGen pictures = $PicturesGen();
 }
 
 class AssetGenImage {

diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -55,12 +55,12 @@ void main() async {
                 width: 120,
                 height: 120,
               ),
-              Assets.pictures.chip5.image(
-                key: const Key("chip5"),
-                width: 120,
-                height: 120,
-                fit: BoxFit.scaleDown,
-              ),
+              // Assets.pictures.chip5.image(
+              //   key: const Key("chip5"),
+              //   width: 120,
+              //   height: 120,
+              //   fit: BoxFit.scaleDown,
+              // ),
               const Text(
                 'Hi there, I\'m FlutterGen',
                 style: TextStyle(

diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -7,7 +7,7 @@ version: 1.0.0+2
 
 environment:
   sdk: ">=2.16.0 <3.0.0"
-  flutter: ">=2.10.4"
+  flutter: ">=3.0.0"
 
 dependencies:
   flutter:
@@ -131,6 +131,10 @@ flutter_gen:
 
     # Assets.images.chip (default style)
     # style: dot-delimiter
+    exclude: 
+      - assets/images/chip3/chip3.jpg
+      - pictures/chip5.jpg
+      - assets/flare/
 
   fonts:
     enabled: true

diff --git a/example_resources/pubspec.yaml b/example_resources/pubspec.yaml
@@ -7,7 +7,7 @@ version: 1.0.0+2
 
 environment:
   sdk: ">=2.16.0 <3.0.0"
-  flutter: ">=2.10.4"
+  flutter: ">=3.0.0"
 
 dependencies:
   flutter:

diff --git a/packages/core/lib/generators/assets_generator.dart b/packages/core/lib/generators/assets_generator.dart
@@ -33,7 +33,7 @@ class AssetsGenConfig {
       config.pubspec.packageName,
       config.pubspec.flutterGen,
       config.pubspec.flutter.assets,
-      config.pubspec.flutterGen.exclude
+      config.pubspec.flutterGen.assets.exclude
           .map((pattern) => Glob(pattern))
           .toList(),
     );

diff --git a/packages/core/lib/settings/config.dart b/packages/core/lib/settings/config.dart
@@ -47,6 +47,7 @@ flutter_gen:
     enabled: true
     package_parameter_enabled: false
     style: dot-delimiter
+    exclude: []
     
   fonts:
     enabled: true
@@ -55,8 +56,6 @@ flutter_gen:
     enabled: true
     inputs: []
 
-  exclude: []
-
 flutter:
   assets: []
   fonts: []

diff --git a/packages/core/lib/settings/pubspec.dart b/packages/core/lib/settings/pubspec.dart
@@ -58,7 +58,6 @@ class FlutterGen {
     required this.fonts,
     required this.integrations,
     required this.colors,
-    required this.exclude,
   });
 
   @JsonKey(name: 'output', required: true)
@@ -79,9 +78,6 @@ class FlutterGen {
   @JsonKey(name: 'colors', required: true)
   final FlutterGenColors colors;
 
-  @JsonKey(name: 'exclude', required: true)
-  final List<String> exclude;
-
   factory FlutterGen.fromJson(Map json) => _$FlutterGenFromJson(json);
 }
 
@@ -109,6 +105,7 @@ class FlutterGenAssets {
     required this.enabled,
     required this.packageParameterEnabled,
     required this.style,
+    required this.exclude,
   }) {
     if (style != dotDelimiterStyle &&
         style != snakeCaseStyle &&
@@ -126,6 +123,9 @@ class FlutterGenAssets {
   @JsonKey(name: 'style', required: true)
   final String style;
 
+  @JsonKey(name: 'exclude', required: true)
+  final List<String> exclude;
+
   bool get isDotDelimiterStyle => style == dotDelimiterStyle;
 
   bool get isSnakeCaseStyle => style == snakeCaseStyle;

diff --git a/packages/core/lib/settings/pubspec.g.dart b/packages/core/lib/settings/pubspec.g.dart
diff --git a/packages/core/test_resources/actual_data/assets_camel_case.gen.dart b/packages/core/test_resources/actual_data/assets_camel_case.gen.dart
diff --git a/packages/core/test_resources/pubspec_assets_exclude_files.yaml b/packages/core/test_resources/pubspec_assets_exclude_files.yaml
@@ -7,10 +7,11 @@ flutter_gen:
   integrations:
     flutter_svg: true
 
-  exclude:
-    - assets/images/chip3/*.jpg
-    - assets/images/*.png
-    - assets/**/icons/*
+  assets: 
+    exclude:
+      - assets/images/chip3/*.jpg
+      - assets/images/*.png
+      - assets/**/icons/*
 
 flutter:
   uses-material-design: true