From 44239e472fa09d28389a7242f5412727926158a9 Mon Sep 17 00:00:00 2001 From: zhangmeng <494089941@qq.com> Date: Thu, 3 Jun 2021 17:50:37 +0800 Subject: [PATCH] remove aku_ui --- lib/ui/home/announcement/All_anouncement.dart | 2 +- .../home/application/applications_page.dart | 2 +- lib/ui/home/business/todo_outdoor_card.dart | 2 +- lib/ui/home/home_page.dart | 4 +- .../home/messages/comment_message_card.dart | 2 +- lib/ui/home/messages/message.dart | 2 +- lib/ui/home/messages/systen_message_card.dart | 2 +- lib/ui/home/personal_draw.dart | 3 +- lib/ui/home/search_workorder_page.dart | 2 +- lib/ui/login/login_page.dart | 2 +- lib/ui/login/login_sms_page.dart | 3 +- .../facilities/facilities_card.dart | 2 +- .../facilities_inspect_report_page.dart | 2 +- .../green_manage/green_manage_card.dart | 2 +- .../green_manage_details_page.dart | 2 +- .../hygience_manage/hygience_manage_card.dart | 2 +- .../hygience_manage_detail_page.dart | 2 +- .../inspection_manage_card.dart | 2 +- .../inspection_manage_details_page.dart | 3 +- .../inspection_point_input_page.dart | 2 +- .../inspection_point_submit_page.dart | 2 +- .../interview/interview_card.dart | 14 +++-- lib/ui/settings/setting_feedback_page.dart | 2 +- lib/ui/settings/settings_page.dart | 2 +- .../borrow_manager/add_borrow_item_page.dart | 2 +- .../borrow_manager/all_borrow_goods.dart | 2 +- .../borrow_item_detail_page.dart | 2 +- .../borrow_manager/borrow_items_page.dart | 3 +- .../borrow_manager/borrow_manager_card.dart | 2 +- .../borrow_manager/borrow_manager_page.dart | 3 +- .../business_and_fix_detail_page.dart | 2 +- .../business_and_fix/business_fix_card.dart | 2 +- .../business_and_fix/fix_more_time_page.dart | 2 +- .../fix_work_finish_page.dart | 2 +- .../fixer_department_page.dart | 2 +- .../decoration_department_page.dart | 2 +- .../decoration_manager_card.dart | 2 +- .../decoration_manager_detail_page.dart | 2 +- .../decoration_success_page.dart | 3 +- .../items_outdoor/items_outdoor_card.dart | 2 +- .../items_outdoor_details_page.dart | 4 +- .../items_outdoor/outdoor_notpass_page.dart | 2 +- .../items_outdoor/outdoor_pass_page.dart | 3 +- lib/ui/tool_pages/warning/warning_page.dart | 4 +- .../tool_pages/warning/warning_sub_page.dart | 2 +- .../tool_pages/warning/warning_success.dart | 2 +- lib/ui/widgets/common/aku_back_button.dart | 2 +- lib/ui/widgets/inner/aku_bottom_button.dart | 2 +- lib/ui/widgets/inner/show_bottom_sheet.dart | 2 +- pubspec.lock | 57 +++++++++++++++---- pubspec.yaml | 7 +-- 51 files changed, 106 insertions(+), 81 deletions(-) diff --git a/lib/ui/home/announcement/All_anouncement.dart b/lib/ui/home/announcement/All_anouncement.dart index 219df3c..d6d91bc 100644 --- a/lib/ui/home/announcement/All_anouncement.dart +++ b/lib/ui/home/announcement/All_anouncement.dart @@ -2,10 +2,10 @@ import 'dart:ui'; // Flutter imports: +import 'package:aku_community_manager/ui/widgets/common/aku_button.dart'; import 'package:flutter/material.dart'; // Package imports: -import 'package:aku_ui/aku_ui.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; diff --git a/lib/ui/home/application/applications_page.dart b/lib/ui/home/application/applications_page.dart index 6c03f08..4345b80 100644 --- a/lib/ui/home/application/applications_page.dart +++ b/lib/ui/home/application/applications_page.dart @@ -4,10 +4,10 @@ import 'package:aku_community_manager/ui/manage_pages/facilities/facilities_sele import 'package:aku_community_manager/ui/manage_pages/house_keeping/house_keeping_page.dart'; import 'package:aku_community_manager/ui/manage_pages/interview/interview_page.dart'; import 'package:aku_community_manager/ui/sub_pages/decoration_manager/new_renovation/new_renovation_page.dart'; +import 'package:aku_community_manager/ui/widgets/common/aku_material_button.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'; diff --git a/lib/ui/home/business/todo_outdoor_card.dart b/lib/ui/home/business/todo_outdoor_card.dart index 8d8fb2e..035a82b 100644 --- a/lib/ui/home/business/todo_outdoor_card.dart +++ b/lib/ui/home/business/todo_outdoor_card.dart @@ -1,8 +1,8 @@ // Flutter imports: +import 'package:aku_community_manager/ui/widgets/common/aku_button.dart'; 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:velocity_x/velocity_x.dart'; diff --git a/lib/ui/home/home_page.dart b/lib/ui/home/home_page.dart index f552f56..a7bd2e4 100644 --- a/lib/ui/home/home_page.dart +++ b/lib/ui/home/home_page.dart @@ -1,10 +1,10 @@ // Flutter imports: +import 'package:aku_community_manager/ui/widgets/common/aku_button.dart'; +import 'package:aku_community_manager/ui/widgets/common/aku_material_button.dart'; 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:badges/badges.dart'; import 'package:carousel_slider/carousel_slider.dart'; import 'package:dio/dio.dart'; diff --git a/lib/ui/home/messages/comment_message_card.dart b/lib/ui/home/messages/comment_message_card.dart index 7a03ad5..f010b45 100644 --- a/lib/ui/home/messages/comment_message_card.dart +++ b/lib/ui/home/messages/comment_message_card.dart @@ -1,8 +1,8 @@ // Flutter imports: +import 'package:aku_community_manager/ui/widgets/common/aku_button.dart'; import 'package:flutter/material.dart'; // Package imports: -import 'package:aku_ui/aku_ui.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:shimmer/shimmer.dart'; import 'package:velocity_x/velocity_x.dart'; diff --git a/lib/ui/home/messages/message.dart b/lib/ui/home/messages/message.dart index dac5b8c..d293bd3 100644 --- a/lib/ui/home/messages/message.dart +++ b/lib/ui/home/messages/message.dart @@ -1,8 +1,8 @@ // Flutter imports: +import 'package:aku_community_manager/ui/widgets/common/aku_button.dart'; import 'package:flutter/material.dart'; // Package imports: -import 'package:aku_ui/aku_ui.dart'; import 'package:dio/dio.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; diff --git a/lib/ui/home/messages/systen_message_card.dart b/lib/ui/home/messages/systen_message_card.dart index 20ef69d..6d16529 100644 --- a/lib/ui/home/messages/systen_message_card.dart +++ b/lib/ui/home/messages/systen_message_card.dart @@ -1,8 +1,8 @@ // Flutter imports: +import 'package:aku_community_manager/ui/widgets/common/aku_button.dart'; 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:shimmer/shimmer.dart'; diff --git a/lib/ui/home/personal_draw.dart b/lib/ui/home/personal_draw.dart index 7113e0d..b84b5f9 100644 --- a/lib/ui/home/personal_draw.dart +++ b/lib/ui/home/personal_draw.dart @@ -1,8 +1,7 @@ // Flutter imports: +import 'package:aku_community_manager/ui/widgets/common/aku_button.dart'; import 'package:flutter/material.dart'; -// Package imports: -import 'package:aku_ui/common_widgets/aku_button.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:provider/provider.dart'; diff --git a/lib/ui/home/search_workorder_page.dart b/lib/ui/home/search_workorder_page.dart index 7dcda93..19aab90 100644 --- a/lib/ui/home/search_workorder_page.dart +++ b/lib/ui/home/search_workorder_page.dart @@ -4,10 +4,10 @@ import 'package:aku_community_manager/ui/manage_pages/facilities/facilities_sele import 'package:aku_community_manager/ui/manage_pages/house_keeping/house_keeping_page.dart'; import 'package:aku_community_manager/ui/manage_pages/interview/interview_page.dart'; import 'package:aku_community_manager/ui/sub_pages/decoration_manager/new_renovation/new_renovation_page.dart'; +import 'package:aku_community_manager/ui/widgets/common/aku_material_button.dart'; import 'package:flutter/material.dart'; // Package imports: -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'; diff --git a/lib/ui/login/login_page.dart b/lib/ui/login/login_page.dart index 5c59369..6a9d277 100644 --- a/lib/ui/login/login_page.dart +++ b/lib/ui/login/login_page.dart @@ -2,11 +2,11 @@ import 'dart:ui'; // Flutter imports: +import 'package:aku_community_manager/ui/widgets/common/aku_material_button.dart'; 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'; diff --git a/lib/ui/login/login_sms_page.dart b/lib/ui/login/login_sms_page.dart index 1473d7e..5300817 100644 --- a/lib/ui/login/login_sms_page.dart +++ b/lib/ui/login/login_sms_page.dart @@ -2,10 +2,9 @@ import 'dart:async'; // Flutter imports: +import 'package:aku_community_manager/ui/widgets/common/aku_material_button.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:dio/dio.dart'; import 'package:get/get.dart' hide Response; diff --git a/lib/ui/manage_pages/facilities/facilities_card.dart b/lib/ui/manage_pages/facilities/facilities_card.dart index a909739..00d9298 100644 --- a/lib/ui/manage_pages/facilities/facilities_card.dart +++ b/lib/ui/manage_pages/facilities/facilities_card.dart @@ -2,11 +2,11 @@ import 'package:aku_community_manager/models/manager/facilities/facilities_check_list_model.dart'; import 'package:aku_community_manager/ui/manage_pages/facilities/facilities_inspect_report_page.dart'; import 'package:aku_community_manager/ui/manage_pages/facilities/facilities_map.dart'; +import 'package:aku_community_manager/ui/widgets/common/aku_material_button.dart'; import 'package:common_utils/common_utils.dart'; import 'package:flutter/material.dart'; // Package imports: -import 'package:aku_ui/common_widgets/aku_material_button.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:velocity_x/velocity_x.dart'; diff --git a/lib/ui/manage_pages/facilities/facilities_inspect_report_page.dart b/lib/ui/manage_pages/facilities/facilities_inspect_report_page.dart index f1cd387..0d3b2f1 100644 --- a/lib/ui/manage_pages/facilities/facilities_inspect_report_page.dart +++ b/lib/ui/manage_pages/facilities/facilities_inspect_report_page.dart @@ -4,13 +4,13 @@ import 'dart:io'; // Flutter imports: import 'package:aku_community_manager/const/api.dart'; import 'package:aku_community_manager/ui/manage_pages/facilities/facilities_map.dart'; +import 'package:aku_community_manager/ui/widgets/common/aku_button.dart'; import 'package:aku_community_manager/utils/network/base_model.dart'; import 'package:aku_community_manager/utils/network/net_util.dart'; import 'package:bot_toast/bot_toast.dart'; import 'package:flutter/material.dart'; // Package imports: -import 'package:aku_ui/common_widgets/aku_button.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:velocity_x/velocity_x.dart'; diff --git a/lib/ui/manage_pages/green_manage/green_manage_card.dart b/lib/ui/manage_pages/green_manage/green_manage_card.dart index 1abd0ef..3831f10 100644 --- a/lib/ui/manage_pages/green_manage/green_manage_card.dart +++ b/lib/ui/manage_pages/green_manage/green_manage_card.dart @@ -2,13 +2,13 @@ import 'package:aku_community_manager/const/api.dart'; import 'package:aku_community_manager/models/manager/green_manage/green_manage_list_model.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_button.dart'; import 'package:aku_community_manager/utils/network/base_model.dart'; import 'package:aku_community_manager/utils/network/net_util.dart'; import 'package:bot_toast/bot_toast.dart'; import 'package:flutter/material.dart'; // Package imports: -import 'package:aku_ui/common_widgets/aku_button.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:velocity_x/velocity_x.dart'; 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 c85c1cf..0251083 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,9 +1,9 @@ // Flutter imports: import 'package:aku_community_manager/models/manager/green_manage/green_manage_list_model.dart'; +import 'package:aku_community_manager/ui/widgets/common/aku_button.dart'; import 'package:flutter/material.dart'; // Package imports: -import 'package:aku_ui/aku_ui.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; // Project imports: diff --git a/lib/ui/manage_pages/hygience_manage/hygience_manage_card.dart b/lib/ui/manage_pages/hygience_manage/hygience_manage_card.dart index 2248e0f..272afbf 100644 --- a/lib/ui/manage_pages/hygience_manage/hygience_manage_card.dart +++ b/lib/ui/manage_pages/hygience_manage/hygience_manage_card.dart @@ -2,13 +2,13 @@ import 'package:aku_community_manager/const/api.dart'; import 'package:aku_community_manager/models/manager/hygience_manage/heygience_list_model.dart'; import 'package:aku_community_manager/ui/manage_pages/hygience_manage/hygience_manage_detail_page.dart'; +import 'package:aku_community_manager/ui/widgets/common/aku_button.dart'; import 'package:aku_community_manager/utils/network/base_model.dart'; import 'package:aku_community_manager/utils/network/net_util.dart'; import 'package:bot_toast/bot_toast.dart'; import 'package:flutter/material.dart'; // Package imports: -import 'package:aku_ui/common_widgets/aku_button.dart'; import 'package:get/get.dart'; import 'package:velocity_x/velocity_x.dart'; diff --git a/lib/ui/manage_pages/hygience_manage/hygience_manage_detail_page.dart b/lib/ui/manage_pages/hygience_manage/hygience_manage_detail_page.dart index 92a731c..e1cf38a 100644 --- a/lib/ui/manage_pages/hygience_manage/hygience_manage_detail_page.dart +++ b/lib/ui/manage_pages/hygience_manage/hygience_manage_detail_page.dart @@ -1,8 +1,8 @@ import 'package:aku_community_manager/models/manager/hygience_manage/heygience_list_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_button.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; -import 'package:aku_ui/common_widgets/aku_button.dart'; import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:aku_community_manager/const/resource.dart'; 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 2f12360..2e46caf 100644 --- a/lib/ui/manage_pages/inspection_manage/inspection_manage_card.dart +++ b/lib/ui/manage_pages/inspection_manage/inspection_manage_card.dart @@ -1,8 +1,8 @@ // Flutter imports: +import 'package:aku_community_manager/ui/widgets/common/aku_button.dart'; import 'package:flutter/material.dart'; // Package imports: -import 'package:aku_ui/aku_ui.dart'; import 'package:common_utils/common_utils.dart'; import 'package:get/get.dart'; import 'package:provider/provider.dart'; 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 8e87ac6..152973a 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 @@ -2,11 +2,10 @@ import 'dart:async'; // Flutter imports: +import 'package:aku_community_manager/ui/widgets/common/aku_button.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -// Package imports: -import 'package:aku_ui/aku_ui.dart'; import 'package:amap_flutter_base/amap_flutter_base.dart'; import 'package:amap_flutter_map/amap_flutter_map.dart'; import 'package:bot_toast/bot_toast.dart'; diff --git a/lib/ui/manage_pages/inspection_manage/inspection_point_input_page.dart b/lib/ui/manage_pages/inspection_manage/inspection_point_input_page.dart index c4934b3..25a966b 100644 --- a/lib/ui/manage_pages/inspection_manage/inspection_point_input_page.dart +++ b/lib/ui/manage_pages/inspection_manage/inspection_point_input_page.dart @@ -3,10 +3,10 @@ import 'dart:io'; // Flutter imports: import 'package:aku_community_manager/ui/manage_pages/inspection_manage/inspection_point_submit_page.dart'; +import 'package:aku_community_manager/ui/widgets/common/aku_button.dart'; import 'package:flutter/material.dart'; // Package imports: -import 'package:aku_ui/aku_ui.dart'; import 'package:bot_toast/bot_toast.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; diff --git a/lib/ui/manage_pages/inspection_manage/inspection_point_submit_page.dart b/lib/ui/manage_pages/inspection_manage/inspection_point_submit_page.dart index b40ceb6..ee09a84 100644 --- a/lib/ui/manage_pages/inspection_manage/inspection_point_submit_page.dart +++ b/lib/ui/manage_pages/inspection_manage/inspection_point_submit_page.dart @@ -1,8 +1,8 @@ // Flutter imports: +import 'package:aku_community_manager/ui/widgets/common/aku_button.dart'; 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:velocity_x/velocity_x.dart'; diff --git a/lib/ui/manage_pages/interview/interview_card.dart b/lib/ui/manage_pages/interview/interview_card.dart index 8f7ad8d..b66c8ef 100644 --- a/lib/ui/manage_pages/interview/interview_card.dart +++ b/lib/ui/manage_pages/interview/interview_card.dart @@ -1,14 +1,16 @@ -import 'package:aku_community_manager/models/manager/interview/interview_list_model.dart'; -import 'package:aku_community_manager/style/app_style.dart'; -import 'package:aku_community_manager/tools/aku_divider.dart'; -import 'package:aku_community_manager/ui/manage_pages/interview/interview_detail_page.dart'; -import 'package:aku_community_manager/ui/manage_pages/interview/interview_feedback_page.dart'; -import 'package:aku_ui/aku_ui.dart'; + +import 'package:aku_community_manager/ui/widgets/common/aku_button.dart'; import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:velocity_x/velocity_x.dart'; + +import 'package:aku_community_manager/models/manager/interview/interview_list_model.dart'; +import 'package:aku_community_manager/style/app_style.dart'; +import 'package:aku_community_manager/tools/aku_divider.dart'; import 'package:aku_community_manager/tools/extensions/list_extension_tool.dart'; +import 'package:aku_community_manager/ui/manage_pages/interview/interview_detail_page.dart'; +import 'package:aku_community_manager/ui/manage_pages/interview/interview_feedback_page.dart'; class InterviewCard extends StatefulWidget { final InterviewListModel model; diff --git a/lib/ui/settings/setting_feedback_page.dart b/lib/ui/settings/setting_feedback_page.dart index d753f7b..adc711b 100644 --- a/lib/ui/settings/setting_feedback_page.dart +++ b/lib/ui/settings/setting_feedback_page.dart @@ -2,10 +2,10 @@ import 'dart:io'; // Flutter imports: +import 'package:aku_community_manager/ui/widgets/common/aku_material_button.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'; diff --git a/lib/ui/settings/settings_page.dart b/lib/ui/settings/settings_page.dart index d335d67..82867e1 100644 --- a/lib/ui/settings/settings_page.dart +++ b/lib/ui/settings/settings_page.dart @@ -1,10 +1,10 @@ // Flutter imports: import 'package:aku_community_manager/ui/agreements/about_page.dart'; +import 'package:aku_community_manager/ui/widgets/common/aku_material_button.dart'; 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'; 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 c71fc15..0070ab6 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 @@ -2,11 +2,11 @@ import 'dart:io'; // Flutter imports: +import 'package:aku_community_manager/ui/widgets/common/aku_material_button.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.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:get/instance_manager.dart'; 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 dcfecdc..6c65fac 100644 --- a/lib/ui/sub_pages/borrow_manager/all_borrow_goods.dart +++ b/lib/ui/sub_pages/borrow_manager/all_borrow_goods.dart @@ -1,8 +1,8 @@ // Flutter imports: +import 'package:aku_community_manager/ui/widgets/common/aku_material_button.dart'; import 'package:flutter/material.dart'; // Package imports: -import 'package:aku_ui/common_widgets/aku_material_button.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:get/get.dart'; import 'package:provider/provider.dart'; 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 3e5ead2..4f508ce 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,8 +1,8 @@ // Flutter imports: +import 'package:aku_community_manager/ui/widgets/common/aku_material_button.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:flutter_easyrefresh/easy_refresh.dart'; import 'package:provider/provider.dart'; 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 8c50b9e..db40b97 100644 --- a/lib/ui/sub_pages/borrow_manager/borrow_items_page.dart +++ b/lib/ui/sub_pages/borrow_manager/borrow_items_page.dart @@ -1,9 +1,8 @@ // Flutter imports: +import 'package:aku_community_manager/ui/widgets/common/aku_material_button.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -// Package imports: -import 'package:aku_ui/common_widgets/aku_material_button.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:get/get.dart'; import 'package:provider/provider.dart'; 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 20eea92..bc25c24 100644 --- a/lib/ui/sub_pages/borrow_manager/borrow_manager_card.dart +++ b/lib/ui/sub_pages/borrow_manager/borrow_manager_card.dart @@ -1,8 +1,8 @@ // Flutter imports: +import 'package:aku_community_manager/ui/widgets/common/aku_material_button.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:common_utils/common_utils.dart'; import 'package:get/get.dart'; 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 2f9f319..e77705c 100644 --- a/lib/ui/sub_pages/borrow_manager/borrow_manager_page.dart +++ b/lib/ui/sub_pages/borrow_manager/borrow_manager_page.dart @@ -1,8 +1,7 @@ // Flutter imports: +import 'package:aku_community_manager/ui/widgets/common/aku_material_button.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'; 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 02fa2e8..31bab55 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,8 @@ // Flutter imports: +import 'package:aku_community_manager/ui/widgets/common/aku_material_button.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:common_utils/common_utils.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart'; 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 b25b040..b09cf2c 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,8 +1,8 @@ // Flutter imports: +import 'package:aku_community_manager/ui/widgets/common/aku_material_button.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'; import 'package:provider/provider.dart'; 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 e91ac7f..5a1cb79 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,8 +1,8 @@ // Flutter imports: +import 'package:aku_community_manager/ui/widgets/common/aku_material_button.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'; 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 e8b8947..28264e3 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 @@ -2,11 +2,11 @@ import 'dart:io'; // Flutter imports: +import 'package:aku_community_manager/ui/widgets/common/aku_material_button.dart'; 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:common_utils/common_utils.dart'; 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 6534266..a274fda 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,8 +1,8 @@ // Flutter imports: +import 'package:aku_community_manager/ui/widgets/common/aku_material_button.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:expandable/expandable.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart'; 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 2da241c..d5bbec3 100644 --- a/lib/ui/sub_pages/decoration_manager/decoration_department_page.dart +++ b/lib/ui/sub_pages/decoration_manager/decoration_department_page.dart @@ -1,8 +1,8 @@ // Flutter imports: +import 'package:aku_community_manager/ui/widgets/common/aku_material_button.dart'; 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'; 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 846210a..1937ffa 100644 --- a/lib/ui/sub_pages/decoration_manager/decoration_manager_card.dart +++ b/lib/ui/sub_pages/decoration_manager/decoration_manager_card.dart @@ -1,8 +1,8 @@ // Flutter imports: +import 'package:aku_community_manager/ui/widgets/common/aku_material_button.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'; 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 6d30083..df167d5 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 @@ -4,6 +4,7 @@ import 'dart:math'; // Flutter imports: import 'package:aku_community_manager/const/api.dart'; import 'package:aku_community_manager/models/manager/decoration/decoration_detail_model.dart'; +import 'package:aku_community_manager/ui/widgets/common/aku_material_button.dart'; import 'package:aku_community_manager/utils/network/base_model.dart'; import 'package:aku_community_manager/utils/network/net_util.dart'; import 'package:bot_toast/bot_toast.dart'; @@ -11,7 +12,6 @@ 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:flutter_easyrefresh/easy_refresh.dart'; 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 a982259..88e6aae 100644 --- a/lib/ui/sub_pages/decoration_manager/decoration_success_page.dart +++ b/lib/ui/sub_pages/decoration_manager/decoration_success_page.dart @@ -1,8 +1,7 @@ // Flutter imports: +import 'package:aku_community_manager/ui/widgets/common/aku_material_button.dart'; import 'package:flutter/material.dart'; -// Package imports: -import 'package:aku_ui/common_widgets/aku_material_button.dart'; import 'package:get/get.dart'; // Project imports: 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 66d0f82..a502505 100644 --- a/lib/ui/sub_pages/items_outdoor/items_outdoor_card.dart +++ b/lib/ui/sub_pages/items_outdoor/items_outdoor_card.dart @@ -1,8 +1,8 @@ // Flutter imports: +import 'package:aku_community_manager/ui/widgets/common/aku_button.dart'; 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'; 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 516461b..d19b8ca 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,9 +1,9 @@ // Flutter imports: +import 'package:aku_community_manager/ui/widgets/common/aku_button.dart'; +import 'package:aku_community_manager/ui/widgets/common/aku_material_button.dart'; 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:common_utils/common_utils.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; 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 f9ef084..b4a4d80 100644 --- a/lib/ui/sub_pages/items_outdoor/outdoor_notpass_page.dart +++ b/lib/ui/sub_pages/items_outdoor/outdoor_notpass_page.dart @@ -1,8 +1,8 @@ // Flutter imports: +import 'package:aku_community_manager/ui/widgets/common/aku_button.dart'; 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'; 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 3842e46..5636ccb 100644 --- a/lib/ui/sub_pages/items_outdoor/outdoor_pass_page.dart +++ b/lib/ui/sub_pages/items_outdoor/outdoor_pass_page.dart @@ -1,8 +1,7 @@ // Flutter imports: +import 'package:aku_community_manager/ui/widgets/common/aku_button.dart'; 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_screenutil/flutter_screenutil.dart'; diff --git a/lib/ui/tool_pages/warning/warning_page.dart b/lib/ui/tool_pages/warning/warning_page.dart index 281b736..9839d84 100644 --- a/lib/ui/tool_pages/warning/warning_page.dart +++ b/lib/ui/tool_pages/warning/warning_page.dart @@ -3,12 +3,12 @@ import 'dart:ui'; // Flutter imports: import 'package:aku_community_manager/const/api.dart'; +import 'package:aku_community_manager/ui/widgets/common/aku_cupertino_button.dart'; +import 'package:aku_community_manager/ui/widgets/common/aku_material_button.dart'; import 'package:aku_community_manager/utils/network/net_util.dart'; 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_flutter_base/amap_flutter_base.dart'; import 'package:amap_flutter_map/amap_flutter_map.dart'; import 'package:get/get.dart'; diff --git a/lib/ui/tool_pages/warning/warning_sub_page.dart b/lib/ui/tool_pages/warning/warning_sub_page.dart index 67398ec..41e5dae 100644 --- a/lib/ui/tool_pages/warning/warning_sub_page.dart +++ b/lib/ui/tool_pages/warning/warning_sub_page.dart @@ -2,10 +2,10 @@ import 'dart:async'; // Flutter imports: +import 'package:aku_community_manager/ui/widgets/common/aku_material_button.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'; diff --git a/lib/ui/tool_pages/warning/warning_success.dart b/lib/ui/tool_pages/warning/warning_success.dart index ae31835..7fe3a80 100644 --- a/lib/ui/tool_pages/warning/warning_success.dart +++ b/lib/ui/tool_pages/warning/warning_success.dart @@ -2,10 +2,10 @@ import 'dart:async'; // Flutter imports: +import 'package:aku_community_manager/ui/widgets/common/aku_material_button.dart'; import 'package:flutter/material.dart'; // Package imports: -import 'package:aku_ui/common_widgets/aku_material_button.dart'; import 'package:get/get.dart'; // Project imports: diff --git a/lib/ui/widgets/common/aku_back_button.dart b/lib/ui/widgets/common/aku_back_button.dart index 18eba8e..5207b32 100644 --- a/lib/ui/widgets/common/aku_back_button.dart +++ b/lib/ui/widgets/common/aku_back_button.dart @@ -1,8 +1,8 @@ // Flutter imports: +import 'package:aku_community_manager/ui/widgets/common/aku_material_button.dart'; 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'; diff --git a/lib/ui/widgets/inner/aku_bottom_button.dart b/lib/ui/widgets/inner/aku_bottom_button.dart index ff540ba..b94a673 100644 --- a/lib/ui/widgets/inner/aku_bottom_button.dart +++ b/lib/ui/widgets/inner/aku_bottom_button.dart @@ -1,8 +1,8 @@ // Flutter imports: +import 'package:aku_community_manager/ui/widgets/common/aku_material_button.dart'; 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'; diff --git a/lib/ui/widgets/inner/show_bottom_sheet.dart b/lib/ui/widgets/inner/show_bottom_sheet.dart index db98177..7078707 100644 --- a/lib/ui/widgets/inner/show_bottom_sheet.dart +++ b/lib/ui/widgets/inner/show_bottom_sheet.dart @@ -1,8 +1,8 @@ // Flutter imports: +import 'package:aku_community_manager/ui/widgets/common/aku_material_button.dart'; import 'package:flutter/material.dart'; // Package imports: -import 'package:aku_ui/common_widgets/aku_material_button.dart'; import 'package:get/get.dart'; // Project imports: diff --git a/pubspec.lock b/pubspec.lock index 0e82d13..6372c83 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -8,15 +8,6 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "21.0.0" - aku_ui: - dependency: "direct main" - description: - path: "." - ref: HEAD - resolved-ref: fb1ea5caca32062b676295da85f8c281da261e55 - url: "https://git.oa00.com/flutter_pub/aku_ui" - source: git - version: "0.0.1" amap_flutter_base: dependency: "direct main" description: @@ -512,14 +503,14 @@ packages: name: hive url: "https://pub.flutter-io.cn" source: hosted - version: "1.6.0-nullsafety.2" + version: "2.0.4" hive_flutter: dependency: "direct main" description: name: hive_flutter url: "https://pub.flutter-io.cn" source: hosted - version: "0.3.1" + version: "1.0.0" http: dependency: transitive description: @@ -738,7 +729,35 @@ packages: name: path_provider url: "https://pub.flutter-io.cn" source: hosted - version: "1.2.0" + version: "2.0.2" + path_provider_linux: + dependency: transitive + description: + name: path_provider_linux + url: "https://pub.flutter-io.cn" + source: hosted + version: "2.0.0" + path_provider_macos: + dependency: transitive + description: + name: path_provider_macos + url: "https://pub.flutter-io.cn" + source: hosted + version: "2.0.0" + path_provider_platform_interface: + dependency: transitive + description: + name: path_provider_platform_interface + url: "https://pub.flutter-io.cn" + source: hosted + version: "2.0.1" + path_provider_windows: + dependency: transitive + description: + name: path_provider_windows + url: "https://pub.flutter-io.cn" + source: hosted + version: "2.0.1" pedantic: dependency: transitive description: @@ -795,6 +814,13 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "1.2.1" + process: + dependency: transitive + description: + name: process + url: "https://pub.flutter-io.cn" + source: hosted + version: "4.2.1" provider: dependency: "direct main" description: @@ -1031,6 +1057,13 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "2.0.5" + xdg_directories: + dependency: transitive + description: + name: xdg_directories + url: "https://pub.flutter-io.cn" + source: hosted + version: "0.2.0" yaml: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 936b5c8..a06b7c0 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -58,12 +58,9 @@ dependencies: power_logger: ^1.0.1-nullsafety.1 logger: ^1.0.0 - aku_ui: - git: - url: https://git.oa00.com/flutter_pub/aku_ui - hive: ^1.4.4+1 - hive_flutter: ^0.3.1 + hive: ^2.0.4 + hive_flutter: ^1.0.0 jpush_flutter: git: url: https://git.oa00.com/flutter_third/jpush-flutter-plugin