diff --git a/lib/main.dart b/lib/main.dart index 744e422..2ef29b6 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,3 +1,16 @@ +// Flutter imports: +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:amap_map_fluttify/amap_map_fluttify.dart'; +import 'package:bot_toast/bot_toast.dart'; +import 'package:flutter_localizations/flutter_localizations.dart'; +import 'package:get/get.dart'; +import 'package:jpush_flutter/jpush_flutter.dart'; +import 'package:provider/provider.dart'; + +// Project imports: import 'package:aku_community_manager/provider/anouncement_provider.dart'; import 'package:aku_community_manager/provider/app_provider.dart'; import 'package:aku_community_manager/provider/fix_provider.dart'; @@ -5,14 +18,6 @@ import 'package:aku_community_manager/provider/manage_provider.dart'; import 'package:aku_community_manager/provider/outdoor_provider.dart'; import 'package:aku_community_manager/provider/user_provider.dart'; import 'package:aku_community_manager/ui/splash/splash_page.dart'; -import 'package:amap_map_fluttify/amap_map_fluttify.dart'; -import 'package:bot_toast/bot_toast.dart'; -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_localizations/flutter_localizations.dart'; -import 'package:get/get.dart'; -import 'package:jpush_flutter/jpush_flutter.dart'; -import 'package:provider/provider.dart'; void main() async { WidgetsFlutterBinding.ensureInitialized(); diff --git a/lib/mock_models/all_model.dart b/lib/mock_models/all_model.dart index d510f8f..b98bb8a 100644 --- a/lib/mock_models/all_model.dart +++ b/lib/mock_models/all_model.dart @@ -1,9 +1,14 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:provider/provider.dart'; + +// Project imports: import 'package:aku_community_manager/mock_models/decoration/decoration_data.dart'; 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'; -import 'package:flutter/material.dart'; -import 'package:provider/provider.dart'; class AllModel { BuildContext context; diff --git a/lib/mock_models/anouncement/anouncement_model.dart b/lib/mock_models/anouncement/anouncement_model.dart index e40f797..f3ca776 100644 --- a/lib/mock_models/anouncement/anouncement_model.dart +++ b/lib/mock_models/anouncement/anouncement_model.dart @@ -1,3 +1,4 @@ +// Flutter imports: import 'package:flutter/material.dart'; class AnouncementCardModel { diff --git a/lib/mock_models/borrow/borrow_data.dart b/lib/mock_models/borrow/borrow_data.dart index da06a3f..6e00d8e 100644 --- a/lib/mock_models/borrow/borrow_data.dart +++ b/lib/mock_models/borrow/borrow_data.dart @@ -1,3 +1,4 @@ +// Project imports: import 'package:aku_community_manager/const/resource.dart'; import 'package:aku_community_manager/mock_models/borrow/borrow_model.dart'; diff --git a/lib/mock_models/borrow/borrow_model.dart b/lib/mock_models/borrow/borrow_model.dart index 343c73b..105bd66 100644 --- a/lib/mock_models/borrow/borrow_model.dart +++ b/lib/mock_models/borrow/borrow_model.dart @@ -1,5 +1,7 @@ +// Dart imports: import 'dart:math'; +// Package imports: import 'package:meta/meta.dart'; enum BORROW_STATUS { diff --git a/lib/mock_models/decoration/decoration_data.dart b/lib/mock_models/decoration/decoration_data.dart index e5a11e7..d94c589 100644 --- a/lib/mock_models/decoration/decoration_data.dart +++ b/lib/mock_models/decoration/decoration_data.dart @@ -1,3 +1,4 @@ +// Project imports: import 'package:aku_community_manager/mock_models/decoration/decoration_model.dart'; import 'package:aku_community_manager/mock_models/fix/fixer_model.dart'; diff --git a/lib/mock_models/decoration/decoration_model.dart b/lib/mock_models/decoration/decoration_model.dart index 1dbd68e..e260cb4 100644 --- a/lib/mock_models/decoration/decoration_model.dart +++ b/lib/mock_models/decoration/decoration_model.dart @@ -1,6 +1,9 @@ -import 'package:aku_community_manager/mock_models/fix/fixer_model.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'package:aku_community_manager/const/resource.dart'; +import 'package:aku_community_manager/mock_models/fix/fixer_model.dart'; enum DecorationType { ///待指派 diff --git a/lib/mock_models/fix/fix_model.dart b/lib/mock_models/fix/fix_model.dart index 6288538..0b21788 100644 --- a/lib/mock_models/fix/fix_model.dart +++ b/lib/mock_models/fix/fix_model.dart @@ -1,5 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; +// Project imports: import 'package:aku_community_manager/const/resource.dart'; enum FIX_ENUM { diff --git a/lib/mock_models/outdoor_models/outdoor_model.dart b/lib/mock_models/outdoor_models/outdoor_model.dart index 225cb2d..3b864ea 100644 --- a/lib/mock_models/outdoor_models/outdoor_model.dart +++ b/lib/mock_models/outdoor_models/outdoor_model.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'package:aku_community_manager/const/resource.dart'; enum OUTDOORSTATUS { diff --git a/lib/mock_models/users/user_info_model.dart b/lib/mock_models/users/user_info_model.dart index 3c81639..e2e14d3 100644 --- a/lib/mock_models/users/user_info_model.dart +++ b/lib/mock_models/users/user_info_model.dart @@ -1,3 +1,4 @@ +// Dart imports: import 'dart:io'; enum USER_ROLE { diff --git a/lib/models/user/user_profile_model.dart b/lib/models/user/user_profile_model.dart index 686a5da..8776ead 100644 --- a/lib/models/user/user_profile_model.dart +++ b/lib/models/user/user_profile_model.dart @@ -1,3 +1,4 @@ +// Project imports: import 'package:aku_community_manager/models/common/img_model.dart'; class UserProfileModel { diff --git a/lib/provider/anouncement_provider.dart b/lib/provider/anouncement_provider.dart index 5403594..e60a339 100644 --- a/lib/provider/anouncement_provider.dart +++ b/lib/provider/anouncement_provider.dart @@ -1,6 +1,9 @@ -import 'package:aku_community_manager/mock_models/anouncement/anouncement_model.dart'; +// Flutter imports: import 'package:flutter/material.dart'; +// Project imports: +import 'package:aku_community_manager/mock_models/anouncement/anouncement_model.dart'; + class AnouncementProvider extends ChangeNotifier { List _anouncementCardModel = AnouncementCardModel.initList(); diff --git a/lib/provider/app_provider.dart b/lib/provider/app_provider.dart index 5617444..ffa9200 100644 --- a/lib/provider/app_provider.dart +++ b/lib/provider/app_provider.dart @@ -1,6 +1,9 @@ -import 'package:aku_community_manager/ui/home/application/applications_page.dart'; +// Flutter imports: import 'package:flutter/material.dart'; +// Project imports: +import 'package:aku_community_manager/ui/home/application/applications_page.dart'; + class AppProvider extends ChangeNotifier { List _recentUsedApp = []; List get recentUsedApp => _recentUsedApp; diff --git a/lib/provider/fix_provider.dart b/lib/provider/fix_provider.dart index 9633809..8195580 100644 --- a/lib/provider/fix_provider.dart +++ b/lib/provider/fix_provider.dart @@ -1,9 +1,14 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:provider/provider.dart'; + +// Project imports: import 'package:aku_community_manager/mock_models/fix/fix_model.dart'; import 'package:aku_community_manager/mock_models/fix/fixer_model.dart'; import 'package:aku_community_manager/mock_models/users/user_info_model.dart'; import 'package:aku_community_manager/provider/user_provider.dart'; -import 'package:flutter/material.dart'; -import 'package:provider/provider.dart'; class FixProvider extends ChangeNotifier { List _fixModels = FixModel.initList(); diff --git a/lib/provider/manage_provider.dart b/lib/provider/manage_provider.dart index 12e757c..9c1b0cd 100644 --- a/lib/provider/manage_provider.dart +++ b/lib/provider/manage_provider.dart @@ -1,6 +1,9 @@ -import 'package:aku_community_manager/mock_models/manage_models/manage_model.dart'; +// Flutter imports: import 'package:flutter/material.dart'; +// Project imports: +import 'package:aku_community_manager/mock_models/manage_models/manage_model.dart'; + class GreenManageProvider extends ChangeNotifier { List _greenManageModel = GreenManageCardModel.initList(); diff --git a/lib/provider/outdoor_provider.dart b/lib/provider/outdoor_provider.dart index 5345ed1..5e5d5cf 100644 --- a/lib/provider/outdoor_provider.dart +++ b/lib/provider/outdoor_provider.dart @@ -1,6 +1,9 @@ -import 'package:aku_community_manager/mock_models/outdoor_models/outdoor_model.dart'; +// Flutter imports: import 'package:flutter/material.dart'; +// Project imports: +import 'package:aku_community_manager/mock_models/outdoor_models/outdoor_model.dart'; + class OutdoorProvider extends ChangeNotifier { List _itemOutdoorModel = ItemsOutdoorModel.initList(); List get itemOutdoorModels => _itemOutdoorModel; diff --git a/lib/provider/user_provider.dart b/lib/provider/user_provider.dart index 29eba6a..be9a0d9 100644 --- a/lib/provider/user_provider.dart +++ b/lib/provider/user_provider.dart @@ -1,14 +1,19 @@ +// Dart imports: import 'dart:io'; +// Flutter imports: +import 'package:flutter/material.dart'; + +// Project imports: import 'package:aku_community_manager/const/api.dart'; import 'package:aku_community_manager/mock_models/users/user_info_model.dart'; import 'package:aku_community_manager/models/user/user_profile_model.dart'; import 'package:aku_community_manager/utils/hive_store.dart'; import 'package:aku_community_manager/utils/network/base_model.dart'; import 'package:aku_community_manager/utils/network/net_util.dart'; + import 'package:aku_community_manager/models/user/user_info_model.dart' as USER_INFO; -import 'package:flutter/material.dart'; //登录状态管理 class UserProvider extends ChangeNotifier { diff --git a/lib/style/app_style.dart b/lib/style/app_style.dart index 9bc19a9..d5eb2ee 100644 --- a/lib/style/app_style.dart +++ b/lib/style/app_style.dart @@ -1,5 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; +// Package imports: import 'package:flutter_screenutil/flutter_screenutil.dart'; export 'package:flutter_screenutil/flutter_screenutil.dart'; diff --git a/lib/tools/permission_tool.dart b/lib/tools/permission_tool.dart index 4657981..bde5e02 100644 --- a/lib/tools/permission_tool.dart +++ b/lib/tools/permission_tool.dart @@ -1,3 +1,4 @@ +// Package imports: import 'package:permission_handler/permission_handler.dart'; class PermissionTool { diff --git a/lib/tools/screen_tool.dart b/lib/tools/screen_tool.dart index 786275d..4f0e748 100644 --- a/lib/tools/screen_tool.dart +++ b/lib/tools/screen_tool.dart @@ -1,4 +1,6 @@ +// Package imports: import 'package:flutter_screenutil/flutter_screenutil.dart'; + export 'package:flutter_screenutil/flutter_screenutil.dart'; double get statusBarHeight => ScreenUtil().statusBarHeight; diff --git a/lib/tools/widget_tool.dart b/lib/tools/widget_tool.dart index 2e00a4d..aee07f1 100644 --- a/lib/tools/widget_tool.dart +++ b/lib/tools/widget_tool.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_screenutil/flutter_screenutil.dart'; ///自定义分割线 diff --git a/lib/ui/agreements/agreement_page.dart b/lib/ui/agreements/agreement_page.dart index 4ddfb94..f554c71 100644 --- a/lib/ui/agreements/agreement_page.dart +++ b/lib/ui/agreements/agreement_page.dart @@ -1,7 +1,12 @@ -import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_screenutil/flutter_screenutil.dart'; +// Project imports: +import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; + class AgreementPage extends StatelessWidget { const AgreementPage({Key key}) : super(key: key); diff --git a/lib/ui/agreements/privacy_page.dart b/lib/ui/agreements/privacy_page.dart index 4e07a7c..8820e0f 100644 --- a/lib/ui/agreements/privacy_page.dart +++ b/lib/ui/agreements/privacy_page.dart @@ -1,7 +1,12 @@ -import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_screenutil/flutter_screenutil.dart'; +// Project imports: +import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; + class PrivacyPage extends StatelessWidget { const PrivacyPage({Key key}) : super(key: key); diff --git a/lib/ui/home/announcement/All_anouncement.dart b/lib/ui/home/announcement/All_anouncement.dart index 858ea47..b8c52ec 100644 --- a/lib/ui/home/announcement/All_anouncement.dart +++ b/lib/ui/home/announcement/All_anouncement.dart @@ -1,16 +1,22 @@ +// Dart imports: import 'dart:ui'; +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:aku_ui/aku_ui.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:get/get.dart'; +import 'package:provider/provider.dart'; + +// Project imports: +import 'package:aku_community_manager/const/resource.dart'; import 'package:aku_community_manager/mock_models/anouncement/anouncement_model.dart'; import 'package:aku_community_manager/provider/anouncement_provider.dart'; import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/ui/home/announcement/anouncement_details.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; -import 'package:aku_ui/aku_ui.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:aku_community_manager/const/resource.dart'; -import 'package:get/get.dart'; -import 'package:provider/provider.dart'; class AllAnouncement extends StatefulWidget { AllAnouncement({Key key}) : super(key: key); diff --git a/lib/ui/home/announcement/anouncement_details.dart b/lib/ui/home/announcement/anouncement_details.dart index 35faf5f..8b8446e 100644 --- a/lib/ui/home/announcement/anouncement_details.dart +++ b/lib/ui/home/announcement/anouncement_details.dart @@ -1,8 +1,13 @@ -import 'package:aku_community_manager/style/app_style.dart'; -import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_screenutil/flutter_screenutil.dart'; +// Project imports: +import 'package:aku_community_manager/style/app_style.dart'; +import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; + class AnouncementDetails extends StatelessWidget { final String title; final String date; diff --git a/lib/ui/home/application/applications_page.dart b/lib/ui/home/application/applications_page.dart index 4111574..fba6658 100644 --- a/lib/ui/home/application/applications_page.dart +++ b/lib/ui/home/application/applications_page.dart @@ -1,22 +1,26 @@ -import 'package:aku_community_manager/ui/manage_pages/green_manage/green_manage_page.dart'; -import 'package:aku_community_manager/ui/manage_pages/inspection_manage/inspection_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'; -import 'package:aku_community_manager/ui/sub_pages/decoration_manager/decoration_manager_page.dart'; -import 'package:aku_community_manager/ui/sub_pages/items_outdoor/items_outdoor_page.dart'; -import 'package:aku_community_manager/ui/sub_pages/visitor_manager/visitor_manager_page.dart'; -import 'package:aku_community_manager/ui/tool_pages/warning/warning_page.dart'; -import 'package:aku_ui/common_widgets/aku_material_button.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: +import 'package:aku_ui/common_widgets/aku_material_button.dart'; import 'package:get/get.dart'; import 'package:provider/provider.dart'; +// Project imports: import 'package:aku_community_manager/const/resource.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/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/inspection_manage/inspection_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'; +import 'package:aku_community_manager/ui/sub_pages/decoration_manager/decoration_manager_page.dart'; +import 'package:aku_community_manager/ui/sub_pages/items_outdoor/items_outdoor_page.dart'; +import 'package:aku_community_manager/ui/sub_pages/visitor_manager/visitor_manager_page.dart'; +import 'package:aku_community_manager/ui/tool_pages/warning/warning_page.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_back_button.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; diff --git a/lib/ui/home/business/business_card.dart b/lib/ui/home/business/business_card.dart index 039d4d6..75e0a97 100644 --- a/lib/ui/home/business/business_card.dart +++ b/lib/ui/home/business/business_card.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'package:aku_community_manager/tools/screen_tool.dart'; class BusinessCard extends StatefulWidget { diff --git a/lib/ui/home/business/business_page.dart b/lib/ui/home/business/business_page.dart index a79aa7b..fefb020 100644 --- a/lib/ui/home/business/business_page.dart +++ b/lib/ui/home/business/business_page.dart @@ -1,16 +1,21 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:provider/provider.dart'; + +// Project imports: import 'package:aku_community_manager/mock_models/all_model.dart'; import 'package:aku_community_manager/mock_models/decoration/decoration_data.dart'; 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'; import 'package:aku_community_manager/style/app_style.dart'; +import 'package:aku_community_manager/tools/screen_tool.dart'; import 'package:aku_community_manager/ui/sub_pages/business_and_fix/business_fix_card.dart'; import 'package:aku_community_manager/ui/sub_pages/decoration_manager/decoration_manager_card.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:aku_community_manager/tools/screen_tool.dart'; -import 'package:provider/provider.dart'; class BusinessPage extends StatefulWidget { ///DEFAULT IS 0 diff --git a/lib/ui/home/home_page.dart b/lib/ui/home/home_page.dart index d577256..1f997a6 100644 --- a/lib/ui/home/home_page.dart +++ b/lib/ui/home/home_page.dart @@ -1,37 +1,42 @@ +// Flutter imports: +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; + +// Package imports: +import 'package:aku_ui/aku_ui.dart'; +import 'package:aku_ui/common_widgets/aku_material_button.dart'; +import 'package:carousel_slider/carousel_slider.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:get/get.dart'; +import 'package:provider/provider.dart'; + +// Project imports: import 'package:aku_community_manager/const/api.dart'; import 'package:aku_community_manager/const/resource.dart'; -import 'package:aku_community_manager/provider/anouncement_provider.dart'; import 'package:aku_community_manager/mock_models/all_model.dart'; 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/anouncement_provider.dart'; import 'package:aku_community_manager/provider/app_provider.dart'; import 'package:aku_community_manager/provider/user_provider.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/widget_tool.dart'; import 'package:aku_community_manager/ui/home/announcement/All_anouncement.dart'; +import 'package:aku_community_manager/ui/home/application/applications_page.dart'; import 'package:aku_community_manager/ui/home/business/business_page.dart'; import 'package:aku_community_manager/ui/home/messages/message.dart'; -import 'package:aku_community_manager/ui/home/application/applications_page.dart'; import 'package:aku_community_manager/ui/home/personal_draw.dart'; import 'package:aku_community_manager/ui/home/search_workorder_page.dart'; import 'package:aku_community_manager/ui/login/login_page.dart'; import 'package:aku_community_manager/ui/settings/user_info_page.dart'; +import 'package:aku_community_manager/ui/sub_pages/business_and_fix/business_and_fix_page.dart'; import 'package:aku_community_manager/ui/sub_pages/business_and_fix/business_fix_card.dart'; import 'package:aku_community_manager/ui/sub_pages/decoration_manager/decoration_manager_card.dart'; import 'package:aku_community_manager/ui/sub_pages/visitor_manager/visitor_manager_page.dart'; -import 'package:aku_community_manager/ui/sub_pages/business_and_fix/business_and_fix_page.dart'; import 'package:aku_community_manager/ui/tool_pages/scan_page.dart'; import 'package:aku_community_manager/ui/tool_pages/warning/warning_page.dart'; import 'package:aku_community_manager/ui/widgets/app_widgets/aku_avatar.dart'; -import 'package:aku_ui/aku_ui.dart'; -import 'package:aku_ui/common_widgets/aku_material_button.dart'; -import 'package:carousel_slider/carousel_slider.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:get/get.dart'; -import 'package:provider/provider.dart'; class HomePage extends StatefulWidget { HomePage({Key key}) : super(key: key); diff --git a/lib/ui/home/messages/comment_message.dart b/lib/ui/home/messages/comment_message.dart index 9178447..41fade7 100644 --- a/lib/ui/home/messages/comment_message.dart +++ b/lib/ui/home/messages/comment_message.dart @@ -1,9 +1,14 @@ -import 'package:aku_community_manager/style/app_style.dart'; -import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; -import 'package:aku_ui/common_widgets/aku_common_widgets.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: +import 'package:aku_ui/common_widgets/aku_common_widgets.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; + +// Project imports: import 'package:aku_community_manager/const/resource.dart'; +import 'package:aku_community_manager/style/app_style.dart'; +import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; class CommentMessage extends StatefulWidget { CommentMessage({Key key}) : super(key: key); diff --git a/lib/ui/home/messages/message.dart b/lib/ui/home/messages/message.dart index a77e093..a63bbf3 100644 --- a/lib/ui/home/messages/message.dart +++ b/lib/ui/home/messages/message.dart @@ -1,13 +1,18 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:aku_ui/aku_ui.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:get/get.dart'; +import 'package:get/instance_manager.dart'; + +// Project imports: import 'package:aku_community_manager/const/resource.dart'; import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/ui/home/messages/comment_message.dart'; import 'package:aku_community_manager/ui/home/messages/system_message.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; -import 'package:aku_ui/aku_ui.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:get/instance_manager.dart'; -import 'package:get/get.dart'; class Message extends StatefulWidget { Message({Key key}) : super(key: key); diff --git a/lib/ui/home/messages/system_message.dart b/lib/ui/home/messages/system_message.dart index 7c73c31..6278aa3 100644 --- a/lib/ui/home/messages/system_message.dart +++ b/lib/ui/home/messages/system_message.dart @@ -1,10 +1,15 @@ -import 'package:aku_community_manager/style/app_style.dart'; -import 'package:aku_community_manager/tools/widget_tool.dart'; -import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; -import 'package:aku_ui/aku_ui.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: +import 'package:aku_ui/aku_ui.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; + +// Project imports: import 'package:aku_community_manager/const/resource.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/widgets/common/aku_scaffold.dart'; class SystemMessage extends StatefulWidget { SystemMessage({Key key}) : super(key: key); diff --git a/lib/ui/home/personal_draw.dart b/lib/ui/home/personal_draw.dart index b254934..ce58803 100644 --- a/lib/ui/home/personal_draw.dart +++ b/lib/ui/home/personal_draw.dart @@ -1,3 +1,14 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:aku_ui/common_widgets/aku_button.dart'; +import 'package:aku_ui/common_widgets/aku_round_button.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:get/get.dart'; +import 'package:provider/provider.dart'; + +// Project imports: import 'package:aku_community_manager/const/api.dart'; import 'package:aku_community_manager/const/resource.dart'; import 'package:aku_community_manager/provider/user_provider.dart'; @@ -6,12 +17,6 @@ import 'package:aku_community_manager/ui/login/login_page.dart'; import 'package:aku_community_manager/ui/settings/settings_page.dart'; import 'package:aku_community_manager/ui/settings/user_info_page.dart'; import 'package:aku_community_manager/ui/widgets/app_widgets/aku_avatar.dart'; -import 'package:aku_ui/common_widgets/aku_button.dart'; -import 'package:aku_ui/common_widgets/aku_round_button.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:get/get.dart'; -import 'package:provider/provider.dart'; class PersonalDraw extends StatefulWidget { PersonalDraw({Key key}) : super(key: key); diff --git a/lib/ui/home/search_workorder_page.dart b/lib/ui/home/search_workorder_page.dart index eaad046..f44fcd2 100644 --- a/lib/ui/home/search_workorder_page.dart +++ b/lib/ui/home/search_workorder_page.dart @@ -1,10 +1,15 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_screenutil/flutter_screenutil.dart'; + +// Project imports: +import 'package:aku_community_manager/const/resource.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/widgets/common/aku_back_button.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:aku_community_manager/const/resource.dart'; class SearchWorkOrderPage extends StatefulWidget { SearchWorkOrderPage({Key key}) : super(key: key); diff --git a/lib/ui/login/login_page.dart b/lib/ui/login/login_page.dart index e7e2884..13edc8a 100644 --- a/lib/ui/login/login_page.dart +++ b/lib/ui/login/login_page.dart @@ -1,7 +1,20 @@ +// Dart imports: import 'dart:ui'; +// Flutter imports: +import 'package:flutter/cupertino.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:extended_text/extended_text.dart'; +import 'package:get/route_manager.dart'; + +// Project imports: import 'package:aku_community_manager/const/api.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/widget_tool.dart'; import 'package:aku_community_manager/ui/agreements/agreement_page.dart'; import 'package:aku_community_manager/ui/agreements/privacy_page.dart'; @@ -9,13 +22,6 @@ import 'package:aku_community_manager/ui/login/login_sms_page.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_back_button.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; import 'package:aku_community_manager/utils/network/net_util.dart'; -import 'package:aku_ui/common_widgets/aku_material_button.dart'; -import 'package:common_utils/common_utils.dart'; -import 'package:extended_text/extended_text.dart'; -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; -import 'package:aku_community_manager/tools/screen_tool.dart'; -import 'package:get/route_manager.dart'; class LoginPage extends StatefulWidget { LoginPage({Key key}) : super(key: key); diff --git a/lib/ui/login/login_sms_page.dart b/lib/ui/login/login_sms_page.dart index 6f97343..cea452d 100644 --- a/lib/ui/login/login_sms_page.dart +++ b/lib/ui/login/login_sms_page.dart @@ -1,23 +1,29 @@ +// Dart imports: import 'dart:async'; +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:aku_ui/common_widgets/aku_material_button.dart'; +import 'package:bot_toast/bot_toast.dart'; +import 'package:dio/dio.dart'; +import 'package:get/get.dart'; +import 'package:pin_input_text_field/pin_input_text_field.dart'; +import 'package:provider/provider.dart'; + +// Project imports: import 'package:aku_community_manager/const/api.dart'; import 'package:aku_community_manager/mock_models/users/user_info_model.dart'; import 'package:aku_community_manager/provider/user_provider.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/widget_tool.dart'; import 'package:aku_community_manager/ui/home/home_page.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_back_button.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; import 'package:aku_community_manager/utils/network/login_model.dart'; import 'package:aku_community_manager/utils/network/net_util.dart'; -import 'package:aku_ui/common_widgets/aku_material_button.dart'; -import 'package:bot_toast/bot_toast.dart'; -import 'package:dio/dio.dart'; -import 'package:flutter/material.dart'; -import 'package:aku_community_manager/tools/screen_tool.dart'; -import 'package:get/get.dart'; -import 'package:pin_input_text_field/pin_input_text_field.dart'; -import 'package:provider/provider.dart'; class LoginSMSPage extends StatefulWidget { final String phone; diff --git a/lib/ui/manage_pages/green_manage/green_manage_details_page.dart b/lib/ui/manage_pages/green_manage/green_manage_details_page.dart index 157ef9c..eb2f72b 100644 --- a/lib/ui/manage_pages/green_manage/green_manage_details_page.dart +++ b/lib/ui/manage_pages/green_manage/green_manage_details_page.dart @@ -1,11 +1,16 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:aku_ui/aku_ui.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; + +// Project imports: +import 'package:aku_community_manager/const/resource.dart'; import 'package:aku_community_manager/mock_models/manage_models/manage_model.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/widgets/common/aku_scaffold.dart'; -import 'package:aku_ui/aku_ui.dart'; -import 'package:flutter/material.dart'; -import 'package:aku_community_manager/const/resource.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; class GreenManageDetailsPage extends StatelessWidget { final GreenManageCardModel cardModel; 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 5f71219..b93b454 100644 --- a/lib/ui/manage_pages/green_manage/green_manage_page.dart +++ b/lib/ui/manage_pages/green_manage/green_manage_page.dart @@ -1,15 +1,20 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:aku_ui/common_widgets/aku_common_widgets.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:get/get.dart'; +import 'package:provider/provider.dart'; + +// Project imports: +import 'package:aku_community_manager/const/resource.dart'; import 'package:aku_community_manager/mock_models/manage_models/manage_model.dart'; import 'package:aku_community_manager/provider/manage_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/manage_pages/green_manage/green_manage_details_page.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; -import 'package:aku_ui/common_widgets/aku_common_widgets.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:aku_community_manager/const/resource.dart'; -import 'package:get/get.dart'; -import 'package:provider/provider.dart'; class GreenManagePage extends StatefulWidget { GreenManagePage({Key key}) : super(key: key); diff --git a/lib/ui/manage_pages/inspection_manage/inspection_manage_card.dart b/lib/ui/manage_pages/inspection_manage/inspection_manage_card.dart index 0b06afc..99c7ba7 100644 --- a/lib/ui/manage_pages/inspection_manage/inspection_manage_card.dart +++ b/lib/ui/manage_pages/inspection_manage/inspection_manage_card.dart @@ -1,13 +1,18 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:aku_ui/common_widgets/aku_common_widgets.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:get/get.dart'; +import 'package:get/instance_manager.dart'; + +// Project imports: +import 'package:aku_community_manager/const/resource.dart'; import 'package:aku_community_manager/mock_models/manage_models/manage_model.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/manage_pages/inspection_manage/inspection_manage_details_page.dart'; -import 'package:aku_ui/common_widgets/aku_common_widgets.dart'; -import 'package:flutter/material.dart'; -import 'package:aku_community_manager/const/resource.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:get/instance_manager.dart'; -import 'package:get/get.dart'; class InspectionManageCard { final InspectionManageCardModel cardModel; diff --git a/lib/ui/manage_pages/inspection_manage/inspection_manage_details_page.dart b/lib/ui/manage_pages/inspection_manage/inspection_manage_details_page.dart index 2b2ea12..d6378d3 100644 --- a/lib/ui/manage_pages/inspection_manage/inspection_manage_details_page.dart +++ b/lib/ui/manage_pages/inspection_manage/inspection_manage_details_page.dart @@ -1,11 +1,16 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_screenutil/flutter_screenutil.dart'; + +// Project imports: +import 'package:aku_community_manager/const/resource.dart'; import 'package:aku_community_manager/mock_models/manage_models/manage_model.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/manage_pages/inspection_manage/inspection_manage_card.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:aku_community_manager/const/resource.dart'; class InspectionManageDetailsPage extends StatelessWidget { final InspectionManageCardModel cardModel; diff --git a/lib/ui/manage_pages/inspection_manage/inspection_manage_page.dart b/lib/ui/manage_pages/inspection_manage/inspection_manage_page.dart index fd2236e..d80a5a2 100644 --- a/lib/ui/manage_pages/inspection_manage/inspection_manage_page.dart +++ b/lib/ui/manage_pages/inspection_manage/inspection_manage_page.dart @@ -1,10 +1,15 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:provider/provider.dart'; + +// Project imports: import 'package:aku_community_manager/provider/manage_provider.dart'; import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/ui/manage_pages/inspection_manage/inspection_manage_card.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:provider/provider.dart'; class InspectionManagePage extends StatefulWidget { InspectionManagePage({Key key}) : super(key: key); diff --git a/lib/ui/settings/setting_feedback_page.dart b/lib/ui/settings/setting_feedback_page.dart index 4fb4478..b8027cd 100644 --- a/lib/ui/settings/setting_feedback_page.dart +++ b/lib/ui/settings/setting_feedback_page.dart @@ -1,8 +1,13 @@ -import 'package:aku_community_manager/style/app_style.dart'; -import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; -import 'package:aku_ui/common_widgets/aku_material_button.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: +import 'package:aku_ui/common_widgets/aku_material_button.dart'; + +// Project imports: +import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/tools/screen_tool.dart'; +import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; class SettingFeedBackPage extends StatefulWidget { SettingFeedBackPage({Key key}) : super(key: key); diff --git a/lib/ui/settings/settings_page.dart b/lib/ui/settings/settings_page.dart index e46831a..bfbea27 100644 --- a/lib/ui/settings/settings_page.dart +++ b/lib/ui/settings/settings_page.dart @@ -1,5 +1,17 @@ +// Flutter imports: +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:aku_ui/common_widgets/aku_material_button.dart'; +import 'package:bot_toast/bot_toast.dart'; +import 'package:get/get.dart'; +import 'package:provider/provider.dart'; + +// Project imports: import 'package:aku_community_manager/provider/user_provider.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/widget_tool.dart'; import 'package:aku_community_manager/ui/agreements/agreement_page.dart'; import 'package:aku_community_manager/ui/agreements/privacy_page.dart'; @@ -7,13 +19,6 @@ import 'package:aku_community_manager/ui/home/home_page.dart'; import 'package:aku_community_manager/ui/settings/setting_feedback_page.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_tile.dart'; -import 'package:aku_ui/common_widgets/aku_material_button.dart'; -import 'package:bot_toast/bot_toast.dart'; -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; -import 'package:aku_community_manager/tools/screen_tool.dart'; -import 'package:get/get.dart'; -import 'package:provider/provider.dart'; class SettingsPage extends StatefulWidget { SettingsPage({Key key}) : super(key: key); diff --git a/lib/ui/settings/user_info_page.dart b/lib/ui/settings/user_info_page.dart index 42c60b4..cd5560c 100644 --- a/lib/ui/settings/user_info_page.dart +++ b/lib/ui/settings/user_info_page.dart @@ -1,14 +1,19 @@ -import 'package:aku_community_manager/const/resource.dart'; +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:common_utils/common_utils.dart'; +import 'package:provider/provider.dart'; + +// Project imports: import 'package:aku_community_manager/const/api.dart'; +import 'package:aku_community_manager/const/resource.dart'; import 'package:aku_community_manager/provider/user_provider.dart'; +import 'package:aku_community_manager/tools/screen_tool.dart'; import 'package:aku_community_manager/ui/widgets/app_widgets/aku_avatar.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_tile.dart'; import 'package:aku_community_manager/ui/widgets/inner/pick_image.dart'; -import 'package:common_utils/common_utils.dart'; -import 'package:flutter/material.dart'; -import 'package:aku_community_manager/tools/screen_tool.dart'; -import 'package:provider/provider.dart'; class UserInfoPage extends StatefulWidget { UserInfoPage({Key key}) : super(key: key); diff --git a/lib/ui/splash/splash_page.dart b/lib/ui/splash/splash_page.dart index c56d7e5..6b7ac9c 100644 --- a/lib/ui/splash/splash_page.dart +++ b/lib/ui/splash/splash_page.dart @@ -1,12 +1,17 @@ -import 'package:aku_community_manager/ui/home/home_page.dart'; -import 'package:aku_community_manager/utils/hive_store.dart'; -import 'package:amap_map_fluttify/amap_map_fluttify.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: +import 'package:amap_map_fluttify/amap_map_fluttify.dart'; import 'package:get/get.dart'; import 'package:hive/hive.dart'; import 'package:hive_flutter/hive_flutter.dart'; import 'package:power_logger/power_logger.dart'; +// Project imports: +import 'package:aku_community_manager/ui/home/home_page.dart'; +import 'package:aku_community_manager/utils/hive_store.dart'; + class SplashPage extends StatefulWidget { SplashPage({Key key}) : super(key: key); diff --git a/lib/ui/sub_pages/activity_manager/activity_detail_page.dart b/lib/ui/sub_pages/activity_manager/activity_detail_page.dart index 7566dca..f6a079a 100644 --- a/lib/ui/sub_pages/activity_manager/activity_detail_page.dart +++ b/lib/ui/sub_pages/activity_manager/activity_detail_page.dart @@ -1,10 +1,15 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:common_utils/common_utils.dart'; + +// Project imports: 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/activity_manager/fake_activity_model.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; -import 'package:common_utils/common_utils.dart'; -import 'package:flutter/material.dart'; -import 'package:aku_community_manager/tools/screen_tool.dart'; class ActivityDetailPage extends StatefulWidget { final FakeActivityManagerModel model; diff --git a/lib/ui/sub_pages/activity_manager/activity_manager_card.dart b/lib/ui/sub_pages/activity_manager/activity_manager_card.dart index 37e44c1..06d0891 100644 --- a/lib/ui/sub_pages/activity_manager/activity_manager_card.dart +++ b/lib/ui/sub_pages/activity_manager/activity_manager_card.dart @@ -1,11 +1,16 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:common_utils/common_utils.dart'; +import 'package:get/route_manager.dart'; + +// Project imports: 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/activity_manager/activity_detail_page.dart'; import 'package:aku_community_manager/ui/sub_pages/activity_manager/fake_activity_model.dart'; -import 'package:common_utils/common_utils.dart'; -import 'package:flutter/material.dart'; -import 'package:aku_community_manager/tools/screen_tool.dart'; -import 'package:get/route_manager.dart'; class ActivityManagerCard extends StatelessWidget { String get startDate => diff --git a/lib/ui/sub_pages/activity_manager/activity_manager_page.dart b/lib/ui/sub_pages/activity_manager/activity_manager_page.dart index b9d4605..5d67dc6 100644 --- a/lib/ui/sub_pages/activity_manager/activity_manager_page.dart +++ b/lib/ui/sub_pages/activity_manager/activity_manager_page.dart @@ -1,7 +1,10 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Project imports: import 'package:aku_community_manager/ui/sub_pages/activity_manager/activity_manager_card.dart'; import 'package:aku_community_manager/ui/sub_pages/activity_manager/fake_activity_model.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; -import 'package:flutter/material.dart'; class ActivityManagerPage extends StatefulWidget { ActivityManagerPage({Key key}) : super(key: key); diff --git a/lib/ui/sub_pages/activity_manager/fake_activity_model.dart b/lib/ui/sub_pages/activity_manager/fake_activity_model.dart index 928686a..2d6386a 100644 --- a/lib/ui/sub_pages/activity_manager/fake_activity_model.dart +++ b/lib/ui/sub_pages/activity_manager/fake_activity_model.dart @@ -1,3 +1,4 @@ +// Project imports: import 'package:aku_community_manager/const/resource.dart'; class FakeActivityManagerModel { diff --git a/lib/ui/sub_pages/borrow_manager/add_borrow_item_page.dart b/lib/ui/sub_pages/borrow_manager/add_borrow_item_page.dart index c70b29a..70526a5 100644 --- a/lib/ui/sub_pages/borrow_manager/add_borrow_item_page.dart +++ b/lib/ui/sub_pages/borrow_manager/add_borrow_item_page.dart @@ -1,15 +1,21 @@ +// Dart imports: import 'dart:io'; import 'dart:math'; +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:aku_ui/common_widgets/aku_material_button.dart'; +import 'package:bot_toast/bot_toast.dart'; +import 'package:common_utils/common_utils.dart'; + +// Project imports: import 'package:aku_community_manager/mock_models/borrow/borrow_model.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/widgets/common/aku_scaffold.dart'; import 'package:aku_community_manager/ui/widgets/inner/pick_image.dart'; -import 'package:aku_ui/common_widgets/aku_material_button.dart'; -import 'package:bot_toast/bot_toast.dart'; -import 'package:common_utils/common_utils.dart'; -import 'package:flutter/material.dart'; class AddBorrowItemPage extends StatefulWidget { final BorrowObject object; diff --git a/lib/ui/sub_pages/borrow_manager/add_borrow_object_page.dart b/lib/ui/sub_pages/borrow_manager/add_borrow_object_page.dart index 256a818..a1bfaab 100644 --- a/lib/ui/sub_pages/borrow_manager/add_borrow_object_page.dart +++ b/lib/ui/sub_pages/borrow_manager/add_borrow_object_page.dart @@ -1,5 +1,17 @@ +// Dart imports: import 'dart:io'; +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:aku_ui/common_widgets/aku_material_button.dart'; +import 'package:bot_toast/bot_toast.dart'; +import 'package:common_utils/common_utils.dart'; +import 'package:get/get.dart'; +import 'package:provider/provider.dart'; + +// Project imports: import 'package:aku_community_manager/mock_models/borrow/borrow_data.dart'; import 'package:aku_community_manager/mock_models/borrow/borrow_model.dart'; import 'package:aku_community_manager/mock_models/users/user_info_model.dart'; @@ -9,12 +21,6 @@ import 'package:aku_community_manager/tools/widget_tool.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; import 'package:aku_community_manager/ui/widgets/inner/aku_bottom_button.dart'; import 'package:aku_community_manager/ui/widgets/inner/pick_image.dart'; -import 'package:aku_ui/common_widgets/aku_material_button.dart'; -import 'package:bot_toast/bot_toast.dart'; -import 'package:common_utils/common_utils.dart'; -import 'package:flutter/material.dart'; -import 'package:get/get.dart'; -import 'package:provider/provider.dart'; class AddBorrowObjectPage extends StatefulWidget { AddBorrowObjectPage({Key key}) : super(key: key); diff --git a/lib/ui/sub_pages/borrow_manager/all_borrow_goods.dart b/lib/ui/sub_pages/borrow_manager/all_borrow_goods.dart index 019b096..d188d91 100644 --- a/lib/ui/sub_pages/borrow_manager/all_borrow_goods.dart +++ b/lib/ui/sub_pages/borrow_manager/all_borrow_goods.dart @@ -1,3 +1,13 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:aku_ui/common_widgets/aku_material_button.dart'; +import 'package:get/get.dart'; +import 'package:provider/provider.dart'; + +// Project imports: +import 'package:aku_community_manager/const/resource.dart'; import 'package:aku_community_manager/mock_models/borrow/borrow_data.dart'; import 'package:aku_community_manager/mock_models/borrow/borrow_model.dart'; import 'package:aku_community_manager/mock_models/users/user_info_model.dart'; @@ -7,11 +17,6 @@ import 'package:aku_community_manager/tools/widget_tool.dart'; import 'package:aku_community_manager/ui/sub_pages/borrow_manager/add_borrow_object_page.dart'; import 'package:aku_community_manager/ui/sub_pages/borrow_manager/borrow_items_page.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; -import 'package:aku_ui/common_widgets/aku_material_button.dart'; -import 'package:aku_community_manager/const/resource.dart'; -import 'package:flutter/material.dart'; -import 'package:get/get.dart'; -import 'package:provider/provider.dart'; class AllBorrowGoods extends StatefulWidget { AllBorrowGoods({Key key}) : super(key: key); diff --git a/lib/ui/sub_pages/borrow_manager/borrow_item_detail_page.dart b/lib/ui/sub_pages/borrow_manager/borrow_item_detail_page.dart index c579cab..12f40fd 100644 --- a/lib/ui/sub_pages/borrow_manager/borrow_item_detail_page.dart +++ b/lib/ui/sub_pages/borrow_manager/borrow_item_detail_page.dart @@ -1,12 +1,17 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:aku_ui/common_widgets/aku_material_button.dart'; +import 'package:provider/provider.dart'; + +// Project imports: import 'package:aku_community_manager/mock_models/borrow/borrow_model.dart'; import 'package:aku_community_manager/mock_models/users/user_info_model.dart'; import 'package:aku_community_manager/provider/user_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/widgets/common/aku_scaffold.dart'; -import 'package:aku_ui/common_widgets/aku_material_button.dart'; -import 'package:flutter/material.dart'; -import 'package:provider/provider.dart'; class BorrowItemDetailPage extends StatefulWidget { final SingleBorrowGoods item; diff --git a/lib/ui/sub_pages/borrow_manager/borrow_items_page.dart b/lib/ui/sub_pages/borrow_manager/borrow_items_page.dart index bc2609a..17569d4 100644 --- a/lib/ui/sub_pages/borrow_manager/borrow_items_page.dart +++ b/lib/ui/sub_pages/borrow_manager/borrow_items_page.dart @@ -1,3 +1,13 @@ +// Flutter imports: +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:aku_ui/common_widgets/aku_material_button.dart'; +import 'package:get/get.dart'; +import 'package:provider/provider.dart'; + +// Project imports: import 'package:aku_community_manager/mock_models/borrow/borrow_model.dart'; import 'package:aku_community_manager/mock_models/users/user_info_model.dart'; import 'package:aku_community_manager/provider/user_provider.dart'; @@ -6,11 +16,6 @@ import 'package:aku_community_manager/tools/widget_tool.dart'; import 'package:aku_community_manager/ui/sub_pages/borrow_manager/add_borrow_item_page.dart'; import 'package:aku_community_manager/ui/sub_pages/borrow_manager/borrow_item_detail_page.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; -import 'package:aku_ui/common_widgets/aku_material_button.dart'; -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; -import 'package:get/get.dart'; -import 'package:provider/provider.dart'; class BorrowItemPage extends StatefulWidget { final BorrowObject object; diff --git a/lib/ui/sub_pages/borrow_manager/borrow_manager_card.dart b/lib/ui/sub_pages/borrow_manager/borrow_manager_card.dart index 755ccef..5bdcf95 100644 --- a/lib/ui/sub_pages/borrow_manager/borrow_manager_card.dart +++ b/lib/ui/sub_pages/borrow_manager/borrow_manager_card.dart @@ -1,3 +1,15 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:aku_ui/common_widgets/aku_material_button.dart'; +import 'package:bot_toast/bot_toast.dart'; +import 'package:common_utils/common_utils.dart'; +import 'package:get/get.dart'; +import 'package:provider/provider.dart'; +import 'package:url_launcher/url_launcher.dart'; + +// Project imports: import 'package:aku_community_manager/mock_models/borrow/borrow_model.dart'; import 'package:aku_community_manager/mock_models/users/user_info_model.dart'; import 'package:aku_community_manager/provider/user_provider.dart'; @@ -5,13 +17,6 @@ import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/tools/widget_tool.dart'; import 'package:aku_community_manager/ui/sub_pages/borrow_manager/borrow_manager_check_page.dart'; import 'package:aku_community_manager/ui/widgets/inner/aku_chip_box.dart'; -import 'package:aku_ui/common_widgets/aku_material_button.dart'; -import 'package:bot_toast/bot_toast.dart'; -import 'package:common_utils/common_utils.dart'; -import 'package:flutter/material.dart'; -import 'package:get/get.dart'; -import 'package:provider/provider.dart'; -import 'package:url_launcher/url_launcher.dart'; class BorrowManagerCard extends StatefulWidget { final BorrowModel model; diff --git a/lib/ui/sub_pages/borrow_manager/borrow_manager_check_page.dart b/lib/ui/sub_pages/borrow_manager/borrow_manager_check_page.dart index 4114a9c..2b71b3d 100644 --- a/lib/ui/sub_pages/borrow_manager/borrow_manager_check_page.dart +++ b/lib/ui/sub_pages/borrow_manager/borrow_manager_check_page.dart @@ -1,10 +1,15 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:get/get.dart'; + +// Project imports: import 'package:aku_community_manager/mock_models/borrow/borrow_model.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/widgets/common/aku_scaffold.dart'; import 'package:aku_community_manager/ui/widgets/inner/aku_bottom_button.dart'; -import 'package:flutter/material.dart'; -import 'package:get/get.dart'; class BorrowManagerCheckPage extends StatefulWidget { final BorrowModel model; diff --git a/lib/ui/sub_pages/borrow_manager/borrow_manager_page.dart b/lib/ui/sub_pages/borrow_manager/borrow_manager_page.dart index bea3316..56be063 100644 --- a/lib/ui/sub_pages/borrow_manager/borrow_manager_page.dart +++ b/lib/ui/sub_pages/borrow_manager/borrow_manager_page.dart @@ -1,3 +1,12 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:aku_ui/common_widgets/aku_material_button.dart'; +import 'package:get/get.dart'; +import 'package:provider/provider.dart'; + +// Project imports: import 'package:aku_community_manager/mock_models/borrow/borrow_data.dart'; import 'package:aku_community_manager/mock_models/borrow/borrow_model.dart'; import 'package:aku_community_manager/mock_models/users/user_info_model.dart'; @@ -7,10 +16,6 @@ import 'package:aku_community_manager/ui/sub_pages/borrow_manager/all_borrow_goo import 'package:aku_community_manager/ui/sub_pages/borrow_manager/borrow_manager_card.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:aku_ui/common_widgets/aku_material_button.dart'; -import 'package:flutter/material.dart'; -import 'package:get/get.dart'; -import 'package:provider/provider.dart'; class BorrowManagerPage extends StatefulWidget { BorrowManagerPage({Key key}) : super(key: key); diff --git a/lib/ui/sub_pages/business_and_fix/business_and_fix_detail_page.dart b/lib/ui/sub_pages/business_and_fix/business_and_fix_detail_page.dart index d04b6c9..d40c976 100644 --- a/lib/ui/sub_pages/business_and_fix/business_and_fix_detail_page.dart +++ b/lib/ui/sub_pages/business_and_fix/business_and_fix_detail_page.dart @@ -1,8 +1,19 @@ +// Flutter imports: +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'; +import 'package:provider/provider.dart'; + +// Project imports: import 'package:aku_community_manager/const/resource.dart'; import 'package:aku_community_manager/mock_models/fix/fix_model.dart'; import 'package:aku_community_manager/mock_models/users/user_info_model.dart'; import 'package:aku_community_manager/provider/user_provider.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/widget_tool.dart'; import 'package:aku_community_manager/ui/sub_pages/business_and_fix/fix_more_time_page.dart'; import 'package:aku_community_manager/ui/sub_pages/business_and_fix/fix_work_finish_page.dart'; @@ -10,12 +21,6 @@ import 'package:aku_community_manager/ui/sub_pages/business_and_fix/fixer_depart import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; import 'package:aku_community_manager/ui/widgets/inner/aku_title_box.dart'; import 'package:aku_community_manager/ui/widgets/inner/show_bottom_sheet.dart'; -import 'package:aku_ui/common_widgets/aku_material_button.dart'; -import 'package:common_utils/common_utils.dart'; -import 'package:flutter/material.dart'; -import 'package:aku_community_manager/tools/screen_tool.dart'; -import 'package:get/get.dart'; -import 'package:provider/provider.dart'; class BusinessAndFixDetailPage extends StatefulWidget { final FixModel model; diff --git a/lib/ui/sub_pages/business_and_fix/business_and_fix_page.dart b/lib/ui/sub_pages/business_and_fix/business_and_fix_page.dart index 07ef7fd..8998e6f 100644 --- a/lib/ui/sub_pages/business_and_fix/business_and_fix_page.dart +++ b/lib/ui/sub_pages/business_and_fix/business_and_fix_page.dart @@ -1,13 +1,18 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:provider/provider.dart'; + +// Project imports: import 'package:aku_community_manager/mock_models/fix/fix_model.dart'; import 'package:aku_community_manager/mock_models/users/user_info_model.dart'; import 'package:aku_community_manager/provider/fix_provider.dart'; import 'package:aku_community_manager/provider/user_provider.dart'; +import 'package:aku_community_manager/tools/screen_tool.dart'; import 'package:aku_community_manager/ui/sub_pages/business_and_fix/business_fix_card.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; -import 'package:aku_community_manager/tools/screen_tool.dart'; import 'package:aku_community_manager/ui/widgets/inner/aku_tab_bar.dart'; -import 'package:flutter/material.dart'; -import 'package:provider/provider.dart'; class BusinessAndFixPage extends StatefulWidget { BusinessAndFixPage({Key key}) : super(key: key); diff --git a/lib/ui/sub_pages/business_and_fix/business_fix_card.dart b/lib/ui/sub_pages/business_and_fix/business_fix_card.dart index ba9096b..d9c3365 100644 --- a/lib/ui/sub_pages/business_and_fix/business_fix_card.dart +++ b/lib/ui/sub_pages/business_and_fix/business_fix_card.dart @@ -1,19 +1,24 @@ +// Flutter imports: +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:extended_text/extended_text.dart'; +import 'package:get/get.dart'; +import 'package:provider/provider.dart'; + +// Project imports: import 'package:aku_community_manager/mock_models/fix/fix_model.dart'; import 'package:aku_community_manager/mock_models/users/user_info_model.dart'; import 'package:aku_community_manager/provider/user_provider.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/widget_tool.dart'; import 'package:aku_community_manager/ui/sub_pages/business_and_fix/business_and_fix_detail_page.dart'; import 'package:aku_community_manager/ui/sub_pages/business_and_fix/fix_more_time_page.dart'; import 'package:aku_community_manager/ui/sub_pages/business_and_fix/fix_work_finish_page.dart'; import 'package:aku_community_manager/ui/widgets/inner/aku_chip_box.dart'; -import 'package:aku_ui/common_widgets/aku_material_button.dart'; -import 'package:common_utils/common_utils.dart'; -import 'package:extended_text/extended_text.dart'; -import 'package:flutter/material.dart'; -import 'package:aku_community_manager/tools/screen_tool.dart'; -import 'package:get/get.dart'; -import 'package:provider/provider.dart'; class BusinessFixCard extends StatefulWidget { final FixModel model; diff --git a/lib/ui/sub_pages/business_and_fix/fix_more_time_page.dart b/lib/ui/sub_pages/business_and_fix/fix_more_time_page.dart index 2d6796e..b3807f5 100644 --- a/lib/ui/sub_pages/business_and_fix/fix_more_time_page.dart +++ b/lib/ui/sub_pages/business_and_fix/fix_more_time_page.dart @@ -1,14 +1,19 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:aku_ui/common_widgets/aku_material_button.dart'; +import 'package:get/get.dart'; +import 'package:provider/provider.dart'; + +// Project imports: import 'package:aku_community_manager/const/resource.dart'; import 'package:aku_community_manager/mock_models/fix/fix_model.dart'; import 'package:aku_community_manager/provider/user_provider.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/widget_tool.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; -import 'package:aku_ui/common_widgets/aku_material_button.dart'; -import 'package:flutter/material.dart'; -import 'package:aku_community_manager/tools/screen_tool.dart'; -import 'package:get/get.dart'; -import 'package:provider/provider.dart'; class FixMoreTimePage extends StatefulWidget { final FixModel model; diff --git a/lib/ui/sub_pages/business_and_fix/fix_work_finish_page.dart b/lib/ui/sub_pages/business_and_fix/fix_work_finish_page.dart index 53a909d..b06188e 100644 --- a/lib/ui/sub_pages/business_and_fix/fix_work_finish_page.dart +++ b/lib/ui/sub_pages/business_and_fix/fix_work_finish_page.dart @@ -1,17 +1,23 @@ +// Dart imports: import 'dart:io'; +// Flutter imports: +import 'package:flutter/cupertino.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/mock_models/fix/fix_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/widget_tool.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; -import 'package:aku_community_manager/tools/screen_tool.dart'; import 'package:aku_community_manager/ui/widgets/inner/aku_title_box.dart'; import 'package:aku_community_manager/ui/widgets/inner/pick_image.dart'; -import 'package:aku_ui/common_widgets/aku_material_button.dart'; -import 'package:common_utils/common_utils.dart'; -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; -import 'package:get/get.dart'; class FixWorkFinishPage extends StatefulWidget { final FixModel model; diff --git a/lib/ui/sub_pages/business_and_fix/fixer_department_page.dart b/lib/ui/sub_pages/business_and_fix/fixer_department_page.dart index b304491..5c34476 100644 --- a/lib/ui/sub_pages/business_and_fix/fixer_department_page.dart +++ b/lib/ui/sub_pages/business_and_fix/fixer_department_page.dart @@ -1,16 +1,21 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:aku_ui/common_widgets/aku_material_button.dart'; +import 'package:expandable/expandable.dart'; +import 'package:get/get.dart'; +import 'package:provider/provider.dart'; + +// Project imports: import 'package:aku_community_manager/const/resource.dart'; import 'package:aku_community_manager/mock_models/fix/fix_model.dart'; import 'package:aku_community_manager/mock_models/fix/fixer_model.dart'; import 'package:aku_community_manager/provider/fix_provider.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/widget_tool.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; -import 'package:aku_community_manager/tools/screen_tool.dart'; -import 'package:aku_ui/common_widgets/aku_material_button.dart'; -import 'package:expandable/expandable.dart'; -import 'package:flutter/material.dart'; -import 'package:get/get.dart'; -import 'package:provider/provider.dart'; class FixerDepartmentPage extends StatefulWidget { final FixModel model; diff --git a/lib/ui/sub_pages/decoration_manager/decoration_check_card_widget.dart b/lib/ui/sub_pages/decoration_manager/decoration_check_card_widget.dart index a8aa760..05bcd23 100644 --- a/lib/ui/sub_pages/decoration_manager/decoration_check_card_widget.dart +++ b/lib/ui/sub_pages/decoration_manager/decoration_check_card_widget.dart @@ -1,8 +1,11 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Project imports: import 'package:aku_community_manager/mock_models/decoration/decoration_model.dart'; import 'package:aku_community_manager/style/app_style.dart'; -import 'package:aku_community_manager/tools/widget_tool.dart'; -import 'package:flutter/material.dart'; import 'package:aku_community_manager/tools/screen_tool.dart'; +import 'package:aku_community_manager/tools/widget_tool.dart'; class DecorationCheckCardWidget extends StatelessWidget { final CHECK_TYPE type; diff --git a/lib/ui/sub_pages/decoration_manager/decoration_check_row.dart b/lib/ui/sub_pages/decoration_manager/decoration_check_row.dart index 3fcaf9e..3414fc4 100644 --- a/lib/ui/sub_pages/decoration_manager/decoration_check_row.dart +++ b/lib/ui/sub_pages/decoration_manager/decoration_check_row.dart @@ -1,9 +1,11 @@ -import 'package:aku_community_manager/mock_models/decoration/decoration_model.dart'; -import 'package:aku_community_manager/tools/widget_tool.dart'; -import 'package:aku_community_manager/ui/sub_pages/decoration_manager/decoration_check_card_widget.dart'; +// Flutter imports: import 'package:flutter/material.dart'; +// Project imports: +import 'package:aku_community_manager/mock_models/decoration/decoration_model.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_check_card_widget.dart'; class DecorationCheckRow extends StatefulWidget { final List details; diff --git a/lib/ui/sub_pages/decoration_manager/decoration_checkbox.dart b/lib/ui/sub_pages/decoration_manager/decoration_checkbox.dart index e5978b3..96c15aa 100644 --- a/lib/ui/sub_pages/decoration_manager/decoration_checkbox.dart +++ b/lib/ui/sub_pages/decoration_manager/decoration_checkbox.dart @@ -1,6 +1,9 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Project imports: import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/tools/widget_tool.dart'; -import 'package:flutter/material.dart'; class DecorationCheckBox extends StatefulWidget { final bool initValue; diff --git a/lib/ui/sub_pages/decoration_manager/decoration_department_page.dart b/lib/ui/sub_pages/decoration_manager/decoration_department_page.dart index 388ea4f..2da241c 100644 --- a/lib/ui/sub_pages/decoration_manager/decoration_department_page.dart +++ b/lib/ui/sub_pages/decoration_manager/decoration_department_page.dart @@ -1,16 +1,21 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:aku_ui/common_widgets/aku_material_button.dart'; +import 'package:expandable/expandable.dart'; +import 'package:get/get.dart'; +import 'package:provider/provider.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/mock_models/fix/fixer_model.dart'; import 'package:aku_community_manager/provider/fix_provider.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/widget_tool.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; -import 'package:aku_community_manager/tools/screen_tool.dart'; -import 'package:aku_ui/common_widgets/aku_material_button.dart'; -import 'package:expandable/expandable.dart'; -import 'package:flutter/material.dart'; -import 'package:get/get.dart'; -import 'package:provider/provider.dart'; class DecorationDepartmentPage extends StatefulWidget { final DecorationModel model; diff --git a/lib/ui/sub_pages/decoration_manager/decoration_follow_check.dart b/lib/ui/sub_pages/decoration_manager/decoration_follow_check.dart index 6b75ea0..1231fe8 100644 --- a/lib/ui/sub_pages/decoration_manager/decoration_follow_check.dart +++ b/lib/ui/sub_pages/decoration_manager/decoration_follow_check.dart @@ -1,3 +1,11 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:common_utils/common_utils.dart'; +import 'package:get/get.dart'; + +// Project imports: import 'package:aku_community_manager/mock_models/decoration/decoration_model.dart'; import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/tools/widget_tool.dart'; @@ -5,9 +13,6 @@ import 'package:aku_community_manager/ui/sub_pages/decoration_manager/decoration import 'package:aku_community_manager/ui/sub_pages/decoration_manager/decoration_success_page.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; import 'package:aku_community_manager/ui/widgets/inner/aku_bottom_button.dart'; -import 'package:common_utils/common_utils.dart'; -import 'package:flutter/material.dart'; -import 'package:get/get.dart'; class DecorationFollowCheck extends StatefulWidget { final DecorationModel model; 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 1072249..407e648 100644 --- a/lib/ui/sub_pages/decoration_manager/decoration_manager_card.dart +++ b/lib/ui/sub_pages/decoration_manager/decoration_manager_card.dart @@ -1,18 +1,23 @@ +// Flutter imports: +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'; +import 'package:provider/provider.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/mock_models/users/user_info_model.dart'; import 'package:aku_community_manager/provider/user_provider.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/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:aku_ui/common_widgets/aku_material_button.dart'; -import 'package:common_utils/common_utils.dart'; -import 'package:flutter/material.dart'; -import 'package:aku_community_manager/tools/screen_tool.dart'; -import 'package:aku_community_manager/const/resource.dart'; -import 'package:get/get.dart'; -import 'package:provider/provider.dart'; class DecorationManagerCard extends StatefulWidget { final DecorationModel 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 0a9fe34..a4531df 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 @@ -1,9 +1,24 @@ +// Dart imports: import 'dart:math'; +// Flutter imports: +import 'package:flutter/cupertino.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:expandable/expandable.dart'; +import 'package:get/get.dart'; +import 'package:provider/provider.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/mock_models/users/user_info_model.dart'; import 'package:aku_community_manager/provider/user_provider.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/widget_tool.dart'; import 'package:aku_community_manager/ui/sub_pages/decoration_manager/decoration_check_row.dart'; import 'package:aku_community_manager/ui/sub_pages/decoration_manager/decoration_checkbox.dart'; @@ -14,16 +29,7 @@ import 'package:aku_community_manager/ui/widgets/common/aku_back_button.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; import 'package:aku_community_manager/ui/widgets/inner/aku_bottom_button.dart'; import 'package:aku_community_manager/ui/widgets/inner/aku_title_box.dart'; -import 'package:aku_community_manager/tools/screen_tool.dart'; -import 'package:aku_community_manager/const/resource.dart'; import 'package:aku_community_manager/ui/widgets/inner/show_bottom_sheet.dart'; -import 'package:aku_ui/common_widgets/aku_material_button.dart'; -import 'package:common_utils/common_utils.dart'; -import 'package:expandable/expandable.dart'; -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; -import 'package:get/get.dart'; -import 'package:provider/provider.dart'; class DecorationManagerDetailPage extends StatefulWidget { final DecorationModel model; diff --git a/lib/ui/sub_pages/decoration_manager/decoration_manager_page.dart b/lib/ui/sub_pages/decoration_manager/decoration_manager_page.dart index 9bc4958..23a4852 100644 --- a/lib/ui/sub_pages/decoration_manager/decoration_manager_page.dart +++ b/lib/ui/sub_pages/decoration_manager/decoration_manager_page.dart @@ -1,13 +1,18 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:provider/provider.dart'; + +// Project imports: import 'package:aku_community_manager/mock_models/decoration/decoration_data.dart'; import 'package:aku_community_manager/mock_models/decoration/decoration_model.dart'; import 'package:aku_community_manager/mock_models/users/user_info_model.dart'; import 'package:aku_community_manager/provider/user_provider.dart'; +import 'package:aku_community_manager/tools/screen_tool.dart'; import 'package:aku_community_manager/ui/sub_pages/decoration_manager/decoration_manager_card.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:aku_community_manager/tools/screen_tool.dart'; -import 'package:flutter/material.dart'; -import 'package:provider/provider.dart'; class DecorationManagerPage extends StatefulWidget { DecorationManagerPage({Key key}) : super(key: key); diff --git a/lib/ui/sub_pages/decoration_manager/decoration_success_page.dart b/lib/ui/sub_pages/decoration_manager/decoration_success_page.dart index 28f6ba6..a982259 100644 --- a/lib/ui/sub_pages/decoration_manager/decoration_success_page.dart +++ b/lib/ui/sub_pages/decoration_manager/decoration_success_page.dart @@ -1,9 +1,14 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:aku_ui/common_widgets/aku_material_button.dart'; +import 'package:get/get.dart'; + +// Project imports: import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/tools/widget_tool.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; -import 'package:aku_ui/common_widgets/aku_material_button.dart'; -import 'package:flutter/material.dart'; -import 'package:get/get.dart'; class DecorationSuccessPage extends StatefulWidget { DecorationSuccessPage({Key key}) : super(key: key); diff --git a/lib/ui/sub_pages/decoration_manager/decoration_util.dart b/lib/ui/sub_pages/decoration_manager/decoration_util.dart index e939efa..be91a25 100644 --- a/lib/ui/sub_pages/decoration_manager/decoration_util.dart +++ b/lib/ui/sub_pages/decoration_manager/decoration_util.dart @@ -1,9 +1,14 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:provider/provider.dart'; + +// Project imports: import 'package:aku_community_manager/mock_models/decoration/decoration_model.dart'; import 'package:aku_community_manager/mock_models/users/user_info_model.dart'; import 'package:aku_community_manager/provider/user_provider.dart'; import 'package:aku_community_manager/style/app_style.dart'; -import 'package:flutter/material.dart'; -import 'package:provider/provider.dart'; class DecorationUIUtil { BuildContext context; diff --git a/lib/ui/sub_pages/items_outdoor/items_outdoor_card.dart b/lib/ui/sub_pages/items_outdoor/items_outdoor_card.dart index 2a9e0a2..f9cb2cc 100644 --- a/lib/ui/sub_pages/items_outdoor/items_outdoor_card.dart +++ b/lib/ui/sub_pages/items_outdoor/items_outdoor_card.dart @@ -1,14 +1,19 @@ -import 'package:aku_community_manager/mock_models/outdoor_models/outdoor_model.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/sub_pages/items_outdoor/items_outdoor_details_page.dart'; +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: import 'package:aku_ui/common_widgets/aku_common_widgets.dart'; import 'package:common_utils/common_utils.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:aku_community_manager/const/resource.dart'; import 'package:get/get.dart'; +// Project imports: +import 'package:aku_community_manager/const/resource.dart'; +import 'package:aku_community_manager/mock_models/outdoor_models/outdoor_model.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/sub_pages/items_outdoor/items_outdoor_details_page.dart'; + class ItemsOutdoorCard extends StatefulWidget { final ItemsOutdoorModel cardModel; final bool isdetail; diff --git a/lib/ui/sub_pages/items_outdoor/items_outdoor_details_page.dart b/lib/ui/sub_pages/items_outdoor/items_outdoor_details_page.dart index 9fe6a5e..031336a 100644 --- a/lib/ui/sub_pages/items_outdoor/items_outdoor_details_page.dart +++ b/lib/ui/sub_pages/items_outdoor/items_outdoor_details_page.dart @@ -1,3 +1,15 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:aku_ui/aku_ui.dart'; +import 'package:aku_ui/common_widgets/aku_material_button.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:get/get.dart'; +import 'package:provider/provider.dart'; + +// Project imports: +import 'package:aku_community_manager/const/resource.dart'; import 'package:aku_community_manager/mock_models/outdoor_models/outdoor_model.dart'; import 'package:aku_community_manager/mock_models/users/user_info_model.dart'; import 'package:aku_community_manager/provider/outdoor_provider.dart'; @@ -8,13 +20,6 @@ import 'package:aku_community_manager/ui/sub_pages/items_outdoor/items_outdoor_c import 'package:aku_community_manager/ui/sub_pages/items_outdoor/outdoor_notpass_page.dart'; import 'package:aku_community_manager/ui/sub_pages/items_outdoor/outdoor_pass_page.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; -import 'package:aku_ui/aku_ui.dart'; -import 'package:aku_ui/common_widgets/aku_material_button.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:aku_community_manager/const/resource.dart'; -import 'package:get/get.dart'; -import 'package:provider/provider.dart'; class ItemsOutdoorDetailsPage extends StatefulWidget { final ItemsOutdoorModel cardMedel; diff --git a/lib/ui/sub_pages/items_outdoor/items_outdoor_page.dart b/lib/ui/sub_pages/items_outdoor/items_outdoor_page.dart index b813f7a..8574f6d 100644 --- a/lib/ui/sub_pages/items_outdoor/items_outdoor_page.dart +++ b/lib/ui/sub_pages/items_outdoor/items_outdoor_page.dart @@ -1,11 +1,16 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:provider/provider.dart'; + +// Project imports: import 'package:aku_community_manager/mock_models/outdoor_models/outdoor_model.dart'; import 'package:aku_community_manager/provider/outdoor_provider.dart'; import 'package:aku_community_manager/ui/sub_pages/items_outdoor/items_outdoor_card.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'; -import 'package:provider/provider.dart'; class ItemsOutdoorPage extends StatefulWidget { ItemsOutdoorPage({Key key}) : super(key: key); diff --git a/lib/ui/sub_pages/items_outdoor/outdoor_notpass_page.dart b/lib/ui/sub_pages/items_outdoor/outdoor_notpass_page.dart index 0a02d89..aef8c6f 100644 --- a/lib/ui/sub_pages/items_outdoor/outdoor_notpass_page.dart +++ b/lib/ui/sub_pages/items_outdoor/outdoor_notpass_page.dart @@ -1,13 +1,18 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:aku_ui/common_widgets/aku_common_widgets.dart'; +import 'package:bot_toast/bot_toast.dart'; +import 'package:common_utils/common_utils.dart'; +import 'package:get/get.dart'; + +// Project imports: import 'package:aku_community_manager/mock_models/outdoor_models/outdoor_model.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/widgets/common/aku_radio.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; -import 'package:aku_ui/common_widgets/aku_common_widgets.dart'; -import 'package:bot_toast/bot_toast.dart'; -import 'package:common_utils/common_utils.dart'; -import 'package:flutter/material.dart'; -import 'package:get/get.dart'; class OutdoorNotpassPage extends StatefulWidget { final ItemsOutdoorModel model; diff --git a/lib/ui/sub_pages/items_outdoor/outdoor_pass_page.dart b/lib/ui/sub_pages/items_outdoor/outdoor_pass_page.dart index 44b7fb2..61adb10 100644 --- a/lib/ui/sub_pages/items_outdoor/outdoor_pass_page.dart +++ b/lib/ui/sub_pages/items_outdoor/outdoor_pass_page.dart @@ -1,17 +1,22 @@ -import 'package:aku_community_manager/mock_models/outdoor_models/outdoor_model.dart'; -import 'package:aku_community_manager/provider/outdoor_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/sub_pages/items_outdoor/items_outdoor_details_page.dart'; -import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: import 'package:aku_ui/common_widgets/aku_common_widgets.dart'; import 'package:bot_toast/bot_toast.dart'; import 'package:common_utils/common_utils.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:provider/provider.dart'; +// Project imports: +import 'package:aku_community_manager/mock_models/outdoor_models/outdoor_model.dart'; +import 'package:aku_community_manager/provider/outdoor_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/sub_pages/items_outdoor/items_outdoor_details_page.dart'; +import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; + class OutdoorPassPage extends StatefulWidget { final ItemsOutdoorModel model; OutdoorPassPage({Key key, @required this.model}) : super(key: key); diff --git a/lib/ui/sub_pages/visitor_manager/visitor_manager_card.dart b/lib/ui/sub_pages/visitor_manager/visitor_manager_card.dart index fa79475..10cb374 100644 --- a/lib/ui/sub_pages/visitor_manager/visitor_manager_card.dart +++ b/lib/ui/sub_pages/visitor_manager/visitor_manager_card.dart @@ -1,11 +1,17 @@ +// Dart imports: import 'dart:math'; +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_screenutil/flutter_screenutil.dart'; + +// Project imports: import 'package:aku_community_manager/const/resource.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/sub_pages/visitor_manager/visitor_manager_page.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; class VisitorManagerCard extends StatefulWidget { final String adress; diff --git a/lib/ui/sub_pages/visitor_manager/visitor_manager_page.dart b/lib/ui/sub_pages/visitor_manager/visitor_manager_page.dart index 3e7e31f..20c48ea 100644 --- a/lib/ui/sub_pages/visitor_manager/visitor_manager_page.dart +++ b/lib/ui/sub_pages/visitor_manager/visitor_manager_page.dart @@ -1,9 +1,14 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_screenutil/flutter_screenutil.dart'; + +// Project imports: import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/ui/sub_pages/visitor_manager/visitor_manager_card.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'; enum VisitorStatus { NOT_VISIT, diff --git a/lib/ui/tool_pages/scan_page.dart b/lib/ui/tool_pages/scan_page.dart index 41ccaee..ff011ba 100644 --- a/lib/ui/tool_pages/scan_page.dart +++ b/lib/ui/tool_pages/scan_page.dart @@ -1,10 +1,17 @@ +// Dart imports: import 'dart:async'; -import 'package:aku_community_manager/tools/screen_tool.dart'; -import 'package:aku_community_manager/ui/widgets/common/aku_back_button.dart'; -import 'package:bot_toast/bot_toast.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: +import 'package:bot_toast/bot_toast.dart'; import 'package:qr_code_scanner/qr_code_scanner.dart'; + +// Project imports: +import 'package:aku_community_manager/tools/screen_tool.dart'; +import 'package:aku_community_manager/ui/widgets/common/aku_back_button.dart'; + // import 'package:qr_code_scanner/qr_code_scanner.dart'; class ScanPage extends StatefulWidget { diff --git a/lib/ui/tool_pages/warning/warning_detail_page.dart b/lib/ui/tool_pages/warning/warning_detail_page.dart index 1c48928..89f6f1f 100644 --- a/lib/ui/tool_pages/warning/warning_detail_page.dart +++ b/lib/ui/tool_pages/warning/warning_detail_page.dart @@ -1,7 +1,10 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Project imports: import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/tools/widget_tool.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; -import 'package:flutter/material.dart'; class WarningDetailPage extends StatefulWidget { WarningDetailPage({Key key}) : super(key: key); diff --git a/lib/ui/tool_pages/warning/warning_page.dart b/lib/ui/tool_pages/warning/warning_page.dart index 0d79c40..b6f818a 100644 --- a/lib/ui/tool_pages/warning/warning_page.dart +++ b/lib/ui/tool_pages/warning/warning_page.dart @@ -1,14 +1,19 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:aku_ui/common_widgets/aku_cupertino_button.dart'; +import 'package:aku_ui/common_widgets/aku_material_button.dart'; +import 'package:amap_map_fluttify/amap_map_fluttify.dart'; +import 'package:get/get.dart'; + +// Project imports: import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/tools/permission_tool.dart'; import 'package:aku_community_manager/tools/widget_tool.dart'; import 'package:aku_community_manager/ui/tool_pages/warning/warning_detail_page.dart'; import 'package:aku_community_manager/ui/tool_pages/warning/warning_sub_page.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; -import 'package:aku_ui/common_widgets/aku_cupertino_button.dart'; -import 'package:aku_ui/common_widgets/aku_material_button.dart'; -import 'package:amap_map_fluttify/amap_map_fluttify.dart'; -import 'package:flutter/material.dart'; -import 'package:get/get.dart'; class WarningPage extends StatefulWidget { WarningPage({Key key}) : super(key: key); diff --git a/lib/ui/tool_pages/warning/warning_sub_page.dart b/lib/ui/tool_pages/warning/warning_sub_page.dart index b709885..f4419f8 100644 --- a/lib/ui/tool_pages/warning/warning_sub_page.dart +++ b/lib/ui/tool_pages/warning/warning_sub_page.dart @@ -1,15 +1,21 @@ +// Dart imports: import 'dart:async'; +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:aku_ui/common_widgets/aku_cupertino_button.dart'; +import 'package:aku_ui/common_widgets/aku_material_button.dart'; +import 'package:bot_toast/bot_toast.dart'; +import 'package:get/get.dart'; + +// Project imports: import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/tools/widget_tool.dart'; import 'package:aku_community_manager/ui/tool_pages/warning/warning_detail_page.dart'; import 'package:aku_community_manager/ui/tool_pages/warning/warning_success.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; -import 'package:aku_ui/common_widgets/aku_cupertino_button.dart'; -import 'package:aku_ui/common_widgets/aku_material_button.dart'; -import 'package:bot_toast/bot_toast.dart'; -import 'package:flutter/material.dart'; -import 'package:get/get.dart'; class WarningSubPage extends StatefulWidget { WarningSubPage({Key key}) : super(key: key); diff --git a/lib/ui/tool_pages/warning/warning_success.dart b/lib/ui/tool_pages/warning/warning_success.dart index 8201563..a40029e 100644 --- a/lib/ui/tool_pages/warning/warning_success.dart +++ b/lib/ui/tool_pages/warning/warning_success.dart @@ -1,13 +1,19 @@ +// Dart imports: import 'dart:async'; +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:aku_ui/common_widgets/aku_material_button.dart'; +import 'package:bot_toast/bot_toast.dart'; +import 'package:get/get.dart'; + +// Project imports: import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/tools/widget_tool.dart'; import 'package:aku_community_manager/ui/tool_pages/warning/warning_detail_page.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; -import 'package:aku_ui/common_widgets/aku_material_button.dart'; -import 'package:bot_toast/bot_toast.dart'; -import 'package:flutter/material.dart'; -import 'package:get/get.dart'; class WarningSuccess extends StatefulWidget { WarningSuccess({Key key}) : super(key: key); diff --git a/lib/ui/widgets/app_widgets/aku_avatar.dart b/lib/ui/widgets/app_widgets/aku_avatar.dart index fe6a6af..17d7e1e 100644 --- a/lib/ui/widgets/app_widgets/aku_avatar.dart +++ b/lib/ui/widgets/app_widgets/aku_avatar.dart @@ -1,9 +1,14 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:provider/provider.dart'; + +// Project imports: import 'package:aku_community_manager/const/api.dart'; import 'package:aku_community_manager/const/resource.dart'; import 'package:aku_community_manager/provider/user_provider.dart'; -import 'package:flutter/material.dart'; -import 'package:provider/provider.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; class AkuAvatar extends StatelessWidget { final double size; diff --git a/lib/ui/widgets/common/aku_back_button.dart b/lib/ui/widgets/common/aku_back_button.dart index c4dead4..18eba8e 100644 --- a/lib/ui/widgets/common/aku_back_button.dart +++ b/lib/ui/widgets/common/aku_back_button.dart @@ -1,6 +1,11 @@ -import 'package:aku_community_manager/style/app_style.dart'; -import 'package:aku_ui/common_widgets/aku_material_button.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: +import 'package:aku_ui/common_widgets/aku_material_button.dart'; + +// Project imports: +import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/tools/screen_tool.dart'; class AkuBackButton extends StatefulWidget { diff --git a/lib/ui/widgets/common/aku_radio.dart b/lib/ui/widgets/common/aku_radio.dart index 0e1cf11..d4eeb7d 100644 --- a/lib/ui/widgets/common/aku_radio.dart +++ b/lib/ui/widgets/common/aku_radio.dart @@ -1,8 +1,12 @@ +// Dart imports: import 'dart:ffi'; -import 'package:aku_community_manager/style/app_style.dart'; +// Flutter imports: import 'package:flutter/material.dart'; +// Project imports: +import 'package:aku_community_manager/style/app_style.dart'; + class AkuRadio extends StatefulWidget { final double size; final int grouvalue; diff --git a/lib/ui/widgets/common/aku_scaffold.dart b/lib/ui/widgets/common/aku_scaffold.dart index 34f6b82..794b1e1 100644 --- a/lib/ui/widgets/common/aku_scaffold.dart +++ b/lib/ui/widgets/common/aku_scaffold.dart @@ -1,6 +1,9 @@ -import 'package:aku_community_manager/ui/widgets/common/aku_back_button.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'package:aku_community_manager/tools/screen_tool.dart'; +import 'package:aku_community_manager/ui/widgets/common/aku_back_button.dart'; ///用法大致同Scaffold diff --git a/lib/ui/widgets/common/aku_tile.dart b/lib/ui/widgets/common/aku_tile.dart index 2eed6be..69d25c5 100644 --- a/lib/ui/widgets/common/aku_tile.dart +++ b/lib/ui/widgets/common/aku_tile.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: import 'package:aku_community_manager/tools/screen_tool.dart'; class AkuTile extends StatefulWidget { diff --git a/lib/ui/widgets/inner/aku_bottom_button.dart b/lib/ui/widgets/inner/aku_bottom_button.dart index 482e01b..ff540ba 100644 --- a/lib/ui/widgets/inner/aku_bottom_button.dart +++ b/lib/ui/widgets/inner/aku_bottom_button.dart @@ -1,7 +1,12 @@ -import 'package:aku_community_manager/style/app_style.dart'; -import 'package:aku_ui/common_widgets/aku_material_button.dart'; +// Flutter imports: import 'package:flutter/material.dart'; +// Package imports: +import 'package:aku_ui/common_widgets/aku_material_button.dart'; + +// Project imports: +import 'package:aku_community_manager/style/app_style.dart'; + class AkuBottomButton extends StatefulWidget { final VoidCallback onTap; final String title; diff --git a/lib/ui/widgets/inner/aku_chip_box.dart b/lib/ui/widgets/inner/aku_chip_box.dart index ffe96e7..7b4d843 100644 --- a/lib/ui/widgets/inner/aku_chip_box.dart +++ b/lib/ui/widgets/inner/aku_chip_box.dart @@ -1,6 +1,9 @@ -import 'package:aku_community_manager/style/app_style.dart'; +// Flutter imports: import 'package:flutter/material.dart'; +// Project imports: +import 'package:aku_community_manager/style/app_style.dart'; + class AkuChipBox extends StatelessWidget { final String title; const AkuChipBox({Key key, @required this.title}) : super(key: key); diff --git a/lib/ui/widgets/inner/aku_tab_bar.dart b/lib/ui/widgets/inner/aku_tab_bar.dart index ba62e58..f294727 100644 --- a/lib/ui/widgets/inner/aku_tab_bar.dart +++ b/lib/ui/widgets/inner/aku_tab_bar.dart @@ -1,5 +1,8 @@ -import 'package:aku_community_manager/style/app_style.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: +import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/tools/screen_tool.dart'; class AkuTabBar extends StatefulWidget { diff --git a/lib/ui/widgets/inner/aku_title_box.dart b/lib/ui/widgets/inner/aku_title_box.dart index 0ac717a..25cdb0d 100644 --- a/lib/ui/widgets/inner/aku_title_box.dart +++ b/lib/ui/widgets/inner/aku_title_box.dart @@ -1,7 +1,10 @@ -import 'package:aku_community_manager/style/app_style.dart'; -import 'package:aku_community_manager/tools/widget_tool.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: +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'; class AkuTitleBox extends StatelessWidget { final String title; diff --git a/lib/ui/widgets/inner/pick_image.dart b/lib/ui/widgets/inner/pick_image.dart index c4d3047..081fe2c 100644 --- a/lib/ui/widgets/inner/pick_image.dart +++ b/lib/ui/widgets/inner/pick_image.dart @@ -1,7 +1,11 @@ +// Dart imports: import 'dart:io'; +// Flutter imports: import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:get/get.dart'; import 'package:image_picker/image_picker.dart'; diff --git a/lib/ui/widgets/inner/show_bottom_sheet.dart b/lib/ui/widgets/inner/show_bottom_sheet.dart index bdc51a9..90de61d 100644 --- a/lib/ui/widgets/inner/show_bottom_sheet.dart +++ b/lib/ui/widgets/inner/show_bottom_sheet.dart @@ -1,9 +1,14 @@ -import 'package:aku_community_manager/style/app_style.dart'; -import 'package:aku_community_manager/ui/widgets/common/aku_back_button.dart'; -import 'package:aku_ui/common_widgets/aku_material_button.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: +import 'package:aku_ui/common_widgets/aku_material_button.dart'; import 'package:get/get.dart'; + +// Project imports: +import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/tools/screen_tool.dart'; +import 'package:aku_community_manager/ui/widgets/common/aku_back_button.dart'; ///show bottom sheet Future showAkuSheet({ diff --git a/lib/utils/network/net_util.dart b/lib/utils/network/net_util.dart index 22e7e50..f4c0a93 100644 --- a/lib/utils/network/net_util.dart +++ b/lib/utils/network/net_util.dart @@ -2,15 +2,17 @@ import 'dart:io'; // Package imports: -import 'package:aku_community_manager/const/api.dart'; -import 'package:aku_community_manager/utils/network/base_file_model.dart'; -import 'package:aku_community_manager/utils/network/base_list_model.dart'; -import 'package:aku_community_manager/utils/network/base_model.dart'; import 'package:bot_toast/bot_toast.dart'; import 'package:dio/dio.dart'; import 'package:get/get.dart' hide Response, FormData, MultipartFile; import 'package:power_logger/power_logger.dart'; +// Project imports: +import 'package:aku_community_manager/const/api.dart'; +import 'package:aku_community_manager/utils/network/base_file_model.dart'; +import 'package:aku_community_manager/utils/network/base_list_model.dart'; +import 'package:aku_community_manager/utils/network/base_model.dart'; + class NetUtil { Dio _dio; static final NetUtil _netUtil = NetUtil._internal(); diff --git a/pubspec.lock b/pubspec.lock index 9351d81..3308589 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -38,6 +38,13 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "0.14.0" + args: + dependency: transitive + description: + name: args + url: "https://pub.flutter-io.cn" + source: hosted + version: "1.6.0" async: dependency: transitive description: @@ -94,6 +101,13 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "1.15.0-nullsafety.3" + colorize: + dependency: transitive + description: + name: colorize + url: "https://pub.flutter-io.cn" + source: hosted + version: "2.0.0" common_utils: dependency: "direct main" description: @@ -303,6 +317,13 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "1.1.1" + import_sorter: + dependency: "direct dev" + description: + name: import_sorter + url: "https://pub.flutter-io.cn" + source: hosted + version: "4.4.1" intl: dependency: transitive description: @@ -590,6 +611,13 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "0.1.2" + yaml: + dependency: transitive + description: + name: yaml + url: "https://pub.flutter-io.cn" + source: hosted + version: "2.2.1" sdks: dart: ">=2.10.0 <2.11.0" flutter: ">=1.22.0 <2.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index c7c26e2..bcc5385 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -64,6 +64,7 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter + import_sorter: flutter: uses-material-design: true diff --git a/test/widget_test.dart b/test/widget_test.dart index b51afe6..745f150 100644 --- a/test/widget_test.dart +++ b/test/widget_test.dart @@ -5,9 +5,13 @@ // gestures. You can also use WidgetTester to find child widgets in the widget // tree, read text, and verify that the values of widget properties are correct. +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_test/flutter_test.dart'; +// Project imports: import 'package:aku_community_manager/main.dart'; void main() {