优化代码结构

Author: toly1994328

lib/app/views/navigation/bloc_wrapper.dart renamed to lib/app/bloc_wrapper.dart

@@ -1,12 +1,11 @@
 import 'package:app_config/app_config.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
-import 'package:flutter_unit/app/blocs/color_change_bloc.dart';
 
 import 'package:flutter_unit/app/router/unit_router.dart';
 import 'package:flutter_unit/app/views/splash/standard_unit_splash.dart';
+import 'package:old_fancy_mobile_ui/bloc/color_change_bloc.dart';
 
 
 /// create by 张风捷特烈 on 2020/4/28

lib/app/blocs/color_change_bloc.dart

@@ -2,10 +2,10 @@ 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/navigation/navigation/unit_drawer_header.dart';
-import 'package:flutter_unit/app/blocs/color_change_bloc.dart';
+import 'package:old_fancy_mobile_ui/bloc/color_change_bloc.dart';
+
+import 'unit_drawer_header.dart';
 
 /// create by 张风捷特烈 on 2020-03-26
 /// contact me by email [email protected]

lib/app/views/navigation/flutter_unit.dart renamed to lib/app/flutter_unit.dart

@@ -1,20 +1,20 @@
 import 'package:app_config/app_config.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_unit/app/blocs/color_change_bloc.dart';
+import 'package:flutter_unit/app/plateform_adapter/window/windows_adapter.dart';
 import 'package:flutter_unit/app/views/unit_todo/layout_unit_page.dart';
 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_ui/desk/widget_panel/widget_panel.dart';
+import 'package:flutter_unit/widget_ui/mobile/category_page/collect_page.dart';
+import 'package:flutter_unit/widget_ui/mobile/category_page/home_right_drawer.dart';
+import 'package:old_fancy_mobile_ui/bloc/color_change_bloc.dart';
 
 import 'package:url_launcher/url_launcher.dart';
-import '../../app/plateform_adapter/window/windows_adapter.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_drawer.dart';
 
 
 

lib/navigation/home_page/home_drawer.dart renamed to lib/app/navigation/home_drawer.dart

@@ -7,15 +7,16 @@ import 'package:flutter_unit/app/update_part/bloc_exp.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:flutter_unit/navigation/navigation/pure_bottom_bar.dart';
+import 'package:flutter_unit/widget_ui/mobile/category_page/collect_page.dart';
+import 'package:flutter_unit/widget_ui/mobile/category_page/home_right_drawer.dart';
+import 'package:old_fancy_mobile_ui/bloc/color_change_bloc.dart';
+
+import 'package:old_fancy_mobile_ui/home_page/fancy_home_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_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 'pure_bottom_bar.dart';
 import 'unit_desk_navigation.dart';
 
 /// create by 张风捷特烈 on 2020-04-11
