diff --git a/lib/constants/application_objects.dart b/lib/constants/application_objects.dart index 811ca7f1..f2b8b063 100644 --- a/lib/constants/application_objects.dart +++ b/lib/constants/application_objects.dart @@ -1,5 +1,4 @@ // Flutter imports: -import 'package:akuCommunity/pages/questionnaire_page/questionnaire_page.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; @@ -16,6 +15,7 @@ import 'package:akuCommunity/pages/one_alarm/widget/alarm_page.dart'; import 'package:akuCommunity/pages/open_door_page/open_door_page.dart'; import 'package:akuCommunity/pages/opening_code_page/opening_code_page.dart'; import 'package:akuCommunity/pages/questionnaire_page/questionnaire_details_page/questionnaire_details_page.dart'; +import 'package:akuCommunity/pages/questionnaire_page/questionnaire_page.dart'; import 'package:akuCommunity/pages/things_page/fixed_submit_page.dart'; import 'package:akuCommunity/pages/visitor_access_page/visitor_access_page.dart'; import 'package:akuCommunity/ui/home/application/all_application.dart'; diff --git a/lib/model/manager/questinnaire_model.dart b/lib/model/manager/questinnaire_model.dart index e6141eea..3aad375d 100644 --- a/lib/model/manager/questinnaire_model.dart +++ b/lib/model/manager/questinnaire_model.dart @@ -1,3 +1,4 @@ +// Project imports: import 'package:akuCommunity/model/common/img_model.dart'; class QuestionnaireModel { diff --git a/lib/pages/event_activity/voting_detail_page.dart b/lib/pages/event_activity/voting_detail_page.dart index 194db64f..272ba8cc 100644 --- a/lib/pages/event_activity/voting_detail_page.dart +++ b/lib/pages/event_activity/voting_detail_page.dart @@ -1,23 +1,23 @@ // Flutter imports: -import 'package:akuCommunity/base/base_style.dart'; -import 'package:akuCommunity/utils/network/base_model.dart'; -import 'package:akuCommunity/widget/buttons/bottom_button.dart'; -import 'package:bot_toast/bot_toast.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; // Package imports: +import 'package:bot_toast/bot_toast.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart'; +import 'package:get/get.dart'; // Project imports: +import 'package:akuCommunity/base/base_style.dart'; import 'package:akuCommunity/constants/api.dart'; import 'package:akuCommunity/model/manager/voting_detail_model.dart'; import 'package:akuCommunity/pages/manager_func.dart'; +import 'package:akuCommunity/utils/headers.dart'; +import 'package:akuCommunity/utils/network/base_model.dart'; import 'package:akuCommunity/widget/bee_divider.dart'; import 'package:akuCommunity/widget/bee_scaffold.dart'; import 'package:akuCommunity/widget/buttons/bee_single_check.dart'; -import 'package:akuCommunity/utils/headers.dart'; -import 'package:get/get.dart'; +import 'package:akuCommunity/widget/buttons/bottom_button.dart'; class VotingDetailPage extends StatefulWidget { final int id; diff --git a/lib/pages/manager_func.dart b/lib/pages/manager_func.dart index 1e79cee7..5758e89d 100644 --- a/lib/pages/manager_func.dart +++ b/lib/pages/manager_func.dart @@ -1,13 +1,13 @@ // Package imports: -import 'package:akuCommunity/model/manager/article_QR_code_model.dart'; -import 'package:akuCommunity/model/manager/moving_company_model.dart'; -import 'package:akuCommunity/model/manager/voting_detail_model.dart'; import 'package:dio/dio.dart'; import 'package:flustars/flustars.dart'; // Project imports: import 'package:akuCommunity/constants/api.dart'; +import 'package:akuCommunity/model/manager/article_QR_code_model.dart'; import 'package:akuCommunity/model/manager/fixed_detail_model.dart'; +import 'package:akuCommunity/model/manager/moving_company_model.dart'; +import 'package:akuCommunity/model/manager/voting_detail_model.dart'; import 'package:akuCommunity/utils/network/base_model.dart'; import 'package:akuCommunity/utils/network/net_util.dart'; diff --git a/lib/pages/one_alarm/alarm_detail_page.dart b/lib/pages/one_alarm/alarm_detail_page.dart index 0898ca91..d079b239 100644 --- a/lib/pages/one_alarm/alarm_detail_page.dart +++ b/lib/pages/one_alarm/alarm_detail_page.dart @@ -1,6 +1,9 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Project imports: import 'package:akuCommunity/utils/headers.dart'; import 'package:akuCommunity/widget/bee_scaffold.dart'; -import 'package:flutter/material.dart'; class AlarmDetailPage extends StatelessWidget { const AlarmDetailPage({Key key}) : super(key: key); diff --git a/lib/pages/one_alarm/widget/alarm_page.dart b/lib/pages/one_alarm/widget/alarm_page.dart index aacf625f..8208a636 100644 --- a/lib/pages/one_alarm/widget/alarm_page.dart +++ b/lib/pages/one_alarm/widget/alarm_page.dart @@ -1,5 +1,4 @@ // Flutter imports: -import 'package:akuCommunity/pages/one_alarm/alarm_detail_page.dart'; import 'package:flutter/material.dart'; // Package imports: @@ -13,6 +12,7 @@ import 'package:url_launcher/url_launcher.dart'; import 'package:velocity_x/velocity_x.dart'; // Project imports: +import 'package:akuCommunity/pages/one_alarm/alarm_detail_page.dart'; import 'package:akuCommunity/utils/headers.dart'; import 'package:akuCommunity/widget/bee_scaffold.dart'; diff --git a/lib/pages/questionnaire_page/questionnaire_page.dart b/lib/pages/questionnaire_page/questionnaire_page.dart index a52baec7..4a46695a 100644 --- a/lib/pages/questionnaire_page/questionnaire_page.dart +++ b/lib/pages/questionnaire_page/questionnaire_page.dart @@ -1,12 +1,17 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_easyrefresh/easy_refresh.dart'; + +// Project imports: import 'package:akuCommunity/base/base_style.dart'; import 'package:akuCommunity/constants/api.dart'; import 'package:akuCommunity/model/manager/questinnaire_model.dart'; import 'package:akuCommunity/pages/things_page/widget/bee_list_view.dart'; +import 'package:akuCommunity/utils/headers.dart'; import 'package:akuCommunity/widget/bee_scaffold.dart'; import 'package:akuCommunity/widget/others/stack_avatar.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_easyrefresh/easy_refresh.dart'; -import 'package:akuCommunity/utils/headers.dart'; class QuestionnairePage extends StatefulWidget { QuestionnairePage({Key key}) : super(key: key); diff --git a/lib/ui/community/community_views/event_detail_page.dart b/lib/ui/community/community_views/event_detail_page.dart index 2b75bf2f..d19879a3 100644 --- a/lib/ui/community/community_views/event_detail_page.dart +++ b/lib/ui/community/community_views/event_detail_page.dart @@ -1,14 +1,16 @@ // Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_easyrefresh/easy_refresh.dart'; + +// Project imports: import 'package:akuCommunity/constants/api.dart'; import 'package:akuCommunity/model/community/event_item_model.dart'; import 'package:akuCommunity/ui/community/community_views/widgets/chat_card.dart'; import 'package:akuCommunity/utils/network/base_model.dart'; import 'package:akuCommunity/utils/network/net_util.dart'; -import 'package:flutter/material.dart'; - -// Project imports: import 'package:akuCommunity/widget/bee_scaffold.dart'; -import 'package:flutter_easyrefresh/easy_refresh.dart'; class EventDetailPage extends StatefulWidget { final int themeId; diff --git a/lib/ui/community/community_views/widgets/chat_card.dart b/lib/ui/community/community_views/widgets/chat_card.dart index 82dd6e9c..eb4eb583 100644 --- a/lib/ui/community/community_views/widgets/chat_card.dart +++ b/lib/ui/community/community_views/widgets/chat_card.dart @@ -1,6 +1,4 @@ // Flutter imports: -import 'package:akuCommunity/base/base_style.dart'; -import 'package:akuCommunity/model/community/event_item_model.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -11,7 +9,9 @@ import 'package:provider/provider.dart'; import 'package:velocity_x/velocity_x.dart'; // Project imports: +import 'package:akuCommunity/base/base_style.dart'; import 'package:akuCommunity/constants/api.dart'; +import 'package:akuCommunity/model/community/event_item_model.dart'; import 'package:akuCommunity/provider/user_provider.dart'; import 'package:akuCommunity/ui/community/community_views/event_detail_page.dart'; import 'package:akuCommunity/utils/bee_date_util.dart'; diff --git a/lib/widget/buttons/bee_single_check.dart b/lib/widget/buttons/bee_single_check.dart index 0d51662c..279870a4 100644 --- a/lib/widget/buttons/bee_single_check.dart +++ b/lib/widget/buttons/bee_single_check.dart @@ -1,6 +1,9 @@ -import 'package:akuCommunity/base/base_style.dart'; +// Flutter imports: import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; + +// Project imports: +import 'package:akuCommunity/base/base_style.dart'; import 'package:akuCommunity/utils/headers.dart'; class BeeSingleCheck extends StatefulWidget {