Merge pull request #233 from yumemi-inc/feature/fix_flavor_issue

dart-define系のissueを修正

apps/app/android/app/build.gradle

@@ -29,7 +29,8 @@ if (project.hasProperty('dart-defines')) {
         .split(',')
         .collectEntries { entry ->
             def pair = new String(entry.decodeBase64(), 'UTF-8').split('=')
-            [(pair.first()): pair.last()]
+            // valueがemtpyの時にlastがkeyになるので、lengthが2でなければ空のmapにする
+            pair.length == 2 ? [(pair.first()): pair.last()] : [:]
         }
 }
 
@@ -54,7 +55,9 @@ android {
 
     defaultConfig {
         applicationId = "${dartDefines.appId}"
-        applicationIdSuffix = "${dartDefines.appIdSuffix}"
+        if (dartDefines.appIdSuffix != null) {
+            applicationIdSuffix = "${dartDefines.appIdSuffix}"
+        }
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
         minSdkVersion = flutter.minSdkVersion

apps/app/lib/app_build_config.dart

@@ -9,13 +9,7 @@ final class AppBuildConfig implements BuildConfig {
     required this.buildNumber,
     required this.buildSignature,
     this.installerStore,
-  }) : flavor = switch (appFlavor) {
-          'dev' => Flavor.dev,
-          'stg' => Flavor.stg,
-          'prod' => Flavor.prd,
-          // default flavor
-          _ => Flavor.dev,
-        };
+  }) : flavor = Flavor.values.byName(appFlavor);
 
   @override
   String appName;

packages/cores/core/lib/extension.dart

@@ -0,0 +1 @@
+export 'src/extension/enum.dart';

packages/cores/core/lib/src/extension/enum.dart

@@ -0,0 +1,12 @@
+extension EnumByName<T extends Enum> on Iterable<T> {
+  // byNameで取得できなかった場合はnullを返す版
+  T? byNameOrNull(String name) {
+    for (final MapEntry(key: key, value: value) in asNameMap().entries) {
+      if (key == name) {
+        return value;
+      }
+    }
+
+    return null;
+  }
+}