diff --git a/ios/Flutter/.last_build_id b/ios/Flutter/.last_build_id index ad3dfad9..60ab2fda 100644 --- a/ios/Flutter/.last_build_id +++ b/ios/Flutter/.last_build_id @@ -1 +1 @@ -1639ba717cd75e55d448599066f95969 \ No newline at end of file +08772c882ade7695c518fdf7d64d7a30 \ No newline at end of file diff --git a/lib/model/community/activity_detail_model.dart b/lib/model/community/activity_detail_model.dart index ed6912a1..3a1ee8e1 100644 --- a/lib/model/community/activity_detail_model.dart +++ b/lib/model/community/activity_detail_model.dart @@ -1,6 +1,9 @@ -import 'package:akuCommunity/model/common/img_model.dart'; +// Package imports: import 'package:common_utils/common_utils.dart'; +// Project imports: +import 'package:akuCommunity/model/common/img_model.dart'; + class ActivityDetailModel { int id; String title; diff --git a/lib/model/community/activity_item_model.dart b/lib/model/community/activity_item_model.dart index 8d57746f..9de3238f 100644 --- a/lib/model/community/activity_item_model.dart +++ b/lib/model/community/activity_item_model.dart @@ -1,6 +1,9 @@ -import 'package:akuCommunity/model/common/img_model.dart'; +// Package imports: import 'package:common_utils/common_utils.dart'; +// Project imports: +import 'package:akuCommunity/model/common/img_model.dart'; + class ActivityItemModel { int id; String title; diff --git a/lib/model/manager/advice_detail_model.dart b/lib/model/manager/advice_detail_model.dart index 88b80a47..a88ac6e0 100644 --- a/lib/model/manager/advice_detail_model.dart +++ b/lib/model/manager/advice_detail_model.dart @@ -1,7 +1,9 @@ // Package imports: -import 'package:akuCommunity/model/common/img_model.dart'; import 'package:common_utils/common_utils.dart'; +// Project imports: +import 'package:akuCommunity/model/common/img_model.dart'; + class AdviceDetailModel { AppAdviceDetailVo appAdviceDetailVo; diff --git a/lib/model/manager/fixed_detail_model.dart b/lib/model/manager/fixed_detail_model.dart index 4b41c9dd..bd8ee287 100644 --- a/lib/model/manager/fixed_detail_model.dart +++ b/lib/model/manager/fixed_detail_model.dart @@ -1,3 +1,4 @@ +// Project imports: import 'package:akuCommunity/model/common/img_model.dart'; class FixedDetailModel { diff --git a/lib/model/manager/suggestion_or_complain_model.dart b/lib/model/manager/suggestion_or_complain_model.dart index fda6c0c5..798172d6 100644 --- a/lib/model/manager/suggestion_or_complain_model.dart +++ b/lib/model/manager/suggestion_or_complain_model.dart @@ -1,7 +1,9 @@ // Package imports: -import 'package:akuCommunity/model/common/img_model.dart'; import 'package:common_utils/common_utils.dart'; +// Project imports: +import 'package:akuCommunity/model/common/img_model.dart'; + class SuggestionOrComplainModel { int id; int type; diff --git a/lib/model/user/fixed_submit_model.dart b/lib/model/user/fixed_submit_model.dart index 1b94e7e2..7794ff17 100644 --- a/lib/model/user/fixed_submit_model.dart +++ b/lib/model/user/fixed_submit_model.dart @@ -1,3 +1,4 @@ +// Project imports: import 'package:akuCommunity/model/common/img_model.dart'; class FixedSubmitModel { diff --git a/lib/pages/home/home_page.dart b/lib/pages/home/home_page.dart index 1ef84d3b..b92589f1 100644 --- a/lib/pages/home/home_page.dart +++ b/lib/pages/home/home_page.dart @@ -3,17 +3,11 @@ import 'dart:async'; import 'dart:convert'; // Flutter imports: -import 'package:akuCommunity/model/community/activity_item_model.dart'; -import 'package:akuCommunity/ui/community/activity_card.dart'; -import 'package:akuCommunity/ui/community/activity_list_page.dart'; -import 'package:akuCommunity/ui/community/community_func.dart'; -import 'package:akuCommunity/ui/home/home_notification.dart'; -import 'package:akuCommunity/ui/home/home_title.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_easyrefresh/easy_refresh.dart'; // Package imports: +import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:flutter_icons/flutter_icons.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:velocity_x/velocity_x.dart'; @@ -23,6 +17,7 @@ import 'package:akuCommunity/const/resource.dart'; import 'package:akuCommunity/extensions/num_ext.dart'; import 'package:akuCommunity/extensions/page_router.dart'; import 'package:akuCommunity/model/aku_shop_model.dart'; +import 'package:akuCommunity/model/community/activity_item_model.dart'; import 'package:akuCommunity/pages/convenient_phone/convenient_phone_page.dart'; import 'package:akuCommunity/pages/home/widget/animate_app_bar.dart'; import 'package:akuCommunity/pages/industry_committee/industry_committee_page.dart'; @@ -33,6 +28,11 @@ import 'package:akuCommunity/pages/things_page/fixed_submit_page.dart'; import 'package:akuCommunity/pages/total_application_page/total_applications_page.dart'; import 'package:akuCommunity/pages/visitor_access_page/visitor_access_page.dart'; import 'package:akuCommunity/service/base_model.dart'; +import 'package:akuCommunity/ui/community/activity_card.dart'; +import 'package:akuCommunity/ui/community/activity_list_page.dart'; +import 'package:akuCommunity/ui/community/community_func.dart'; +import 'package:akuCommunity/ui/home/home_notification.dart'; +import 'package:akuCommunity/ui/home/home_title.dart'; import 'package:akuCommunity/ui/manager/advice/advice_page.dart'; import 'package:akuCommunity/utils/headers.dart'; import 'package:akuCommunity/widget/container_comment.dart'; diff --git a/lib/pages/home/widget/home_card.dart b/lib/pages/home/widget/home_card.dart index 107d2318..76a7ae86 100644 --- a/lib/pages/home/widget/home_card.dart +++ b/lib/pages/home/widget/home_card.dart @@ -15,7 +15,6 @@ import 'package:akuCommunity/routers/page_routers.dart'; import 'package:akuCommunity/utils/headers.dart'; import 'package:akuCommunity/widget/cached_image_wrapper.dart'; - //TODO CLEAN BOTTOM CODES. @Deprecated("sh*t home_card need to be cleaned.") class HomeCard extends StatefulWidget { diff --git a/lib/ui/community/activity_card.dart b/lib/ui/community/activity_card.dart index 3d3a23a0..e6d4ad64 100644 --- a/lib/ui/community/activity_card.dart +++ b/lib/ui/community/activity_card.dart @@ -1,13 +1,18 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:common_utils/common_utils.dart'; +import 'package:velocity_x/velocity_x.dart'; + +// Project imports: +import 'package:akuCommunity/const/resource.dart'; +import 'package:akuCommunity/constants/api.dart'; import 'package:akuCommunity/model/common/img_model.dart'; import 'package:akuCommunity/model/community/activity_item_model.dart'; import 'package:akuCommunity/ui/community/activity_detail_page.dart'; import 'package:akuCommunity/utils/headers.dart'; -import 'package:akuCommunity/const/resource.dart'; -import 'package:akuCommunity/constants/api.dart'; import 'package:akuCommunity/widget/others/stack_avatar.dart'; -import 'package:common_utils/common_utils.dart'; -import 'package:flutter/material.dart'; -import 'package:velocity_x/velocity_x.dart'; class ActivityCard extends StatelessWidget { final ActivityItemModel model; diff --git a/lib/ui/community/activity_detail_page.dart b/lib/ui/community/activity_detail_page.dart index f040f09b..12620b55 100644 --- a/lib/ui/community/activity_detail_page.dart +++ b/lib/ui/community/activity_detail_page.dart @@ -1,3 +1,14 @@ +// Flutter imports: +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:common_utils/common_utils.dart'; +import 'package:flutter_easyrefresh/easy_refresh.dart'; +import 'package:get/get.dart'; +import 'package:shimmer/shimmer.dart'; + +// Project imports: import 'package:akuCommunity/const/resource.dart'; import 'package:akuCommunity/constants/api.dart'; import 'package:akuCommunity/model/community/activity_detail_model.dart'; @@ -8,12 +19,6 @@ import 'package:akuCommunity/utils/network/net_util.dart'; import 'package:akuCommunity/widget/bee_scaffold.dart'; import 'package:akuCommunity/widget/others/stack_avatar.dart'; import 'package:akuCommunity/widget/picker/bee_image_preview.dart'; -import 'package:common_utils/common_utils.dart'; -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_easyrefresh/easy_refresh.dart'; -import 'package:get/get.dart'; -import 'package:shimmer/shimmer.dart'; class ActivityDetailPage extends StatefulWidget { final int id; diff --git a/lib/ui/community/activity_list_page.dart b/lib/ui/community/activity_list_page.dart index 95e1977f..8bb31cfe 100644 --- a/lib/ui/community/activity_list_page.dart +++ b/lib/ui/community/activity_list_page.dart @@ -1,11 +1,16 @@ -import 'package:akuCommunity/utils/headers.dart'; +// 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/activity_item_model.dart'; import 'package:akuCommunity/pages/things_page/widget/bee_list_view.dart'; import 'package:akuCommunity/ui/community/activity_card.dart'; +import 'package:akuCommunity/utils/headers.dart'; import 'package:akuCommunity/widget/bee_scaffold.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_easyrefresh/easy_refresh.dart'; class ActivityListPage extends StatefulWidget { ActivityListPage({Key key}) : super(key: key); diff --git a/lib/ui/community/activity_people_list_page.dart b/lib/ui/community/activity_people_list_page.dart index 2ee99aca..fafaccfe 100644 --- a/lib/ui/community/activity_people_list_page.dart +++ b/lib/ui/community/activity_people_list_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/const/resource.dart'; -import 'package:akuCommunity/utils/headers.dart'; import 'package:akuCommunity/constants/api.dart'; import 'package:akuCommunity/model/community/activity_people_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'; class ActivityPeopleListPage extends StatefulWidget { final int id; diff --git a/lib/ui/community/community_func.dart b/lib/ui/community/community_func.dart index f9a60796..b21ff73e 100644 --- a/lib/ui/community/community_func.dart +++ b/lib/ui/community/community_func.dart @@ -1,3 +1,4 @@ +// Project imports: import 'package:akuCommunity/constants/api.dart'; import 'package:akuCommunity/model/community/activity_item_model.dart'; import 'package:akuCommunity/utils/network/base_list_model.dart'; diff --git a/lib/ui/home/home_notification.dart b/lib/ui/home/home_notification.dart index 559e75dc..33e56179 100644 --- a/lib/ui/home/home_notification.dart +++ b/lib/ui/home/home_notification.dart @@ -1,10 +1,15 @@ -import 'package:akuCommunity/base/base_style.dart'; -import 'package:akuCommunity/const/resource.dart'; -import 'package:akuCommunity/utils/headers.dart'; +// Flutter imports: import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:velocity_x/velocity_x.dart'; +// Project imports: +import 'package:akuCommunity/base/base_style.dart'; +import 'package:akuCommunity/const/resource.dart'; +import 'package:akuCommunity/utils/headers.dart'; + class HomeNotification extends StatefulWidget { HomeNotification({Key key}) : super(key: key); diff --git a/lib/ui/home/home_title.dart b/lib/ui/home/home_title.dart index 6df8309a..c1629505 100644 --- a/lib/ui/home/home_title.dart +++ b/lib/ui/home/home_title.dart @@ -1,9 +1,14 @@ -import 'package:akuCommunity/base/base_style.dart'; -import 'package:akuCommunity/utils/headers.dart'; +// Flutter imports: import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:velocity_x/velocity_x.dart'; +// Project imports: +import 'package:akuCommunity/base/base_style.dart'; +import 'package:akuCommunity/utils/headers.dart'; + class HomeTitle extends StatelessWidget { final String title; final String suffixTitle; diff --git a/lib/widget/others/stack_avatar.dart b/lib/widget/others/stack_avatar.dart index e2df0d80..ad2209e2 100644 --- a/lib/widget/others/stack_avatar.dart +++ b/lib/widget/others/stack_avatar.dart @@ -1,7 +1,10 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Project imports: import 'package:akuCommunity/const/resource.dart'; import 'package:akuCommunity/constants/api.dart'; import 'package:akuCommunity/utils/headers.dart'; -import 'package:flutter/material.dart'; class StackAvatar extends StatelessWidget { final List avatars;