flr 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b4e690c98b54e5cb00ed7136585e7d86d47b14a499fff89b8c607faf750cfb7
-  data.tar.gz: 5a7335ddb9a37e4d94aee57ce86d291ea971d9ead763663f91c355210b07e0a2
+  metadata.gz: 316ebc8040b9907879cfd70d48163feb0804aba01ee376b21a7cb2c3dfa84347
+  data.tar.gz: a45282c1106560d8d4b0c7acb35a0f221a2e0e3fe057977aa339d78f80af43f1
 SHA512:
-  metadata.gz: 14dd754b4e3277fc773128058f8a167501c519e056aeb18e8e7f4ae0b1eb351d88da61b0482509ef2fbe3bd378d24cbaf09f39b52d8ae8f1412b92deb25e819a
-  data.tar.gz: 9ba05b656a9ed2c2e1c95004f1f4a0ce2e2fa1b43a0650164c3de5415f886376cb0a8bd3a3cfbda66ec5b7eccb97a960fb0fa958ee0194f06a12d71d4d683c66
+  metadata.gz: ff1cd35e4be19a8b82af8c27c996ab67e7d37106fd3fcc2f843ea04cb01d89a6b5a65c437308d16cf79d02c9d9b171e6e6d994393ccd05fbf2fdb735b7b9b2c4
+  data.tar.gz: be14c260f62e3421587569ec97f091278e98443474f3e074e7ccb1efcb6ee95d36c6293269c95c593472522859a88b487a43bac23bf77111b29d3f0200189b53

data/.gitignore

@@ -37,4 +37,5 @@ build/
 # Local Pubspec Tests
 pubspec.yaml
 pubspec.lock
-.packages
+.packages
+.dart_tool/

data/CHANGELOG.md

@@ -1,6 +1,10 @@
+## 3.2.0
+
+- Support for nullsafety-feature of Dart 2.12
+
 ## 3.1.0
 
-- Support for processing(init/generate/monitor) multi projects(the main project and its sub projects in one workspace)
+- Support for processing (init/generate/monitor) multi projects (the main project and its sub projects in one workspace)
 
 - Support for auto merging old asset specifications when specifying new assets
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    flr (3.1.0)
+    flr (3.2.0)
       bundler (~> 2.0, >= 2.0.2)
       listen (~> 3.0, >= 3.2.1)
       thor (~> 1.0, >= 1.0.1)

data/lib/flr/command.rb

@@ -154,11 +154,21 @@ Flr recommends the following flutter resource structure schemes:
         return r_dart_library_version
       end
 
-      version_with_hotfix_str = flutter_version_result.split(" ")[1]
-      version_without_hotfix_str = version_with_hotfix_str.split("+")[0]
+      flutter_version_with_hotfix_str = flutter_version_result.split(" ")[1]
+      flutter_version_without_hotfix_str = flutter_version_with_hotfix_str.split("+")[0]
 
-      if Version.new(version_with_hotfix_str) >= Version.new("1.10.15")
+      dart_version_str = flutter_version_result.split("Dart")[1]
+      dart_version_str.strip!
+
+      puts("the flutter development environment is:")
+      puts("  - Flutter SDK Version: #{flutter_version_with_hotfix_str}")
+      puts("  - Dart SDK Version: #{dart_version_str}")
+
+      if Version.new(flutter_version_with_hotfix_str) >= Version.new("1.10.15")
         r_dart_library_version = "0.2.1"
+        if Version.new(dart_version_str) >= Version.new("2.12.0")
+          r_dart_library_version = "0.4.0-nullsafety.0"
+        end
       end
 
       return r_dart_library_version
@@ -297,14 +307,10 @@ Flr recommends the following flutter resource structure schemes:
       #
       # r_dart_library的依赖声明：
       # ```yaml
-      # r_dart_library:
-      #  git:
-      #    url: "https://github.com/YK-Unit/r_dart_library.git"
-      #    ref: 0.1.1
+      # r_dart_library: 0.1.1
       # ```
       r_dart_library_version = get_r_dart_library_version
-      r_dart_library_config = Hash["git" => Hash["url" => "https://github.com/YK-Unit/r_dart_library.git", "ref" => r_dart_library_version]]
-      dependencies_config["r_dart_library"] = r_dart_library_config
+      dependencies_config["r_dart_library"] = r_dart_library_version
       pubspec_config["dependencies"] = dependencies_config
 
       puts("add flr configuration into pubspec.yaml done!")

data/lib/flr/util/code_util.rb

@@ -5,6 +5,36 @@ module Flr
   # 代码生成相关的工具类方法
   class CodeUtil
 
