Merge pull request #285 from Securrency-OSS/dv/border-radius

feat: Added a new way to redefine how we declare BorderRadius
Securrency-OSS · Mar 2, 2024 · 2ef7209 · 2ef7209
2 parents 7600243 + 6274a8e
commit 2ef7209
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 14 deletions.
diff --git a/examples/mirai_gallery/assets/json/text_field_example.json b/examples/mirai_gallery/assets/json/text_field_example.json
@@ -246,12 +246,7 @@
               "labelText": "Gradient TextField",
               "border": {
                 "type": "outlineInputBorder",
-                "borderRadius": {
-                  "topLeft": 8,
-                  "topRight": 8,
-                  "bottomLeft": 8,
-                  "bottomRight": 8
-                },
+                "borderRadius": 80,
                 "gradient": {
                   "colors": [
                     "#FF0000",

diff --git a/packages/mirai/lib/src/parsers/mirai_border_radius/mirai_border_radius.dart b/packages/mirai/lib/src/parsers/mirai_border_radius/mirai_border_radius.dart
@@ -13,8 +13,37 @@ class MiraiBorderRadius with _$MiraiBorderRadius {
     @Default(0.0) double bottomRight,
   }) = _MiraiBorder;
 
-  factory MiraiBorderRadius.fromJson(Map<String, dynamic> json) =>
-      _$MiraiBorderRadiusFromJson(json);
+  factory MiraiBorderRadius.fromJson(dynamic json) => _fromJson(json);
+
+  static MiraiBorderRadius _fromJson(dynamic json) {
+    Map<String, dynamic> resultantJson;
+
+    if (json is num) {
+      resultantJson = {
+        "topLeft": json,
+        "topRight": json,
+        "bottomLeft": json,
+        "bottomRight": json
+      };
+    } else if (json is List<dynamic> && json.length == 4) {
+      bool allElementsNum = json.every((element) => element is num);
+      if (!allElementsNum) {
+        throw ArgumentError('Invalid input format for MiraiEdgeInsets');
+      }
+      resultantJson = {
+        "topLeft": json[0],
+        "topRight": json[1],
+        "bottomLeft": json[2],
+        "bottomRight": json[3]
+      };
+    } else if (json is Map<String, dynamic>) {
+      resultantJson = json;
+    } else {
+      throw ArgumentError('Invalid input format for MiraiEdgeInsets');
+    }
+
+    return _$MiraiBorderRadiusFromJson(resultantJson);
+  }
 }
 
 extension MiraiBorderRadiusParser on MiraiBorderRadius? {

diff --git a/packages/mirai/lib/src/parsers/mirai_box_decoration/mirai_box_decoration.g.dart b/packages/mirai/lib/src/parsers/mirai_box_decoration/mirai_box_decoration.g.dart
diff --git a/packages/mirai/lib/src/parsers/mirai_input_border/mirai_input_border.g.dart b/packages/mirai/lib/src/parsers/mirai_input_border/mirai_input_border.g.dart
diff --git a/...irai/lib/src/parsers/mirai_rounded_rectangle_border/mirai_rounded_rectangle_border.g.dart b/...irai/lib/src/parsers/mirai_rounded_rectangle_border/mirai_rounded_rectangle_border.g.dart