Merge branch 'main' into yousufmyk/feature/replace_image_network

Securrency-OSS · Feb 29, 2024 · a711197 · a711197
2 parents 39362da + a403f12
commit a711197
Show file tree

Hide file tree

Showing 44 changed files with 917 additions and 139 deletions.
diff --git a/examples/mirai_gallery/assets/json/home_screen.json b/examples/mirai_gallery/assets/json/home_screen.json
@@ -1145,6 +1145,40 @@
               "assetPath": "assets/json/chip_example.json"
             }
           }
+        },
+        {
+          "type": "listTile",
+          "leading": {
+            "type": "icon",
+            "iconType": "material",
+            "icon": "wrap_text"
+          },
+          "title": {
+            "type": "text",
+            "data": "Wrap",
+            "align": "center",
+            "style": {
+              "fontSize": 21
+            }
+          },
+          "subtitle": {
+            "type": "text",
+            "data": "A widget to creates a wrap layout",
+            "align": "center",
+            "style": {
+              "fontSize": 12
+            }
+          },
+          "isThreeLine": true,
+          "style": "list",
+          "onTap": {
+            "actionType": "navigate",
+            "navigationStyle": "push",
+            "widgetJson": {
+              "type": "exampleScreen",
+              "assetPath": "assets/json/wrap_example.json"
+            }
+          }
         }
       ]
     }

diff --git a/examples/mirai_gallery/assets/json/wrap_example.json b/examples/mirai_gallery/assets/json/wrap_example.json
@@ -0,0 +1,180 @@
+{
+  "type": "scaffold",
+  "appBar": {
+    "type": "appBar",
+    "title": {
+      "type": "text",
+      "data": "Wrap Demo"
+    }
+  },
+  "body": {
+    "type": "center",
+    "child": {
+      "type": "wrap",
+      "spacing": 8.0,
+      "runSpacing": 4.0,
+      "children": [
+        {
+          "type": "container",
+          "color": "#FFCDD2",
+          "width": 100,
+          "height": 100,
+          "child": {
+            "type": "center",
+            "child": {
+              "type": "text",
+              "data": "1",
+              "style": {
+                "color": "#FFFFFF"
+              }
+            }
+          }
+        },
+        {
+          "type": "container",
+          "color": "#F8BBD0",
+          "width": 100,
+          "height": 100,
+          "child": {
+            "type": "center",
+            "child": {
+              "type": "text",
+              "data": "2",
+              "style": {
+                "color": "#FFFFFF"
+              }
+            }
+          }
+        },
+        {
+          "type": "container",
+          "color": "#E1BEE7",
+          "width": 100,
+          "height": 100,
+          "child": {
+            "type": "center",
+            "child": {
+              "type": "text",
+              "data": "3",
+              "style": {
+                "color": "#FFFFFF"
+              }
+            }
+          }
+        },
+        {
+          "type": "container",
+          "color": "#D1C4E9",
+          "width": 100,
+          "height": 100,
+          "child": {
+            "type": "center",
+            "child": {
+              "type": "text",
+              "data": "4",
+              "style": {
+                "color": "#FFFFFF"
+              }
+            }
+          }
+        },
+        {
+          "type": "container",
+          "color": "#C5CAE9",
+          "width": 100,
+          "height": 100,
+          "child": {
+            "type": "center",
+            "child": {
+              "type": "text",
+              "data": "5",
+              "style": {
+                "color": "#FFFFFF"
+              }
+            }
+          }
+        },
+        {
+          "type": "container",
+          "color": "#BBDEFB",
+          "width": 100,
+          "height": 100,
+          "child": {
+            "type": "center",
+            "child": {
+              "type": "text",
+              "data": "6",
+              "style": {
+                "color": "#FFFFFF"
+              }
+            }
+          }
+        },
+        {
+          "type": "container",
+          "color": "#B3E5FC",
+          "width": 100,
+          "height": 100,
+          "child": {
+            "type": "center",
+            "child": {
+              "type": "text",
+              "data": "7",
+              "style": {
+                "color": "#FFFFFF"
+              }
+            }
+          }
+        },
+        {
+          "type": "container",
+          "color": "#B2EBF2",
+          "width": 100,
+          "height": 100,
+          "child": {
+            "type": "center",
+            "child": {
+              "type": "text",
+              "data": "8",
+              "style": {
+                "color": "#FFFFFF"
+              }
+            }
+          }
+        },
+        {
+          "type": "container",
+          "color": "#B2DFDB",
+          "width": 100,
+          "height": 100,
+          "child": {
+            "type": "center",
+            "child": {
+              "type": "text",
+              "data": "9",
+              "style": {
+                "color": "#FFFFFF"
+              }
+            }
+          }
+        },
+        {
+          "type": "container",
+          "color": "#C8E6C9",
+          "width": 100,
+          "height": 100,
+          "child": {
+            "type": "center",
+            "child": {
+              "type": "text",
+              "data": "10",
+              "style": {
+                "color": "#FFFFFF"
+              }
+            }
+          }
+        }
+      ]
+    }
+  }
+}
diff --git a/packages/mirai/lib/src/framework/mirai.dart b/packages/mirai/lib/src/framework/mirai.dart
@@ -7,6 +7,7 @@ import 'package:flutter/services.dart';
 import 'package:mirai/src/action_parsers/action_parsers.dart';
 import 'package:mirai/src/action_parsers/mirai_network_request/mirai_network_request_parser.dart';
 import 'package:mirai/src/framework/mirai_registry.dart';
