Skip to content

Commit

Permalink
Refactor imports
Browse files Browse the repository at this point in the history
  • Loading branch information
@divyanshub024
divyanshub024 committed Feb 20, 2024
1 parent 8a8d1df commit dc359d4
Show file tree
Hide file tree
Showing 19 changed files with 73 additions and 40 deletions.
2 changes: 1 addition & 1 deletion examples/mirai_gallery/macos/Podfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: 236401fc2c932af29a9fcf0e97baeeb2d750d367

COCOAPODS: 1.12.1
COCOAPODS: 1.14.3
2 changes: 1 addition & 1 deletion examples/mirai_gallery/macos/Runner.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0920;
LastUpgradeCheck = 1430;
LastUpgradeCheck = 1510;
ORGANIZATIONNAME = "";
TargetAttributes = {
331C80D4294CF70F00263BE5 = {
Expand Down
2 changes: 1 addition & 1 deletion examples/mirai_gallery/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1430"
LastUpgradeVersion = "1510"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
58 changes: 41 additions & 17 deletions examples/mirai_gallery/pubspec.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,30 @@ packages:
url: "https://pub.dev"
source: hosted
version: "6.7.1"
leak_tracker:
dependency: transitive
description:
name: leak_tracker
sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
url: "https://pub.dev"
source: hosted
version: "10.0.0"
leak_tracker_flutter_testing:
dependency: transitive
description:
name: leak_tracker_flutter_testing
sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
url: "https://pub.dev"
source: hosted
version: "2.0.1"
leak_tracker_testing:
dependency: transitive
description:
name: leak_tracker_testing
sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
url: "https://pub.dev"
source: hosted
version: "2.0.1"
lints:
dependency: transitive
description:
Expand Down Expand Up @@ -359,26 +383,26 @@ packages:
dependency: transitive
description:
name: matcher
sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
url: "https://pub.dev"
source: hosted
version: "0.12.16"
version: "0.12.16+1"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
url: "https://pub.dev"
source: hosted
version: "0.5.0"
version: "0.8.0"
meta:
dependency: transitive
description:
name: meta
sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
url: "https://pub.dev"
source: hosted
version: "1.10.0"
version: "1.11.0"
mime:
dependency: transitive
description:
Expand All @@ -393,7 +417,7 @@ packages:
path: "../../packages/mirai"
relative: true
source: path
version: "0.5.1"
version: "0.6.0"
mirai_framework:
dependency: "direct overridden"
description:
Expand Down Expand Up @@ -428,10 +452,10 @@ packages:
dependency: transitive
description:
name: path
sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
url: "https://pub.dev"
source: hosted
version: "1.8.3"
version: "1.9.0"
plugin_platform_interface:
dependency: transitive
description:
Expand Down Expand Up @@ -589,22 +613,22 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.1.4"
watcher:
vm_service:
dependency: transitive
description:
name: watcher
sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8"
name: vm_service
sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
url: "https://pub.dev"
source: hosted
version: "1.1.0"
web:
version: "13.0.0"
watcher:
dependency: transitive
description:
name: web
sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
name: watcher
sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8"
url: "https://pub.dev"
source: hosted
version: "0.3.0"
version: "1.1.0"
web_socket_channel:
dependency: transitive
description:
Expand Down
1 change: 1 addition & 0 deletions packages/mirai/lib/src/action_parsers/mirai_dialog_action/mirai_dialog_action.g.dart
View file

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

11 changes: 1 addition & 10 deletions packages/mirai/lib/src/framework/mirai.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,6 @@ import 'package:mirai/src/action_parsers/action_parsers.dart';
import 'package:mirai/src/framework/mirai_registry.dart';
import 'package:mirai/src/network/mirai_network.dart';
import 'package:mirai/src/network/mirai_request.dart';
import 'package:mirai/src/parsers/mirai_align/mirai_align_parser.dart';
import 'package:mirai/src/parsers/mirai_center/mirai_center_parser.dart';
import 'package:mirai/src/parsers/mirai_check_box_widget/mirai_check_box_widget_parser.dart';
import 'package:mirai/src/parsers/mirai_form/mirai_form_parser.dart';
import 'package:mirai/src/parsers/mirai_form_field/mirai_form_field_parser.dart';
import 'package:mirai/src/parsers/mirai_fractionally_sized_box/mirai_fractionally_sized_box_parser.dart';
import 'package:mirai/src/parsers/mirai_refresh_indicator/mirai_refresh_indicator_parser.dart';
import 'package:mirai/src/parsers/mirai_switch/mirai_switch_parser.dart';
import 'package:mirai/src/parsers/mirai_tab/mirai_tab_parser.dart';
import 'package:mirai/src/parsers/parsers.dart';
import 'package:mirai/src/utils/log.dart';
import 'package:mirai_framework/mirai_framework.dart';
Expand Down Expand Up @@ -58,7 +49,7 @@ class Mirai {
const MiraiBottomNavigationBarParser(),
const MiraiListViewParser(),
const MiraiDefaultTabControllerParser(),
const MiraiScrollViewParser(),
const MiraiSingleChildScrollViewParser(),
const MiraiAlertDialogParser(),
const MiraiTabParser(),
const MiraiFormParser(),
Expand Down
2 changes: 1 addition & 1 deletion packages/mirai/lib/src/parsers/mirai_align/mirai_align.dart
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'package:freezed_annotation/freezed_annotation.dart';
import 'package:mirai/src/parsers/parsers.dart';

export 'package:mirai/src/parsers/mirai_stack/mirai_stack_parser.dart';
export 'package:mirai/src/parsers/mirai_align/mirai_align_parser.dart';

part 'mirai_align.freezed.dart';
part 'mirai_align.g.dart';
Expand Down
2 changes: 1 addition & 1 deletion packages/mirai/lib/src/parsers/mirai_center/mirai_center.dart
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:freezed_annotation/freezed_annotation.dart';

export 'package:mirai/src/parsers/mirai_sized_box/mirai_sized_box_parser.dart';
export 'package:mirai/src/parsers/mirai_center/mirai_center_parser.dart';

part 'mirai_center.freezed.dart';
part 'mirai_center.g.dart';
Expand Down
2 changes: 2 additions & 0 deletions packages/mirai/lib/src/parsers/mirai_check_box_widget/mirai_check_box_widget.dart
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import 'package:freezed_annotation/freezed_annotation.dart';
import 'package:mirai/src/parsers/mirai_material_color/mirai_material_color.dart';

export 'package:mirai/src/parsers/mirai_check_box_widget/mirai_check_box_widget_parser.dart';

part 'mirai_check_box_widget.freezed.dart';
part 'mirai_check_box_widget.g.dart';

Expand Down
2 changes: 1 addition & 1 deletion packages/mirai/lib/src/parsers/mirai_form/mirai_form.dart
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:freezed_annotation/freezed_annotation.dart';

export 'package:mirai/src/parsers/mirai_form/mirai_form.dart';
export 'package:mirai/src/parsers/mirai_form/mirai_form_parser.dart';

part 'mirai_form.freezed.dart';
part 'mirai_form.g.dart';
Expand Down
2 changes: 2 additions & 0 deletions packages/mirai/lib/src/parsers/mirai_form_field/mirai_form_field.dart
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import 'package:freezed_annotation/freezed_annotation.dart';

export 'package:mirai/src/parsers/mirai_form_field/mirai_form_field_parser.dart';

part 'mirai_form_field.freezed.dart';
part 'mirai_form_field.g.dart';

Expand Down
2 changes: 1 addition & 1 deletion ...ages/mirai/lib/src/parsers/mirai_fractionally_sized_box/mirai_fractionally_sized_box.dart
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'package:freezed_annotation/freezed_annotation.dart';
import 'package:mirai/mirai.dart';

export 'package:mirai/src/parsers/mirai_sized_box/mirai_sized_box_parser.dart';
export 'package:mirai/src/parsers/mirai_fractionally_sized_box/mirai_fractionally_sized_box_parser.dart';

part 'mirai_fractionally_sized_box.freezed.dart';
part 'mirai_fractionally_sized_box.g.dart';
Expand Down
6 changes: 4 additions & 2 deletions packages/mirai/lib/src/parsers/mirai_refresh_indicator/mirai_refresh_indicator_parser.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@ import 'dart:convert';

import 'package:dio/dio.dart';
import 'package:flutter/material.dart';
import 'package:mirai/mirai.dart';
import 'package:mirai/src/framework/framework.dart';
import 'package:mirai/src/parsers/mirai_refresh_indicator/mirai_refresh_indicator.dart';
import 'package:mirai/src/utils/color_utils.dart';
import 'package:mirai/src/utils/widget_type.dart';
import 'package:mirai_framework/mirai_framework.dart';

class MiraiRefreshIndicatorParser extends MiraiParser<MiraiRefreshIndicator> {
const MiraiRefreshIndicatorParser();
Expand Down Expand Up @@ -63,7 +65,7 @@ class _RefreshIndicatorWidgetState extends State<_RefreshIndicatorWidget> {
}
}
},
color: widget.model.color.toColor(context),
color: widget.model.color?.toColor(context),
backgroundColor: widget.model.backgroundColor.toColor(context),
semanticsLabel: widget.model.semanticsLabel,
semanticsValue: widget.model.semanticsValue,
Expand Down
2 changes: 2 additions & 0 deletions packages/mirai/lib/src/parsers/mirai_switch/mirai_switch.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import 'package:freezed_annotation/freezed_annotation.dart';
import 'package:mirai/mirai.dart';
import 'package:mirai/src/parsers/mirai_material_color/mirai_material_color.dart';

export 'package:mirai/src/parsers/mirai_switch/mirai_switch_parser.dart';

part 'mirai_switch.freezed.dart';
part 'mirai_switch.g.dart';

Expand Down
2 changes: 1 addition & 1 deletion packages/mirai/lib/src/parsers/mirai_switch/mirai_switch_parser.dart
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import 'package:flutter/material.dart';
import 'package:mirai/mirai.dart';
import 'package:mirai/src/parsers/mirai_switch/mirai_switch.dart';
import 'package:mirai/src/parsers/mirai_switch/widget/mirai_switch_widget.dart';
import 'package:mirai/src/utils/widget_type.dart';
import 'package:mirai_framework/mirai_framework.dart';

class MiraiSwitchParser extends MiraiParser<MiraiSwitch> {
const MiraiSwitchParser();
Expand Down
2 changes: 1 addition & 1 deletion packages/mirai/lib/src/parsers/mirai_switch/widget/mirai_switch_widget.dart
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:mirai/mirai.dart';
import 'package:mirai/src/framework/framework.dart';
import 'package:mirai/src/parsers/mirai_material_color/mirai_material_color.dart';
import 'package:mirai/src/parsers/mirai_switch/mirai_switch.dart';

Expand Down
2 changes: 2 additions & 0 deletions packages/mirai/lib/src/parsers/mirai_tab/mirai_tab.dart
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import 'package:freezed_annotation/freezed_annotation.dart';
import 'package:mirai/src/parsers/mirai_edge_insets/mirai_edge_insets.dart';

export 'package:mirai/src/parsers/mirai_tab/mirai_tab_parser.dart';

part 'mirai_tab.freezed.dart';
part 'mirai_tab.g.dart';

Expand Down
9 changes: 8 additions & 1 deletion packages/mirai/lib/src/parsers/parsers.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ export 'package:mirai/src/parsers/mirai_box_shadow/mirai_box_shadow.dart';
export 'package:mirai/src/parsers/mirai_button_style/mirai_button_style.dart';
export 'package:mirai/src/parsers/mirai_card/mirai_card.dart';
export 'package:mirai/src/parsers/mirai_card_theme_data/mirai_card_theme_data.dart';
export 'package:mirai/src/parsers/mirai_center/mirai_center.dart';
export 'package:mirai/src/parsers/mirai_check_box_widget/mirai_check_box_widget.dart';
export 'package:mirai/src/parsers/mirai_column/mirai_column.dart';
export 'package:mirai/src/parsers/mirai_container/mirai_container.dart';
export 'package:mirai/src/parsers/mirai_container_image/mirai_container_image.dart';
Expand All @@ -29,6 +31,8 @@ export 'package:mirai/src/parsers/mirai_flexible/mirai_flexible.dart';
export 'package:mirai/src/parsers/mirai_floating_action_button/mirai_floating_action_button.dart';
export 'package:mirai/src/parsers/mirai_floating_action_button_theme_data/mirai_floating_action_button_theme_data.dart';
export 'package:mirai/src/parsers/mirai_form/mirai_form.dart';
export 'package:mirai/src/parsers/mirai_form_field/mirai_form_field.dart';
export 'package:mirai/src/parsers/mirai_fractionally_sized_box/mirai_fractionally_sized_box.dart';
export 'package:mirai/src/parsers/mirai_gradient/mirai_gradient.dart';
export 'package:mirai/src/parsers/mirai_icon/mirai_icon.dart';
export 'package:mirai/src/parsers/mirai_icon_button/mirai_icon_button.dart';
Expand All @@ -45,13 +49,16 @@ export 'package:mirai/src/parsers/mirai_outlined_button/mirai_outlined_button.da
export 'package:mirai/src/parsers/mirai_padding/mirai_padding.dart';
export 'package:mirai/src/parsers/mirai_page_view/mirai_page_view.dart';
export 'package:mirai/src/parsers/mirai_positioned/mirai_positioned.dart';
export 'package:mirai/src/parsers/mirai_refresh_indicator/mirai_refresh_indicator.dart';
export 'package:mirai/src/parsers/mirai_row/mirai_row.dart';
export 'package:mirai/src/parsers/mirai_safe_area/mirai_safe_area.dart';
export 'package:mirai/src/parsers/mirai_scaffold/mirai_scaffold.dart';
export 'package:mirai/src/parsers/mirai_scroll_view/mirai_scroll_view.dart';
export 'package:mirai/src/parsers/mirai_single_child_scroll_view/mirai_single_child_scroll_view.dart';
export 'package:mirai/src/parsers/mirai_size/mirai_size.dart';
export 'package:mirai/src/parsers/mirai_sized_box/mirai_sized_box.dart';
export 'package:mirai/src/parsers/mirai_stack/mirai_stack.dart';
export 'package:mirai/src/parsers/mirai_switch/mirai_switch.dart';
export 'package:mirai/src/parsers/mirai_tab/mirai_tab.dart';
export 'package:mirai/src/parsers/mirai_tab_bar/mirai_tab_bar.dart';
export 'package:mirai/src/parsers/mirai_tab_bar_theme_data/mirai_tab_bar_theme_data.dart';
export 'package:mirai/src/parsers/mirai_tab_bar_view/mirai_tab_bar_view.dart';
Expand Down
2 changes: 1 addition & 1 deletion packages/mirai/lib/src/utils/widget_type.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ enum WidgetType {
bottomNavigationBar,
listView,
defaultTabController,
scrollView,
singleChildScrollView,
tab,
form,
formField,
Expand Down

0 comments on commit dc359d4

Please sign in to comment.