From ac34d1a9446f854855361f0e98fc7beef67f011c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=83=A1=E5=A4=A9?= Date: Wed, 26 Jul 2023 18:03:02 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=93=E6=9E=84=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/modules/application/application_page.dart | 8 ++++---- .../widgets}/account/account_binding.dart | 0 .../widgets}/account/account_controller.dart | 0 .../widgets}/account/account_page.dart | 0 .../widgets}/account/account_state.dart | 0 .../widgets}/bookmarks/bookmarks_binding.dart | 0 .../widgets}/bookmarks/bookmarks_controller.dart | 0 .../widgets}/bookmarks/bookmarks_page.dart | 4 ++-- .../widgets}/bookmarks/bookmarks_state.dart | 0 .../widgets}/category/category_binding.dart | 0 .../widgets}/category/category_controller.dart | 3 ++- .../widgets}/category/category_page.dart | 2 +- .../widgets}/category/category_state.dart | 0 .../widgets}/category/widgets/news_item.dart | 0 .../widgets}/category/widgets/news_page_list.dart | 5 +++-- .../{ => application/widgets}/main/main_binding.dart | 0 .../widgets}/main/main_controller.dart | 3 ++- .../{ => application/widgets}/main/main_page.dart | 10 +++++----- .../{ => application/widgets}/main/main_state.dart | 0 .../{ => application/widgets}/main/widgets/ad.dart | 3 ++- .../widgets}/main/widgets/categories.dart | 3 ++- .../widgets}/main/widgets/channels.dart | 3 ++- .../widgets}/main/widgets/news_letter.dart | 3 ++- .../widgets}/main/widgets/news_list.dart | 5 +++-- .../widgets}/main/widgets/recommend.dart | 7 ++++--- lib/routes/app_pages.dart | 8 ++++---- 26 files changed, 38 insertions(+), 29 deletions(-) rename lib/modules/{ => application/widgets}/account/account_binding.dart (100%) rename lib/modules/{ => application/widgets}/account/account_controller.dart (100%) rename lib/modules/{ => application/widgets}/account/account_page.dart (100%) rename lib/modules/{ => application/widgets}/account/account_state.dart (100%) rename lib/modules/{ => application/widgets}/bookmarks/bookmarks_binding.dart (100%) rename lib/modules/{ => application/widgets}/bookmarks/bookmarks_controller.dart (100%) rename lib/modules/{ => application/widgets}/bookmarks/bookmarks_page.dart (86%) rename lib/modules/{ => application/widgets}/bookmarks/bookmarks_state.dart (100%) rename lib/modules/{ => application/widgets}/category/category_binding.dart (100%) rename lib/modules/{ => application/widgets}/category/category_controller.dart (96%) rename lib/modules/{ => application/widgets}/category/category_page.dart (81%) rename lib/modules/{ => application/widgets}/category/category_state.dart (100%) rename lib/modules/{ => application/widgets}/category/widgets/news_item.dart (100%) rename lib/modules/{ => application/widgets}/category/widgets/news_page_list.dart (91%) rename lib/modules/{ => application/widgets}/main/main_binding.dart (100%) rename lib/modules/{ => application/widgets}/main/main_controller.dart (97%) rename lib/modules/{ => application/widgets}/main/main_page.dart (66%) rename lib/modules/{ => application/widgets}/main/main_state.dart (100%) rename lib/modules/{ => application/widgets}/main/widgets/ad.dart (95%) rename lib/modules/{ => application/widgets}/main/widgets/categories.dart (96%) rename lib/modules/{ => application/widgets}/main/widgets/channels.dart (97%) rename lib/modules/{ => application/widgets}/main/widgets/news_letter.dart (98%) rename lib/modules/{ => application/widgets}/main/widgets/news_list.dart (98%) rename lib/modules/{ => application/widgets}/main/widgets/recommend.dart (95%) diff --git a/lib/modules/application/application_page.dart b/lib/modules/application/application_page.dart index 2cf45c3..6647a11 100644 --- a/lib/modules/application/application_page.dart +++ b/lib/modules/application/application_page.dart @@ -1,14 +1,14 @@ import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; -import 'package:news_getx/modules/account/account_page.dart'; -import 'package:news_getx/modules/bookmarks/bookmarks_page.dart'; -import 'package:news_getx/modules/category/category_page.dart'; -import 'package:news_getx/modules/main/main_page.dart'; import 'package:news_getx/modules/widgets/app_bar.dart'; import 'package:news_getx/theme/app_colors.dart'; import 'application_controller.dart'; +import 'widgets/account/account_page.dart'; +import 'widgets/bookmarks/bookmarks_page.dart'; +import 'widgets/category/category_page.dart'; +import 'widgets/main/main_page.dart'; class ApplicationPage extends GetView { const ApplicationPage({Key? key}) : super(key: key); diff --git a/lib/modules/account/account_binding.dart b/lib/modules/application/widgets/account/account_binding.dart similarity index 100% rename from lib/modules/account/account_binding.dart rename to lib/modules/application/widgets/account/account_binding.dart diff --git a/lib/modules/account/account_controller.dart b/lib/modules/application/widgets/account/account_controller.dart similarity index 100% rename from lib/modules/account/account_controller.dart rename to lib/modules/application/widgets/account/account_controller.dart diff --git a/lib/modules/account/account_page.dart b/lib/modules/application/widgets/account/account_page.dart similarity index 100% rename from lib/modules/account/account_page.dart rename to lib/modules/application/widgets/account/account_page.dart diff --git a/lib/modules/account/account_state.dart b/lib/modules/application/widgets/account/account_state.dart similarity index 100% rename from lib/modules/account/account_state.dart rename to lib/modules/application/widgets/account/account_state.dart diff --git a/lib/modules/bookmarks/bookmarks_binding.dart b/lib/modules/application/widgets/bookmarks/bookmarks_binding.dart similarity index 100% rename from lib/modules/bookmarks/bookmarks_binding.dart rename to lib/modules/application/widgets/bookmarks/bookmarks_binding.dart diff --git a/lib/modules/bookmarks/bookmarks_controller.dart b/lib/modules/application/widgets/bookmarks/bookmarks_controller.dart similarity index 100% rename from lib/modules/bookmarks/bookmarks_controller.dart rename to lib/modules/application/widgets/bookmarks/bookmarks_controller.dart diff --git a/lib/modules/bookmarks/bookmarks_page.dart b/lib/modules/application/widgets/bookmarks/bookmarks_page.dart similarity index 86% rename from lib/modules/bookmarks/bookmarks_page.dart rename to lib/modules/application/widgets/bookmarks/bookmarks_page.dart index 35c3dfc..1524e1c 100644 --- a/lib/modules/bookmarks/bookmarks_page.dart +++ b/lib/modules/application/widgets/bookmarks/bookmarks_page.dart @@ -16,8 +16,8 @@ class BookmarksPage extends GetView { ElevatedButton( onPressed: () { // EasyLoading.showProgress(0.3, status: 'downloading...'); - // EasyLoading.showToast("1231232"); - EasyLoading.show(status: "Loading"); + EasyLoading.showToast("测试"); + // EasyLoading.show(status: "Loading"); }, child: Text("Test"), ), diff --git a/lib/modules/bookmarks/bookmarks_state.dart b/lib/modules/application/widgets/bookmarks/bookmarks_state.dart similarity index 100% rename from lib/modules/bookmarks/bookmarks_state.dart rename to lib/modules/application/widgets/bookmarks/bookmarks_state.dart diff --git a/lib/modules/category/category_binding.dart b/lib/modules/application/widgets/category/category_binding.dart similarity index 100% rename from lib/modules/category/category_binding.dart rename to lib/modules/application/widgets/category/category_binding.dart diff --git a/lib/modules/category/category_controller.dart b/lib/modules/application/widgets/category/category_controller.dart similarity index 96% rename from lib/modules/category/category_controller.dart rename to lib/modules/application/widgets/category/category_controller.dart index b643781..30c26c9 100644 --- a/lib/modules/category/category_controller.dart +++ b/lib/modules/application/widgets/category/category_controller.dart @@ -1,9 +1,10 @@ import 'package:get/get.dart'; import 'package:news_getx/data/model/news.dart'; import 'package:news_getx/data/repository/news_repository.dart'; -import 'package:news_getx/modules/category/category_state.dart'; import 'package:pull_to_refresh/pull_to_refresh.dart'; +import 'category_state.dart'; + class CategoryController extends GetxController { NewsRepository newsRepository; diff --git a/lib/modules/category/category_page.dart b/lib/modules/application/widgets/category/category_page.dart similarity index 81% rename from lib/modules/category/category_page.dart rename to lib/modules/application/widgets/category/category_page.dart index c75b378..9f783b6 100644 --- a/lib/modules/category/category_page.dart +++ b/lib/modules/application/widgets/category/category_page.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:news_getx/modules/category/widgets/news_page_list.dart'; import 'category_controller.dart'; +import 'widgets/news_page_list.dart'; class CategoryPage extends GetView { const CategoryPage({Key? key}) : super(key: key); diff --git a/lib/modules/category/category_state.dart b/lib/modules/application/widgets/category/category_state.dart similarity index 100% rename from lib/modules/category/category_state.dart rename to lib/modules/application/widgets/category/category_state.dart diff --git a/lib/modules/category/widgets/news_item.dart b/lib/modules/application/widgets/category/widgets/news_item.dart similarity index 100% rename from lib/modules/category/widgets/news_item.dart rename to lib/modules/application/widgets/category/widgets/news_item.dart diff --git a/lib/modules/category/widgets/news_page_list.dart b/lib/modules/application/widgets/category/widgets/news_page_list.dart similarity index 91% rename from lib/modules/category/widgets/news_page_list.dart rename to lib/modules/application/widgets/category/widgets/news_page_list.dart index 69e3611..bc3a73c 100644 --- a/lib/modules/category/widgets/news_page_list.dart +++ b/lib/modules/application/widgets/category/widgets/news_page_list.dart @@ -1,10 +1,11 @@ import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; -import 'package:news_getx/modules/category/category_controller.dart'; -import 'package:news_getx/modules/category/widgets/news_item.dart'; +import 'package:news_getx/modules/application/widgets/category/category_controller.dart'; import 'package:pull_to_refresh/pull_to_refresh.dart'; +import 'news_item.dart'; + class NewsPageList extends StatefulWidget { const NewsPageList({Key? key}) : super(key: key); diff --git a/lib/modules/main/main_binding.dart b/lib/modules/application/widgets/main/main_binding.dart similarity index 100% rename from lib/modules/main/main_binding.dart rename to lib/modules/application/widgets/main/main_binding.dart diff --git a/lib/modules/main/main_controller.dart b/lib/modules/application/widgets/main/main_controller.dart similarity index 97% rename from lib/modules/main/main_controller.dart rename to lib/modules/application/widgets/main/main_controller.dart index 123d80e..4399e16 100644 --- a/lib/modules/main/main_controller.dart +++ b/lib/modules/application/widgets/main/main_controller.dart @@ -1,7 +1,8 @@ import 'package:get/get.dart'; import 'package:news_getx/data/model/news.dart'; import 'package:news_getx/data/repository/news_repository.dart'; -import 'package:news_getx/modules/main/main_state.dart'; + +import 'main_state.dart'; class MainController extends GetxController { NewsRepository newsRepository; diff --git a/lib/modules/main/main_page.dart b/lib/modules/application/widgets/main/main_page.dart similarity index 66% rename from lib/modules/main/main_page.dart rename to lib/modules/application/widgets/main/main_page.dart index 98961d1..952c5e8 100644 --- a/lib/modules/main/main_page.dart +++ b/lib/modules/application/widgets/main/main_page.dart @@ -1,12 +1,12 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:news_getx/modules/main/widgets/categories.dart'; -import 'package:news_getx/modules/main/widgets/channels.dart'; -import 'package:news_getx/modules/main/widgets/news_letter.dart'; -import 'package:news_getx/modules/main/widgets/news_list.dart'; -import 'package:news_getx/modules/main/widgets/recommend.dart'; import 'main_controller.dart'; +import 'widgets/categories.dart'; +import 'widgets/channels.dart'; +import 'widgets/news_letter.dart'; +import 'widgets/news_list.dart'; +import 'widgets/recommend.dart'; class MainPage extends GetView { const MainPage({Key? key}) : super(key: key); diff --git a/lib/modules/main/main_state.dart b/lib/modules/application/widgets/main/main_state.dart similarity index 100% rename from lib/modules/main/main_state.dart rename to lib/modules/application/widgets/main/main_state.dart diff --git a/lib/modules/main/widgets/ad.dart b/lib/modules/application/widgets/main/widgets/ad.dart similarity index 95% rename from lib/modules/main/widgets/ad.dart rename to lib/modules/application/widgets/main/widgets/ad.dart index 903e7b6..9a93470 100644 --- a/lib/modules/main/widgets/ad.dart +++ b/lib/modules/application/widgets/main/widgets/ad.dart @@ -1,11 +1,12 @@ import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; -import 'package:news_getx/modules/main/main_controller.dart'; import 'package:news_getx/theme/app_borders.dart'; import 'package:news_getx/theme/app_colors.dart'; import 'package:news_getx/theme/app_radii.dart'; +import '../main_controller.dart'; + class AdWidget extends GetView{ @override Widget build(BuildContext context) { diff --git a/lib/modules/main/widgets/categories.dart b/lib/modules/application/widgets/main/widgets/categories.dart similarity index 96% rename from lib/modules/main/widgets/categories.dart rename to lib/modules/application/widgets/main/widgets/categories.dart index eaab1a8..368e674 100644 --- a/lib/modules/main/widgets/categories.dart +++ b/lib/modules/application/widgets/main/widgets/categories.dart @@ -1,9 +1,10 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; -import 'package:news_getx/modules/main/main_controller.dart'; import 'package:news_getx/theme/app_colors.dart'; +import '../main_controller.dart'; + class NewsCategoriesWidget extends GetView { @override Widget build(BuildContext context) { diff --git a/lib/modules/main/widgets/channels.dart b/lib/modules/application/widgets/main/widgets/channels.dart similarity index 97% rename from lib/modules/main/widgets/channels.dart rename to lib/modules/application/widgets/main/widgets/channels.dart index bdbc407..f4e23b0 100644 --- a/lib/modules/main/widgets/channels.dart +++ b/lib/modules/application/widgets/main/widgets/channels.dart @@ -2,10 +2,11 @@ import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:news_getx/data/model/channels.dart'; -import 'package:news_getx/modules/main/main_controller.dart'; import 'package:news_getx/theme/app_colors.dart'; import 'package:news_getx/theme/app_shadows.dart'; +import '../main_controller.dart'; + class NewsChannelsWidget extends GetView { Widget _buildChannelItem(ChannelResponse item) { return Container( diff --git a/lib/modules/main/widgets/news_letter.dart b/lib/modules/application/widgets/main/widgets/news_letter.dart similarity index 98% rename from lib/modules/main/widgets/news_letter.dart rename to lib/modules/application/widgets/main/widgets/news_letter.dart index 700e57b..f694b89 100644 --- a/lib/modules/main/widgets/news_letter.dart +++ b/lib/modules/application/widgets/main/widgets/news_letter.dart @@ -2,12 +2,13 @@ import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; -import 'package:news_getx/modules/main/main_controller.dart'; import 'package:news_getx/modules/widgets/button.dart'; import 'package:news_getx/modules/widgets/input.dart'; import 'package:news_getx/modules/widgets/toast.dart'; import 'package:news_getx/theme/app_colors.dart'; +import '../main_controller.dart'; + /// 邮件订阅 class NewsLetterWidget extends GetView { @override diff --git a/lib/modules/main/widgets/news_list.dart b/lib/modules/application/widgets/main/widgets/news_list.dart similarity index 98% rename from lib/modules/main/widgets/news_list.dart rename to lib/modules/application/widgets/main/widgets/news_list.dart index 1dca19a..22860fb 100644 --- a/lib/modules/main/widgets/news_list.dart +++ b/lib/modules/application/widgets/main/widgets/news_list.dart @@ -2,13 +2,14 @@ import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:news_getx/data/model/news.dart'; -import 'package:news_getx/modules/main/main_controller.dart'; -import 'package:news_getx/modules/main/widgets/ad.dart'; import 'package:news_getx/modules/widgets/image.dart'; import 'package:news_getx/routes/app_pages.dart'; import 'package:news_getx/theme/app_colors.dart'; import 'package:news_getx/utils/date.dart'; +import '../main_controller.dart'; +import 'ad.dart'; + /// 新闻行 Item class NewsListWidget extends GetView { Widget _buildListItem(NewsItem item) { diff --git a/lib/modules/main/widgets/recommend.dart b/lib/modules/application/widgets/main/widgets/recommend.dart similarity index 95% rename from lib/modules/main/widgets/recommend.dart rename to lib/modules/application/widgets/main/widgets/recommend.dart index 145ce1b..1f30367 100644 --- a/lib/modules/main/widgets/recommend.dart +++ b/lib/modules/application/widgets/main/widgets/recommend.dart @@ -1,13 +1,13 @@ import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; -import 'package:news_getx/data/services/config.dart'; -import 'package:news_getx/modules/main/main_controller.dart'; import 'package:news_getx/modules/widgets/image.dart'; import 'package:news_getx/routes/app_pages.dart'; import 'package:news_getx/theme/app_colors.dart'; import 'package:news_getx/utils/date.dart'; +import '../main_controller.dart'; + class NewsRecommendWidget extends GetView { @override Widget build(BuildContext context) { @@ -22,7 +22,8 @@ class NewsRecommendWidget extends GetView { // 图 InkWell( onTap: () { - Get.toNamed(AppRoutes.Detail, arguments: controller.state.newsRecommend!); + Get.toNamed(AppRoutes.Detail, + arguments: controller.state.newsRecommend!); }, child: netImageCached( controller.state.newsRecommend?.thumbnail ?? "", diff --git a/lib/routes/app_pages.dart b/lib/routes/app_pages.dart index e683110..742d227 100644 --- a/lib/routes/app_pages.dart +++ b/lib/routes/app_pages.dart @@ -2,14 +2,14 @@ import 'package:flutter/cupertino.dart'; import 'package:get/get.dart'; import 'package:news_getx/middlewares/router_auth.dart'; import 'package:news_getx/middlewares/router_welcome.dart'; -import 'package:news_getx/modules/account/account_binding.dart'; import 'package:news_getx/modules/application/application_binding.dart'; import 'package:news_getx/modules/application/application_page.dart'; -import 'package:news_getx/modules/bookmarks/bookmarks_binding.dart'; -import 'package:news_getx/modules/category/category_binding.dart'; +import 'package:news_getx/modules/application/widgets/account/account_binding.dart'; +import 'package:news_getx/modules/application/widgets/bookmarks/bookmarks_binding.dart'; +import 'package:news_getx/modules/application/widgets/category/category_binding.dart'; +import 'package:news_getx/modules/application/widgets/main/main_binding.dart'; import 'package:news_getx/modules/detail/detail_binding.dart'; import 'package:news_getx/modules/detail/detail_page.dart'; -import 'package:news_getx/modules/main/main_binding.dart'; import 'package:news_getx/modules/not_found/not_found_binding.dart'; import 'package:news_getx/modules/not_found/not_found_page.dart'; import 'package:news_getx/modules/sign_in/sign_in_binding.dart';