+    @@should_support_nullsafety = nil
+
+    def self.should_support_nullsafety
+      if @@should_support_nullsafety != nil
+        return @@should_support_nullsafety
+      end
+
+      # $ flutter --version
+      # Flutter 1.12.13+hotfix.5 • channel stable • https://github.com/flutter/flutter.git
+      # Framework • revision 27321ebbad (5 weeks ago) • 2019-12-10 18:15:01 -0800
+      # Engine • revision 2994f7e1e6
+      # Tools • Dart 2.7.0
+      flutter_version_result = `flutter --version`
+      if (flutter_version_result.nil? == true || flutter_version_result.empty? == true)
+        @@should_support_nullsafety = false
+        return @@should_support_nullsafety
+      end
+
+      dart_version_str = flutter_version_result.split("Dart")[1]
+      dart_version_str.strip!
+
+      if Version.new(dart_version_str) >= Version.new("2.12.0")
+        @@should_support_nullsafety = true
+        return @@should_support_nullsafety
+      end
+
+      @@should_support_nullsafety = false
+      return @@should_support_nullsafety
+    end
+
     # generate_R_class(package_name) -> string
     #
     # 根据模板生成 R class 的代码
@@ -66,6 +96,58 @@ class R {
 /// - fileBasename：example.png
 /// - fileBasenameNoExtension：example
 /// - fileExtname：.png
+      CODE
+
+      if should_support_nullsafety
+        code += <<-CODE
+class AssetResource {
+  /// Creates an object to hold the asset resource’s metadata.
+  const AssetResource(this.assetName, {this.packageName});
+
+  /// The name of the main asset from the set of asset resources to choose from.
+  final String assetName;
+
+  /// The name of the package from which the asset resource is included.
+  final String? packageName;
+
+  /// The name used to generate the key to obtain the asset resource. For local assets
+  /// this is [assetName], and for assets from packages the [assetName] is
+  /// prefixed 'packages/<package_name>/'.
+  String get keyName => packageName == null ? assetName : "packages/$packageName/$assetName";
+
+  /// The file basename of the asset resource.
+  String get fileBasename {
+    final basename = path.basename(assetName);
+    return basename;
+  }
+
+  /// The no extension file basename of the asset resource.
+  String get fileBasenameNoExtension {
+    final basenameWithoutExtension = path.basenameWithoutExtension(assetName);
+    return basenameWithoutExtension;
+  }
+
+  /// The file extension name of the asset resource.
+  String get fileExtname {
+    final extension = path.extension(assetName);
+    return extension;
+  }
+
+  /// The directory path name of the asset resource.
+  String get fileDirname {
+    var dirname = assetName;
+    if (packageName != null) {
+      final packageStr = "packages/$packageName/";
+      dirname = dirname.replaceAll(packageStr, "");
+    }
+    final filenameStr = "$fileBasename/";
+    dirname = dirname.replaceAll(filenameStr, "");
+    return dirname;
+  }
+}
+        CODE
+      else
+        code += <<-CODE
 class AssetResource {
   /// Creates an object to hold the asset resource’s metadata.
   const AssetResource(this.assetName, {this.packageName}) : assert(assetName != null);
@@ -111,7 +193,8 @@ class AssetResource {
     return dirname;
   }
 }
-      CODE
+        CODE
+      end
 
       return code
     end
@@ -426,14 +509,25 @@ class _R_Image {
         asset_id = svg_image_asset_id_dict[image_asset]
         asset_comment = generate_asset_comment(image_asset, package_name)
 
-        g_Asset_method_code = <<-CODE
+        if should_support_nullsafety
+          g_Asset_method_code = <<-CODE
+  /// #{asset_comment}
+  // ignore: non_constant_identifier_names
+  AssetSvg #{asset_id}({required double width, required double height}) {
+    final imageProvider = AssetSvg(asset.#{asset_id}.keyName, width: width, height: height);
+    return imageProvider;
+  }
+          CODE
+        else
+          g_Asset_method_code = <<-CODE
   /// #{asset_comment}
   // ignore: non_constant_identifier_names
   AssetSvg #{asset_id}({@required double width, @required double height}) {
     final imageProvider = AssetSvg(asset.#{asset_id}.keyName, width: width, height: height);
     return imageProvider;
   }
-        CODE
+          CODE
+        end
 
         all_g_Asset_method_code += g_Asset_method_code
       end

data/lib/flr/version.rb

@@ -1,9 +1,9 @@
 module Flr
   # 工具版本号
-  VERSION = "3.1.0"
+  VERSION = "3.2.0"
 
   # 核心逻辑版本号
-  CORE_VERSION = "3.1.0"
+  CORE_VERSION = "3.2.0"
 
   class Version < Array
     def initialize str

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flr
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - York
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-27 00:00:00.000000000 Z
+date: 2021-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -124,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.13
 signing_key: 
 specification_version: 4
 summary: 'Flr(Flutter-R): A Flutter Resource Manager CLI TooL.'