Skip to content

Commit

Permalink
Merge branch 'main' into asim/mirai_web3
Browse files Browse the repository at this point in the history
  • Loading branch information
i-asimkhan authored Mar 16, 2024
2 parents b731525 + 2e75287 commit a1b68ea
Show file tree
Hide file tree
Showing 91 changed files with 3,863 additions and 1,246 deletions.
127 changes: 71 additions & 56 deletions examples/mirai_gallery/assets/json/bottom_nav_bar_example.json
Original file line number Diff line number Diff line change
@@ -1,66 +1,81 @@
{
"type": "scaffold",
"appBar": {
"type": "appBar",
"title": {
"type": "text",
"data": "Selected label"
}
},
"body": {
"type": "row",
"mainAxisAlignment": "center",
"crossAxisAlignment": "center",
"children": [
{
"type": "column",
"mainAxisAlignment": "center",
"crossAxisAlignment": "center",
"children": [
{
"type": "defaultBottomNavigationController",
"length": 3,
"child": {
"type": "scaffold",
"appBar": {
"type": "appBar",
"title": {
"type": "text",
"data": "Bottom Navigation Screen"
}
},
"body": {
"type": "bottomNavigationView",
"children": [
{
"type": "center",
"child": {
"type": "text",
"data": "Home",
"style": {
"fontSize": 17
"fontSize": 24
}
}
},
{
"type": "center",
"child": {
"type": "text",
"data": "Search",
"style": {
"fontSize": 24
}
}
},
{
"type": "center",
"child": {
"type": "text",
"data": "Profile",
"style": {
"fontSize": 24
}
}
]
}
]
},
"bottomNavigationBar": {
"type": "bottomNavigationBar",
"items": [
{
"type": "navigationBarItem",
"label": "Comments",
"icon": {
"type": "icon",
"iconType": "material",
"icon": "comment",
"size": 24
}
},
{
"type": "navigationBarItem",
"label": "Calendar",
"icon": {
"type": "icon",
"iconType": "material",
"icon": "calendar_month",
"size": 24
}
},
{
"type": "navigationBarItem",
"label": "Account",
"icon": {
"type": "icon",
"iconType": "cupertino",
"icon": "profile_circled",
"size": 24
]
},
"bottomNavigationBar": {
"type": "bottomNavigationBar",
"items": [
{
"type": "navigationBarItem",
"label": "Home",
"icon": {
"type": "icon",
"iconType": "material",
"icon": "home"
}
},
{
"type": "navigationBarItem",
"label": "Search",
"icon": {
"type": "icon",
"iconType": "material",
"icon": "search"
}
},
{
"type": "navigationBarItem",
"label": "Profile",
"icon": {
"type": "icon",
"iconType": "material",
"icon": "account_circle"
}
}
}
]
]
}
}
}
6 changes: 1 addition & 5 deletions examples/mirai_gallery/assets/json/container_example.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,8 @@
{
"type": "container",
"color": "#672BFF",
"clipBehavior": "hardEdge",
"height": 250,
"width": 200,
"decoration": {
}
"width": 200
},
{
"type": "sizedBox",
Expand All @@ -32,7 +29,6 @@
{
"type": "container",
"color": "#FC5632",
"clipBehavior": "hardEdge",
"height": 250,
"width": 200,
"child": {
Expand Down
Loading

0 comments on commit a1b68ea

Please sign in to comment.