优化代码结构

Author: toly1994328

lib/app/router/router_utils.dart

@@ -20,12 +20,14 @@ import 'package:flutter_unit/point_system/views/issues_point/issues_detail.dart'
 import 'package:flutter_unit/point_system/views/issues_point/issues_point_page.dart';
 import 'package:flutter_unit/user_system/pages/login/login_page.dart';
 import 'package:flutter_unit/user_system/pages/register/register_page.dart';
-import 'package:flutter_unit/widget_system/views/widget_system_view.dart';
+import 'package:flutter_unit/widget_ui/desk/widget_detail/widget_detail_page.dart';
+import 'package:flutter_unit/widget_ui/mobile/category_page/category_detail.dart';
+import 'package:flutter_unit/widget_ui/mobile/category_page/collect_page.dart';
+import 'package:flutter_unit/widget_ui/mobile/search_page/search_page.dart';
+import 'package:flutter_unit/widget_ui/mobile/widget_detail/widget_detail_page.dart';
 import 'package:widget_repository/widget_repository.dart';
 
 import '../../navigation/navigation/unit_navigation.dart';
-import '../../widget_system/views/widget_detail_page/desk_ui/widget_detail_page.dart';
-import 'router_utils.dart';
 
 class UnitRouters {
   static const String widget_detail = '/widget_detail';

lib/app/router/unit_router.dart

@@ -1,11 +1,12 @@
 import 'package:app_config/app_config.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_unit/widget_system/views/standard_widget_home/standard_item/widget_model_item.dart';
 
 import 'package:old_fancy_mobile_ui/old_fancy_mobile_ui.dart';
 import 'package:widget_repository/widget_repository.dart';
 
+import '../../widget_ui/mobile/widget_panel/widget_model_item.dart';
+
 class PhoneWidgetContent extends StatelessWidget {
   final List<WidgetModel> items;
 

lib/navigation/home_page/phone_widget_content.dart

@@ -7,15 +7,15 @@ import 'package:flutter_unit/app/views/unit_todo/point_unit_page.dart';
 import 'package:components/toly_ui/toly_ui.dart';
 
 import 'package:flutter_unit/painter_system/gallery_unit.dart';
-import 'package:flutter_unit/widget_system/views/widget_system_view.dart';
+import 'package:flutter_unit/widget_ui/desk/widget_panel/widget_panel.dart';
 
 import 'package:url_launcher/url_launcher.dart';
-import 'package:window_manager/window_manager.dart';
-
 import '../../app/plateform_adapter/window/windows_adapter.dart';
-import '../../widget_system/views/desk_ui/widget_panel/widget_panel.dart';
+
+import '../../widget_ui/mobile/category_page/collect_page.dart';
+import '../../widget_ui/mobile/category_page/home_right_drawer.dart';
 import '../home_page/home_drawer.dart';
-import '../home_page/home_page.dart';
+
 
 
 class UnitDeskNavigation extends StatefulWidget {

lib/navigation/navigation/unit_desk_navigation.dart

@@ -3,18 +3,18 @@ import 'dart:io';
 import 'package:app_config/app_config.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_unit/app/router/unit_router.dart';
 import 'package:flutter_unit/app/update_part/bloc_exp.dart';
 import 'package:flutter_unit/components/project/nav/pure_bottom_bar.dart';
 import 'package:flutter_unit/painter_system/gallery_unit.dart';
 import 'package:flutter_unit/app/update_part/views/update_red_point.dart';
 import 'package:flutter_unit/user_system/pages/user/user_page.dart';
 import 'package:old_fancy_mobile_ui/old_fancy_mobile_ui.dart';
 import 'package:widget_module/blocs/blocs.dart';
-import 'package:flutter_unit/widget_system/views/standard_widget_home/standard_home_page.dart';
-import 'package:flutter_unit/widget_system/views/widget_system_view.dart';
+import 'package:flutter_unit/widget_ui/mobile/widget_panel/standard_home_page.dart';
 
 import '../../app/blocs/color_change_bloc.dart';
+import '../../widget_ui/mobile/category_page/collect_page.dart';
+import '../../widget_ui/mobile/category_page/home_right_drawer.dart';
 import '../home_page/home_page.dart';
 import 'unit_desk_navigation.dart';
 

lib/navigation/navigation/unit_navigation.dart

@@ -8,7 +8,8 @@ import 'package:flutter_unit/app/utils/Toast.dart';
 import 'package:flutter_unit/components/flutter/diy_flexible_space_bar.dart';
 import 'package:components/toly_ui/toly_ui.dart';
 import 'package:flutter_unit/components/project/windmill.dart';
-import 'package:flutter_unit/widget_system/views/desk_ui/widget_panel/window_buttons.dart';
+import 'package:flutter_unit/widget_ui/desk/widget_panel/window_buttons.dart';
+
 import 'package:widget_module/blocs/blocs.dart';
 import 'package:widget_repository/widget_repository.dart';
 

lib/widget_system/views/widget_system_view.dart

@@ -2,17 +2,14 @@ import 'package:app_config/app_config.dart';
 import 'package:components/toly_ui/toly_ui.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_unit/app/plateform_adapter/window/windows_adapter.dart';
-
-import 'package:flutter_unit/components/project/widget_node_panel.dart';
+import 'package:flutter_unit/widget_ui/mobile/widget_detail/category_end_drawer.dart';
 import 'package:widget_module/blocs/blocs.dart';
 
 import 'package:widget_repository/widget_repository.dart';
+import 'package:widgets/widgets.dart';
 
-import '../../../widgets/widgets_map.dart';
-import '../category_end_drawer.dart';
-import 'link_widget_buttons.dart';
-import 'widget_detail_bar.dart';
+import '../../../../widget_ui/desk/widget_detail/link_widget_buttons.dart';
+import '../../../../widget_ui/desk/widget_detail/widget_detail_bar.dart';
 import 'widget_detail_panel.dart';
 import 'widget_node_panel.dart';
 

lib/widget_system/views/widget_detail_page/desk_ui/link_widget_buttons.dart renamed to lib/widget_ui/desk/widget_detail/link_widget_buttons.dart

@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_unit/app/plateform_adapter/window/windows_adapter.dart';
 import 'package:flutter_unit/components/permanent/decorations/round_rect_rab_indicator.dart';
-import 'package:flutter_unit/widget_system/views/desk_ui/widget_panel/window_buttons.dart';
 
 import 'desk_search_bar.dart';
+import 'window_buttons.dart';
 
 class DeskWidgetTopBar extends StatefulWidget {
   final ValueChanged<int> onTabPressed;

lib/widget_system/views/widget_detail_page/desk_ui/widget_detail_bar.dart renamed to lib/widget_ui/desk/widget_detail/widget_detail_bar.dart

@@ -1,18 +1,12 @@
 import 'package:app_config/app_config.dart';
-import 'package:db_storage/db_storage.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_unit/app/plateform_adapter/window/windows_adapter.dart';
 import 'package:flutter_unit/app/utils/convert.dart';
-import 'package:flutter_unit/components/permanent/decorations/round_rect_rab_indicator.dart';
 import 'package:widget_module/blocs/blocs.dart';
 import 'package:widget_repository/widget_repository.dart';
-import 'package:window_manager/window_manager.dart';
 
 import 'desk_widget_model_item.dart';
-import 'desk_search_bar.dart';
 import 'desk_widget_top_bar.dart';
-import 'window_buttons.dart';
 
 class DeskWidgetPanel extends StatefulWidget {
   const DeskWidgetPanel({Key? key}) : super(key: key);

lib/widget_system/views/widget_detail_page/desk_ui/widget_detail_page.dart renamed to lib/widget_ui/desk/widget_detail/widget_detail_page.dart

@@ -1,16 +1,16 @@
 import 'package:app_config/app_config.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_unit/app/router/unit_router.dart';
 import 'package:flutter_unit/components/permanent/circle.dart';
 import 'package:flutter_unit/components/project/default/loading_shower.dart';
 import 'package:flutter_unit/components/project/dialogs/delete_category_dialog.dart';
-import 'package:flutter_unit/widget_system/views/category_view/category_list_item.dart';
+
 import 'package:flutter_unit/components/project/no_more_widget.dart';
 import 'package:widget_module/blocs/blocs.dart';
 
 import 'package:widget_repository/widget_repository.dart';
 
+import 'category_list_item.dart';
 import 'edit_category_panel.dart';
 import 'empty_category.dart';
 

lib/widget_system/views/widget_detail_page/desk_ui/widget_detail_panel.dart renamed to lib/widget_ui/desk/widget_detail/widget_detail_panel.dart

@@ -11,6 +11,7 @@ import 'like_widget_page.dart';
 import 'sync/async_button.dart';
 import 'sync/upload_button.dart';
 
+
 class CollectPage extends StatefulWidget {
   const CollectPage({Key? key}) : super(key: key);
 

lib/widget_system/views/widget_detail_page/desk_ui/widget_node_panel.dart renamed to lib/widget_ui/desk/widget_detail/widget_node_panel.dart

@@ -2,15 +2,15 @@ import 'package:app_config/app_config.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_unit/app/router/router_utils.dart';
 
 import 'package:flutter_unit/components/project/no_more_widget.dart';
 import 'package:widget_repository/widget_repository.dart';
-import 'package:flutter_unit/widget_system/views/widget_detail_page/collect_widget_list_item.dart';
+import 'package:flutter_unit/widget_ui/mobile/widget_detail/collect_widget_list_item.dart';
 import 'package:widget_module/blocs/blocs.dart';
 
+import '../widget_detail/widget_detail_page.dart';
+
 
-import '../widget_system_view.dart';
 
 /// create by 张风捷特烈 on 2020/6/16
 /// contact me by email [email protected]

lib/widget_system/views/desk_ui/widget_panel/desk_search_bar.dart renamed to lib/widget_ui/desk/widget_panel/desk_search_bar.dart

@@ -1,4 +1,5 @@
 import 'package:app_config/app_config.dart';
+import 'package:components/components.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_unit/components/permanent/circle.dart';
@@ -9,10 +10,8 @@ import 'package:old_fancy_mobile_ui/old_fancy_mobile_ui.dart';
 import 'package:widget_module/blocs/blocs.dart';
 
 import 'package:widget_repository/widget_repository.dart';
-import 'package:db_storage/db_storage.dart';
 import 'app_search_bar.dart';
-import 'empty_search_page.dart';
-import 'error_page.dart';
+
 
 // SearchPage 可以复用 WidgetsBloc，进行局部的 Bloc
 // 不必单独提供 SearchBloc 增加复杂性

lib/widget_system/views/desk_ui/widget_panel/desk_widget_model_item.dart renamed to lib/widget_ui/desk/widget_panel/desk_widget_model_item.dart

@@ -1,16 +1,15 @@
 import 'package:app_config/app_config.dart';
+import 'package:components/components.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_unit/app/router/unit_router.dart';
 import 'package:flutter_unit/components/project/default/empty_shower.dart';
 import 'package:flutter_unit/components/project/default/loading_shower.dart';
 import 'package:widget_module/blocs/blocs.dart';
-import 'package:flutter_unit/widget_system/views/search_view/empty_search_page.dart';
-import 'package:flutter_unit/widget_system/views/search_view/error_page.dart';
-import 'package:flutter_unit/widget_system/views/standard_widget_home/standard_item/widget_model_item.dart';
-import 'package:flutter_unit/widget_system/views/standard_widget_home/search_page/standard_search_bar.dart';
 import 'package:widget_repository/widget_repository.dart';
 
+import '../widget_panel/widget_model_item.dart';
+import 'standard_search_bar.dart';
+
 // SearchPage 可以复用 WidgetsBloc，进行局部的 Bloc
 // 不必单独提供 SearchBloc 增加复杂性
 class StandardSearchPageProvider extends StatelessWidget {