@@ -83,7 +84,7 @@ class _UnitPhoneNavigationState extends State<UnitPhoneNavigation> {
         physics: _neverScroll,
         controller: _controller,
         children: [
-          if (style == AppStyle.fancy) const HomePage(),
+          if (style == AppStyle.fancy) const FancyHomePage(),
           if (style == AppStyle.standard) const StandardHomePage(),
           GalleryUnit(),
           CollectPage(),

lib/navigation/navigation/overlay_tool_wrapper.dart renamed to lib/app/navigation/overlay_tool_wrapper.dart

@@ -4,6 +4,7 @@ import 'dart:io';
 
 import 'package:app_config/app_config.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_unit/app/navigation/unit_navigation.dart';
 import 'package:flutter_unit/app/views/about/about_app_page.dart';
 import 'package:flutter_unit/app/views/about/about_me_page.dart';
 import 'package:flutter_unit/app/views/about/version_info.dart';
@@ -27,7 +28,6 @@ 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';
 
 class UnitRouters {
   static const String widget_detail = '/widget_detail';

lib/navigation/navigation/pure_bottom_bar.dart renamed to lib/app/navigation/pure_bottom_bar.dart

@@ -2,8 +2,8 @@ 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/navigation/overlay_tool_wrapper.dart';
 
-import 'package:flutter_unit/navigation/navigation/overlay_tool_wrapper.dart';
 
 import 'app_style_setting.dart';
 

lib/navigation/navigation/unit_desk_navigation.dart renamed to lib/app/navigation/unit_desk_navigation.dart

@@ -2,8 +2,8 @@ import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 
 import 'app/plateform_adapter/window/windows_adapter.dart';
-import 'app/views/navigation/bloc_wrapper.dart';
-import 'app/views/navigation/flutter_unit.dart';
+import 'app/bloc_wrapper.dart';
+import 'app/flutter_unit.dart';
 
 
 void main() {

lib/navigation/navigation/unit_drawer_header.dart renamed to lib/app/navigation/unit_drawer_header.dart

@@ -3,11 +3,11 @@ import 'dart:convert';
 import 'package:app_config/app_config.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_unit/app/blocs/color_change_bloc.dart';
 import 'package:components/toly_ui/toly_ui.dart';
 
 import 'package:flutter_unit/painter_system/gallery_card_item.dart';
 import 'package:flutter_unit/painter_system/gallery_factory.dart';
+import 'package:old_fancy_mobile_ui/bloc/color_change_bloc.dart';
 
 import '../gallery_detail_page.dart';
 

lib/navigation/navigation/unit_navigation.dart renamed to lib/app/navigation/unit_navigation.dart

@@ -4,12 +4,12 @@ import 'package:components/project_ui/project_ui.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_unit/app/blocs/color_change_bloc.dart';
 import 'package:components/toly_ui/toly_ui.dart';
 
 import 'package:flutter_unit/painter_system/gallery_card_item.dart';
 import 'package:flutter_unit/painter_system/bloc/gallery_unit/bloc.dart';
 import 'package:flutter_unit/painter_system/gallery_factory.dart';
+import 'package:old_fancy_mobile_ui/bloc/color_change_bloc.dart';
 
 import 'desk_ui/desk_gallery_unit.dart';
 import 'gallery_detail_page.dart';

lib/app/router/unit_router.dart

@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_unit/app/blocs/color_change_bloc.dart';
 import 'package:components/toly_ui/toly_ui.dart';
 
 import 'package:flutter_unit/user_system/component/authentic_widget.dart';
+import 'package:old_fancy_mobile_ui/bloc/color_change_bloc.dart';
 
 import 'category_page.dart';
 import 'like_widget_page.dart';

lib/app/views/setting/setting_page.dart

@@ -1,8 +1,8 @@
 import 'package:components/toly_ui/ti/circle.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_unit/app/blocs/color_change_bloc.dart';
-import 'package:flutter_unit/navigation/navigation/unit_drawer_header.dart';
+import 'package:flutter_unit/app/navigation/unit_drawer_header.dart';
+import 'package:old_fancy_mobile_ui/bloc/color_change_bloc.dart';
 
 import 'edit_category_panel.dart';
 

lib/main.dart

@@ -2,10 +2,11 @@ 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/navigation/unit_drawer_header.dart';
 import 'package:widget_module/blocs/blocs.dart';
 
 import 'package:widget_repository/widget_repository.dart';
-import 'package:flutter_unit/navigation/navigation/unit_drawer_header.dart';
+
 
 /// create by 张风捷特烈 on 2020-04-22
 /// contact me by email [email protected]

lib/painter_system/desk_ui/desk_gallery_unit.dart

@@ -0,0 +1,34 @@
+import 'package:app_config/app_config.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:old_fancy_mobile_ui/old_fancy_mobile_ui.dart';
+import 'package:widget_repository/widget_repository.dart';
+
+import 'widget_model_item.dart';
+
+class PhoneWidgetContent extends StatelessWidget {
+  final List<WidgetModel> items;
+
+  const PhoneWidgetContent({Key? key,required this.items}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return SliverList(
+      delegate: SliverChildBuilderDelegate(
+        (_, int index) => StandardWidgetItem(
+          model:  items[index],
+          onTap: () => _toDetail(context,  items[index]),
+        ),
+        childCount: items.length,
+      ),
+    );
+  }
+
+  void _toDetail(BuildContext context, WidgetModel model) {
+    Navigator.pushNamed(
+      context,
+      UnitRouter.widget_detail,
+      arguments: model,
+    );
+  }
+}

lib/painter_system/gallery_unit.dart

@@ -3,12 +3,12 @@ import 'package:components/toly_ui/toly_ui.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_unit/app/blocs/color_change_bloc.dart';
+import 'package:flutter_unit/app/navigation/home_drawer.dart';
 import 'package:flutter_unit/app/utils/convert.dart';
+import 'package:old_fancy_mobile_ui/bloc/color_change_bloc.dart';
 import 'package:widget_module/blocs/blocs.dart';
 import 'package:widget_repository/widget_repository.dart';
 
-import '../../../navigation/home_page/home_drawer.dart';
 import 'standard_home_search.dart';
 import 'widget_list_panel.dart';
 

lib/widget_ui/mobile/category_page/collect_page.dart

@@ -5,7 +5,7 @@ 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 '../../../navigation/home_page/phone_widget_content.dart';
+import 'phone_widget_content.dart';
 
 class WidgetListPanel extends StatelessWidget {
   const WidgetListPanel({Key? key}) : super(key: key);

lib/widget_ui/mobile/category_page/home_right_drawer.dart

@@ -4,24 +4,23 @@ import 'package:app_config/app_config.dart';
 import 'package:components/project_ui/project_ui.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_unit/app/blocs/color_change_bloc.dart';
-import 'package:flutter_unit/app/utils/convert.dart';
 
 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 '../bloc/color_change_bloc.dart';
 import 'phone_widget_content.dart';
 
+class FancyHomePage extends StatefulWidget {
 
-class HomePage extends StatefulWidget {
-  const HomePage({Key? key}) : super(key: key);
+  const FancyHomePage({Key? key}) : super(key: key);
 
   @override
-  _HomePageState createState() => _HomePageState();
+  _FancyHomePageState createState() => _FancyHomePageState();
 }
 
-class _HomePageState extends State<HomePage> with AutomaticKeepAliveClientMixin {
+class _FancyHomePageState extends State<FancyHomePage> with AutomaticKeepAliveClientMixin {
 
   @override
   Widget build(BuildContext context) {
@@ -90,7 +89,7 @@ class _HomePageState extends State<HomePage> with AutomaticKeepAliveClientMixin
             width: c.crossAxisExtent,
           );
         }
-        return PhoneWidgetContent(
+        return FancyWidgetContent(
           items: items,
         );
       });
@@ -106,7 +105,7 @@ class _HomePageState extends State<HomePage> with AutomaticKeepAliveClientMixin
   }
 
   void _switchTab(int index) {
-    WidgetFamily widgetFamily = Convert.toFamily(index);
+    WidgetFamily widgetFamily = WidgetFamily.values[index];
     context.read<ColorChangeCubit>().change(Cons.tabColors[index],family: widgetFamily);
     BlocProvider.of<WidgetsBloc>(context).add(EventTabTap(widgetFamily));
   }

lib/widget_ui/mobile/widget_detail/category_end_drawer.dart

@@ -5,33 +5,23 @@ import 'package:flutter_bloc/flutter_bloc.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 {
+class FancyWidgetContent extends StatelessWidget {
   final List<WidgetModel> items;
 
-  const PhoneWidgetContent({Key? key,required this.items}) : super(key: key);
+  const FancyWidgetContent({Key? key,required this.items}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
-    AppStyle style = context.read<AppBloc>().state.appStyle;
     return SliverList(
       delegate: SliverChildBuilderDelegate(
-        (_, int index) => _buildHomeItem(context, items[index], style),
+        (_, int index) => _buildHomeItem(context, items[index]),
         childCount: items.length,
       ),
     );
   }
 
-  Widget _buildHomeItem(
-      BuildContext context, WidgetModel model, AppStyle style) {
-    switch (style) {
-      case AppStyle.standard:
-        return StandardWidgetItem(
-          model: model,
-          onTap: () => _toDetail(context, model),
-        );
-      case AppStyle.fancy:
+  Widget _buildHomeItem(BuildContext context, WidgetModel model) {
         return BlocBuilder<AppBloc, AppState>(
           buildWhen: (p, c) => (p.itemStyleIndex != c.itemStyleIndex),
           builder: (context, state) {
@@ -47,7 +37,7 @@ class PhoneWidgetContent extends StatelessWidget {
             );
           },
         );
-    }
+
   }
 
   void _toDetail(BuildContext context, WidgetModel model) {