From 8f68226fe2f9116cb49badcc77664466f7bb5c68 Mon Sep 17 00:00:00 2001 From: zhangmeng <494089941@qq.com> Date: Thu, 20 May 2021 17:56:35 +0800 Subject: [PATCH] sort import --- lib/mock_models/all_model.dart | 1 + lib/mock_models/decoration/decoration_data.dart | 1 + lib/ui/home/application/applications_page.dart | 2 +- lib/ui/home/search_workorder_page.dart | 10 +++++----- .../green_manage/green_manage_card.dart | 15 ++++++++++----- .../green_manage/green_manage_map.dart | 1 + .../green_manage/green_manage_page.dart | 4 ++-- .../green_manage/green_manage_view.dart | 5 ++++- .../hygience_manage/hygience_manage_card.dart | 13 +++++++++---- .../hygience_manage/hygience_manage_map.dart | 3 ++- .../hygience_manage/hygience_manage_page.dart | 9 +++++++-- .../hygience_manage/hygience_manage_view.dart | 5 ++++- .../decoration_manager_card.dart | 4 ++-- .../decoration_manager_detail_page.dart | 2 +- lib/ui/sub_pages/manage_func.dart | 1 + lib/utils/network/manage_func.dart | 1 + 16 files changed, 52 insertions(+), 25 deletions(-) diff --git a/lib/mock_models/all_model.dart b/lib/mock_models/all_model.dart index a9f6467..b19ed7a 100644 --- a/lib/mock_models/all_model.dart +++ b/lib/mock_models/all_model.dart @@ -9,6 +9,7 @@ import 'package:aku_community_manager/mock_models/decoration/decoration_data.dar import 'package:aku_community_manager/mock_models/decoration/decoration_model.dart'; import 'package:aku_community_manager/mock_models/fix/fix_model.dart'; import 'package:aku_community_manager/provider/fix_provider.dart'; + @Deprecated('this mock model should be removed') class AllModel { BuildContext context; diff --git a/lib/mock_models/decoration/decoration_data.dart b/lib/mock_models/decoration/decoration_data.dart index 53f90c8..dd32a51 100644 --- a/lib/mock_models/decoration/decoration_data.dart +++ b/lib/mock_models/decoration/decoration_data.dart @@ -1,6 +1,7 @@ // Project imports: import 'package:aku_community_manager/mock_models/decoration/decoration_model.dart'; import 'package:aku_community_manager/mock_models/fix/fixer_model.dart'; + @Deprecated('this should be removed') class DecorationData { static List allModels = [ diff --git a/lib/ui/home/application/applications_page.dart b/lib/ui/home/application/applications_page.dart index 305eb59..c28eff5 100644 --- a/lib/ui/home/application/applications_page.dart +++ b/lib/ui/home/application/applications_page.dart @@ -1,5 +1,4 @@ // Flutter imports: -import 'package:aku_community_manager/ui/manage_pages/hygience_manage/hygience_manage_page.dart'; import 'package:flutter/material.dart'; // Package imports: @@ -15,6 +14,7 @@ import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/tools/screen_tool.dart'; import 'package:aku_community_manager/tools/widget_tool.dart'; import 'package:aku_community_manager/ui/manage_pages/green_manage/green_manage_page.dart'; +import 'package:aku_community_manager/ui/manage_pages/hygience_manage/hygience_manage_page.dart'; import 'package:aku_community_manager/ui/manage_pages/inspection_manage/inspection_manage_page.dart'; import 'package:aku_community_manager/ui/manage_pages/key_manage/key_manage_page.dart'; import 'package:aku_community_manager/ui/manage_pages/packages_manage/packages_manage_page.dart'; diff --git a/lib/ui/home/search_workorder_page.dart b/lib/ui/home/search_workorder_page.dart index 27e578f..0f73cee 100644 --- a/lib/ui/home/search_workorder_page.dart +++ b/lib/ui/home/search_workorder_page.dart @@ -1,9 +1,4 @@ // Flutter imports: -import 'package:aku_community_manager/models/manager/facilities/facilities_page.dart'; -import 'package:aku_community_manager/ui/manage_pages/hygience_manage/hygience_manage_page.dart'; -import 'package:aku_community_manager/ui/manage_pages/key_manage/key_manage_page.dart'; -import 'package:aku_community_manager/ui/manage_pages/packages_manage/packages_manage_page.dart'; -import 'package:aku_community_manager/ui/manage_pages/rules_manage/rules_manage_page.dart'; import 'package:flutter/material.dart'; // Package imports: @@ -14,12 +9,17 @@ import 'package:provider/provider.dart'; // Project imports: import 'package:aku_community_manager/const/resource.dart'; +import 'package:aku_community_manager/models/manager/facilities/facilities_page.dart'; import 'package:aku_community_manager/provider/app_provider.dart'; import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/tools/widget_tool.dart'; import 'package:aku_community_manager/ui/home/application/applications_page.dart'; import 'package:aku_community_manager/ui/manage_pages/green_manage/green_manage_page.dart'; +import 'package:aku_community_manager/ui/manage_pages/hygience_manage/hygience_manage_page.dart'; import 'package:aku_community_manager/ui/manage_pages/inspection_manage/inspection_manage_page.dart'; +import 'package:aku_community_manager/ui/manage_pages/key_manage/key_manage_page.dart'; +import 'package:aku_community_manager/ui/manage_pages/packages_manage/packages_manage_page.dart'; +import 'package:aku_community_manager/ui/manage_pages/rules_manage/rules_manage_page.dart'; import 'package:aku_community_manager/ui/sub_pages/activity_manager/activity_manager_page.dart'; import 'package:aku_community_manager/ui/sub_pages/borrow_manager/borrow_manager_page.dart'; import 'package:aku_community_manager/ui/sub_pages/business_and_fix/business_and_fix_page.dart'; diff --git a/lib/ui/manage_pages/green_manage/green_manage_card.dart b/lib/ui/manage_pages/green_manage/green_manage_card.dart index f8e89f5..caaa565 100644 --- a/lib/ui/manage_pages/green_manage/green_manage_card.dart +++ b/lib/ui/manage_pages/green_manage/green_manage_card.dart @@ -1,12 +1,17 @@ -import 'package:aku_community_manager/style/app_style.dart'; -import 'package:aku_community_manager/tools/aku_divider.dart'; -import 'package:aku_community_manager/tools/widget_tool.dart'; -import 'package:aku_community_manager/ui/manage_pages/green_manage/green_manage_map.dart'; -import 'package:aku_ui/common_widgets/aku_button.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: +import 'package:aku_ui/common_widgets/aku_button.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:velocity_x/velocity_x.dart'; + +// Project imports: +import 'package:aku_community_manager/style/app_style.dart'; +import 'package:aku_community_manager/tools/aku_divider.dart'; import 'package:aku_community_manager/tools/extensions/list_extension_tool.dart'; +import 'package:aku_community_manager/tools/widget_tool.dart'; +import 'package:aku_community_manager/ui/manage_pages/green_manage/green_manage_map.dart'; class GreenManageCard extends StatefulWidget { final int index; diff --git a/lib/ui/manage_pages/green_manage/green_manage_map.dart b/lib/ui/manage_pages/green_manage/green_manage_map.dart index ffc197c..d45e778 100644 --- a/lib/ui/manage_pages/green_manage/green_manage_map.dart +++ b/lib/ui/manage_pages/green_manage/green_manage_map.dart @@ -1,3 +1,4 @@ +// Flutter imports: import 'package:flutter/material.dart'; class GreenManageMap { diff --git a/lib/ui/manage_pages/green_manage/green_manage_page.dart b/lib/ui/manage_pages/green_manage/green_manage_page.dart index 0a67ded..75e16fa 100644 --- a/lib/ui/manage_pages/green_manage/green_manage_page.dart +++ b/lib/ui/manage_pages/green_manage/green_manage_page.dart @@ -1,6 +1,4 @@ // Flutter imports: -import 'package:aku_community_manager/ui/manage_pages/green_manage/green_manage_view.dart'; -import 'package:aku_community_manager/ui/widgets/inner/aku_tab_bar.dart'; import 'package:flutter/material.dart'; // Package imports: @@ -8,7 +6,9 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; // Project imports: import 'package:aku_community_manager/style/app_style.dart'; +import 'package:aku_community_manager/ui/manage_pages/green_manage/green_manage_view.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; +import 'package:aku_community_manager/ui/widgets/inner/aku_tab_bar.dart'; class GreenManagePage extends StatefulWidget { GreenManagePage({Key key}) : super(key: key); diff --git a/lib/ui/manage_pages/green_manage/green_manage_view.dart b/lib/ui/manage_pages/green_manage/green_manage_view.dart index daf75ef..16b4071 100644 --- a/lib/ui/manage_pages/green_manage/green_manage_view.dart +++ b/lib/ui/manage_pages/green_manage/green_manage_view.dart @@ -1,6 +1,9 @@ -import 'package:aku_community_manager/ui/manage_pages/green_manage/green_manage_card.dart'; +// Flutter imports: import 'package:flutter/material.dart'; +// Project imports: +import 'package:aku_community_manager/ui/manage_pages/green_manage/green_manage_card.dart'; + class GreenManageView extends StatefulWidget { final int index; GreenManageView({Key key, this.index}) : super(key: key); diff --git a/lib/ui/manage_pages/hygience_manage/hygience_manage_card.dart b/lib/ui/manage_pages/hygience_manage/hygience_manage_card.dart index ed578a1..d7264a9 100644 --- a/lib/ui/manage_pages/hygience_manage/hygience_manage_card.dart +++ b/lib/ui/manage_pages/hygience_manage/hygience_manage_card.dart @@ -1,11 +1,16 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:aku_ui/common_widgets/aku_button.dart'; +import 'package:velocity_x/velocity_x.dart'; + +// Project imports: import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/tools/aku_divider.dart'; +import 'package:aku_community_manager/tools/extensions/list_extension_tool.dart'; import 'package:aku_community_manager/tools/widget_tool.dart'; import 'package:aku_community_manager/ui/manage_pages/hygience_manage/hygience_manage_map.dart'; -import 'package:aku_ui/common_widgets/aku_button.dart'; -import 'package:flutter/material.dart'; -import 'package:velocity_x/velocity_x.dart'; -import 'package:aku_community_manager/tools/extensions/list_extension_tool.dart'; class HyginecManageCard extends StatefulWidget { final int index; diff --git a/lib/ui/manage_pages/hygience_manage/hygience_manage_map.dart b/lib/ui/manage_pages/hygience_manage/hygience_manage_map.dart index a4e42d0..9f62157 100644 --- a/lib/ui/manage_pages/hygience_manage/hygience_manage_map.dart +++ b/lib/ui/manage_pages/hygience_manage/hygience_manage_map.dart @@ -1,3 +1,4 @@ +// Flutter imports: import 'package:flutter/material.dart'; class HygienceManageMap { @@ -26,4 +27,4 @@ class HygienceManageMap { return Colors.black; } } -} \ No newline at end of file +} diff --git a/lib/ui/manage_pages/hygience_manage/hygience_manage_page.dart b/lib/ui/manage_pages/hygience_manage/hygience_manage_page.dart index c75b832..d9e9261 100644 --- a/lib/ui/manage_pages/hygience_manage/hygience_manage_page.dart +++ b/lib/ui/manage_pages/hygience_manage/hygience_manage_page.dart @@ -1,8 +1,13 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_screenutil/flutter_screenutil.dart'; + +// Project imports: import 'package:aku_community_manager/ui/manage_pages/hygience_manage/hygience_manage_view.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; import 'package:aku_community_manager/ui/widgets/inner/aku_tab_bar.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; class HygienceManagePage extends StatefulWidget { HygienceManagePage({Key key}) : super(key: key); diff --git a/lib/ui/manage_pages/hygience_manage/hygience_manage_view.dart b/lib/ui/manage_pages/hygience_manage/hygience_manage_view.dart index 2ba39c1..06a0256 100644 --- a/lib/ui/manage_pages/hygience_manage/hygience_manage_view.dart +++ b/lib/ui/manage_pages/hygience_manage/hygience_manage_view.dart @@ -1,6 +1,9 @@ -import 'package:aku_community_manager/ui/manage_pages/hygience_manage/hygience_manage_card.dart'; +// Flutter imports: import 'package:flutter/material.dart'; +// Project imports: +import 'package:aku_community_manager/ui/manage_pages/hygience_manage/hygience_manage_card.dart'; + class HygienceManageView extends StatefulWidget { final int index; HygienceManageView({Key key, this.index}) : super(key: key); diff --git a/lib/ui/sub_pages/decoration_manager/decoration_manager_card.dart b/lib/ui/sub_pages/decoration_manager/decoration_manager_card.dart index 35076b1..fe49614 100644 --- a/lib/ui/sub_pages/decoration_manager/decoration_manager_card.dart +++ b/lib/ui/sub_pages/decoration_manager/decoration_manager_card.dart @@ -1,10 +1,10 @@ // Flutter imports: -import 'package:aku_community_manager/ui/sub_pages/decoration_manager/decoration_manager_detail_page.dart'; import 'package:flutter/material.dart'; // Package imports: import 'package:aku_ui/common_widgets/aku_material_button.dart'; import 'package:common_utils/common_utils.dart'; +import 'package:get/get.dart'; // Project imports: import 'package:aku_community_manager/const/resource.dart'; @@ -12,9 +12,9 @@ import 'package:aku_community_manager/models/manager/decoration/decoration_list_ import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/tools/screen_tool.dart'; import 'package:aku_community_manager/tools/widget_tool.dart'; +import 'package:aku_community_manager/ui/sub_pages/decoration_manager/decoration_manager_detail_page.dart'; import 'package:aku_community_manager/ui/sub_pages/decoration_manager/decoration_util.dart'; import 'package:aku_community_manager/ui/widgets/inner/aku_chip_box.dart'; -import 'package:get/get.dart'; class DecorationManagerCard extends StatefulWidget { final DecorationListModel model; diff --git a/lib/ui/sub_pages/decoration_manager/decoration_manager_detail_page.dart b/lib/ui/sub_pages/decoration_manager/decoration_manager_detail_page.dart index a79f870..9527b81 100644 --- a/lib/ui/sub_pages/decoration_manager/decoration_manager_detail_page.dart +++ b/lib/ui/sub_pages/decoration_manager/decoration_manager_detail_page.dart @@ -2,7 +2,6 @@ import 'dart:math'; // Flutter imports: -import 'package:aku_community_manager/models/manager/decoration/decoration_list_model.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -15,6 +14,7 @@ import 'package:get/get.dart'; // Project imports: import 'package:aku_community_manager/const/resource.dart'; import 'package:aku_community_manager/mock_models/decoration/decoration_model.dart'; +import 'package:aku_community_manager/models/manager/decoration/decoration_list_model.dart'; import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/tools/screen_tool.dart'; import 'package:aku_community_manager/tools/user_tool.dart'; diff --git a/lib/ui/sub_pages/manage_func.dart b/lib/ui/sub_pages/manage_func.dart index 92fbfc5..31c1161 100644 --- a/lib/ui/sub_pages/manage_func.dart +++ b/lib/ui/sub_pages/manage_func.dart @@ -1,4 +1,5 @@ // Dart imports: + // Flutter imports: import 'package:flutter/material.dart'; diff --git a/lib/utils/network/manage_func.dart b/lib/utils/network/manage_func.dart index 95c5890..1d20b29 100644 --- a/lib/utils/network/manage_func.dart +++ b/lib/utils/network/manage_func.dart @@ -1,4 +1,5 @@ // Flutter imports: + // Package imports: import 'package:dio/dio.dart';