+import 'package:mirai/src/parsers/mirai_wrap/mirai_wrap.dart';
 import 'package:mirai/src/parsers/parsers.dart';
 import 'package:mirai/src/services/mirai_network_service.dart';
 import 'package:mirai/src/utils/log.dart';
@@ -67,6 +68,7 @@ class Mirai {
     const MiraiGridViewParser(),
     const MiraiBottomNavigationViewParser(),
     const MiraiDefaultBottomNavigationControllerParser(),
+    const MiraiWrapParser(),
   ];
 
   static final _actionParsers = <MiraiActionParser>[

diff --git a/packages/mirai/lib/src/parsers/mirai_alert_dialog/mirai_alert_dialog.g.dart b/packages/mirai/lib/src/parsers/mirai_alert_dialog/mirai_alert_dialog.g.dart
diff --git a/packages/mirai/lib/src/parsers/mirai_app_bar/mirai_app_bar.g.dart b/packages/mirai/lib/src/parsers/mirai_app_bar/mirai_app_bar.g.dart
diff --git a/packages/mirai/lib/src/parsers/mirai_app_bar_theme/mirai_app_bar_theme.g.dart b/packages/mirai/lib/src/parsers/mirai_app_bar_theme/mirai_app_bar_theme.g.dart
diff --git a/packages/mirai/lib/src/parsers/mirai_bottom_app_bar_theme/mirai_bottom_app_bar_theme.g.dart b/packages/mirai/lib/src/parsers/mirai_bottom_app_bar_theme/mirai_bottom_app_bar_theme.g.dart
diff --git a/packages/mirai/lib/src/parsers/mirai_bottom_nav_bar_theme/mirai_bottom_nav_bar_theme.g.dart b/packages/mirai/lib/src/parsers/mirai_bottom_nav_bar_theme/mirai_bottom_nav_bar_theme.g.dart
diff --git a/...ages/mirai/lib/src/parsers/mirai_bottom_navigation_bar/mirai_bottom_navigation_bar.g.dart b/...ages/mirai/lib/src/parsers/mirai_bottom_navigation_bar/mirai_bottom_navigation_bar.g.dart
diff --git a/packages/mirai/lib/src/parsers/mirai_button_style/mirai_button_style.g.dart b/packages/mirai/lib/src/parsers/mirai_button_style/mirai_button_style.g.dart
diff --git a/packages/mirai/lib/src/parsers/mirai_card/mirai_card.g.dart b/packages/mirai/lib/src/parsers/mirai_card/mirai_card.g.dart
diff --git a/packages/mirai/lib/src/parsers/mirai_card_theme_data/mirai_card_theme_data.g.dart b/packages/mirai/lib/src/parsers/mirai_card_theme_data/mirai_card_theme_data.g.dart