Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions examples/mirai_gallery/assets/json/divider_example.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"type": "scaffold",
"appBar": {
"type": "appBar",
"title": {
"type": "text",
"data": "Divider"
}
},
"body": {
"type": "listView",
"children": [{
"type": "divider",
"thickness": 5,
"height": 5,
"color": "#672BFF"
},
{
"type": "sizedBox",
"height": 20
},
{
"type": "divider",
"thickness": 3,
"height": 3,
"color": "#FC5632"
},
{
"type": "sizedBox",
"height": 20
},
{
"type": "divider",
"thickness": 2,
"height": 2,
"color": "#32FC88"
}]
}
}
34 changes: 34 additions & 0 deletions examples/mirai_gallery/assets/json/home_screen.json
Original file line number Diff line number Diff line change
Expand Up @@ -1319,6 +1319,40 @@
}
}
},
{
"type": "listTile",
"leading": {
"type": "icon",
"iconType": "material",
"icon": "star"
},
"title": {
"type": "text",
"data": "Mirai Divider",
"align": "center",
"style": {
"fontSize": 21
}
},
"subtitle": {
"type": "text",
"data": "A Material Design Divider widget",
"align": "center",
"style": {
"fontSize": 12
}
},
"isThreeLine": false,
"style": "list",
"onTap": {
"actionType": "navigate",
"navigationStyle": "push",
"widgetJson": {
"type": "exampleScreen",
"assetPath": "assets/json/divider_example.json"
}
}
},
{
"type": "sizedBox",
"height": 24.0
Expand Down
2 changes: 2 additions & 0 deletions packages/mirai/lib/src/framework/mirai.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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_divider/mirai_divider_parser.dart';
import 'package:mirai/src/parsers/parsers.dart';
import 'package:mirai/src/services/mirai_network_service.dart';
import 'package:mirai/src/utils/log.dart';
Expand Down Expand Up @@ -82,6 +83,7 @@ class Mirai {
const MiraiTableCellParser(),
const MiraiCarouselViewParser(),
const MiraiColoredBoxParser(),
const MiraiDividerParser()
];

static final _actionParsers = <MiraiActionParser>[
Expand Down
16 changes: 16 additions & 0 deletions packages/mirai/lib/src/parsers/mirai_divider/mirai_divider.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import 'package:freezed_annotation/freezed_annotation.dart';

part 'mirai_divider.freezed.dart'; // Auto-generated Freezed file
part 'mirai_divider.g.dart'; // Auto-generated JSON serialization file
Comment on lines +3 to +4
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These 2 generated files are missing. We need to include them as well.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@divyanshub024 added this.


@freezed
class MiraiDivider with _$MiraiDivider {
const factory MiraiDivider({
double? thickness,
double? height,
String? color,
}) = _MiraiDivider;

factory MiraiDivider.fromJson(Map<String, dynamic> json) =>
_$MiraiDividerFromJson(json);
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions packages/mirai/lib/src/parsers/mirai_divider/mirai_divider.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import 'package:flutter/material.dart';
import 'package:mirai/mirai.dart';
import 'package:mirai/src/utils/widget_type.dart';

class MiraiDividerParser extends MiraiParser<MiraiDivider> {
const MiraiDividerParser();

@override
MiraiDivider getModel(Map<String, dynamic> json) {
return MiraiDivider.fromJson(json);
}

@override
Widget parse(BuildContext context, MiraiDivider model) {
return Divider(
thickness: model.thickness,
color: model.color.toColor(context),
height: model.height,
);
}

@override
String get type => WidgetType.divider.name;
}
1 change: 1 addition & 0 deletions packages/mirai/lib/src/parsers/parsers.dart
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ export 'package:mirai/src/parsers/mirai_container/mirai_container.dart';
export 'package:mirai/src/parsers/mirai_default_bottom_navigation_controller/mirai_default_bottom_navigation_controller.dart';
export 'package:mirai/src/parsers/mirai_default_tab_controller/mirai_default_tab_controller.dart';
export 'package:mirai/src/parsers/mirai_dialog_theme/mirai_dialog_theme.dart';
export 'package:mirai/src/parsers/mirai_divider/mirai_divider.dart';
export 'package:mirai/src/parsers/mirai_edge_insets/mirai_edge_insets.dart';
export 'package:mirai/src/parsers/mirai_elevated_button/mirai_elevated_button.dart';
export 'package:mirai/src/parsers/mirai_expanded/mirai_expanded.dart';
Expand Down
1 change: 1 addition & 0 deletions packages/mirai/lib/src/utils/widget_type.dart
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,5 @@ enum WidgetType {
tableCell,
carouselView,
coloredBox,
divider
}
Loading