项目结构调整

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<ApplicationController> {
   const ApplicationPage({Key? key}) : super(key: key);

lib/modules/application/widgets/bookmarks/bookmarks_page.dart

@@ -16,8 +16,8 @@ class BookmarksPage extends GetView<BookmarksController> {
           ElevatedButton(
             onPressed: () {
               // EasyLoading.showProgress(0.3, status: 'downloading...');
-              // EasyLoading.showToast("1231232");
-              EasyLoading.show(status: "Loading");
+              EasyLoading.showToast("测试");
+              // EasyLoading.show(status: "Loading");
             },
             child: Text("Test"),
           ),

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;
 

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<CategoryController> {
   const CategoryPage({Key? key}) : super(key: key);

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);
 

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;

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<MainController> {
   const MainPage({Key? key}) : super(key: key);

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<MainController>{
   @override
   Widget build(BuildContext context) {

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<MainController> {
   @override
   Widget build(BuildContext context) {

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<MainController> {
   Widget _buildChannelItem(ChannelResponse item) {
     return Container(

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<MainController> {
   @override

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<MainController> {
   Widget _buildListItem(NewsItem item) {

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<MainController> {
   @override
   Widget build(BuildContext context) {
@@ -22,7 +22,8 @@ class NewsRecommendWidget extends GetView<MainController> {
                   // 图
                   InkWell(
                     onTap: () {
-                      Get.toNamed(AppRoutes.Detail, arguments:  controller.state.newsRecommend!);
+                      Get.toNamed(AppRoutes.Detail,
+                          arguments: controller.state.newsRecommend!);
                     },
                     child: netImageCached(
                       controller.state.newsRecommend?.thumbnail ?? "",

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';