diff --git a/assets/flutter.db b/assets/flutter.db index 132af61e..5cd3c7a2 100644 Binary files a/assets/flutter.db and b/assets/flutter.db differ diff --git a/lib/views/navigation/color_change_bloc.dart b/lib/app/blocs/color_change_bloc.dart similarity index 90% rename from lib/views/navigation/color_change_bloc.dart rename to lib/app/blocs/color_change_bloc.dart index 2201431d..39aae10f 100644 --- a/lib/views/navigation/color_change_bloc.dart +++ b/lib/app/blocs/color_change_bloc.dart @@ -2,7 +2,7 @@ import 'dart:ui'; import 'package:bloc/bloc.dart'; import 'package:flutter_unit/app/res/cons.dart'; -import 'package:flutter_unit/model/enums.dart'; +import 'package:flutter_unit/widget_system/repositories/model/enums.dart'; class SelectTab { final WidgetFamily family; diff --git a/lib/blocs/global/global_bloc.dart b/lib/app/blocs/global/global_bloc.dart similarity index 95% rename from lib/blocs/global/global_bloc.dart rename to lib/app/blocs/global/global_bloc.dart index b7b09dbf..a11f7e9c 100644 --- a/lib/blocs/global/global_bloc.dart +++ b/lib/app/blocs/global/global_bloc.dart @@ -1,8 +1,7 @@ import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_unit/app/res/cons.dart'; import 'package:flutter_unit/app/res/sp.dart'; -import 'package:flutter_unit/repositories/app_start.dart'; -import 'package:flutter_unit/repositories/local_storage.dart'; +import 'package:flutter_unit/widget_system/repositories/repositories.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'global_event.dart'; diff --git a/lib/blocs/global/global_event.dart b/lib/app/blocs/global/global_event.dart similarity index 100% rename from lib/blocs/global/global_event.dart rename to lib/app/blocs/global/global_event.dart diff --git a/lib/blocs/global/global_state.dart b/lib/app/blocs/global/global_state.dart similarity index 100% rename from lib/blocs/global/global_state.dart rename to lib/app/blocs/global/global_state.dart diff --git a/lib/app/router/unit_router.dart b/lib/app/router/unit_router.dart index f7ee889f..81f045a3 100644 --- a/lib/app/router/unit_router.dart +++ b/lib/app/router/unit_router.dart @@ -1,28 +1,28 @@ import 'package:flutter/material.dart'; -import 'package:flutter_unit/model/category_model.dart'; -import 'package:flutter_unit/model/widget_model.dart'; +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/widget_system/repositories/model/category_model.dart'; +import 'package:flutter_unit/widget_system/repositories/model/widget_model.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/views/pages/about/about_app_page.dart'; -import 'package:flutter_unit/views/pages/about/about_me_page.dart'; -import 'package:flutter_unit/views/pages/about/version_info.dart'; -import 'package:flutter_unit/views/navigation/unit_navigation.dart'; -import 'package:flutter_unit/widget_system/widget_category/view/category_detail.dart'; -import 'package:flutter_unit/widget_system/widget_category/view/collect_page.dart'; -import 'package:flutter_unit/views/pages/data_manage/data_manage_page.dart'; + import 'package:flutter_unit/painter_system/gallery_page.dart'; -import 'package:flutter_unit/views/pages/issues_point/issues_detail.dart'; -import 'package:flutter_unit/views/pages/issues_point/issues_point_page.dart'; -import 'package:flutter_unit/views/pages/search/serach_page.dart'; -import 'package:flutter_unit/views/pages/setting/code_style_setting.dart'; -import 'package:flutter_unit/views/pages/setting/font_setting.dart'; -import 'package:flutter_unit/views/pages/setting/item_style_setting.dart'; -import 'package:flutter_unit/views/pages/setting/setting_page.dart'; -import 'package:flutter_unit/views/pages/setting/theme_color_setting.dart'; -import 'package:flutter_unit/views/pages/unit_todo/attr_unit_page.dart'; -import 'package:flutter_unit/views/pages/unit_todo/layout_unit_page.dart'; -import 'package:flutter_unit/views/pages/unit_todo/point_unit_page.dart'; -import 'package:flutter_unit/widget_system/widget_detail/view/widget_detail_page.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'; +import 'package:flutter_unit/app/views/navigation/unit_navigation.dart'; +import 'package:flutter_unit/app/views/data_manage/data_manage_page.dart'; +import 'package:flutter_unit/app/views/setting/code_style_setting.dart'; +import 'package:flutter_unit/app/views/setting/font_setting.dart'; +import 'package:flutter_unit/app/views/setting/item_style_setting.dart'; +import 'package:flutter_unit/app/views/setting/setting_page.dart'; +import 'package:flutter_unit/app/views/setting/theme_color_setting.dart'; +import 'package:flutter_unit/app/views/unit_todo/attr_unit_page.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:flutter_unit/widget_system/views/widget_system_view.dart'; import 'router_utils.dart'; @@ -30,7 +30,7 @@ class UnitRouter { static const String widget_detail = '/widget_detail'; static const String detail = 'detail'; - static const String search = 'search'; + static const String search = 'search_bloc'; static const String nav = 'nav'; static const String collect = 'CollectPage'; diff --git a/lib/app/utils/convert.dart b/lib/app/utils/convert.dart index 2bfff699..c02c3266 100644 --- a/lib/app/utils/convert.dart +++ b/lib/app/utils/convert.dart @@ -1,4 +1,4 @@ -import 'package:flutter_unit/model/enums.dart'; +import 'package:flutter_unit/widget_system/repositories/model/enums.dart'; import 'package:flutter_unit/painter_system/gallery_factory.dart'; /// create by 张风捷特烈 on 2020-03-07 diff --git a/lib/app/utils/stream_ext/backpressure.dart b/lib/app/utils/stream_ext/backpressure.dart index f214b32d..47d14d3d 100644 --- a/lib/app/utils/stream_ext/backpressure.dart +++ b/lib/app/utils/stream_ext/backpressure.dart @@ -251,7 +251,7 @@ class _BackpressureStreamSink implements ForwardingSink { // startBufferEvery = 3 // last buffer: [0, 1] // 0 is the first event, - // the n-the event is not yet dispatched at this point + // the n-the event is not yet dispatched at this point_bloc // skip becomes 1 // event 2 is skipped, skip becomes 0 // event 3 is now added to the buffer diff --git a/lib/views/pages/about/about_app_page.dart b/lib/app/views/about/about_app_page.dart similarity index 97% rename from lib/views/pages/about/about_app_page.dart rename to lib/app/views/about/about_app_page.dart index 7050f3ae..1cdbc3cf 100644 --- a/lib/views/pages/about/about_app_page.dart +++ b/lib/app/views/about/about_app_page.dart @@ -114,7 +114,7 @@ class AboutAppPage extends StatelessWidget { children: [ FeedbackWidget( onPressed: () => - _launchURL("https://github.com/toly1994328/FlutterUnit"), + _launchURL("https://github_model.com/toly1994328/FlutterUnit"), child: Wrap( direction: Axis.vertical, crossAxisAlignment: WrapCrossAlignment.center, @@ -154,7 +154,7 @@ class AboutAppPage extends StatelessWidget { info: ' Flutter Unit 是一个非盈利性的开源项目，' '旨在提供全面的Flutter学习指南及编程者的交流技术的接口。' '由【张风捷特烈】提供技术支持和全权维护。唯一开源网站网址: ' - 'https://github.com/toly1994328/FlutterUnit', + 'https://github_model.com/toly1994328/FlutterUnit', ), Divider( height: 20, diff --git a/lib/views/pages/about/about_me_page.dart b/lib/app/views/about/about_me_page.dart similarity index 98% rename from lib/views/pages/about/about_me_page.dart rename to lib/app/views/about/about_me_page.dart index 1b066764..d59104dd 100644 --- a/lib/views/pages/about/about_me_page.dart +++ b/lib/app/views/about/about_me_page.dart @@ -187,7 +187,7 @@ class AboutMePage extends StatelessWidget { )), FeedbackWidget( onPressed: () => - _launchURL("https://github.com/toly1994328"), + _launchURL("https://github_model.com/toly1994328"), child: Wrap( direction: Axis.vertical, crossAxisAlignment: WrapCrossAlignment.center, diff --git a/lib/views/pages/about/version/app_version_checker.dart b/lib/app/views/about/version/app_version_checker.dart similarity index 98% rename from lib/views/pages/about/version/app_version_checker.dart rename to lib/app/views/about/version/app_version_checker.dart index beebe080..f315d6d6 100644 --- a/lib/views/pages/about/version/app_version_checker.dart +++ b/lib/app/views/about/version/app_version_checker.dart @@ -3,11 +3,12 @@ import 'dart:io'; import 'package:dio/dio.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_unit/app/api/app_info.dart'; + import 'package:flutter_unit/app/utils/Toast.dart'; import 'package:flutter_unit/app/utils/convert.dart'; import 'package:flutter_unit/app/utils/http_utils/http_util.dart'; import 'package:flutter_unit/app/utils/http_utils/result_bean.dart'; +import 'package:flutter_unit/point_system/api/app_info.dart'; import 'package:install_plugin/install_plugin.dart'; import 'package:package_info/package_info.dart'; import 'package:path/path.dart' as path; diff --git a/lib/views/pages/about/version/version_shower.dart b/lib/app/views/about/version/version_shower.dart similarity index 100% rename from lib/views/pages/about/version/version_shower.dart rename to lib/app/views/about/version/version_shower.dart diff --git a/lib/views/pages/about/version_info.dart b/lib/app/views/about/version_info.dart similarity index 93% rename from lib/views/pages/about/version_info.dart rename to lib/app/views/about/version_info.dart index 552a6cea..730700fa 100644 --- a/lib/views/pages/about/version_info.dart +++ b/lib/app/views/about/version_info.dart @@ -1,10 +1,9 @@ import 'package:flutter/material.dart'; -import 'package:flutter_unit/app/api/app_info.dart'; -import 'package:flutter_unit/app/res/str_unit.dart'; + import 'package:flutter_unit/app/res/style/behavior/no_scroll_behavior.dart'; import 'package:flutter_unit/app/router/unit_router.dart'; -import 'package:flutter_unit/app/utils/http_utils/result_bean.dart'; + import 'package:flutter_unit/views/components/permanent/circle_image.dart'; import 'package:flutter_unit/views/components/permanent/feedback_widget.dart'; import 'package:url_launcher/url_launcher.dart'; @@ -107,7 +106,7 @@ class VersionInfo extends StatelessWidget { children: [ FeedbackWidget( onPressed: (){ - _launchURL("https://github.com/toly1994328/FlutterUnit"); + _launchURL("https://github_model.com/toly1994328/FlutterUnit"); }, child: Text('《查看本项目Github仓库》',style: TextStyle(fontSize: 12,color: Color(0xff616C84),),)), Text('Power By 张风捷特烈',style: TextStyle(fontSize: 12,color: Colors.grey),), diff --git a/lib/views/pages/data_manage/data_manage_page.dart b/lib/app/views/data_manage/data_manage_page.dart similarity index 94% rename from lib/views/pages/data_manage/data_manage_page.dart rename to lib/app/views/data_manage/data_manage_page.dart index 566a1fdd..e9639111 100644 --- a/lib/views/pages/data_manage/data_manage_page.dart +++ b/lib/app/views/data_manage/data_manage_page.dart @@ -4,15 +4,17 @@ import 'dart:io'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:flutter_unit/app/api/category_api.dart'; + import 'package:flutter_unit/app/res/toly_icon.dart'; import 'package:flutter_unit/app/utils/Toast.dart'; import 'package:flutter_unit/app/utils/http_utils/result_bean.dart'; -import 'package:flutter_unit/blocs/bloc_exp.dart'; -import 'package:flutter_unit/model/category_model.dart'; -import 'package:flutter_unit/repositories/local_db.dart'; -import 'package:flutter_unit/repositories/rep/category_repository.dart'; +import 'package:flutter_unit/point_system/api/category_api.dart'; + +import 'package:flutter_unit/widget_system/repositories/model/category_model.dart'; +import 'package:flutter_unit/widget_system/repositories/repositories.dart'; + import 'package:flutter_unit/user_system/component/authentic_widget.dart'; +import 'package:flutter_unit/widget_system/blocs/widget_system_bloc.dart'; import 'package:path/path.dart' as path; import 'package:sqflite/sqflite.dart'; diff --git a/lib/views/navigation/bloc_wrapper.dart b/lib/app/views/navigation/bloc_wrapper.dart similarity index 79% rename from lib/views/navigation/bloc_wrapper.dart rename to lib/app/views/navigation/bloc_wrapper.dart index fd39bcdf..cfbb8bc5 100644 --- a/lib/views/navigation/bloc_wrapper.dart +++ b/lib/app/views/navigation/bloc_wrapper.dart @@ -1,18 +1,16 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:flutter_unit/repositories/app_start.dart'; -import 'package:flutter_unit/repositories/local_db.dart'; -import 'package:flutter_unit/repositories/rep/impl/catagory_db_repository.dart'; -import 'package:flutter_unit/repositories/rep/impl/widget_db_repository.dart'; -import 'package:flutter_unit/repositories/rep/widget_repository.dart'; +import 'package:flutter_unit/app/blocs/global/global_bloc.dart'; +import 'package:flutter_unit/app/blocs/global/global_event.dart'; +import 'package:flutter_unit/point_system/blocs/point_system_bloc.dart'; +import 'package:flutter_unit/widget_system/repositories/repositories.dart'; import 'package:flutter_unit/user_system/bloc/authentic/bloc.dart'; import 'package:flutter_unit/user_system/bloc/authentic/event.dart'; import 'package:flutter_unit/user_system/bloc/login/bloc.dart'; import 'package:flutter_unit/user_system/bloc/register/bloc.dart'; -import 'package:flutter_unit/model/enums.dart'; -import 'package:flutter_unit/blocs/bloc_exp.dart'; -import 'package:flutter_unit/widget_system/widget_detail/bloc/detail/detail_bloc.dart'; -import 'package:flutter_unit/widget_system/widget_home/bloc/widgets_bloc.dart'; + +import 'package:flutter_unit/widget_system/blocs/widget_system_bloc.dart'; + /// create by 张风捷特烈 on 2020/4/28 diff --git a/lib/views/navigation/flutter_unit.dart b/lib/app/views/navigation/flutter_unit.dart similarity index 81% rename from lib/views/navigation/flutter_unit.dart rename to lib/app/views/navigation/flutter_unit.dart index 4dbf5c0e..bc3bd207 100644 --- a/lib/views/navigation/flutter_unit.dart +++ b/lib/app/views/navigation/flutter_unit.dart @@ -1,11 +1,13 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:flutter_unit/app/blocs/global/global_bloc.dart'; +import 'package:flutter_unit/app/blocs/global/global_state.dart'; import 'package:flutter_unit/app/res/cons.dart'; import 'package:flutter_unit/app/res/str_unit.dart'; import 'package:flutter_unit/app/router/unit_router.dart'; -import 'package:flutter_unit/blocs/bloc_exp.dart'; -import 'package:flutter_unit/views/navigation/color_change_bloc.dart'; -import 'package:flutter_unit/views/pages/splash/unit_splash.dart'; + +import 'package:flutter_unit/app/blocs/color_change_bloc.dart'; +import 'package:flutter_unit/app/views/splash/unit_splash.dart'; /// create by 张风捷特烈 on 2020/4/28 diff --git a/lib/views/navigation/unit_navigation.dart b/lib/app/views/navigation/unit_navigation.dart similarity index 90% rename from lib/views/navigation/unit_navigation.dart rename to lib/app/views/navigation/unit_navigation.dart index a5c08ed7..c4876e3c 100644 --- a/lib/views/navigation/unit_navigation.dart +++ b/lib/app/views/navigation/unit_navigation.dart @@ -2,20 +2,17 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_unit/app/res/cons.dart'; import 'package:flutter_unit/app/router/unit_router.dart'; -import 'package:flutter_unit/blocs/bloc_exp.dart'; + import 'package:flutter_unit/painter_system/gallery_unit.dart'; import 'package:flutter_unit/user_system/pages/user/user_page.dart'; import 'package:flutter_unit/views/components/project/nav/unit_bottom_bar.dart'; import 'package:flutter_unit/views/components/project/overlay_tool_wrapper.dart'; +import 'package:flutter_unit/widget_system/blocs/widget_system_bloc.dart'; -import 'package:flutter_unit/widget_system/widget_category/view/collect_page.dart'; -import 'package:flutter_unit/widget_system/widget_category/view/home_right_drawer.dart'; - +import 'package:flutter_unit/widget_system/views/widget_system_view.dart'; -import 'package:flutter_unit/widget_system/widget_home/view/home_drawer.dart'; -import 'package:flutter_unit/widget_system/widget_home/view/home_page.dart'; -import 'color_change_bloc.dart'; +import '../../blocs/color_change_bloc.dart'; /// create by 张风捷特烈 on 2020-04-11 /// contact me by email 1981462002@qq.com diff --git a/lib/views/pages/setting/code_style_setting.dart b/lib/app/views/setting/code_style_setting.dart similarity index 92% rename from lib/views/pages/setting/code_style_setting.dart rename to lib/app/views/setting/code_style_setting.dart index addc9053..5000edad 100644 --- a/lib/views/pages/setting/code_style_setting.dart +++ b/lib/app/views/setting/code_style_setting.dart @@ -1,7 +1,10 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:flutter_unit/app/blocs/global/global_bloc.dart'; +import 'package:flutter_unit/app/blocs/global/global_event.dart'; +import 'package:flutter_unit/app/blocs/global/global_state.dart'; import 'package:flutter_unit/app/res/cons.dart'; -import 'package:flutter_unit/blocs/bloc_exp.dart'; + import 'package:flutter_unit/views/components/permanent/code/code_widget.dart'; import 'package:flutter_unit/views/components/permanent/code/highlighter_style.dart'; import 'package:flutter_unit/views/components/permanent/feedback_widget.dart'; diff --git a/lib/views/pages/setting/font_setting.dart b/lib/app/views/setting/font_setting.dart similarity index 93% rename from lib/views/pages/setting/font_setting.dart rename to lib/app/views/setting/font_setting.dart index bf19fd90..27eb5f72 100644 --- a/lib/views/pages/setting/font_setting.dart +++ b/lib/app/views/setting/font_setting.dart @@ -2,7 +2,9 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_unit/app/res/cons.dart'; -import 'package:flutter_unit/blocs/bloc_exp.dart'; +import 'package:flutter_unit/app/blocs/global/global_bloc.dart'; +import 'package:flutter_unit/app/blocs/global/global_event.dart'; +import 'package:flutter_unit/app/blocs/global/global_state.dart'; import 'package:flutter_unit/views/components/permanent/feedback_widget.dart'; import 'package:flutter_unit/views/components/permanent/circle.dart'; diff --git a/lib/views/pages/setting/item_style_setting.dart b/lib/app/views/setting/item_style_setting.dart similarity index 90% rename from lib/views/pages/setting/item_style_setting.dart rename to lib/app/views/setting/item_style_setting.dart index baed8952..72c8625d 100644 --- a/lib/views/pages/setting/item_style_setting.dart +++ b/lib/app/views/setting/item_style_setting.dart @@ -1,6 +1,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:flutter_unit/blocs/bloc_exp.dart'; +import 'package:flutter_unit/app/blocs/global/global_bloc.dart'; +import 'package:flutter_unit/app/blocs/global/global_event.dart'; +import 'package:flutter_unit/app/blocs/global/global_state.dart'; import 'package:flutter_unit/views/components/permanent/feedback_widget.dart'; import 'package:flutter_unit/views/components/permanent/circle.dart'; import 'package:flutter_unit/views/components/project/items/widget/home_item_support.dart'; diff --git a/lib/views/pages/setting/setting_page.dart b/lib/app/views/setting/setting_page.dart similarity index 94% rename from lib/views/pages/setting/setting_page.dart rename to lib/app/views/setting/setting_page.dart index 062e0239..bcd401a1 100644 --- a/lib/views/pages/setting/setting_page.dart +++ b/lib/app/views/setting/setting_page.dart @@ -2,7 +2,9 @@ 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/res/toly_icon.dart'; -import 'package:flutter_unit/blocs/bloc_exp.dart'; +import 'package:flutter_unit/app/blocs/global/global_bloc.dart'; +import 'package:flutter_unit/app/blocs/global/global_event.dart'; +import 'package:flutter_unit/app/blocs/global/global_state.dart'; class SettingPage extends StatelessWidget { @override diff --git a/lib/views/pages/setting/theme_color_setting.dart b/lib/app/views/setting/theme_color_setting.dart similarity index 94% rename from lib/views/pages/setting/theme_color_setting.dart rename to lib/app/views/setting/theme_color_setting.dart index af39661c..494e1bc0 100644 --- a/lib/views/pages/setting/theme_color_setting.dart +++ b/lib/app/views/setting/theme_color_setting.dart @@ -1,7 +1,9 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_unit/app/res/cons.dart'; -import 'package:flutter_unit/blocs/bloc_exp.dart'; +import 'package:flutter_unit/app/blocs/global/global_bloc.dart'; +import 'package:flutter_unit/app/blocs/global/global_event.dart'; +import 'package:flutter_unit/app/blocs/global/global_state.dart'; import 'package:flutter_unit/views/components/permanent/feedback_widget.dart'; import 'package:flutter_unit/views/components/permanent/circle.dart'; diff --git a/lib/views/pages/splash/flutter_unit_text.dart b/lib/app/views/splash/flutter_unit_text.dart similarity index 100% rename from lib/views/pages/splash/flutter_unit_text.dart rename to lib/app/views/splash/flutter_unit_text.dart diff --git a/lib/views/pages/splash/splash_bottom.dart b/lib/app/views/splash/splash_bottom.dart similarity index 100% rename from lib/views/pages/splash/splash_bottom.dart rename to lib/app/views/splash/splash_bottom.dart diff --git a/lib/views/pages/splash/unit_paint.dart b/lib/app/views/splash/unit_paint.dart similarity index 100% rename from lib/views/pages/splash/unit_paint.dart rename to lib/app/views/splash/unit_paint.dart diff --git a/lib/views/pages/splash/unit_splash.dart b/lib/app/views/splash/unit_splash.dart similarity index 92% rename from lib/views/pages/splash/unit_splash.dart rename to lib/app/views/splash/unit_splash.dart index f8836231..2a6a1e11 100644 --- a/lib/views/pages/splash/unit_splash.dart +++ b/lib/app/views/splash/unit_splash.dart @@ -4,11 +4,11 @@ import 'package:flutter/services.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_unit/app/res/str_unit.dart'; import 'package:flutter_unit/app/router/unit_router.dart'; -import 'package:flutter_unit/blocs/bloc_exp.dart'; -import 'package:flutter_unit/model/enums.dart'; -import 'package:flutter_unit/views/pages/splash/splash_bottom.dart'; -import 'package:flutter_unit/widget_system/widget_home/bloc/widgets_bloc.dart'; -import 'package:flutter_unit/widget_system/widget_home/bloc/widgets_event.dart'; +import 'package:flutter_unit/widget_system/repositories/model/enums.dart'; +import 'package:flutter_unit/app/views/splash/splash_bottom.dart'; +import 'package:flutter_unit/widget_system/blocs/widget_system_bloc.dart'; +import 'package:flutter_unit/app/blocs/global/global_bloc.dart'; +import 'package:flutter_unit/app/blocs/global/global_state.dart'; import 'flutter_unit_text.dart'; import 'unit_paint.dart'; diff --git a/lib/views/pages/unit_todo/attr_unit_page.dart b/lib/app/views/unit_todo/attr_unit_page.dart similarity index 100% rename from lib/views/pages/unit_todo/attr_unit_page.dart rename to lib/app/views/unit_todo/attr_unit_page.dart diff --git a/lib/views/pages/unit_todo/layout_unit_page.dart b/lib/app/views/unit_todo/layout_unit_page.dart similarity index 100% rename from lib/views/pages/unit_todo/layout_unit_page.dart rename to lib/app/views/unit_todo/layout_unit_page.dart diff --git a/lib/views/pages/unit_todo/paint_unit_page.dart b/lib/app/views/unit_todo/paint_unit_page.dart similarity index 100% rename from lib/views/pages/unit_todo/paint_unit_page.dart rename to lib/app/views/unit_todo/paint_unit_page.dart diff --git a/lib/views/pages/unit_todo/point_unit_page.dart b/lib/app/views/unit_todo/point_unit_page.dart similarity index 100% rename from lib/views/pages/unit_todo/point_unit_page.dart rename to lib/app/views/unit_todo/point_unit_page.dart diff --git a/lib/blocs/bloc_exp.dart b/lib/blocs/bloc_exp.dart deleted file mode 100644 index 7dc4858a..00000000 --- a/lib/blocs/bloc_exp.dart +++ /dev/null @@ -1,35 +0,0 @@ -/// create by 张风捷特烈 on 2020/4/28 -/// contact me by email 1981462002@qq.com -/// 说明: - -library bloc_unit; - -export 'category/category_bloc.dart'; -export 'category/category_state.dart'; -export 'category/category_event.dart'; - -export 'category_widget/category_widget_bloc.dart'; -export 'category_widget/category_widget_state.dart'; -export 'category_widget/category_widget_event.dart'; - -export 'like/like_bloc.dart'; -export 'like/like_state.dart'; -export 'like/like_event.dart'; - - -export 'global/global_bloc.dart'; -export 'global/global_state.dart'; -export 'global/global_event.dart'; - -export 'point/point_bloc.dart'; -export 'point/point_state.dart'; -export 'point/point_event.dart'; - - -export 'point_comment/point_comment_bloc.dart'; -export 'point_comment/point_comment_state.dart'; -export 'point_comment/point_comment_event.dart'; - -export 'search/search_bloc.dart'; -export 'search/search_state.dart'; -export 'search/search_event.dart'; \ No newline at end of file diff --git a/lib/main.dart b/lib/main.dart index 038b40e1..558ffa9a 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,8 +1,9 @@ import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; -import 'views/navigation/bloc_wrapper.dart'; -import 'views/navigation/flutter_unit.dart'; +import 'app/views/navigation/bloc_wrapper.dart'; +import 'app/views/navigation/flutter_unit.dart'; + void main() { WidgetsFlutterBinding.ensureInitialized(); diff --git a/lib/model/github/g/github_user.g.dart b/lib/model/github/g/github_user.g.dart deleted file mode 100644 index 4c1bd8ce..00000000 --- a/lib/model/github/g/github_user.g.dart +++ /dev/null @@ -1,93 +0,0 @@ -// GENERATED CODE - DO NOT MODIFY BY HAND - -part of '../github_user.dart'; - -// ************************************************************************** -// JsonSerializableGenerator -// ************************************************************************** - -GithubUser _$UserFromJson(Map json) { - return GithubUser( - json['login'] as String?, - json['id'] as int?, - json['node_id'] as String?, - json['avatar_url'] as String?, - json['gravatar_id'] as String?, - json['url'] as String?, - json['html_url'] as String?, - json['followers_url'] as String?, - json['following_url'] as String?, - json['gists_url'] as String?, - json['starred_url'] as String?, - json['subscriptions_url'] as String?, - json['organizations_url'] as String?, - json['repos_url'] as String?, - json['events_url'] as String?, - json['received_events_url'] as String?, - json['type'] as String?, - json['site_admin'] as bool?, - json['name'] as String?, - json['company'] as String?, - json['blog'] as String?, - json['location'] as String?, - json['email'] as String?, - json['starred'] as String?, - json['bio'] as String?, - json['public_repos'] as int?, - json['public_gists'] as int?, - json['followers'] as int?, - json['following'] as int?, - json['created_at'] == null - ? null - : DateTime.parse(json['created_at'] as String), - json['updated_at'] == null - ? null - : DateTime.parse(json['updated_at'] as String), - json['private_gists'] as int?, - json['total_private_repos'] as int?, - json['owned_private_repos'] as int?, - json['disk_usage'] as int?, - json['collaborators'] as int?, - json['two_factor_authentication'] as bool?, - ); -} - -Map _$UserToJson(GithubUser instance) => { - 'login': instance.login, - 'id': instance.id, - 'node_id': instance.nodeId, - 'avatar_url': instance.avatarUrl, - 'gravatar_id': instance.gravatarId, - 'url': instance.url, - 'html_url': instance.htmlUrl, - 'followers_url': instance.followersUrl, - 'following_url': instance.followingUrl, - 'gists_url': instance.gistsUrl, - 'starred_url': instance.starredUrl, - 'subscriptions_url': instance.subscriptionsUrl, - 'organizations_url': instance.organizationsUrl, - 'repos_url': instance.reposUrl, - 'events_url': instance.eventsUrl, - 'received_events_url': instance.receivedEventsUrl, - 'type': instance.type, - 'site_admin': instance.siteAdmin, - 'name': instance.name, - 'company': instance.company, - 'blog': instance.blog, - 'location': instance.location, - 'email': instance.email, - 'starred': instance.starred, - 'bio': instance.bio, - 'public_repos': instance.publicRepos, - 'public_gists': instance.publicGists, - 'followers': instance.followers, - 'following': instance.following, - 'created_at': instance.createdAt?.toIso8601String(), - 'updated_at': instance.updatedAt?.toIso8601String(), - 'private_gists': instance.privateGists, - 'total_private_repos': instance.totalPrivateRepos, - 'owned_private_repos': instance.ownedPrivateRepos, - 'disk_usage': instance.diskUsage, - 'collaborators': instance.collaborators, - 'two_factor_authentication': instance.twoFactorAuthentication, -}; diff --git a/lib/model/github/g/issue.g.dart b/lib/model/github/g/issue.g.dart deleted file mode 100644 index a22583ab..00000000 --- a/lib/model/github/g/issue.g.dart +++ /dev/null @@ -1,55 +0,0 @@ -// GENERATED CODE - DO NOT MODIFY BY HAND - -part of '../issue.dart'; - -// ************************************************************************** -// JsonSerializableGenerator -// ************************************************************************** - -Issue _$IssueFromJson(dynamic json) { - return Issue( - json['id'] as int?, - json['number'] as int?, - json['title'] as String?, - json['state'] as String?, - json['locked'] as bool?, - json['comments'] as int?, - json['created_at'] == null - ? null - : DateTime.parse(json['created_at'] as String), - json['updated_at'] == null - ? null - : DateTime.parse(json['updated_at'] as String), - json['closed_at'] == null - ? null - : DateTime.parse(json['closed_at'] as String), - json['body'] as String?, - json['body_html'] as String?, - json['user'] == null - ? null - : GithubUser.fromJson(json['user'] as Map), - json['repository_url'] as String?, - json['html_url'] as String?, - json['closed_by'] == null - ? null - : GithubUser.fromJson(json['closed_by'] as Map), - ); -} - -Map _$IssueToJson(Issue instance) => { - 'id': instance.id, - 'number': instance.number, - 'title': instance.title, - 'state': instance.state, - 'locked': instance.locked, - 'comments': instance.commentNum, - 'created_at': instance.createdAt?.toIso8601String(), - 'updated_at': instance.updatedAt?.toIso8601String(), - 'closed_at': instance.closedAt?.toIso8601String(), - 'body': instance.body, - 'body_html': instance.bodyHtml, - 'user': instance.user, - 'repository_url': instance.repoUrl, - 'html_url': instance.htmlUrl, - 'closed_by': instance.closeBy, - }; diff --git a/lib/model/github/g/issue_comment.g.dart b/lib/model/github/g/issue_comment.g.dart deleted file mode 100644 index 0050ac19..00000000 --- a/lib/model/github/g/issue_comment.g.dart +++ /dev/null @@ -1,40 +0,0 @@ -// GENERATED CODE - DO NOT MODIFY BY HAND - -part of '../issue_comment.dart'; - -// ************************************************************************** -// JsonSerializableGenerator -// ************************************************************************** - -IssueComment _$IssueEventFromJson(Map json) { - return IssueComment( - json['id'] as int?, - json['user'] == null - ? null - : GithubUser.fromJson(json['user'] as Map), - json['created_at'] == null - ? null - : DateTime.parse(json['created_at'] as String), - json['updated_at'] == null - ? null - : DateTime.parse(json['updated_at'] as String), - json['author_association'] as String?, - json['body'] as String?, - json['body_html'] as String?, - json['event'] as String?, - json['html_url'] as String?, - ); -} - -Map _$IssueEventToJson(IssueComment instance) => - { - 'id': instance.id, - 'user': instance.user, - 'created_at': instance.createdAt?.toIso8601String(), - 'updated_at': instance.updatedAt?.toIso8601String(), - 'author_association': instance.authorAssociation, - 'body': instance.body, - 'body_html': instance.bodyHtml, - 'event': instance.type, - 'html_url': instance.htmlUrl, - }; diff --git a/lib/model/github/g/license.g.dart b/lib/model/github/g/license.g.dart deleted file mode 100644 index baa97dd5..00000000 --- a/lib/model/github/g/license.g.dart +++ /dev/null @@ -1,19 +0,0 @@ -// GENERATED CODE - DO NOT MODIFY BY HAND - -part of '../license.dart'; - -// ************************************************************************** -// JsonSerializableGenerator -// ************************************************************************** - -License _$LicenseFromJson(Map json) { - return License( - json['name'] as String?, - json['spdx_id'] as String?, - ); -} - -Map _$LicenseToJson(License instance) => { - 'name': instance.name, - 'spdx_id': instance.spdxId, - }; diff --git a/lib/model/github/g/repository.g.dart b/lib/model/github/g/repository.g.dart deleted file mode 100644 index 5c60285e..00000000 --- a/lib/model/github/g/repository.g.dart +++ /dev/null @@ -1,96 +0,0 @@ -// GENERATED CODE - DO NOT MODIFY BY HAND - -part of '../repository.dart'; - -// ************************************************************************** -// JsonSerializableGenerator -// ************************************************************************** - -Repository _$RepositoryFromJson(Map json) { - return Repository( - json['id'] as int?, - json['size'] as int?, - json['name'] as String?, - json['full_name'] as String?, - json['html_url'] as String?, - json['description'] as String?, - json['language'] as String?, - json['license'] == null - ? null - : License.fromJson(json['license'] as Map), - json['default_branch'] as String?, - json['created_at'] == null - ? null - : DateTime.parse(json['created_at'] as String), - json['updated_at'] == null - ? null - : DateTime.parse(json['updated_at'] as String), - json['pushed_at'] == null - ? null - : DateTime.parse(json['pushed_at'] as String), - json['git_url'] as String?, - json['ssh_url'] as String?, - json['clone_url'] as String?, - json['svn_url'] as String?, - json['stargazers_count'] as int?, - json['watchers_count'] as int?, - json['forks_count'] as int?, - json['open_issues_count'] as int?, - json['subscribers_count'] as int?, - json['private'] as bool?, - json['fork'] as bool?, - json['has_issues'] as bool?, - json['has_projects'] as bool?, - json['has_downloads'] as bool?, - json['has_wiki'] as bool?, - json['has_pages'] as bool?, - json['owner'] == null - ? null - : GithubUser.fromJson(json['owner'] as Map), - json['parent'] == null - ? null - : Repository.fromJson(json['parent'] as Map), - json['permissions'] == null - ? null - : RepositoryPermissions.fromJson( - json['permissions'] as Map), - (json['topics'] as List?)?.map((e) => e as String).toList(), - )..allIssueCount = json['allIssueCount'] as int?; -} - -Map _$RepositoryToJson(Repository instance) => - { - 'id': instance.id, - 'size': instance.size, - 'name': instance.name, - 'full_name': instance.fullName, - 'html_url': instance.htmlUrl, - 'description': instance.description, - 'language': instance.language, - 'default_branch': instance.defaultBranch, - 'created_at': instance.createdAt?.toIso8601String(), - 'updated_at': instance.updatedAt?.toIso8601String(), - 'pushed_at': instance.pushedAt?.toIso8601String(), - 'git_url': instance.gitUrl, - 'ssh_url': instance.sshUrl, - 'clone_url': instance.cloneUrl, - 'svn_url': instance.svnUrl, - 'stargazers_count': instance.stargazersCount, - 'watchers_count': instance.watchersCount, - 'forks_count': instance.forksCount, - 'open_issues_count': instance.openIssuesCount, - 'subscribers_count': instance.subscribersCount, - 'private': instance.private, - 'fork': instance.fork, - 'has_issues': instance.hasIssues, - 'has_projects': instance.hasProjects, - 'has_downloads': instance.hasDownloads, - 'has_wiki': instance.hasWiki, - 'has_pages': instance.hasPages, - 'owner': instance.owner, - 'license': instance.license, - 'parent': instance.parent, - 'permissions': instance.permissions, - 'topics': instance.topics, - 'allIssueCount': instance.allIssueCount, - }; diff --git a/lib/model/github/g/repository_permissions.g.dart b/lib/model/github/g/repository_permissions.g.dart deleted file mode 100644 index 201c8fbc..00000000 --- a/lib/model/github/g/repository_permissions.g.dart +++ /dev/null @@ -1,24 +0,0 @@ -// GENERATED CODE - DO NOT MODIFY BY HAND - -part of '../repository_permissions.dart'; - -// ************************************************************************** -// JsonSerializableGenerator -// ************************************************************************** - -RepositoryPermissions _$RepositoryPermissionsFromJson( - Map json) { - return RepositoryPermissions( - json['admin'] as bool?, - json['push'] as bool?, - json['pull'] as bool?, - ); -} - -Map _$RepositoryPermissionsToJson( - RepositoryPermissions instance) => - { - 'admin': instance.admin, - 'push': instance.push, - 'pull': instance.pull, - }; diff --git a/lib/model/github/github_user.dart b/lib/model/github/github_user.dart deleted file mode 100644 index dce5c300..00000000 --- a/lib/model/github/github_user.dart +++ /dev/null @@ -1,94 +0,0 @@ -/// create by 张风捷特烈 on 2020/6/17 -/// contact me by email 1981462002@qq.com -/// 说明: - -part 'g/github_user.g.dart'; - -class GithubUser { - GithubUser( - this.login, - this.id, - this.nodeId, - this.avatarUrl, - this.gravatarId, - this.url, - this.htmlUrl, - this.followersUrl, - this.followingUrl, - this.gistsUrl, - this.starredUrl, - this.subscriptionsUrl, - this.organizationsUrl, - this.reposUrl, - this.eventsUrl, - this.receivedEventsUrl, - this.type, - this.siteAdmin, - this.name, - this.company, - this.blog, - this.location, - this.email, - this.starred, - this.bio, - this.publicRepos, - this.publicGists, - this.followers, - this.following, - this.createdAt, - this.updatedAt, - this.privateGists, - this.totalPrivateRepos, - this.ownedPrivateRepos, - this.diskUsage, - this.collaborators, - this.twoFactorAuthentication); - - String? login; - int? id; - String? nodeId; - String? avatarUrl; - String? gravatarId; - String? url; - String? htmlUrl; - String? followersUrl; - String? followingUrl; - String? gistsUrl; - String? starredUrl; - String? subscriptionsUrl; - String? organizationsUrl; - String? reposUrl; - String? eventsUrl; - String? receivedEventsUrl; - String? type; - bool? siteAdmin; - String? name; - String? company; - String? blog; - String? location; - String? email; - String? starred; - String? bio; - int? publicRepos; - int? publicGists; - int? followers; - int? following; - DateTime? createdAt; - DateTime? updatedAt; - int? privateGists; - int? totalPrivateRepos; - int? ownedPrivateRepos; - int? diskUsage; - int? collaborators; - bool? twoFactorAuthentication; - - - factory GithubUser.fromJson(Map json) => _$UserFromJson(json); - - - Map toJson() => _$UserToJson(this); - - // 命名构造函数 - GithubUser.empty(); - -} diff --git a/lib/model/github/issue.dart b/lib/model/github/issue.dart deleted file mode 100644 index bf10520c..00000000 --- a/lib/model/github/issue.dart +++ /dev/null @@ -1,77 +0,0 @@ -import 'package:equatable/equatable.dart'; -import 'package:flutter_unit/model/github/github_user.dart'; - -part 'g/issue.g.dart'; - -class Issue extends Equatable { - final int? id; - final int? number; - final String? title; - final String? state; - final bool? locked; - - final int? commentNum; - - final DateTime? createdAt; - - final DateTime? updatedAt; - - final DateTime? closedAt; - final String? body; - - final String? bodyHtml; - - final GithubUser? user; - - final String? repoUrl; - - final String? htmlUrl; - - final GithubUser? closeBy; - - Issue( - this.id, - this.number, - this.title, - this.state, - this.locked, - this.commentNum, - this.createdAt, - this.updatedAt, - this.closedAt, - this.body, - this.bodyHtml, - this.user, - this.repoUrl, - this.htmlUrl, - this.closeBy, - ); - - static Issue fromJson(dynamic json) => _$IssueFromJson(json); - - Map toJson() => _$IssueToJson(this); - - @override - String toString() { - return 'Issue{id: $id, number: $number, title: $title, state: $state, locked: $locked, commentNum: $commentNum, createdAt: $createdAt, updatedAt: $updatedAt, closedAt: $closedAt, body: $body, bodyHtml: $bodyHtml, user: $user, repoUrl: $repoUrl, htmlUrl: $htmlUrl, closeBy: $closeBy}'; - } - - @override - List get props => [ - id, - number, - title, - state, - locked, - commentNum, - createdAt, - updatedAt, - closedAt, - body, - bodyHtml, - user, - repoUrl, - htmlUrl, - closeBy, - ]; -} diff --git a/lib/model/github/issue_comment.dart b/lib/model/github/issue_comment.dart deleted file mode 100644 index 821cbe33..00000000 --- a/lib/model/github/issue_comment.dart +++ /dev/null @@ -1,36 +0,0 @@ -import 'package:flutter_unit/model/github/github_user.dart'; - -part 'g/issue_comment.g.dart'; - - -class IssueComment{ - int? id; - GithubUser? user; - - DateTime? createdAt; - - DateTime? updatedAt; - - String? authorAssociation; - String? body; - - String? bodyHtml; - String? type; - String? htmlUrl; - - IssueComment( - this.id, - this.user, - this.createdAt, - this.updatedAt, - this.authorAssociation, - this.body, - this.bodyHtml, - this.type, - this.htmlUrl, - ); - - factory IssueComment.fromJson(Map json) => _$IssueEventFromJson(json); - - Map toJson() => _$IssueEventToJson(this); -} diff --git a/lib/model/github/license.dart b/lib/model/github/license.dart deleted file mode 100644 index e7937887..00000000 --- a/lib/model/github/license.dart +++ /dev/null @@ -1,19 +0,0 @@ - -part 'g/license.g.dart'; - -class License { - - String? name; - String? spdxId; - - License(this.name,this.spdxId); - - String get type { - return spdxId ==null?"未知":spdxId!; - } - - - factory License.fromJson(Map json) => _$LicenseFromJson(json); - - Map toJson() => _$LicenseToJson(this); -} diff --git a/lib/model/github/repository.dart b/lib/model/github/repository.dart deleted file mode 100644 index 98c96e16..00000000 --- a/lib/model/github/repository.dart +++ /dev/null @@ -1,137 +0,0 @@ - - -import 'package:flutter_unit/model/github/github_user.dart'; - -import 'license.dart'; -import 'repository_permissions.dart'; - -part 'g/repository.g.dart'; - -class Repository { - int? id; - - int? size; - - String? name; - - String? fullName; - - - String? htmlUrl; - - String? description; - - String? language; - - - String? defaultBranch; - - - DateTime? createdAt; - - - DateTime? updatedAt; - - DateTime? pushedAt; - - - String? gitUrl; - - - String? sshUrl; - - - String? cloneUrl; - - - String? svnUrl; - - - int? stargazersCount; - - - int? watchersCount; - - - int? forksCount; - - - int? openIssuesCount; - - - int? subscribersCount; - - - bool? private; - - bool? fork; - - bool? hasIssues; - - bool? hasProjects; - - bool? hasDownloads; - - bool? hasWiki; - - bool? hasPages; - - GithubUser? owner; - - License? license; - - Repository? parent; - - RepositoryPermissions? permissions; - - List? topics; - - int? allIssueCount; - - Repository( - this.id, - this.size, - this.name, - this.fullName, - this.htmlUrl, - this.description, - this.language, - this.license, - this.defaultBranch, - this.createdAt, - this.updatedAt, - this.pushedAt, - this.gitUrl, - this.sshUrl, - this.cloneUrl, - this.svnUrl, - this.stargazersCount, - this.watchersCount, - this.forksCount, - this.openIssuesCount, - this.subscribersCount, - this.private, - this.fork, - this.hasIssues, - this.hasProjects, - this.hasDownloads, - this.hasWiki, - this.hasPages, - this.owner, - this.parent, - this.permissions, - this.topics, - ); - - factory Repository.fromJson(Map json) => _$RepositoryFromJson(json); - - - @override - String toString() { - return 'Repository{id: $id, size: $size, name: $name, fullName: $fullName, htmlUrl: $htmlUrl, description: $description, language: $language, defaultBranch: $defaultBranch, createdAt: $createdAt, updatedAt: $updatedAt, pushedAt: $pushedAt, gitUrl: $gitUrl, sshUrl: $sshUrl, cloneUrl: $cloneUrl, svnUrl: $svnUrl, stargazersCount: $stargazersCount, watchersCount: $watchersCount, forksCount: $forksCount, openIssuesCount: $openIssuesCount, subscribersCount: $subscribersCount, private: $private, fork: $fork, hasIssues: $hasIssues, hasProjects: $hasProjects, hasDownloads: $hasDownloads, hasWiki: $hasWiki, hasPages: $hasPages, owner: $owner, license: $license, parent: $parent, permissions: $permissions, topics: $topics, allIssueCount: $allIssueCount}'; - } - - Map toJson() => _$RepositoryToJson(this); - - Repository.empty(); -} diff --git a/lib/model/github/repository_permissions.dart b/lib/model/github/repository_permissions.dart deleted file mode 100644 index f6b38968..00000000 --- a/lib/model/github/repository_permissions.dart +++ /dev/null @@ -1,18 +0,0 @@ - - -part 'g/repository_permissions.g.dart'; - -class RepositoryPermissions { - bool? admin; - bool? push; - bool? pull; - - RepositoryPermissions( - this.admin, - this.push, - this.pull, - ); - - factory RepositoryPermissions.fromJson(Map json) => _$RepositoryPermissionsFromJson(json); - Map toJson() => _$RepositoryPermissionsToJson(this); -} diff --git a/lib/painter_system/gallery_unit.dart b/lib/painter_system/gallery_unit.dart index 7aebf938..3ab84618 100644 --- a/lib/painter_system/gallery_unit.dart +++ b/lib/painter_system/gallery_unit.dart @@ -3,11 +3,11 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_unit/app/res/str_unit.dart'; -import 'package:flutter_unit/blocs/bloc_exp.dart'; + import 'package:flutter_unit/views/components/permanent/feedback_widget.dart'; import 'package:flutter_unit/views/components/project/items/gallery/gallery_card_item.dart'; import 'package:flutter_unit/painter_system/gallery_factory.dart'; -import 'package:flutter_unit/views/navigation/color_change_bloc.dart'; +import 'package:flutter_unit/app/blocs/color_change_bloc.dart'; import 'gallery_detail_page.dart'; diff --git a/lib/app/api/app_info.dart b/lib/point_system/api/app_info.dart similarity index 100% rename from lib/app/api/app_info.dart rename to lib/point_system/api/app_info.dart diff --git a/lib/app/api/category_api.dart b/lib/point_system/api/category_api.dart similarity index 100% rename from lib/app/api/category_api.dart rename to lib/point_system/api/category_api.dart diff --git a/lib/app/api/issues_api.dart b/lib/point_system/api/issues_api.dart similarity index 82% rename from lib/app/api/issues_api.dart rename to lib/point_system/api/issues_api.dart index 4127ab82..63d46500 100644 --- a/lib/app/api/issues_api.dart +++ b/lib/point_system/api/issues_api.dart @@ -1,9 +1,8 @@ import 'dart:convert'; import 'package:dio/dio.dart'; -import 'package:flutter_unit/model/github/issue_comment.dart'; -import 'package:flutter_unit/model/github/issue.dart'; -import 'package:flutter_unit/model/github/repository.dart'; +import 'package:flutter_unit/point_system/github_model/github_model.dart'; + /// create by 张风捷特烈 on 2020/6/17 /// contact me by email 1981462002@qq.com @@ -22,7 +21,7 @@ class IssuesApi { static Future> getIssues( {int page = 1, int pageSize = 100}) async { - List res = (await dio.get('/point', + List res = (await dio.get('/point_bloc', queryParameters: {"page": page, "pageSize": pageSize})) .data['data'] as List; return res.map((e) => Issue.fromJson(json.decode(e['pointData']))).toList(); diff --git a/lib/blocs/point/point_bloc.dart b/lib/point_system/blocs/point_bloc/point_bloc.dart similarity index 85% rename from lib/blocs/point/point_bloc.dart rename to lib/point_system/blocs/point_bloc/point_bloc.dart index b1a65165..e0015962 100644 --- a/lib/blocs/point/point_bloc.dart +++ b/lib/point_system/blocs/point_bloc/point_bloc.dart @@ -1,10 +1,9 @@ import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:flutter_unit/app/api/issues_api.dart'; -import 'package:flutter_unit/blocs/point/point_state.dart'; - +import 'package:flutter_unit/point_system/api/issues_api.dart'; import 'point_event.dart'; +import 'point_state.dart'; /// create by 张风捷特烈 on 2020-09-03 diff --git a/lib/blocs/point/point_event.dart b/lib/point_system/blocs/point_bloc/point_event.dart similarity index 100% rename from lib/blocs/point/point_event.dart rename to lib/point_system/blocs/point_bloc/point_event.dart diff --git a/lib/blocs/point/point_state.dart b/lib/point_system/blocs/point_bloc/point_state.dart similarity index 88% rename from lib/blocs/point/point_state.dart rename to lib/point_system/blocs/point_bloc/point_state.dart index c3da3d2a..43b8dc9e 100644 --- a/lib/blocs/point/point_state.dart +++ b/lib/point_system/blocs/point_bloc/point_state.dart @@ -1,5 +1,6 @@ import 'package:equatable/equatable.dart'; -import 'package:flutter_unit/model/github/issue.dart'; +import 'package:flutter_unit/point_system/github_model/github_model.dart'; + /// create by 张风捷特烈 on 2020/9/3 /// contact me by email 1981462002@qq.com diff --git a/lib/blocs/point_comment/point_comment_bloc.dart b/lib/point_system/blocs/point_comment_bloc/point_comment_bloc.dart similarity index 83% rename from lib/blocs/point_comment/point_comment_bloc.dart rename to lib/point_system/blocs/point_comment_bloc/point_comment_bloc.dart index 3274d7d7..96a5e53e 100644 --- a/lib/blocs/point_comment/point_comment_bloc.dart +++ b/lib/point_system/blocs/point_comment_bloc/point_comment_bloc.dart @@ -1,7 +1,8 @@ import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:flutter_unit/app/api/issues_api.dart'; -import 'package:flutter_unit/model/github/issue_comment.dart'; +import 'package:flutter_unit/point_system/api/issues_api.dart'; +import 'package:flutter_unit/point_system/github_model/github_model.dart'; + import 'point_comment_event.dart'; @@ -28,7 +29,7 @@ class PointCommentBloc extends Bloc { Stream _mapLoadWidgetToState(EventLoadPointComment event) async* { yield PointCommentLoading(event.point); if(event.point.number==null){ - yield PointCommentLoadFailure('point id 为空'); + yield PointCommentLoadFailure('point_bloc id 为空'); } try { final List comments = await IssuesApi.getIssuesComment(event.point.number!); diff --git a/lib/blocs/point_comment/point_comment_event.dart b/lib/point_system/blocs/point_comment_bloc/point_comment_event.dart similarity index 82% rename from lib/blocs/point_comment/point_comment_event.dart rename to lib/point_system/blocs/point_comment_bloc/point_comment_event.dart index 3dfc044c..15da9ed5 100644 --- a/lib/blocs/point_comment/point_comment_event.dart +++ b/lib/point_system/blocs/point_comment_bloc/point_comment_event.dart @@ -1,7 +1,7 @@ import 'package:equatable/equatable.dart'; -import 'package:flutter_unit/model/github/issue.dart'; +import 'package:flutter_unit/point_system/github_model/github_model.dart'; /// create by 张风捷特烈 on 2020/9/3 /// contact me by email 1981462002@qq.com diff --git a/lib/blocs/point_comment/point_comment_state.dart b/lib/point_system/blocs/point_comment_bloc/point_comment_state.dart similarity index 89% rename from lib/blocs/point_comment/point_comment_state.dart rename to lib/point_system/blocs/point_comment_bloc/point_comment_state.dart index 0edcedb6..1b53df4e 100644 --- a/lib/blocs/point_comment/point_comment_state.dart +++ b/lib/point_system/blocs/point_comment_bloc/point_comment_state.dart @@ -1,6 +1,6 @@ import 'package:equatable/equatable.dart'; -import 'package:flutter_unit/model/github/issue_comment.dart'; -import 'package:flutter_unit/model/github/issue.dart'; +import 'package:flutter_unit/point_system/github_model/github_model.dart'; + /// create by 张风捷特烈 on 2020/9/3 /// contact me by email 1981462002@qq.com diff --git a/lib/point_system/blocs/point_system_bloc.dart b/lib/point_system/blocs/point_system_bloc.dart new file mode 100644 index 00000000..e9642c71 --- /dev/null +++ b/lib/point_system/blocs/point_system_bloc.dart @@ -0,0 +1,9 @@ +export './point_comment_bloc/point_comment_bloc.dart'; +export './point_comment_bloc/point_comment_event.dart'; +export './point_comment_bloc/point_comment_state.dart'; + +export './point_bloc/point_bloc.dart'; +export './point_bloc/point_event.dart'; +export './point_bloc/point_state.dart'; + + diff --git a/lib/point_system/github_model/github_model.dart b/lib/point_system/github_model/github_model.dart new file mode 100644 index 00000000..0d4bd5ee --- /dev/null +++ b/lib/point_system/github_model/github_model.dart @@ -0,0 +1,6 @@ +export './github_user.dart'; +export './issue.dart'; +export './issue_comment.dart'; +export './license.dart'; +export './repository.dart'; +export './repository_permissions.dart'; diff --git a/lib/point_system/github_model/github_user.dart b/lib/point_system/github_model/github_user.dart new file mode 100644 index 00000000..56b7739c --- /dev/null +++ b/lib/point_system/github_model/github_user.dart @@ -0,0 +1,172 @@ +/// create by 张风捷特烈 on 2020/6/17 +/// contact me by email 1981462002@qq.com +/// 说明: + +class GithubUser { + GithubUser( + this.login, + this.id, + this.nodeId, + this.avatarUrl, + this.gravatarId, + this.url, + this.htmlUrl, + this.followersUrl, + this.followingUrl, + this.gistsUrl, + this.starredUrl, + this.subscriptionsUrl, + this.organizationsUrl, + this.reposUrl, + this.eventsUrl, + this.receivedEventsUrl, + this.type, + this.siteAdmin, + this.name, + this.company, + this.blog, + this.location, + this.email, + this.starred, + this.bio, + this.publicRepos, + this.publicGists, + this.followers, + this.following, + this.createdAt, + this.updatedAt, + this.privateGists, + this.totalPrivateRepos, + this.ownedPrivateRepos, + this.diskUsage, + this.collaborators, + this.twoFactorAuthentication); + + String? login; + int? id; + String? nodeId; + String? avatarUrl; + String? gravatarId; + String? url; + String? htmlUrl; + String? followersUrl; + String? followingUrl; + String? gistsUrl; + String? starredUrl; + String? subscriptionsUrl; + String? organizationsUrl; + String? reposUrl; + String? eventsUrl; + String? receivedEventsUrl; + String? type; + bool? siteAdmin; + String? name; + String? company; + String? blog; + String? location; + String? email; + String? starred; + String? bio; + int? publicRepos; + int? publicGists; + int? followers; + int? following; + DateTime? createdAt; + DateTime? updatedAt; + int? privateGists; + int? totalPrivateRepos; + int? ownedPrivateRepos; + int? diskUsage; + int? collaborators; + bool? twoFactorAuthentication; + + + factory GithubUser.fromJson(Map json) => GithubUser( + json['login'] as String?, + json['id'] as int?, + json['node_id'] as String?, + json['avatar_url'] as String?, + json['gravatar_id'] as String?, + json['url'] as String?, + json['html_url'] as String?, + json['followers_url'] as String?, + json['following_url'] as String?, + json['gists_url'] as String?, + json['starred_url'] as String?, + json['subscriptions_url'] as String?, + json['organizations_url'] as String?, + json['repos_url'] as String?, + json['events_url'] as String?, + json['received_events_url'] as String?, + json['type'] as String?, + json['site_admin'] as bool?, + json['name'] as String?, + json['company'] as String?, + json['blog'] as String?, + json['location'] as String?, + json['email'] as String?, + json['starred'] as String?, + json['bio'] as String?, + json['public_repos'] as int?, + json['public_gists'] as int?, + json['followers'] as int?, + json['following'] as int?, + json['created_at'] == null + ? null + : DateTime.parse(json['created_at'] as String), + json['updated_at'] == null + ? null + : DateTime.parse(json['updated_at'] as String), + json['private_gists'] as int?, + json['total_private_repos'] as int?, + json['owned_private_repos'] as int?, + json['disk_usage'] as int?, + json['collaborators'] as int?, + json['two_factor_authentication'] as bool?, + ); + + + Map toJson() => { + 'login': login, + 'id': id, + 'node_id': nodeId, + 'avatar_url': avatarUrl, + 'gravatar_id': gravatarId, + 'url': url, + 'html_url': htmlUrl, + 'followers_url': followersUrl, + 'following_url': followingUrl, + 'gists_url': gistsUrl, + 'starred_url': starredUrl, + 'subscriptions_url': subscriptionsUrl, + 'organizations_url': organizationsUrl, + 'repos_url': reposUrl, + 'events_url': eventsUrl, + 'received_events_url': receivedEventsUrl, + 'type': type, + 'site_admin': siteAdmin, + 'name': name, + 'company': company, + 'blog': blog, + 'location': location, + 'email': email, + 'starred': starred, + 'bio': bio, + 'public_repos': publicRepos, + 'public_gists': publicGists, + 'followers': followers, + 'following': following, + 'created_at': createdAt?.toIso8601String(), + 'updated_at': updatedAt?.toIso8601String(), + 'private_gists': privateGists, + 'total_private_repos': totalPrivateRepos, + 'owned_private_repos': ownedPrivateRepos, + 'disk_usage': diskUsage, + 'collaborators': collaborators, + 'two_factor_authentication': twoFactorAuthentication, + }; + + // 命名构造函数 + GithubUser.empty(); + +} diff --git a/lib/point_system/github_model/issue.dart b/lib/point_system/github_model/issue.dart new file mode 100644 index 00000000..1c5283f4 --- /dev/null +++ b/lib/point_system/github_model/issue.dart @@ -0,0 +1,117 @@ +import 'package:equatable/equatable.dart'; +import 'github_user.dart'; + +class Issue extends Equatable { + final int? id; + final int? number; + final String? title; + final String? state; + final bool? locked; + + final int? commentNum; + + final DateTime? createdAt; + + final DateTime? updatedAt; + + final DateTime? closedAt; + final String? body; + + final String? bodyHtml; + + final GithubUser? user; + + final String? repoUrl; + + final String? htmlUrl; + + final GithubUser? closeBy; + + Issue( + this.id, + this.number, + this.title, + this.state, + this.locked, + this.commentNum, + this.createdAt, + this.updatedAt, + this.closedAt, + this.body, + this.bodyHtml, + this.user, + this.repoUrl, + this.htmlUrl, + this.closeBy, + ); + + static Issue fromJson(dynamic json) => Issue( + json['id'] as int?, + json['number'] as int?, + json['title'] as String?, + json['state'] as String?, + json['locked'] as bool?, + json['comments'] as int?, + json['created_at'] == null + ? null + : DateTime.parse(json['created_at'] as String), + json['updated_at'] == null + ? null + : DateTime.parse(json['updated_at'] as String), + json['closed_at'] == null + ? null + : DateTime.parse(json['closed_at'] as String), + json['body'] as String?, + json['body_html'] as String?, + json['user'] == null + ? null + : GithubUser.fromJson(json['user'] as Map), + json['repository_url'] as String?, + json['html_url'] as String?, + json['closed_by'] == null + ? null + : GithubUser.fromJson(json['closed_by'] as Map), + ); + + Map toJson() => { + 'id': id, + 'number': number, + 'title': title, + 'state': state, + 'locked': locked, + 'comments': commentNum, + 'created_at': createdAt?.toIso8601String(), + 'updated_at': updatedAt?.toIso8601String(), + 'closed_at': closedAt?.toIso8601String(), + 'body': body, + 'body_html': bodyHtml, + 'user': user, + 'repository_url': repoUrl, + 'html_url': htmlUrl, + 'closed_by': closeBy, + }; + + @override + String toString() { + return 'Issue{id: $id, number: $number, title: $title, state: $state, locked: $locked, commentNum: $commentNum, createdAt: $createdAt, updatedAt: $updatedAt, closedAt: $closedAt, body: $body, bodyHtml: $bodyHtml, user: $user, repoUrl: $repoUrl, htmlUrl: $htmlUrl, closeBy: $closeBy}'; + } + + @override + List get props => [ + id, + number, + title, + state, + locked, + commentNum, + createdAt, + updatedAt, + closedAt, + body, + bodyHtml, + user, + repoUrl, + htmlUrl, + closeBy, + ]; +} diff --git a/lib/point_system/github_model/issue_comment.dart b/lib/point_system/github_model/issue_comment.dart new file mode 100644 index 00000000..28a984eb --- /dev/null +++ b/lib/point_system/github_model/issue_comment.dart @@ -0,0 +1,62 @@ + + + +import 'github_user.dart'; + +class IssueComment{ + int? id; + GithubUser? user; + + DateTime? createdAt; + + DateTime? updatedAt; + + String? authorAssociation; + String? body; + + String? bodyHtml; + String? type; + String? htmlUrl; + + IssueComment( + this.id, + this.user, + this.createdAt, + this.updatedAt, + this.authorAssociation, + this.body, + this.bodyHtml, + this.type, + this.htmlUrl, + ); + + factory IssueComment.fromJson(Map json) => IssueComment( + json['id'] as int?, + json['user'] == null + ? null + : GithubUser.fromJson(json['user'] as Map), + json['created_at'] == null + ? null + : DateTime.parse(json['created_at'] as String), + json['updated_at'] == null + ? null + : DateTime.parse(json['updated_at'] as String), + json['author_association'] as String?, + json['body'] as String?, + json['body_html'] as String?, + json['event'] as String?, + json['html_url'] as String?, + ); + + Map toJson() => { + 'id': id, + 'user': user, + 'created_at': createdAt?.toIso8601String(), + 'updated_at': updatedAt?.toIso8601String(), + 'author_association': authorAssociation, + 'body': body, + 'body_html': bodyHtml, + 'event': type, + 'html_url': htmlUrl, + }; +} diff --git a/lib/point_system/github_model/license.dart b/lib/point_system/github_model/license.dart new file mode 100644 index 00000000..9e166fc3 --- /dev/null +++ b/lib/point_system/github_model/license.dart @@ -0,0 +1,24 @@ + + +class License { + + String? name; + String? spdxId; + + License(this.name,this.spdxId); + + String get type { + return spdxId ==null?"未知":spdxId!; + } + + + factory License.fromJson(Map json) => License( + json['name'] as String?, + json['spdx_id'] as String?, + ); + + Map toJson() => { + 'name': name, + 'spdx_id': spdxId, + }; +} diff --git a/lib/point_system/github_model/repository.dart b/lib/point_system/github_model/repository.dart new file mode 100644 index 00000000..1eec4e6c --- /dev/null +++ b/lib/point_system/github_model/repository.dart @@ -0,0 +1,216 @@ + + +import 'github_user.dart'; +import 'license.dart'; +import 'repository_permissions.dart'; + +class Repository { + int? id; + + int? size; + + String? name; + + String? fullName; + + + String? htmlUrl; + + String? description; + + String? language; + + + String? defaultBranch; + + + DateTime? createdAt; + + + DateTime? updatedAt; + + DateTime? pushedAt; + + + String? gitUrl; + + + String? sshUrl; + + + String? cloneUrl; + + + String? svnUrl; + + + int? stargazersCount; + + + int? watchersCount; + + + int? forksCount; + + + int? openIssuesCount; + + + int? subscribersCount; + + + bool? private; + + bool? fork; + + bool? hasIssues; + + bool? hasProjects; + + bool? hasDownloads; + + bool? hasWiki; + + bool? hasPages; + + GithubUser? owner; + + License? license; + + Repository? parent; + + RepositoryPermissions? permissions; + + List? topics; + + int? allIssueCount; + + Repository( + this.id, + this.size, + this.name, + this.fullName, + this.htmlUrl, + this.description, + this.language, + this.license, + this.defaultBranch, + this.createdAt, + this.updatedAt, + this.pushedAt, + this.gitUrl, + this.sshUrl, + this.cloneUrl, + this.svnUrl, + this.stargazersCount, + this.watchersCount, + this.forksCount, + this.openIssuesCount, + this.subscribersCount, + this.private, + this.fork, + this.hasIssues, + this.hasProjects, + this.hasDownloads, + this.hasWiki, + this.hasPages, + this.owner, + this.parent, + this.permissions, + this.topics, + ); + + factory Repository.fromJson(Map json) => Repository( + json['id'] as int?, + json['size'] as int?, + json['name'] as String?, + json['full_name'] as String?, + json['html_url'] as String?, + json['description'] as String?, + json['language'] as String?, + json['license'] == null + ? null + : License.fromJson(json['license'] as Map), + json['default_branch'] as String?, + json['created_at'] == null + ? null + : DateTime.parse(json['created_at'] as String), + json['updated_at'] == null + ? null + : DateTime.parse(json['updated_at'] as String), + json['pushed_at'] == null + ? null + : DateTime.parse(json['pushed_at'] as String), + json['git_url'] as String?, + json['ssh_url'] as String?, + json['clone_url'] as String?, + json['svn_url'] as String?, + json['stargazers_count'] as int?, + json['watchers_count'] as int?, + json['forks_count'] as int?, + json['open_issues_count'] as int?, + json['subscribers_count'] as int?, + json['private'] as bool?, + json['fork'] as bool?, + json['has_issues'] as bool?, + json['has_projects'] as bool?, + json['has_downloads'] as bool?, + json['has_wiki'] as bool?, + json['has_pages'] as bool?, + json['owner'] == null + ? null + : GithubUser.fromJson(json['owner'] as Map), + json['parent'] == null + ? null + : Repository.fromJson(json['parent'] as Map), + json['permissions'] == null + ? null + : RepositoryPermissions.fromJson( + json['permissions'] as Map), + (json['topics'] as List?)?.map((e) => e as String).toList(), + )..allIssueCount = json['allIssueCount'] as int?; + + + @override + String toString() { + return 'Repository{id: $id, size: $size, name: $name, fullName: $fullName, htmlUrl: $htmlUrl, description: $description, language: $language, defaultBranch: $defaultBranch, createdAt: $createdAt, updatedAt: $updatedAt, pushedAt: $pushedAt, gitUrl: $gitUrl, sshUrl: $sshUrl, cloneUrl: $cloneUrl, svnUrl: $svnUrl, stargazersCount: $stargazersCount, watchersCount: $watchersCount, forksCount: $forksCount, openIssuesCount: $openIssuesCount, subscribersCount: $subscribersCount, private: $private, fork: $fork, hasIssues: $hasIssues, hasProjects: $hasProjects, hasDownloads: $hasDownloads, hasWiki: $hasWiki, hasPages: $hasPages, owner: $owner, license: $license, parent: $parent, permissions: $permissions, topics: $topics, allIssueCount: $allIssueCount}'; + } + + Map toJson() =>{ + 'id': id, + 'size': size, + 'name': name, + 'full_name': fullName, + 'html_url': htmlUrl, + 'description': description, + 'language': language, + 'default_branch': defaultBranch, + 'created_at': createdAt?.toIso8601String(), + 'updated_at': updatedAt?.toIso8601String(), + 'pushed_at': pushedAt?.toIso8601String(), + 'git_url': gitUrl, + 'ssh_url': sshUrl, + 'clone_url': cloneUrl, + 'svn_url': svnUrl, + 'stargazers_count': stargazersCount, + 'watchers_count': watchersCount, + 'forks_count': forksCount, + 'open_issues_count': openIssuesCount, + 'subscribers_count': subscribersCount, + 'private': private, + 'fork': fork, + 'has_issues': hasIssues, + 'has_projects': hasProjects, + 'has_downloads': hasDownloads, + 'has_wiki': hasWiki, + 'has_pages': hasPages, + 'owner': owner, + 'license': license, + 'parent': parent, + 'permissions': permissions, + 'topics': topics, + 'allIssueCount': allIssueCount, + }; + + Repository.empty(); +} diff --git a/lib/point_system/github_model/repository_permissions.dart b/lib/point_system/github_model/repository_permissions.dart new file mode 100644 index 00000000..dc8d0b4a --- /dev/null +++ b/lib/point_system/github_model/repository_permissions.dart @@ -0,0 +1,26 @@ + + +class RepositoryPermissions { + bool? admin; + bool? push; + bool? pull; + + RepositoryPermissions( + this.admin, + this.push, + this.pull, + ); + + factory RepositoryPermissions.fromJson(Map json) => + RepositoryPermissions( + json['admin'] as bool?, + json['push'] as bool?, + json['pull'] as bool?, + ); + + Map toJson() => { + 'admin': admin, + 'push': push, + 'pull': pull, + }; +} diff --git a/lib/views/pages/issues_point/issue_item.dart b/lib/point_system/views/issues_point/issue_item.dart similarity index 97% rename from lib/views/pages/issues_point/issue_item.dart rename to lib/point_system/views/issues_point/issue_item.dart index 0f3484d2..f2338e13 100644 --- a/lib/views/pages/issues_point/issue_item.dart +++ b/lib/point_system/views/issues_point/issue_item.dart @@ -3,9 +3,10 @@ import 'dart:ui'; import 'package:flutter/material.dart'; import 'package:flutter_unit/app/res/toly_icon.dart'; import 'package:flutter_unit/app/utils/convert_man.dart'; +import 'package:flutter_unit/point_system/github_model/github_model.dart'; import 'package:flutter_unit/views/components/permanent/circle_image.dart'; import 'package:flutter_unit/views/components/permanent/color_wrapper.dart'; -import 'package:flutter_unit/model/github/issue.dart'; + /// create by 张风捷特烈 on 2020/9/3 /// contact me by email 1981462002@qq.com diff --git a/lib/views/pages/issues_point/issues_detail.dart b/lib/point_system/views/issues_point/issues_detail.dart similarity index 96% rename from lib/views/pages/issues_point/issues_detail.dart rename to lib/point_system/views/issues_point/issues_detail.dart index 53f7862a..d57c3886 100644 --- a/lib/views/pages/issues_point/issues_detail.dart +++ b/lib/point_system/views/issues_point/issues_detail.dart @@ -1,13 +1,14 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_unit/app/utils/convert_man.dart'; -import 'package:flutter_unit/blocs/bloc_exp.dart'; +import 'package:flutter_unit/point_system/blocs/point_system_bloc.dart'; +import 'package:flutter_unit/point_system/github_model/github_model.dart'; + import 'package:flutter_unit/views/components/permanent/circle_image.dart'; import 'package:flutter_unit/views/components/permanent/color_wrapper.dart'; import 'package:flutter_unit/views/components/permanent/markdown/markdown_widget.dart'; import 'package:flutter_unit/views/components/permanent/panel.dart'; -import 'package:flutter_unit/model/github/issue_comment.dart'; -import 'package:flutter_unit/model/github/issue.dart'; + /// create by 张风捷特烈 on 2020/9/3 /// contact me by email 1981462002@qq.com diff --git a/lib/views/pages/issues_point/issues_point_page.dart b/lib/point_system/views/issues_point/issues_point_page.dart similarity index 94% rename from lib/views/pages/issues_point/issues_point_page.dart rename to lib/point_system/views/issues_point/issues_point_page.dart index d07f450f..f45c04a6 100644 --- a/lib/views/pages/issues_point/issues_point_page.dart +++ b/lib/point_system/views/issues_point/issues_point_page.dart @@ -3,11 +3,12 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_spinkit/flutter_spinkit.dart'; -import 'package:flutter_unit/app/api/issues_api.dart'; + import 'package:flutter_unit/app/router/unit_router.dart'; -import 'package:flutter_unit/blocs/bloc_exp.dart'; -import 'package:flutter_unit/model/github/issue.dart'; -import 'package:flutter_unit/model/github/repository.dart'; +import 'package:flutter_unit/point_system/api/issues_api.dart'; +import 'package:flutter_unit/point_system/blocs/point_system_bloc.dart'; +import 'package:flutter_unit/point_system/github_model/github_model.dart'; + import 'issue_item.dart'; import 'repo_widget.dart'; diff --git a/lib/views/pages/issues_point/repo_widget.dart b/lib/point_system/views/issues_point/repo_widget.dart similarity index 98% rename from lib/views/pages/issues_point/repo_widget.dart rename to lib/point_system/views/issues_point/repo_widget.dart index 92c422b8..9c8c5d2a 100644 --- a/lib/views/pages/issues_point/repo_widget.dart +++ b/lib/point_system/views/issues_point/repo_widget.dart @@ -1,8 +1,9 @@ import 'package:flutter/material.dart'; import 'package:flutter_unit/app/res/toly_icon.dart'; import 'package:flutter_unit/app/utils/convert_man.dart'; +import 'package:flutter_unit/point_system/github_model/github_model.dart'; import 'package:flutter_unit/views/components/permanent/color_wrapper.dart'; -import 'package:flutter_unit/model/github/repository.dart'; + /// create by 张风捷特烈 on 2020/9/3 /// contact me by email 1981462002@qq.com diff --git a/lib/repositories/app_start.dart b/lib/repositories/app_start.dart deleted file mode 100644 index 6194feaf..00000000 --- a/lib/repositories/app_start.dart +++ /dev/null @@ -1,91 +0,0 @@ -import 'dart:convert'; -import 'dart:io'; -import 'dart:typed_data'; - -import 'package:flutter/services.dart'; -import 'package:flutter_unit/app/res/cons.dart'; -import 'package:flutter_unit/app/res/sp.dart'; -import 'package:flutter_unit/blocs/global/global_state.dart'; -import 'package:flutter_unit/repositories/local_db.dart'; -import 'package:path/path.dart' as path; -import 'package:shared_preferences/shared_preferences.dart'; -import 'package:sqflite/sqflite.dart'; - -import 'local_storage.dart'; - -/// create by 张风捷特烈 on 2020-03-04 -/// contact me by email 1981462002@qq.com -/// 说明: 本地存储访问对象,用于读取配置数据，及初始化Database和SharedPreferences - -class AppStart { - // 初始化 App 固化的配置数据 - Future initApp() async { - SharedPreferences prefs = await LocalStorage.sp; - //数据库不存在，执行拷贝 - String databasesPath = await getDatabasesPath(); - String dbPath = path.join(databasesPath, "flutter.db"); - - bool shouldCopy = await _checkShouldCopy(dbPath); - - if (shouldCopy) { - await _doCopyAssetsDb(dbPath); - } else { - print("=====flutter.db 已存在===="); - } - - await LocalDb.instance.initDb(); - - bool showBg = prefs.getBool(SP.showBackground) ?? true; - int themeIndex = prefs.getInt(SP.themeColorIndex) ?? 4; - int fontIndex = prefs.getInt(SP.fontFamily) ?? 1; - int codeIndex = prefs.getInt(SP.codeStyleIndex) ?? 0; - int itemStyleIndex = prefs.getInt(SP.itemStyleIndex) ?? 0; - - return GlobalState( - showBackGround: showBg, - themeColor: Cons.themeColorSupport.keys.toList()[themeIndex], - fontFamily: Cons.fontFamilySupport[fontIndex], - itemStyleIndex: itemStyleIndex, - codeStyleIndex: codeIndex); - } - - Future _checkShouldCopy(String dbPath) async { - bool shouldCopy = false; - String versionStr = await rootBundle.loadString('assets/version.json'); - int dbVersion = await json.decode(versionStr)['dbVersion']; - int versionInSP = - await LocalStorage.getInt(LocalStorage.dbVersionKey) ?? -1; - - // 版本升级，执行拷贝 - if (dbVersion > versionInSP) { - shouldCopy = true; - await LocalStorage.saveInt(LocalStorage.dbVersionKey,dbVersion); - } - - //非 release模式，执行拷贝 - const isPro = bool.fromEnvironment('dart.vm.product'); - if (!isPro) { - shouldCopy = true; - } - - //数据库不存在，执行拷贝 - if (!File(dbPath).existsSync()) { - shouldCopy = true; - } - - return shouldCopy; - } - - Future _doCopyAssetsDb(String dbPath) async { - Directory dir = Directory(path.dirname(dbPath)); - if (!dir.existsSync()) { - await dir.create(recursive: true); - } - ByteData data = await rootBundle.load("assets/flutter.db"); - List bytes = - data.buffer.asUint8List(data.offsetInBytes, data.lengthInBytes); - await File(dbPath).writeAsBytes(bytes, flush: true); - - print("=====flutter.db==== assets ======拷贝完成===="); - } -} diff --git a/lib/repositories/bean/category_po.dart b/lib/repositories/bean/category_po.dart deleted file mode 100644 index 0602228b..00000000 --- a/lib/repositories/bean/category_po.dart +++ /dev/null @@ -1,88 +0,0 @@ -import 'package:equatable/equatable.dart'; - -/// create by 张风捷特烈 on 2020-04-17 -/// contact me by email 1981462002@qq.com -/// 说明: 收藏夹数据库-数据模型 - -// """ -// CREATE TABLE IF NOT EXISTS widget_category( -// id INTEGER PRIMARY KEY AUTOINCREMENT, -// name VARCHAR(64) NOT NULL, -// color VARCHAR(9) DEFAULT '#FF2196F3', -// info VARCHAR(256) DEFAULT '这里什么都没有...', -// created DATETIME NOT NULL, -// updated DATETIME NOT NULL, -// priority INTEGER DEFAULT 0, -// image VARCHAR(128) NULL image DEFAULT '' -// );"""; //建表语句 - -class CategoryPo extends Equatable { - final int? id; - final String name; - final String color; - final String info; - final DateTime? created; - final DateTime updated; - final String image; - final int count; - final int priority; - - const CategoryPo({ - this.id, - required this.name, - this.color = '#FFF2F2F2', - this.created, - required this.updated, - this.count = 0, - this.priority = 0, - this.info = '这里什么都没有...', - this.image = '', - }); - - factory CategoryPo.fromJson(Map map) { - return CategoryPo( - id: map['id'], - name: map['name'], - color: map["color"], - created: DateTime.parse(map["created"]), - image: map["image"], - priority: map["priority"], - count: map["count"], - updated: DateTime.parse(map["updated"]), - info: map["info"]); - } - - factory CategoryPo.fromNetJson(Map map) { - return CategoryPo( - id: map['id'], - name: map['name'], - color: map["color"], - created: DateTime.fromMillisecondsSinceEpoch(map["created"]), - image: map["image"], - priority: map["priority"], - count: map["count"], - updated: DateTime.fromMillisecondsSinceEpoch(map["updated"]), - info: map["info"]); - } - - Map toJson() => { - "id": this.id, - "name": this.name, - "info": this.info, - "created": this.created?.millisecondsSinceEpoch, - "updated": this.updated.millisecondsSinceEpoch, - "image": this.image, - "count": this.count, - "color": this.color, - "priority": this.priority, - }; - - @override - String toString() { - return 'CategoryPo{id: $id, name: $name, color: $color, info: $info, created: $created, updated: $updated, image: $image, count: $count, priority: $priority}'; - } - - @override - List get props => - [id, name, color, created, image, info, updated, priority,count]; -} diff --git a/lib/repositories/bean/node_po.dart b/lib/repositories/bean/node_po.dart deleted file mode 100644 index 16bfd817..00000000 --- a/lib/repositories/bean/node_po.dart +++ /dev/null @@ -1,38 +0,0 @@ - -/// create by 张风捷特烈 on 2020-03-04 -/// contact me by email 1981462002@qq.com -/// 说明: 详情页节点-数据库-数据模型 -/// -class NodePo { - final int id; - final int widgetId; - final String name; - final int priority; - final String subtitle; - final String code; - - const NodePo({ - required this.id, - required this.widgetId, - required this.name, - required this.priority, - required this.subtitle, - required this.code, - }); - - factory NodePo.fromJson(Map map) { - return NodePo( - id: map['id'], - name: map['name'], - widgetId: map["widgetId"], - priority: map["priority"], - subtitle: map["subtitle"], - code: map["code"]); - } - - @override - String toString() { - return 'NodePo{id: $id, widgetId: $widgetId, name: $name, priority: $priority, subtitle: $subtitle, code: $code}'; - } - -} diff --git a/lib/repositories/bean/widget_po.dart b/lib/repositories/bean/widget_po.dart deleted file mode 100644 index 29e20219..00000000 --- a/lib/repositories/bean/widget_po.dart +++ /dev/null @@ -1,62 +0,0 @@ - -/// create by 张风捷特烈 on 2020-03-04 -/// contact me by email 1981462002@qq.com -/// 说明: 组件信息-数据库-数据模型 -/// -import 'package:equatable/equatable.dart'; - -class WidgetPo extends Equatable { - final int id; - final String name; - final String nameCN; - final int deprecated; - final int family; - final double lever; - final String info; - final String linkWidget; - - const WidgetPo({ - required this.id, - required this.name, - required this.nameCN, - required this.deprecated, - required this.family, - required this.lever, - required this.linkWidget, - required this.info, - }); - - factory WidgetPo.fromJson(Map map) { - return WidgetPo( - id: map['id'], - name: map['name'], - nameCN: map["nameCN"], - family: map["family"], - deprecated: map["deprecated"] ?? 0, - lever: map["lever"].toDouble(), - linkWidget: map["linkWidget"], - info: map["info"]); - } - - Map toJson() { - return { - "id": this.id, - "name": this.name, - "nameCN": this.nameCN, - "family": this.family, - "deprecated": this.deprecated, - "lever": this.lever, - "linkWidget": this.linkWidget, - "info": this.info - }; - } - - @override - String toString() { - return 'WidgetPo{id: $id, name: $name, nameCN: $nameCN, deprecated: $deprecated, family: $family, lever: $lever, info: $info}'; - } - - @override - List get props => - [id, name, nameCN, deprecated, family, linkWidget, lever, info]; -} diff --git a/lib/repositories/dao/category_dao.dart b/lib/repositories/dao/category_dao.dart deleted file mode 100644 index d26ce85a..00000000 --- a/lib/repositories/dao/category_dao.dart +++ /dev/null @@ -1,202 +0,0 @@ - -import 'package:sqflite/sqflite.dart'; - -import '../app_start.dart'; -import '../bean/category_po.dart'; - - -//""" -// CREATE TABLE IF NOT EXISTS widget_category( -// id INTEGER PRIMARY KEY AUTOINCREMENT, -// name VARCHAR(64) NOT NULL, -// color VARCHAR(9) DEFAULT '#FF2196F3', -// info VARCHAR(256) DEFAULT '这里什么都没有...', -// created DATETIME NOT NULL, -// updated DATETIME NOT NULL, -// priority INTEGER DEFAULT 0, -// image VARCHAR(128) NULL image DEFAULT '' -// ); -//"""; - -class CategoryDao { - final Database db; - - CategoryDao(this.db); - - - - Future insert(CategoryPo category) async { - //插入方法 - String addSql = //插入数据 - "INSERT INTO " - "widget_category(id,name,color,info,priority,image,created,updated) " - "VALUES (?,?,?,?,?,?,?,?);"; - return await db.transaction((tran) async => await tran.rawInsert(addSql, [ - category.id, - category.name, - category.color, - category.info, - category.priority, - category.image, - category.created?.toIso8601String(), - category.updated.toIso8601String(), - ])); - } - - Future update(CategoryPo widget) async { - //插入方法 - String updateSql = //插入数据 - "UPDATE widget_category SET name=? , color=? ,info=?, priority=?,image=?,updated=? " - "WHERE id = ?"; - - return await db.transaction((tran) async => - await tran.rawUpdate(updateSql, [ - widget.name, - widget.color, - widget.info, - widget.priority, - widget.image, - widget.updated.toIso8601String(), - widget.id, - ])); - } - - - - Future addWidget(int categoryId,int widgetId,) async { - String addSql = //插入数据 - "INSERT INTO " - "category_widget(widgetId,categoryId) " - "VALUES (?,?);"; - return await db.transaction((tran) async => await tran.rawInsert(addSql, [ - widgetId, - categoryId, - ])); - } - - Future addWidgets(int categoryId,List widgetIds) async { - String addSql = //插入数据 - "INSERT INTO " - "category_widget(widgetId,categoryId) VALUES "; - - String args = ''; - - for(int i=0;i< widgetIds.length;i++){ - args+= "(${widgetIds[i]},$categoryId)"; - if(i==widgetIds.length-1){ - args+=";"; - }else{ - args+=","; - } - } - addSql += args; - return await db.transaction((tran) async => await tran.rawInsert(addSql)); - } - - Future existByName(String name) async { - String sql = //插入数据 - "SELECT COUNT(name) as count FROM widget_category " - "WHERE name = ?"; - List> rawData = await db.rawQuery(sql, [name]); - if (rawData.length > 0) { - return rawData[0]['count'] > 0; - } - return false; - } - - Future>> queryAll() async { - List> data = await db.rawQuery( - "SELECT c.id,c.name,c.info,c.color,c.image,c.created,c.updated,c.priority,COUNT(cw.categoryId) as `count`" - "FROM widget_category AS c " - "LEFT JOIN category_widget AS cw " - "ON c.id = cw.categoryId GROUP BY c.id " - "ORDER BY priority DESC,created DESC", - []); - return data; - } - - Future> categoryWidgetIds(int id) async { - List> data = await db.rawQuery( - "SELECT categoryId FROM `category_widget`" - "WHERE widgetId = ?", - [id]); - return data.toList().map((e)=>e["categoryId"]).toList(); - } - - - - Future deleteCollect(int id) async { - await db.execute( - "DELETE FROM category_widget " - "WHERE categoryId = ?", - [id]); - return await db.execute( - "DELETE FROM widget_category " - "WHERE id = ?", - [id]); - } - - Future clear() async { - await db.execute( - "DELETE FROM category_widget " - "WHERE categoryId >0"); - return await db.execute( - "DELETE FROM widget_category " - "WHERE id > 0"); - } - - Future removeWidget(int categoryId, int widgetId) async { - //插入方法 - String deleteSql = //插入数据 - "DELETE FROM " - "category_widget WHERE categoryId = ? AND widgetId = ? "; - return await db - .transaction((tran) async => await tran.rawInsert(deleteSql, [ - categoryId, - widgetId, - ])); - } - - Future existWidgetInCollect(int categoryId, int widgetId) async { - String sql = //插入数据 - "SELECT COUNT(id) as count FROM category_widget " - "WHERE categoryId = ? AND widgetId = ?"; - List> rawData = await db.rawQuery(sql, [categoryId, widgetId]); - if (rawData.length > 0) { - return rawData[0]['count'] > 0; - } - return false; - } - - Future toggleCollect(int categoryId, int widgetId) async { - if (await existWidgetInCollect(categoryId, widgetId)) { - //已存在: 移除 - await removeWidget(categoryId, widgetId); - } else { - await addWidget(categoryId, widgetId); - } - } - - Future toggleCollectDefault(int widgetId) async { - await toggleCollect(1, widgetId); - } - - Future>> loadCollectWidgets(int categoryId) async{ - String querySql = //插入数据 - "SELECT * FROM widget " - "WHERE id IN (SELECT widgetId FROM category_widget WHERE categoryId = ?) " - "ORDER BY lever DESC"; - - return await db.rawQuery(querySql,[categoryId]); - } - - Future> loadCollectWidgetIds(int categoryId) async{ - String querySql = //插入数据 - "SELECT id FROM widget " - "WHERE id IN (SELECT widgetId FROM category_widget WHERE categoryId = ?) " - "ORDER BY lever DESC"; - - var data = await db.rawQuery(querySql,[categoryId]); - return data.map((e) => e["id"] as int).toList(); - } -} diff --git a/lib/repositories/dao/like_dao.dart b/lib/repositories/dao/like_dao.dart deleted file mode 100644 index 38e6184d..00000000 --- a/lib/repositories/dao/like_dao.dart +++ /dev/null @@ -1,64 +0,0 @@ -import 'package:sqflite/sqflite.dart'; - -class LikeDao { - final Database db; - - LikeDao(this.db); - - Future> likeWidgetIds() async { - var result = await db.rawQuery("SELECT widget_id FROM like_widget"); - var ids = result.map((e) => e['widget_id'] as int).toList(); - return ids; - } - - // 如果已喜欢，取消喜欢 - // 如果未喜欢，设为喜欢 - Future toggleCollect(int widgetId) async { - bool liked = await isLiked(widgetId); - - if (liked) { - await unlike(widgetId, check: false); - } else { - await like(widgetId, check: false); - } - } - - Future like(int widgetId, {bool check = true}) async { - if (check) { - // 如果 like ，直接取消，不执行 like 操作 - bool liked = await isLiked(widgetId); - if (liked) return 0; - } - - return await db.rawInsert( - "INSERT INTO " - "like_widget(widget_id) " - "VALUES (?);", - [widgetId]); - } - - Future unlike(int widgetId, {bool check = true}) async { - if (check) { - // 如果未 like ，直接取消，不执行 unlike 操作 - bool liked = await isLiked(widgetId); - if (!liked) return; - } - await db.execute( - "DELETE FROM like_widget " - "WHERE widget_id = ?", - [widgetId]); - } - - // 判断组件是否已 liked - Future isLiked(int widgetId) async { - var data = await db.rawQuery( - "Select count(id) as `count` FROM like_widget " - "WHERE widget_id = ?", - [widgetId]); - if (data.length > 0) { - var result = data[0]; - return result['count'] as int > 0; - } - return false; - } -} diff --git a/lib/repositories/dao/node_dao.dart b/lib/repositories/dao/node_dao.dart deleted file mode 100644 index e295f715..00000000 --- a/lib/repositories/dao/node_dao.dart +++ /dev/null @@ -1,44 +0,0 @@ -import 'package:flutter_unit/repositories/bean/node_po.dart'; -import 'package:sqflite/sqflite.dart'; - -import '../app_start.dart'; - - - -class NodeDao { - - final Database db; - - - NodeDao(this.db); - - Future insert(NodePo widget) async { - //插入方法 - String addSql = //插入数据 - "INSERT INTO " - "node(widgetId,name,priority,subtitle,code) " - "VALUES (?,?,?,?,?);"; - return await db.transaction((tran) async => await tran.rawInsert(addSql, [ - widget.widgetId, - widget.name, - widget.priority, - widget.subtitle, - widget.code - ])); - } - - Future>> queryAll() async { - //插入方法 - return await db.rawQuery("SELECT * " - "FROM node"); - } - - //根据 id 查询组件 node - Future>> queryById(int id) async { - return await db.rawQuery( - "SELECT name,subtitle,code " - "FROM node " - "WHERE widgetId = ? ORDER BY priority", - [id]); - } -} diff --git a/lib/repositories/dao/widget_dao.dart b/lib/repositories/dao/widget_dao.dart deleted file mode 100644 index 11b77678..00000000 --- a/lib/repositories/dao/widget_dao.dart +++ /dev/null @@ -1,67 +0,0 @@ - -import 'package:flutter_unit/model/enums.dart'; -import 'package:sqflite/sqflite.dart'; - -import '../app_start.dart'; -import '../bean/widget_po.dart'; - - -class WidgetDao { - - final Database db; - - WidgetDao(this.db); - - Future insert(WidgetPo widget) async { - //插入方法 - String addSql = //插入数据 - "INSERT INTO " - "widget(id,name,nameCN,deprecated,family,lever,linkWidget,info) " - "VALUES (?,?,?,?,?,?,?,?);"; - return await db.transaction((tran) async => await tran.rawInsert(addSql, [ - widget.id, - widget.name, - widget.nameCN, - widget.deprecated, - widget.family, - widget.lever, - widget.linkWidget, - widget.info - ])); - } - - Future>> queryAll() async { - return await db.rawQuery("SELECT * FROM widget"); - } - - Future>> queryByFamily(WidgetFamily family) async { - return await db.rawQuery( - "SELECT * " - "FROM widget WHERE family = ? ORDER BY lever DESC", - [family.index]); - } - - Future>> queryByIds(List ids) async { - if (ids.length == 0) { - return []; - } - String sql = "SELECT * " - "FROM widget WHERE id in (${'?,' * (ids.length - 1)}?) "; - - return await db.rawQuery(sql, [...ids]); - } - - Future>> search(SearchArgs arguments) async { - return await db.rawQuery( - "SELECT * " - "FROM widget WHERE name like ? AND lever IN(?,?,?,?,?) ORDER BY lever DESC", - ["%${arguments.name}%", ...arguments.stars]); - } -} - -class SearchArgs { - final String name; - final List stars; - - const SearchArgs({this.name = '', this.stars = const [-1, -1, -1, -1, -1]}); -} diff --git a/lib/repositories/local_db.dart b/lib/repositories/local_db.dart deleted file mode 100644 index 12d1eeac..00000000 --- a/lib/repositories/local_db.dart +++ /dev/null @@ -1,50 +0,0 @@ -import 'package:flutter_unit/repositories/dao/like_dao.dart'; -import 'package:path/path.dart' as path; -import 'package:sqflite/sqflite.dart'; - -import 'dao/category_dao.dart'; -import 'dao/node_dao.dart'; -import 'dao/widget_dao.dart'; - -class LocalDb { - Database? _database; - - LocalDb._(); - - static LocalDb instance = LocalDb._(); - - late WidgetDao _widgetDao; - late CategoryDao _categoryDao; - late NodeDao _nodeDao; - late LikeDao _likeDao; - - WidgetDao get widgetDao => _widgetDao; - - CategoryDao get categoryDao => _categoryDao; - - NodeDao get nodeDao => _nodeDao; - - LikeDao get likeDao => _likeDao; - - Database get db => _database!; - - Future initDb({String name = "flutter.db"}) async { - if (_database != null) return; - String databasesPath = await getDatabasesPath(); - String dbPath = path.join(databasesPath, name); - - _database = await openDatabase(dbPath); - - _widgetDao = WidgetDao(_database!); - _categoryDao = CategoryDao(_database!); - _nodeDao = NodeDao(_database!); - _likeDao = LikeDao(_database!); - - print('初始化数据库....'); - } - - Future closeDb() async { - await _database?.close(); - _database = null; - } -} diff --git a/lib/repositories/local_storage.dart b/lib/repositories/local_storage.dart deleted file mode 100644 index a06e15d9..00000000 --- a/lib/repositories/local_storage.dart +++ /dev/null @@ -1,42 +0,0 @@ -import 'package:shared_preferences/shared_preferences.dart'; - -/// create by 张风捷特烈 on 2020/6/17 -/// contact me by email 1981462002@qq.com -/// 说明: - -class LocalStorage { - - static String tokenKey= "token_key"; - static String userKey= "user_key"; - static String dbVersionKey= "db_version_key"; - - static SharedPreferences? _sp; - - // 如果_sp已存在，直接返回，为null时创建 - static Future get sp async { - if (_sp == null) { - _sp = await SharedPreferences.getInstance(); - } - return _sp!; - } - - static Future save(String key, String value) async { - return (await sp).setString(key, value); - } - - static dynamic get(String key) async { - return (await sp).get(key); - } - - static Future saveInt(String key, int value) async { - return (await sp).setInt(key, value); - } - - static Future getInt(String key) async { - return (await sp).getInt(key); - } - - static Future remove(String key) async { - return (await sp).remove(key); - } -} \ No newline at end of file diff --git a/lib/repositories/rep/category_repository.dart b/lib/repositories/rep/category_repository.dart deleted file mode 100644 index 1f5b0874..00000000 --- a/lib/repositories/rep/category_repository.dart +++ /dev/null @@ -1,40 +0,0 @@ -import 'package:flutter_unit/model/category_model.dart'; -import 'package:flutter_unit/model/widget_model.dart'; -import 'package:flutter_unit/repositories/bean/category_po.dart'; - -/// create by 张风捷特烈 on 2020-04-21 -/// contact me by email 1981462002@qq.com -/// 说明: 负责数据的存储和操作接口 - -abstract class CategoryRepository { - //切换一个组件在收藏夹中的状态 - Future toggleCategory(int categoryId, int widgetId); - - // 检查一个组件是否在收藏夹内 - Future check(int categoryId,int widgetId); - - // 获取一个收藏夹中的所有组件 - Future> loadCategoryWidgets({int categoryId = 0}); - - // 获取所有收藏集 - Future> loadCategories(); - - // 获取 所有收藏集 及 收藏集对应的组件 id 列表 - Future> loadCategoryData(); - - // 根据 Category 数据 同步 收藏集 - Future syncCategoryByData(String data,String likeData); - - //添加收藏集 - Future addCategory(CategoryPo categoryPo); - - //更新收藏集 - Future updateCategory(CategoryPo categoryPo); - - //删除收藏集 - Future deleteCategory(int id); - - //查看某个组件在哪些收藏集中 - Future> getCategoryByWidget(int widgetId); - -} \ No newline at end of file diff --git a/lib/repositories/rep/impl/catagory_db_repository.dart b/lib/repositories/rep/impl/catagory_db_repository.dart deleted file mode 100644 index dda8a14d..00000000 --- a/lib/repositories/rep/impl/catagory_db_repository.dart +++ /dev/null @@ -1,120 +0,0 @@ -import 'dart:async'; -import 'dart:convert'; - -import 'package:flutter_unit/model/category_model.dart'; -import 'package:flutter_unit/model/widget_model.dart'; -import 'package:flutter_unit/repositories/bean/category_po.dart'; -import 'package:flutter_unit/repositories/bean/widget_po.dart'; -import 'package:flutter_unit/repositories/dao/category_dao.dart'; -import 'package:flutter_unit/repositories/local_db.dart'; -import 'package:flutter_unit/repositories/rep/category_repository.dart'; -import 'package:sqflite/sqflite.dart'; - - -/// create by 张风捷特烈 on 2020-04-21 -/// contact me by email 1981462002@qq.com -/// 说明: - -class CategoryDbRepository implements CategoryRepository { - - CategoryDao get _categoryDao => LocalDb.instance.categoryDao; - - Database get db => LocalDb.instance.db; - - @override - Future addCategory(CategoryPo categoryPo) async { - int success = await _categoryDao.insert(categoryPo); - return success != -1; - } - - @override - Future check(int categoryId, int widgetId) async { - return await _categoryDao.existWidgetInCollect(categoryId, widgetId); - } - - @override - Future deleteCategory(int id) async { - await _categoryDao.deleteCollect(id); - } - - @override - Future> loadCategories() async { - List> data = await _categoryDao.queryAll(); - List collects = - data.map((e) => CategoryPo.fromJson(e)).toList(); - return collects.map(CategoryModel.fromPo).toList(); - } - - @override - Future> loadCategoryWidgets({int categoryId = 0}) async { - List> rawData = - await _categoryDao.loadCollectWidgets(categoryId); - List widgets = rawData.map((e) => WidgetPo.fromJson(e)).toList(); - return widgets.map(WidgetModel.fromPo).toList(); - } - - @override - Future toggleCategory(int categoryId, int widgetId) async { - return await _categoryDao.toggleCollect(categoryId, widgetId); - } - - @override - Future> getCategoryByWidget(int widgetId) async { - return await _categoryDao.categoryWidgetIds(widgetId); - } - - @override - Future updateCategory(CategoryPo categoryPo) async { - int success = await _categoryDao.update(categoryPo); - return success != -1; - } - - @override - Future> loadCategoryData() async { - List> data = await _categoryDao.queryAll(); - - Completer> completer = Completer(); - List collects = []; - - if (data.length == 0) { - completer.complete([]); - } - - for (int i = 0; i < data.length; i++) { - List ids = await _categoryDao.loadCollectWidgetIds(data[i]['id']); - collects.add(CategoryTo( - widgetIds: ids, - model: CategoryPo.fromJson(data[i]))); - - if (i == data.length - 1) { - completer.complete(collects); - } - } - - return completer.future; - } - - @override - Future syncCategoryByData(String data,String likeData) async { - try { - await _categoryDao.clear(); - List dataMap = json.decode(data); - for (int i = 0; i < dataMap.length; i++) { - CategoryPo po = CategoryPo.fromNetJson(dataMap[i]["model"]); - List widgetIds = dataMap[i]["widgetIds"]; - await addCategory(po); - if (widgetIds.isNotEmpty&&po.id!=null) { - await _categoryDao.addWidgets(po.id!, widgetIds); - } - } - List likeWidgets = (json.decode(likeData) as List).map((e) => e).toList(); - for (int i = 0; i < likeWidgets.length; i++) { - await LocalDb.instance.likeDao.like(likeWidgets[i]); - } - return true; - } catch (e) { - print(e); - return false; - } - } -} diff --git a/lib/repositories/rep/impl/widget_db_repository.dart b/lib/repositories/rep/impl/widget_db_repository.dart deleted file mode 100644 index 3293a837..00000000 --- a/lib/repositories/rep/impl/widget_db_repository.dart +++ /dev/null @@ -1,79 +0,0 @@ - -import 'dart:convert'; -import 'dart:io'; - - -import 'package:flutter_unit/repositories/app_start.dart'; -import 'package:flutter_unit/repositories/bean/widget_po.dart'; -import 'package:flutter_unit/repositories/dao/like_dao.dart'; -import 'package:flutter_unit/repositories/local_db.dart'; -import 'package:flutter_unit/repositories/dao/node_dao.dart'; -import 'package:flutter_unit/repositories/dao/widget_dao.dart'; -import 'package:flutter_unit/model/enums.dart'; - -import 'package:flutter_unit/model/node_model.dart'; -import 'package:flutter_unit/model/widget_model.dart'; -import 'package:flutter_unit/repositories/rep/widget_repository.dart'; -import 'package:path_provider/path_provider.dart'; - - -/// create by 张风捷特烈 on 2020-03-03 -/// contact me by email 1981462002@qq.com -/// 说明 : Widget数据仓库 - -class WidgetDbRepository implements WidgetRepository { - - WidgetDao get _widgetDao => LocalDb.instance.widgetDao; - NodeDao get _nodeDao => LocalDb.instance.nodeDao; - LikeDao get _likeDao => LocalDb.instance.likeDao; - - @override - Future> loadWidgets(WidgetFamily family) async { - List> data = await _widgetDao.queryByFamily(family); - List widgets = data.map((e) => WidgetPo.fromJson(e)).toList(); - return widgets.map(WidgetModel.fromPo).toList(); - } - - @override - Future> loadLikeWidgets() async { - List likeIds = await _likeDao.likeWidgetIds(); - List> data = await _widgetDao.queryByIds(likeIds); - List widgets = data.map((e) => WidgetPo.fromJson(e)).toList(); - return widgets.map(WidgetModel.fromPo).toList(); - } - - @override - Future> searchWidgets(SearchArgs args) async { - List> data = await _widgetDao.search(args); - List widgets = data.map((e) => WidgetPo.fromJson(e)).toList(); - return widgets.map(WidgetModel.fromPo).toList(); - } - - @override - Future> loadNode(WidgetModel widgetModel) async { - List> data = await _nodeDao.queryById(widgetModel.id); - List nodes = data.map((e) => NodeModel.fromJson(e)).toList(); - return nodes; - } - - @override - Future> loadWidget(List id) async { - List> data = await _widgetDao.queryByIds(id); - List widgets = data.map((e) => WidgetPo.fromJson(e)).toList(); - if (widgets.length > 0) return widgets.map(WidgetModel.fromPo).toList(); - return []; - } - - @override - Future toggleLike( - int id, - ) { - return _likeDao.toggleCollect(id); - } - - - @override - Future collected(int id) async{ - return await _likeDao.like(id); - } -} diff --git a/lib/repositories/rep/widget_repository.dart b/lib/repositories/rep/widget_repository.dart deleted file mode 100644 index ce74aead..00000000 --- a/lib/repositories/rep/widget_repository.dart +++ /dev/null @@ -1,23 +0,0 @@ -import 'package:flutter_unit/model/enums.dart'; -import 'package:flutter_unit/model/node_model.dart'; -import 'package:flutter_unit/model/widget_model.dart'; -import 'package:flutter_unit/repositories/dao/widget_dao.dart'; - -/// create by 张风捷特烈 on 2020-03-03 -/// contact me by email 1981462002@qq.com - -abstract class WidgetRepository { - Future> loadWidgets(WidgetFamily family); - - Future> loadWidget(List ids); - - Future> searchWidgets(SearchArgs args); - - Future> loadNode(WidgetModel widgetModel); - - Future toggleLike(int id); - - Future> loadLikeWidgets(); - - Future collected(int id); -} diff --git a/lib/user_system/bloc/authentic/bloc.dart b/lib/user_system/bloc/authentic/bloc.dart index 4ce36b16..f1be7ef1 100644 --- a/lib/user_system/bloc/authentic/bloc.dart +++ b/lib/user_system/bloc/authentic/bloc.dart @@ -3,8 +3,9 @@ import 'dart:convert'; import 'package:bloc/bloc.dart'; import 'package:flutter_unit/app/utils/http_utils/http_util.dart'; -import 'package:flutter_unit/repositories/local_storage.dart'; + import 'package:flutter_unit/user_system/model/user.dart'; +import 'package:flutter_unit/widget_system/repositories/repositories.dart'; import 'package:jwt_decoder/jwt_decoder.dart'; import 'event.dart'; diff --git a/lib/views/components/flutter/no_div_expansion_tile.dart b/lib/views/components/flutter/no_div_expansion_tile.dart index d47ca548..2fce786d 100644 --- a/lib/views/components/flutter/no_div_expansion_tile.dart +++ b/lib/views/components/flutter/no_div_expansion_tile.dart @@ -12,10 +12,10 @@ const Duration _kExpand = Duration(milliseconds: 200); /// the tile to reveal or hide the [children]. /// /// This widget is typically used with [ListView] to create an -/// "expand / collapse" list entry. When used with scrolling widgets like +/// "expand / collapse" list entry. When used with scrolling widgets liked_widget_bloc /// [ListView], a unique [PageStorageKey] must be specified to enable the /// [NoBorderExpansionTile] to save and restore its expanded state when it is scrolled -/// in and out of view. +/// in and out of category_view. /// /// See also: /// diff --git a/lib/views/components/project/items/category_list_item.dart b/lib/views/components/project/items/category_list_item.dart index ab4b1dba..125b68a2 100644 --- a/lib/views/components/project/items/category_list_item.dart +++ b/lib/views/components/project/items/category_list_item.dart @@ -2,7 +2,7 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_unit/views/components/permanent/circle_text.dart'; import 'package:flutter_unit/views/components/permanent/feedback_widget.dart'; -import 'package:flutter_unit/model/category_model.dart'; +import 'package:flutter_unit/widget_system/repositories/model/category_model.dart'; /// create by 张风捷特烈 on 2020-04-21 /// contact me by email 1981462002@qq.com diff --git a/lib/views/components/project/items/collect_widget_list_item.dart b/lib/views/components/project/items/collect_widget_list_item.dart index 58f0800e..48853a20 100644 --- a/lib/views/components/project/items/collect_widget_list_item.dart +++ b/lib/views/components/project/items/collect_widget_list_item.dart @@ -6,7 +6,7 @@ import 'package:flutter_unit/app/res/style/shape/techno_shape.dart'; import 'package:flutter_unit/views/components/permanent/circle_image.dart'; import 'package:flutter_unit/views/components/permanent/circle_text.dart'; import 'package:flutter_unit/views/components/permanent/feedback_widget.dart'; -import 'package:flutter_unit/model/widget_model.dart'; +import 'package:flutter_unit/widget_system/repositories/model/widget_model.dart'; class CollectWidgetListItem extends StatelessWidget { final WidgetModel data; diff --git a/lib/views/components/project/items/widget/coupon_widget_list_item.dart b/lib/views/components/project/items/widget/coupon_widget_list_item.dart index 51879284..4e9c50d1 100644 --- a/lib/views/components/project/items/widget/coupon_widget_list_item.dart +++ b/lib/views/components/project/items/widget/coupon_widget_list_item.dart @@ -3,11 +3,12 @@ import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_star/flutter_star.dart'; import 'package:flutter_unit/app/res/cons.dart'; import 'package:flutter_unit/app/res/style/shape/coupon_shape_border.dart'; -import 'package:flutter_unit/blocs/bloc_exp.dart'; +import 'package:flutter_unit/widget_system/blocs/widget_system_bloc.dart'; + import 'package:flutter_unit/views/components/permanent/circle_image.dart'; import 'package:flutter_unit/views/components/permanent/circle_text.dart'; import 'package:flutter_unit/views/components/permanent/tag.dart'; -import 'package:flutter_unit/model/widget_model.dart'; +import 'package:flutter_unit/widget_system/repositories/model/widget_model.dart'; class CouponWidgetListItem extends StatelessWidget { final WidgetModel data; diff --git a/lib/views/components/project/items/widget/home_item_support.dart b/lib/views/components/project/items/widget/home_item_support.dart index 3e3313b5..2dd1791f 100644 --- a/lib/views/components/project/items/widget/home_item_support.dart +++ b/lib/views/components/project/items/widget/home_item_support.dart @@ -1,8 +1,8 @@ import 'dart:math'; import 'package:flutter/material.dart'; -import 'package:flutter_unit/model/enums.dart'; -import 'package:flutter_unit/model/widget_model.dart'; +import 'package:flutter_unit/widget_system/repositories/model/enums.dart'; +import 'package:flutter_unit/widget_system/repositories/model/widget_model.dart'; import 'package:flutter_unit/views/components/project/items/widget/simple_widget_list_item.dart'; import 'coupon_widget_list_item.dart'; diff --git a/lib/views/components/project/items/widget/simple_widget_list_item.dart b/lib/views/components/project/items/widget/simple_widget_list_item.dart index df460792..225e6bd2 100644 --- a/lib/views/components/project/items/widget/simple_widget_list_item.dart +++ b/lib/views/components/project/items/widget/simple_widget_list_item.dart @@ -3,11 +3,12 @@ import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_star/star.dart'; import 'package:flutter_star/star_score.dart'; import 'package:flutter_unit/app/res/cons.dart'; -import 'package:flutter_unit/blocs/bloc_exp.dart'; +import 'package:flutter_unit/widget_system/blocs/widget_system_bloc.dart'; + import 'package:flutter_unit/views/components/permanent/circle_image.dart'; import 'package:flutter_unit/views/components/permanent/circle_text.dart'; import 'package:flutter_unit/views/components/permanent/tag.dart'; -import 'package:flutter_unit/model/widget_model.dart'; +import 'package:flutter_unit/widget_system/repositories/model/widget_model.dart'; /// create by 张风捷特烈 on 2020/11/17 /// contact me by email 1981462002@qq.com diff --git a/lib/views/components/project/items/widget/techno_widget_list_item.dart b/lib/views/components/project/items/widget/techno_widget_list_item.dart index c2a323d1..5248492d 100644 --- a/lib/views/components/project/items/widget/techno_widget_list_item.dart +++ b/lib/views/components/project/items/widget/techno_widget_list_item.dart @@ -4,11 +4,12 @@ import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_star/flutter_star.dart'; import 'package:flutter_unit/app/res/cons.dart'; import 'package:flutter_unit/app/res/style/shape/techno_shape.dart'; -import 'package:flutter_unit/blocs/bloc_exp.dart'; +import 'package:flutter_unit/widget_system/blocs/widget_system_bloc.dart'; + import 'package:flutter_unit/views/components/permanent/circle_image.dart'; import 'package:flutter_unit/views/components/permanent/circle_text.dart'; import 'package:flutter_unit/views/components/permanent/tag.dart'; -import 'package:flutter_unit/model/widget_model.dart'; +import 'package:flutter_unit/widget_system/repositories/model/widget_model.dart'; class TechnoWidgetListItem extends StatelessWidget { final WidgetModel data; diff --git a/lib/views/components/project/overlay_tool_wrapper.dart b/lib/views/components/project/overlay_tool_wrapper.dart index e505f003..0ddd2917 100644 --- a/lib/views/components/project/overlay_tool_wrapper.dart +++ b/lib/views/components/project/overlay_tool_wrapper.dart @@ -2,7 +2,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_unit/app/res/toly_icon.dart'; import 'package:flutter_unit/app/router/unit_router.dart'; -import 'package:flutter_unit/blocs/bloc_exp.dart'; +import 'package:flutter_unit/point_system/blocs/point_system_bloc.dart'; + import '../permanent/burst_menu.dart'; import '../permanent/color_wrapper.dart'; diff --git a/lib/views/widgets/MultiChildRenderObjectWidget/RichText/node2_widget.dart b/lib/views/widgets/MultiChildRenderObjectWidget/RichText/node2_widget.dart index 9f1b1109..db4eb425 100644 --- a/lib/views/widgets/MultiChildRenderObjectWidget/RichText/node2_widget.dart +++ b/lib/views/widgets/MultiChildRenderObjectWidget/RichText/node2_widget.dart @@ -40,7 +40,7 @@ class RichTextWithWidget extends StatelessWidget { style: TextStyle(color: Colors.orange, fontSize: 16), ), TextSpan( - text: 'https://github.com/toly1994328', + text: 'https://github_model.com/toly1994328', style: TextStyle( color: Colors.blue, fontSize: 18, diff --git a/lib/views/widgets/StatefulWidget/AppBar/node1_base.dart b/lib/views/widgets/StatefulWidget/AppBar/node1_base.dart index 5f2ba334..0d2228a5 100755 --- a/lib/views/widgets/StatefulWidget/AppBar/node1_base.dart +++ b/lib/views/widgets/StatefulWidget/AppBar/node1_base.dart @@ -38,7 +38,7 @@ class CustomAppBar extends StatelessWidget { actions: [ IconButton( icon: Icon(Icons.star), - tooltip: 'like', + tooltip: 'liked_widget_bloc', onPressed: () { // do nothing }), diff --git a/lib/views/widgets/StatefulWidget/AppBar/node2_tab.dart b/lib/views/widgets/StatefulWidget/AppBar/node2_tab.dart index 24719d3d..dbbfa819 100755 --- a/lib/views/widgets/StatefulWidget/AppBar/node2_tab.dart +++ b/lib/views/widgets/StatefulWidget/AppBar/node2_tab.dart @@ -66,7 +66,7 @@ class _TabAppBarState extends State actions: [ IconButton( icon: Icon(Icons.star), - tooltip: 'like', + tooltip: 'liked_widget_bloc', onPressed: () { // do nothing }), diff --git a/lib/views/widgets/StatelessWidget/SimpleDialog/node1_base.dart b/lib/views/widgets/StatelessWidget/SimpleDialog/node1_base.dart index f566d99f..e1ebf37b 100644 --- a/lib/views/widgets/StatelessWidget/SimpleDialog/node1_base.dart +++ b/lib/views/widgets/StatelessWidget/SimpleDialog/node1_base.dart @@ -24,7 +24,7 @@ class CustomSimpleDialog extends StatelessWidget { '性别: 男 未婚', '微信: zdl1994328', "掘金: 张风捷特烈", - "github: toly1994328", + "github_model: toly1994328", "邮箱: 1981462008@qq.com", ]; diff --git a/lib/blocs/category/category_bloc.dart b/lib/widget_system/blocs/category_bloc/category_bloc.dart similarity index 93% rename from lib/blocs/category/category_bloc.dart rename to lib/widget_system/blocs/category_bloc/category_bloc.dart index 7b0b9172..123ac9d8 100644 --- a/lib/blocs/category/category_bloc.dart +++ b/lib/widget_system/blocs/category_bloc/category_bloc.dart @@ -3,9 +3,9 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_unit/app/res/style/unit_color.dart'; import 'package:flutter_unit/app/utils/color_utils.dart'; -import 'package:flutter_unit/model/category_model.dart'; -import 'package:flutter_unit/repositories/bean/category_po.dart'; -import 'package:flutter_unit/repositories/rep/category_repository.dart'; +import 'package:flutter_unit/widget_system/repositories/model/category_model.dart'; +import 'package:flutter_unit/widget_system/repositories/repositories.dart'; + import 'category_event.dart'; import 'category_state.dart'; diff --git a/lib/blocs/category/category_event.dart b/lib/widget_system/blocs/category_bloc/category_event.dart similarity index 100% rename from lib/blocs/category/category_event.dart rename to lib/widget_system/blocs/category_bloc/category_event.dart diff --git a/lib/blocs/category/category_state.dart b/lib/widget_system/blocs/category_bloc/category_state.dart similarity index 90% rename from lib/blocs/category/category_state.dart rename to lib/widget_system/blocs/category_bloc/category_state.dart index 84c493e4..a6624aad 100644 --- a/lib/blocs/category/category_state.dart +++ b/lib/widget_system/blocs/category_bloc/category_state.dart @@ -1,5 +1,5 @@ import 'package:equatable/equatable.dart'; -import 'package:flutter_unit/model/category_model.dart'; +import 'package:flutter_unit/widget_system/repositories/model/category_model.dart'; /// create by 张风捷特烈 on 2020-04-21 /// contact me by email 1981462002@qq.com diff --git a/lib/blocs/category_widget/category_widget_bloc.dart b/lib/widget_system/blocs/category_widget_bloc/category_widget_bloc.dart similarity index 81% rename from lib/blocs/category_widget/category_widget_bloc.dart rename to lib/widget_system/blocs/category_widget_bloc/category_widget_bloc.dart index 4490d0c0..dc191364 100644 --- a/lib/blocs/category_widget/category_widget_bloc.dart +++ b/lib/widget_system/blocs/category_widget_bloc/category_widget_bloc.dart @@ -1,8 +1,9 @@ -import 'package:flutter/material.dart'; + import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:flutter_unit/blocs/category/category_bloc.dart'; -import 'package:flutter_unit/blocs/category/category_event.dart'; -import 'package:flutter_unit/repositories/rep/category_repository.dart'; +import 'package:flutter_unit/widget_system/repositories/repositories.dart'; + +import 'package:flutter_unit/widget_system/blocs/category_bloc/category_bloc.dart'; +import 'package:flutter_unit/widget_system/blocs/category_bloc/category_event.dart'; import 'category_widget_event.dart'; import 'category_widget_state.dart'; diff --git a/lib/blocs/category_widget/category_widget_event.dart b/lib/widget_system/blocs/category_widget_bloc/category_widget_event.dart similarity index 100% rename from lib/blocs/category_widget/category_widget_event.dart rename to lib/widget_system/blocs/category_widget_bloc/category_widget_event.dart diff --git a/lib/blocs/category_widget/category_widget_state.dart b/lib/widget_system/blocs/category_widget_bloc/category_widget_state.dart similarity index 86% rename from lib/blocs/category_widget/category_widget_state.dart rename to lib/widget_system/blocs/category_widget_bloc/category_widget_state.dart index ae2f3e08..b26edf90 100644 --- a/lib/blocs/category_widget/category_widget_state.dart +++ b/lib/widget_system/blocs/category_widget_bloc/category_widget_state.dart @@ -1,5 +1,5 @@ import 'package:equatable/equatable.dart'; -import 'package:flutter_unit/model/widget_model.dart'; +import 'package:flutter_unit/widget_system/repositories/model/widget_model.dart'; /// create by 张风捷特烈 on 2020-04-21 /// contact me by email 1981462002@qq.com diff --git a/lib/blocs/like/like_bloc.dart b/lib/widget_system/blocs/liked_widget_bloc/liked_widget_bloc.dart similarity index 82% rename from lib/blocs/like/like_bloc.dart rename to lib/widget_system/blocs/liked_widget_bloc/liked_widget_bloc.dart index d830657d..fed6b1e4 100644 --- a/lib/blocs/like/like_bloc.dart +++ b/lib/widget_system/blocs/liked_widget_bloc/liked_widget_bloc.dart @@ -1,10 +1,9 @@ - -import 'package:flutter/cupertino.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:flutter_unit/repositories/rep/widget_repository.dart'; +import 'package:flutter_unit/widget_system/repositories/repositories.dart'; + -import 'like_event.dart'; -import 'like_state.dart'; +import 'liked_widget_event.dart'; +import 'liked_widget_state.dart'; /// create by 张风捷特烈 on 2020-04-07 /// contact me by email 1981462002@qq.com diff --git a/lib/blocs/like/like_event.dart b/lib/widget_system/blocs/liked_widget_bloc/liked_widget_event.dart similarity index 100% rename from lib/blocs/like/like_event.dart rename to lib/widget_system/blocs/liked_widget_bloc/liked_widget_event.dart diff --git a/lib/blocs/like/like_state.dart b/lib/widget_system/blocs/liked_widget_bloc/liked_widget_state.dart similarity index 80% rename from lib/blocs/like/like_state.dart rename to lib/widget_system/blocs/liked_widget_bloc/liked_widget_state.dart index 5c5ff5df..8b171a4c 100644 --- a/lib/blocs/like/like_state.dart +++ b/lib/widget_system/blocs/liked_widget_bloc/liked_widget_state.dart @@ -1,5 +1,5 @@ import 'package:equatable/equatable.dart'; -import 'package:flutter_unit/model/widget_model.dart'; +import 'package:flutter_unit/widget_system/repositories/model/widget_model.dart'; /// create by 张风捷特烈 on 2020-04-09 /// contact me by email 1981462002@qq.com diff --git a/lib/blocs/search/search_bloc.dart b/lib/widget_system/blocs/search_bloc/search_bloc.dart similarity index 91% rename from lib/blocs/search/search_bloc.dart rename to lib/widget_system/blocs/search_bloc/search_bloc.dart index 2e7981a2..d36cc55c 100644 --- a/lib/blocs/search/search_bloc.dart +++ b/lib/widget_system/blocs/search_bloc/search_bloc.dart @@ -1,7 +1,6 @@ -import 'package:flutter/material.dart'; -import 'package:flutter_unit/repositories/rep/widget_repository.dart'; +import 'package:flutter_unit/widget_system/repositories/repositories.dart'; import 'search_event.dart'; import 'search_state.dart'; diff --git a/lib/blocs/search/search_event.dart b/lib/widget_system/blocs/search_bloc/search_event.dart similarity index 71% rename from lib/blocs/search/search_event.dart rename to lib/widget_system/blocs/search_bloc/search_event.dart index bd085868..cd715490 100644 --- a/lib/blocs/search/search_event.dart +++ b/lib/widget_system/blocs/search_bloc/search_event.dart @@ -1,5 +1,6 @@ -import 'package:flutter_unit/repositories/dao/widget_dao.dart'; +import 'package:flutter_unit/widget_system/repositories/repositories.dart'; + abstract class SearchEvent{//事件基 const SearchEvent(); diff --git a/lib/blocs/search/search_state.dart b/lib/widget_system/blocs/search_bloc/search_state.dart similarity index 84% rename from lib/blocs/search/search_state.dart rename to lib/widget_system/blocs/search_bloc/search_state.dart index 60254a37..4aca0f8f 100644 --- a/lib/blocs/search/search_state.dart +++ b/lib/widget_system/blocs/search_bloc/search_state.dart @@ -1,6 +1,6 @@ -import 'package:flutter_unit/model/widget_model.dart'; +import 'package:flutter_unit/widget_system/repositories/model/widget_model.dart'; abstract class SearchState {//基态 const SearchState(); diff --git a/lib/widget_system/widget_detail/bloc/detail/detail_bloc.dart b/lib/widget_system/blocs/widget_detail_bloc/widget_detail_bloc.dart similarity index 81% rename from lib/widget_system/widget_detail/bloc/detail/detail_bloc.dart rename to lib/widget_system/blocs/widget_detail_bloc/widget_detail_bloc.dart index c7dfa654..d283e77b 100644 --- a/lib/widget_system/widget_detail/bloc/detail/detail_bloc.dart +++ b/lib/widget_system/blocs/widget_detail_bloc/widget_detail_bloc.dart @@ -1,10 +1,10 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:flutter_unit/model/widget_model.dart'; -import 'package:flutter_unit/repositories/rep/widget_repository.dart'; +import 'package:flutter_unit/widget_system/repositories/model/widget_model.dart'; +import 'package:flutter_unit/widget_system/repositories/repositories.dart'; -import 'detail_event.dart'; -import 'detail_state.dart'; + +import 'widget_detail_event.dart'; +import 'widget_detail_state.dart'; /// create by 张风捷特烈 on 2020-03-03 /// contact me by email 1981462002@qq.com diff --git a/lib/widget_system/widget_detail/bloc/detail/detail_event.dart b/lib/widget_system/blocs/widget_detail_bloc/widget_detail_event.dart similarity index 88% rename from lib/widget_system/widget_detail/bloc/detail/detail_event.dart rename to lib/widget_system/blocs/widget_detail_bloc/widget_detail_event.dart index 91464378..ce57084f 100644 --- a/lib/widget_system/widget_detail/bloc/detail/detail_event.dart +++ b/lib/widget_system/blocs/widget_detail_bloc/widget_detail_event.dart @@ -1,5 +1,5 @@ import 'package:equatable/equatable.dart'; -import 'package:flutter_unit/model/widget_model.dart'; +import 'package:flutter_unit/widget_system/repositories/model/widget_model.dart'; /// create by 张风捷特烈 on 2020-03-03 diff --git a/lib/widget_system/widget_detail/bloc/detail/detail_state.dart b/lib/widget_system/blocs/widget_detail_bloc/widget_detail_state.dart similarity index 83% rename from lib/widget_system/widget_detail/bloc/detail/detail_state.dart rename to lib/widget_system/blocs/widget_detail_bloc/widget_detail_state.dart index ca0e8359..ab2d39c5 100644 --- a/lib/widget_system/widget_detail/bloc/detail/detail_state.dart +++ b/lib/widget_system/blocs/widget_detail_bloc/widget_detail_state.dart @@ -1,6 +1,6 @@ import 'package:equatable/equatable.dart'; -import 'package:flutter_unit/model/node_model.dart'; -import 'package:flutter_unit/model/widget_model.dart'; +import 'package:flutter_unit/widget_system/repositories/model/node_model.dart'; +import 'package:flutter_unit/widget_system/repositories/model/widget_model.dart'; /// create by 张风捷特烈 on 2020-03-03 diff --git a/lib/widget_system/blocs/widget_system_bloc.dart b/lib/widget_system/blocs/widget_system_bloc.dart new file mode 100644 index 00000000..b59edffd --- /dev/null +++ b/lib/widget_system/blocs/widget_system_bloc.dart @@ -0,0 +1,25 @@ +export './widgets_bloc/widgets_bloc.dart'; +export './widgets_bloc/widgets_event.dart'; +export './widgets_bloc/widgets_state.dart'; + +export './widget_detail_bloc/widget_detail_bloc.dart'; +export './widget_detail_bloc/widget_detail_event.dart'; +export './widget_detail_bloc/widget_detail_state.dart'; + +export './category_widget_bloc/category_widget_bloc.dart'; +export './category_widget_bloc/category_widget_event.dart'; +export './category_widget_bloc/category_widget_state.dart'; + +export './category_bloc/category_bloc.dart'; +export './category_bloc/category_event.dart'; +export './category_bloc/category_state.dart'; + + +export './liked_widget_bloc/liked_widget_bloc.dart'; +export './liked_widget_bloc/liked_widget_event.dart'; +export './liked_widget_bloc/liked_widget_state.dart'; + + +export './search_bloc/search_bloc.dart'; +export './search_bloc/search_event.dart'; +export './search_bloc/search_state.dart'; diff --git a/lib/widget_system/widget_home/bloc/widgets_bloc.dart b/lib/widget_system/blocs/widgets_bloc/widgets_bloc.dart similarity index 73% rename from lib/widget_system/widget_home/bloc/widgets_bloc.dart rename to lib/widget_system/blocs/widgets_bloc/widgets_bloc.dart index 8244936b..cffb7694 100644 --- a/lib/widget_system/widget_home/bloc/widgets_bloc.dart +++ b/lib/widget_system/blocs/widgets_bloc/widgets_bloc.dart @@ -1,6 +1,8 @@ import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:flutter_unit/model/enums.dart'; -import 'package:flutter_unit/repositories/rep/widget_repository.dart'; +import 'package:flutter_unit/widget_system/repositories/model/enums.dart'; +import 'package:flutter_unit/widget_system/repositories/model/widget_model.dart'; +import 'package:flutter_unit/widget_system/repositories/repositories.dart'; + import 'widgets_event.dart'; @@ -25,7 +27,7 @@ class WidgetsBloc extends Bloc { Stream _mapLoadWidgetToState(WidgetFamily family) async* { yield WidgetsLoading(); try { - final widgets = await this.repository.loadWidgets(family); + final List widgets = await repository.loadWidgets(family); yield WidgetsLoaded(widgets: widgets); } catch (err) { print(err); diff --git a/lib/widget_system/widget_home/bloc/widgets_event.dart b/lib/widget_system/blocs/widgets_bloc/widgets_event.dart similarity index 84% rename from lib/widget_system/widget_home/bloc/widgets_event.dart rename to lib/widget_system/blocs/widgets_bloc/widgets_event.dart index a4f1f7ba..180e0327 100644 --- a/lib/widget_system/widget_home/bloc/widgets_event.dart +++ b/lib/widget_system/blocs/widgets_bloc/widgets_event.dart @@ -1,5 +1,5 @@ import 'package:equatable/equatable.dart'; -import 'package:flutter_unit/model/enums.dart'; +import 'package:flutter_unit/widget_system/repositories/model/enums.dart'; /// create by 张风捷特烈 on 2020-03-03 diff --git a/lib/widget_system/widget_home/bloc/widgets_state.dart b/lib/widget_system/blocs/widgets_bloc/widgets_state.dart similarity index 85% rename from lib/widget_system/widget_home/bloc/widgets_state.dart rename to lib/widget_system/blocs/widgets_bloc/widgets_state.dart index b1b3605e..e2c22050 100644 --- a/lib/widget_system/widget_home/bloc/widgets_state.dart +++ b/lib/widget_system/blocs/widgets_bloc/widgets_state.dart @@ -1,8 +1,8 @@ import 'package:equatable/equatable.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_unit/model/enums.dart'; +import 'package:flutter_unit/widget_system/repositories/model/enums.dart'; import 'package:flutter_unit/app/res/cons.dart'; -import 'package:flutter_unit/model/widget_model.dart'; +import 'package:flutter_unit/widget_system/repositories/model/widget_model.dart'; /// create by 张风捷特烈 on 2020-03-03 /// contact me by email 1981462002@qq.com diff --git a/lib/widget_system/repositories/app_start.dart b/lib/widget_system/repositories/app_start.dart index 6194feaf..57521ed5 100644 --- a/lib/widget_system/repositories/app_start.dart +++ b/lib/widget_system/repositories/app_start.dart @@ -3,10 +3,11 @@ import 'dart:io'; import 'dart:typed_data'; import 'package:flutter/services.dart'; +import 'package:flutter_unit/app/blocs/global/global_state.dart'; import 'package:flutter_unit/app/res/cons.dart'; import 'package:flutter_unit/app/res/sp.dart'; -import 'package:flutter_unit/blocs/global/global_state.dart'; -import 'package:flutter_unit/repositories/local_db.dart'; + +import 'local_db.dart'; import 'package:path/path.dart' as path; import 'package:shared_preferences/shared_preferences.dart'; import 'package:sqflite/sqflite.dart'; diff --git a/lib/widget_system/repositories/dao/category_dao.dart b/lib/widget_system/repositories/dao/category_dao.dart index d26ce85a..943229d6 100644 --- a/lib/widget_system/repositories/dao/category_dao.dart +++ b/lib/widget_system/repositories/dao/category_dao.dart @@ -66,7 +66,7 @@ class CategoryDao { Future addWidget(int categoryId,int widgetId,) async { String addSql = //插入数据 "INSERT INTO " - "category_widget(widgetId,categoryId) " + "category_widget_bloc(widgetId,categoryId) " "VALUES (?,?);"; return await db.transaction((tran) async => await tran.rawInsert(addSql, [ widgetId, @@ -77,7 +77,7 @@ class CategoryDao { Future addWidgets(int categoryId,List widgetIds) async { String addSql = //插入数据 "INSERT INTO " - "category_widget(widgetId,categoryId) VALUES "; + "category_widget_bloc(widgetId,categoryId) VALUES "; String args = ''; @@ -108,7 +108,7 @@ class CategoryDao { List> data = await db.rawQuery( "SELECT c.id,c.name,c.info,c.color,c.image,c.created,c.updated,c.priority,COUNT(cw.categoryId) as `count`" "FROM widget_category AS c " - "LEFT JOIN category_widget AS cw " + "LEFT JOIN category_widget_bloc AS cw " "ON c.id = cw.categoryId GROUP BY c.id " "ORDER BY priority DESC,created DESC", []); @@ -117,7 +117,7 @@ class CategoryDao { Future> categoryWidgetIds(int id) async { List> data = await db.rawQuery( - "SELECT categoryId FROM `category_widget`" + "SELECT categoryId FROM `category_widget_bloc`" "WHERE widgetId = ?", [id]); return data.toList().map((e)=>e["categoryId"]).toList(); @@ -127,7 +127,7 @@ class CategoryDao { Future deleteCollect(int id) async { await db.execute( - "DELETE FROM category_widget " + "DELETE FROM category_widget_bloc " "WHERE categoryId = ?", [id]); return await db.execute( @@ -138,7 +138,7 @@ class CategoryDao { Future clear() async { await db.execute( - "DELETE FROM category_widget " + "DELETE FROM category_widget_bloc " "WHERE categoryId >0"); return await db.execute( "DELETE FROM widget_category " @@ -149,7 +149,7 @@ class CategoryDao { //插入方法 String deleteSql = //插入数据 "DELETE FROM " - "category_widget WHERE categoryId = ? AND widgetId = ? "; + "category_widget_bloc WHERE categoryId = ? AND widgetId = ? "; return await db .transaction((tran) async => await tran.rawInsert(deleteSql, [ categoryId, @@ -159,7 +159,7 @@ class CategoryDao { Future existWidgetInCollect(int categoryId, int widgetId) async { String sql = //插入数据 - "SELECT COUNT(id) as count FROM category_widget " + "SELECT COUNT(id) as count FROM category_widget_bloc " "WHERE categoryId = ? AND widgetId = ?"; List> rawData = await db.rawQuery(sql, [categoryId, widgetId]); if (rawData.length > 0) { @@ -184,7 +184,7 @@ class CategoryDao { Future>> loadCollectWidgets(int categoryId) async{ String querySql = //插入数据 "SELECT * FROM widget " - "WHERE id IN (SELECT widgetId FROM category_widget WHERE categoryId = ?) " + "WHERE id IN (SELECT widgetId FROM category_widget_bloc WHERE categoryId = ?) " "ORDER BY lever DESC"; return await db.rawQuery(querySql,[categoryId]); @@ -193,7 +193,7 @@ class CategoryDao { Future> loadCollectWidgetIds(int categoryId) async{ String querySql = //插入数据 "SELECT id FROM widget " - "WHERE id IN (SELECT widgetId FROM category_widget WHERE categoryId = ?) " + "WHERE id IN (SELECT widgetId FROM category_widget_bloc WHERE categoryId = ?) " "ORDER BY lever DESC"; var data = await db.rawQuery(querySql,[categoryId]); diff --git a/lib/widget_system/repositories/dao/like_dao.dart b/lib/widget_system/repositories/dao/like_dao.dart index 38e6184d..01719ad9 100644 --- a/lib/widget_system/repositories/dao/like_dao.dart +++ b/lib/widget_system/repositories/dao/like_dao.dart @@ -25,7 +25,7 @@ class LikeDao { Future like(int widgetId, {bool check = true}) async { if (check) { - // 如果 like ，直接取消，不执行 like 操作 + // 如果 liked_widget_bloc ，直接取消，不执行 liked_widget_bloc 操作 bool liked = await isLiked(widgetId); if (liked) return 0; } @@ -39,7 +39,7 @@ class LikeDao { Future unlike(int widgetId, {bool check = true}) async { if (check) { - // 如果未 like ，直接取消，不执行 unlike 操作 + // 如果未 liked_widget_bloc ，直接取消，不执行 unlike 操作 bool liked = await isLiked(widgetId); if (!liked) return; } diff --git a/lib/widget_system/repositories/dao/node_dao.dart b/lib/widget_system/repositories/dao/node_dao.dart index e295f715..dee3d8a7 100644 --- a/lib/widget_system/repositories/dao/node_dao.dart +++ b/lib/widget_system/repositories/dao/node_dao.dart @@ -1,10 +1,6 @@ -import 'package:flutter_unit/repositories/bean/node_po.dart'; +import '../bean/node_po.dart'; import 'package:sqflite/sqflite.dart'; -import '../app_start.dart'; - - - class NodeDao { final Database db; diff --git a/lib/widget_system/repositories/dao/widget_dao.dart b/lib/widget_system/repositories/dao/widget_dao.dart index 11b77678..910e9625 100644 --- a/lib/widget_system/repositories/dao/widget_dao.dart +++ b/lib/widget_system/repositories/dao/widget_dao.dart @@ -1,5 +1,5 @@ -import 'package:flutter_unit/model/enums.dart'; +import 'package:flutter_unit/widget_system/repositories/model/enums.dart'; import 'package:sqflite/sqflite.dart'; import '../app_start.dart'; @@ -54,7 +54,7 @@ class WidgetDao { Future>> search(SearchArgs arguments) async { return await db.rawQuery( "SELECT * " - "FROM widget WHERE name like ? AND lever IN(?,?,?,?,?) ORDER BY lever DESC", + "FROM widget WHERE name liked_widget_bloc ? AND lever IN(?,?,?,?,?) ORDER BY lever DESC", ["%${arguments.name}%", ...arguments.stars]); } } diff --git a/lib/widget_system/repositories/local_db.dart b/lib/widget_system/repositories/local_db.dart index 12d1eeac..135207be 100644 --- a/lib/widget_system/repositories/local_db.dart +++ b/lib/widget_system/repositories/local_db.dart @@ -1,4 +1,4 @@ -import 'package:flutter_unit/repositories/dao/like_dao.dart'; +import 'dao/like_dao.dart'; import 'package:path/path.dart' as path; import 'package:sqflite/sqflite.dart'; diff --git a/lib/model/category_model.dart b/lib/widget_system/repositories/model/category_model.dart similarity index 95% rename from lib/model/category_model.dart rename to lib/widget_system/repositories/model/category_model.dart index 54d42ee1..7302bc9b 100644 --- a/lib/model/category_model.dart +++ b/lib/widget_system/repositories/model/category_model.dart @@ -1,7 +1,8 @@ import 'package:equatable/equatable.dart'; import 'package:flutter/material.dart'; import 'package:flutter_unit/app/utils/color_utils.dart'; -import 'package:flutter_unit/repositories/bean/category_po.dart'; +import 'package:flutter_unit/widget_system/repositories/repositories.dart'; + import 'package:intl/intl.dart'; /// create by 张风捷特烈 on 2020-04-21 diff --git a/lib/model/enums.dart b/lib/widget_system/repositories/model/enums.dart similarity index 100% rename from lib/model/enums.dart rename to lib/widget_system/repositories/model/enums.dart diff --git a/lib/model/node_model.dart b/lib/widget_system/repositories/model/node_model.dart similarity index 100% rename from lib/model/node_model.dart rename to lib/widget_system/repositories/model/node_model.dart diff --git a/lib/model/widget_model.dart b/lib/widget_system/repositories/model/widget_model.dart similarity index 92% rename from lib/model/widget_model.dart rename to lib/widget_system/repositories/model/widget_model.dart index 9c3c20a8..0e08fef9 100644 --- a/lib/model/widget_model.dart +++ b/lib/widget_system/repositories/model/widget_model.dart @@ -1,9 +1,10 @@ import 'package:equatable/equatable.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter_unit/app/utils/convert.dart'; -import 'package:flutter_unit/model/enums.dart'; +import 'package:flutter_unit/widget_system/repositories/model/enums.dart'; import 'package:flutter_unit/app/res/cons.dart'; -import 'package:flutter_unit/repositories/bean/widget_po.dart'; +import 'package:flutter_unit/widget_system/repositories/repositories.dart'; + /// create by 张风捷特烈 on 2020-03-04 /// contact me by email 1981462002@qq.com diff --git a/lib/widget_system/repositories/rep/category_repository.dart b/lib/widget_system/repositories/rep/category_repository.dart index 1f5b0874..abf7fd5c 100644 --- a/lib/widget_system/repositories/rep/category_repository.dart +++ b/lib/widget_system/repositories/rep/category_repository.dart @@ -1,6 +1,6 @@ -import 'package:flutter_unit/model/category_model.dart'; -import 'package:flutter_unit/model/widget_model.dart'; -import 'package:flutter_unit/repositories/bean/category_po.dart'; +import 'package:flutter_unit/widget_system/repositories/model/category_model.dart'; +import 'package:flutter_unit/widget_system/repositories/model/widget_model.dart'; +import '../bean/category_po.dart'; /// create by 张风捷特烈 on 2020-04-21 /// contact me by email 1981462002@qq.com diff --git a/lib/widget_system/repositories/rep/impl/catagory_db_repository.dart b/lib/widget_system/repositories/rep/impl/catagory_db_repository.dart index dda8a14d..356953f8 100644 --- a/lib/widget_system/repositories/rep/impl/catagory_db_repository.dart +++ b/lib/widget_system/repositories/rep/impl/catagory_db_repository.dart @@ -1,13 +1,13 @@ import 'dart:async'; import 'dart:convert'; -import 'package:flutter_unit/model/category_model.dart'; -import 'package:flutter_unit/model/widget_model.dart'; -import 'package:flutter_unit/repositories/bean/category_po.dart'; -import 'package:flutter_unit/repositories/bean/widget_po.dart'; -import 'package:flutter_unit/repositories/dao/category_dao.dart'; -import 'package:flutter_unit/repositories/local_db.dart'; -import 'package:flutter_unit/repositories/rep/category_repository.dart'; +import 'package:flutter_unit/widget_system/repositories/model/category_model.dart'; +import 'package:flutter_unit/widget_system/repositories/model/widget_model.dart'; +import '../../bean/category_po.dart'; +import '../../bean/widget_po.dart'; +import '../../dao/category_dao.dart'; +import '../../local_db.dart'; +import '../../rep/category_repository.dart'; import 'package:sqflite/sqflite.dart'; diff --git a/lib/widget_system/repositories/rep/impl/widget_db_repository.dart b/lib/widget_system/repositories/rep/impl/widget_db_repository.dart index 3293a837..9da8c11e 100644 --- a/lib/widget_system/repositories/rep/impl/widget_db_repository.dart +++ b/lib/widget_system/repositories/rep/impl/widget_db_repository.dart @@ -1,20 +1,14 @@ +import '../../bean/widget_po.dart'; +import '../../dao/like_dao.dart'; +import '../../local_db.dart'; +import '../../dao/node_dao.dart'; +import '../../dao/widget_dao.dart'; +import '../../rep/widget_repository.dart'; -import 'dart:convert'; -import 'dart:io'; +import 'package:flutter_unit/widget_system/repositories/model/enums.dart'; - -import 'package:flutter_unit/repositories/app_start.dart'; -import 'package:flutter_unit/repositories/bean/widget_po.dart'; -import 'package:flutter_unit/repositories/dao/like_dao.dart'; -import 'package:flutter_unit/repositories/local_db.dart'; -import 'package:flutter_unit/repositories/dao/node_dao.dart'; -import 'package:flutter_unit/repositories/dao/widget_dao.dart'; -import 'package:flutter_unit/model/enums.dart'; - -import 'package:flutter_unit/model/node_model.dart'; -import 'package:flutter_unit/model/widget_model.dart'; -import 'package:flutter_unit/repositories/rep/widget_repository.dart'; -import 'package:path_provider/path_provider.dart'; +import 'package:flutter_unit/widget_system/repositories/model/node_model.dart'; +import 'package:flutter_unit/widget_system/repositories/model/widget_model.dart'; /// create by 张风捷特烈 on 2020-03-03 diff --git a/lib/widget_system/repositories/rep/widget_repository.dart b/lib/widget_system/repositories/rep/widget_repository.dart index ce74aead..287b2928 100644 --- a/lib/widget_system/repositories/rep/widget_repository.dart +++ b/lib/widget_system/repositories/rep/widget_repository.dart @@ -1,7 +1,7 @@ -import 'package:flutter_unit/model/enums.dart'; -import 'package:flutter_unit/model/node_model.dart'; -import 'package:flutter_unit/model/widget_model.dart'; -import 'package:flutter_unit/repositories/dao/widget_dao.dart'; +import 'package:flutter_unit/widget_system/repositories/model/enums.dart'; +import 'package:flutter_unit/widget_system/repositories/model/node_model.dart'; +import 'package:flutter_unit/widget_system/repositories/model/widget_model.dart'; +import '../dao/widget_dao.dart'; /// create by 张风捷特烈 on 2020-03-03 /// contact me by email 1981462002@qq.com diff --git a/lib/widget_system/repositories/repositories.dart b/lib/widget_system/repositories/repositories.dart new file mode 100644 index 00000000..aa1fdba1 --- /dev/null +++ b/lib/widget_system/repositories/repositories.dart @@ -0,0 +1,18 @@ +export './local_storage.dart'; +export './local_db.dart'; + +export './app_start.dart'; +export './dao/category_dao.dart'; +export './dao/like_dao.dart'; +export './dao/node_dao.dart'; +export './dao/widget_dao.dart'; + + +export './bean/category_po.dart'; +export './bean/node_po.dart'; +export './bean/widget_po.dart'; + +export './rep/impl/widget_db_repository.dart'; +export './rep/impl/catagory_db_repository.dart'; +export './rep/widget_repository.dart'; +export './rep/category_repository.dart'; \ No newline at end of file diff --git a/lib/widget_system/widget_category/view/category_detail.dart b/lib/widget_system/views/category_view/category_detail.dart similarity index 93% rename from lib/widget_system/widget_category/view/category_detail.dart rename to lib/widget_system/views/category_view/category_detail.dart index a7ea9466..ef0949f7 100644 --- a/lib/widget_system/widget_category/view/category_detail.dart +++ b/lib/widget_system/views/category_view/category_detail.dart @@ -3,14 +3,15 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_star/flutter_star.dart'; import 'package:flutter_unit/app/router/unit_router.dart'; -import 'package:flutter_unit/blocs/bloc_exp.dart'; + import 'package:flutter_unit/views/components/permanent/circle_image.dart'; import 'package:flutter_unit/views/components/permanent/circle_text.dart'; import 'package:flutter_unit/views/components/permanent/feedback_widget.dart'; -import 'package:flutter_unit/model/category_model.dart'; -import 'package:flutter_unit/model/widget_model.dart'; -import 'package:flutter_unit/widget_system/widget_detail/bloc/detail/detail_bloc.dart'; -import 'package:flutter_unit/widget_system/widget_detail/bloc/detail/detail_event.dart'; +import 'package:flutter_unit/widget_system/repositories/model/category_model.dart'; +import 'package:flutter_unit/widget_system/repositories/model/widget_model.dart'; +import 'package:flutter_unit/widget_system/blocs/widget_system_bloc.dart'; + + /// create by 张风捷特烈 on 2020-04-22 /// contact me by email 1981462002@qq.com diff --git a/lib/widget_system/widget_category/view/category_page.dart b/lib/widget_system/views/category_view/category_page.dart similarity index 96% rename from lib/widget_system/widget_category/view/category_page.dart rename to lib/widget_system/views/category_view/category_page.dart index 71136608..cccdb5d3 100644 --- a/lib/widget_system/widget_category/view/category_page.dart +++ b/lib/widget_system/views/category_view/category_page.dart @@ -2,8 +2,8 @@ import 'package:flutter/cupertino.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/blocs/bloc_exp.dart'; -import 'package:flutter_unit/model/category_model.dart'; +import 'package:flutter_unit/widget_system/blocs/widget_system_bloc.dart'; +import 'package:flutter_unit/widget_system/repositories/model/category_model.dart'; import 'package:flutter_unit/views/components/permanent/circle.dart'; import 'package:flutter_unit/views/components/project/default/loading_shower.dart'; import 'package:flutter_unit/views/components/project/dialogs/delete_category_dialog.dart'; diff --git a/lib/widget_system/widget_category/view/collect_page.dart b/lib/widget_system/views/category_view/collect_page.dart similarity index 98% rename from lib/widget_system/widget_category/view/collect_page.dart rename to lib/widget_system/views/category_view/collect_page.dart index 44f24e56..7ebf10bb 100644 --- a/lib/widget_system/widget_category/view/collect_page.dart +++ b/lib/widget_system/views/category_view/collect_page.dart @@ -6,7 +6,7 @@ import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_unit/user_system/component/authentic_widget.dart'; import 'package:flutter_unit/views/components/permanent/circle_image.dart'; import 'package:flutter_unit/views/components/permanent/feedback_widget.dart'; -import 'package:flutter_unit/views/navigation/color_change_bloc.dart'; +import 'package:flutter_unit/app/blocs/color_change_bloc.dart'; import 'sync/upload_button.dart'; import 'sync/async_button.dart'; import 'category_page.dart'; diff --git a/lib/widget_system/widget_category/view/edit_category_panel.dart b/lib/widget_system/views/category_view/edit_category_panel.dart similarity index 95% rename from lib/widget_system/widget_category/view/edit_category_panel.dart rename to lib/widget_system/views/category_view/edit_category_panel.dart index 0644b09f..eed7e945 100644 --- a/lib/widget_system/widget_category/view/edit_category_panel.dart +++ b/lib/widget_system/views/category_view/edit_category_panel.dart @@ -2,11 +2,11 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_unit/app/res/style/unit_color.dart'; import 'package:flutter_unit/app/utils/color_utils.dart'; -import 'package:flutter_unit/blocs/bloc_exp.dart'; +import 'package:flutter_unit/widget_system/blocs/widget_system_bloc.dart'; import 'package:flutter_unit/views/components/permanent/edit_panel.dart'; import 'package:flutter_unit/views/components/permanent/input_button.dart'; import 'package:flutter_unit/views/components/project/color_chooser.dart'; -import 'package:flutter_unit/model/category_model.dart'; +import 'package:flutter_unit/widget_system/repositories/model/category_model.dart'; /// create by 张风捷特烈 on 2020-04-23 /// contact me by email 1981462002@qq.com diff --git a/lib/widget_system/widget_category/view/empty_category.dart b/lib/widget_system/views/category_view/empty_category.dart similarity index 96% rename from lib/widget_system/widget_category/view/empty_category.dart rename to lib/widget_system/views/category_view/empty_category.dart index 3244b9b5..447748f8 100644 --- a/lib/widget_system/widget_category/view/empty_category.dart +++ b/lib/widget_system/views/category_view/empty_category.dart @@ -4,7 +4,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_unit/app/res/color_unit.dart'; -import 'package:flutter_unit/blocs/bloc_exp.dart'; +import 'package:flutter_unit/widget_system/blocs/widget_system_bloc.dart'; import 'package:flutter_unit/views/components/permanent/feedback_widget.dart'; import 'package:flutter_unit/views/components/permanent/panel.dart'; import 'package:sqflite/sqflite.dart'; diff --git a/lib/widget_system/widget_category/view/home_right_drawer.dart b/lib/widget_system/views/category_view/home_right_drawer.dart similarity index 94% rename from lib/widget_system/widget_category/view/home_right_drawer.dart rename to lib/widget_system/views/category_view/home_right_drawer.dart index 03ef7019..4d4eaaee 100644 --- a/lib/widget_system/widget_category/view/home_right_drawer.dart +++ b/lib/widget_system/views/category_view/home_right_drawer.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:flutter_unit/blocs/bloc_exp.dart'; + import 'package:flutter_unit/views/components/permanent/circle.dart'; import 'package:flutter_unit/views/components/project/unit_drawer_header.dart'; -import 'package:flutter_unit/views/navigation/color_change_bloc.dart'; +import 'package:flutter_unit/app/blocs/color_change_bloc.dart'; import 'edit_category_panel.dart'; diff --git a/lib/widget_system/widget_category/view/like_widget_page.dart b/lib/widget_system/views/category_view/like_widget_page.dart similarity index 89% rename from lib/widget_system/widget_category/view/like_widget_page.dart rename to lib/widget_system/views/category_view/like_widget_page.dart index a4d4c59b..b974d917 100644 --- a/lib/widget_system/widget_category/view/like_widget_page.dart +++ b/lib/widget_system/views/category_view/like_widget_page.dart @@ -2,12 +2,11 @@ import 'package:flutter/cupertino.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/blocs/bloc_exp.dart'; + import 'package:flutter_unit/views/components/project/no_more_widget.dart'; -import 'package:flutter_unit/model/widget_model.dart'; +import 'package:flutter_unit/widget_system/repositories/model/widget_model.dart'; import 'package:flutter_unit/views/components/project/items/collect_widget_list_item.dart'; -import 'package:flutter_unit/widget_system/widget_detail/bloc/detail/detail_bloc.dart'; -import 'package:flutter_unit/widget_system/widget_detail/bloc/detail/detail_event.dart'; +import 'package:flutter_unit/widget_system/blocs/widget_system_bloc.dart'; /// create by 张风捷特烈 on 2020/6/16 /// contact me by email 1981462002@qq.com diff --git a/lib/widget_system/widget_category/view/sync/async_button.dart b/lib/widget_system/views/category_view/sync/async_button.dart similarity index 89% rename from lib/widget_system/widget_category/view/sync/async_button.dart rename to lib/widget_system/views/category_view/sync/async_button.dart index 477aff1b..1f2e016e 100644 --- a/lib/widget_system/widget_category/view/sync/async_button.dart +++ b/lib/widget_system/views/category_view/sync/async_button.dart @@ -3,14 +3,15 @@ import 'dart:convert'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:flutter_unit/app/api/category_api.dart'; + import 'package:flutter_unit/app/res/toly_icon.dart'; import 'package:flutter_unit/app/utils/http_utils/result_bean.dart'; -import 'package:flutter_unit/blocs/bloc_exp.dart'; -import 'package:flutter_unit/blocs/category/category_bloc.dart'; -import 'package:flutter_unit/model/category_model.dart'; -import 'package:flutter_unit/repositories/local_db.dart'; -import 'package:flutter_unit/repositories/rep/category_repository.dart'; +import 'package:flutter_unit/point_system/api/category_api.dart'; +import 'package:flutter_unit/widget_system/blocs/widget_system_bloc.dart'; + +import 'package:flutter_unit/widget_system/repositories/model/category_model.dart'; +import 'package:flutter_unit/widget_system/repositories/local_db.dart'; +import 'package:flutter_unit/widget_system/repositories/rep/category_repository.dart'; import 'package:flutter_unit/views/components/permanent/feedback_widget.dart'; /// create by 张风捷特烈 on 2021/2/24 diff --git a/lib/widget_system/widget_category/view/sync/upload_button.dart b/lib/widget_system/views/category_view/sync/upload_button.dart similarity index 89% rename from lib/widget_system/widget_category/view/sync/upload_button.dart rename to lib/widget_system/views/category_view/sync/upload_button.dart index be522986..971237fd 100644 --- a/lib/widget_system/widget_category/view/sync/upload_button.dart +++ b/lib/widget_system/views/category_view/sync/upload_button.dart @@ -3,14 +3,16 @@ import 'dart:convert'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:flutter_unit/app/api/category_api.dart'; + import 'package:flutter_unit/app/res/toly_icon.dart'; import 'package:flutter_unit/app/utils/http_utils/result_bean.dart'; -import 'package:flutter_unit/blocs/category/category_bloc.dart'; -import 'package:flutter_unit/model/category_model.dart'; -import 'package:flutter_unit/repositories/local_db.dart'; -import 'package:flutter_unit/repositories/rep/category_repository.dart'; +import 'package:flutter_unit/point_system/api/category_api.dart'; +import 'package:flutter_unit/widget_system/blocs/widget_system_bloc.dart'; + +import 'package:flutter_unit/widget_system/repositories/model/category_model.dart'; + import 'package:flutter_unit/views/components/permanent/feedback_widget.dart'; +import 'package:flutter_unit/widget_system/repositories/repositories.dart'; /// create by 张风捷特烈 on 2021/2/24 /// contact me by email 1981462002@qq.com diff --git a/lib/views/pages/search/app_search_bar.dart b/lib/widget_system/views/search_view/app_search_bar.dart similarity index 91% rename from lib/views/pages/search/app_search_bar.dart rename to lib/widget_system/views/search_view/app_search_bar.dart index 56ed07f6..5a4cfd3c 100644 --- a/lib/views/pages/search/app_search_bar.dart +++ b/lib/widget_system/views/search_view/app_search_bar.dart @@ -1,7 +1,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:flutter_unit/blocs/bloc_exp.dart'; -import 'package:flutter_unit/repositories/dao/widget_dao.dart'; + +import 'package:flutter_unit/widget_system/blocs/widget_system_bloc.dart'; +import 'package:flutter_unit/widget_system/repositories/repositories.dart'; class AppSearchBar extends StatefulWidget { diff --git a/lib/views/pages/search/error_page.dart b/lib/widget_system/views/search_view/error_page.dart similarity index 100% rename from lib/views/pages/search/error_page.dart rename to lib/widget_system/views/search_view/error_page.dart diff --git a/lib/views/pages/search/not_search_page.dart b/lib/widget_system/views/search_view/not_search_page.dart similarity index 100% rename from lib/views/pages/search/not_search_page.dart rename to lib/widget_system/views/search_view/not_search_page.dart diff --git a/lib/views/pages/search/serach_page.dart b/lib/widget_system/views/search_view/serach_page.dart similarity index 87% rename from lib/views/pages/search/serach_page.dart rename to lib/widget_system/views/search_view/serach_page.dart index 57cdf21a..581a3de2 100644 --- a/lib/views/pages/search/serach_page.dart +++ b/lib/widget_system/views/search_view/serach_page.dart @@ -2,20 +2,19 @@ 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/res/toly_icon.dart'; -import 'package:flutter_unit/blocs/bloc_exp.dart'; -import 'package:flutter_unit/repositories/dao/widget_dao.dart'; +import 'package:flutter_unit/widget_system/repositories/repositories.dart'; + import 'package:flutter_unit/views/components/permanent/circle.dart'; +import 'package:flutter_unit/views/components/project/default/empty_shower.dart'; import 'package:flutter_unit/views/components/project/default/loading_shower.dart'; -import 'package:flutter_unit/model/widget_model.dart'; +import 'package:flutter_unit/widget_system/repositories/model/widget_model.dart'; import 'package:flutter_unit/views/components/project/items/widget/techno_widget_list_item.dart'; -import 'package:flutter_unit/views/pages/search/app_search_bar.dart'; -import 'package:flutter_unit/views/pages/search/error_page.dart'; -import 'package:flutter_unit/views/pages/search/not_search_page.dart'; +import 'app_search_bar.dart'; +import 'error_page.dart'; +import 'not_search_page.dart'; import 'package:flutter_unit/views/components/permanent/multi_chip_filter.dart'; -import 'package:flutter_unit/widget_system/widget_detail/bloc/detail/detail_bloc.dart'; -import 'package:flutter_unit/widget_system/widget_detail/bloc/detail/detail_event.dart'; +import 'package:flutter_unit/widget_system/blocs/widget_system_bloc.dart'; -import '../../components/project/default/empty_shower.dart'; class SearchPage extends StatefulWidget { diff --git a/lib/widget_system/widget_detail/view/category_end_drawer.dart b/lib/widget_system/views/widget_detail_view/category_end_drawer.dart similarity index 93% rename from lib/widget_system/widget_detail/view/category_end_drawer.dart rename to lib/widget_system/views/widget_detail_view/category_end_drawer.dart index 547b8353..51e9fac9 100644 --- a/lib/widget_system/widget_detail/view/category_end_drawer.dart +++ b/lib/widget_system/views/widget_detail_view/category_end_drawer.dart @@ -1,12 +1,14 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_unit/app/res/style/unit_text_style.dart'; -import 'package:flutter_unit/blocs/bloc_exp.dart'; -import 'package:flutter_unit/repositories/rep/category_repository.dart'; +import 'package:flutter_unit/widget_system/blocs/widget_system_bloc.dart'; + +import 'package:flutter_unit/widget_system/repositories/repositories.dart'; + import 'package:flutter_unit/views/components/permanent/circle.dart'; import 'package:flutter_unit/views/components/permanent/panel.dart'; -import 'package:flutter_unit/model/category_model.dart'; -import 'package:flutter_unit/model/widget_model.dart'; +import 'package:flutter_unit/widget_system/repositories/model/category_model.dart'; +import 'package:flutter_unit/widget_system/repositories/model/widget_model.dart'; import 'package:flutter_unit/views/components/project/unit_drawer_header.dart'; /// create by 张风捷特烈 on 2020-04-22 diff --git a/lib/widget_system/widget_detail/view/widget_detail_page.dart b/lib/widget_system/views/widget_detail_view/widget_detail_page.dart similarity index 95% rename from lib/widget_system/widget_detail/view/widget_detail_page.dart rename to lib/widget_system/views/widget_detail_view/widget_detail_page.dart index 092e543b..e11be752 100644 --- a/lib/widget_system/widget_detail/view/widget_detail_page.dart +++ b/lib/widget_system/views/widget_detail_view/widget_detail_page.dart @@ -1,19 +1,20 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_star/flutter_star.dart'; +import 'package:flutter_unit/app/blocs/global/global_bloc.dart'; +import 'package:flutter_unit/app/blocs/global/global_state.dart'; import 'package:flutter_unit/app/res/cons.dart'; import 'package:flutter_unit/app/res/toly_icon.dart'; import 'package:flutter_unit/app/utils/Toast.dart'; -import 'package:flutter_unit/blocs/bloc_exp.dart'; -import 'package:flutter_unit/model/node_model.dart'; -import 'package:flutter_unit/model/widget_model.dart'; +import 'package:flutter_unit/widget_system/repositories/model/node_model.dart'; +import 'package:flutter_unit/widget_system/repositories/model/widget_model.dart'; import 'package:flutter_unit/views/components/permanent/feedback_widget.dart'; import 'package:flutter_unit/views/components/permanent/panel.dart'; import 'package:flutter_unit/views/components/project/widget_node_panel.dart'; import 'package:flutter_unit/views/widgets/widgets_map.dart'; -import 'package:flutter_unit/widget_system/widget_detail/bloc/detail/detail_bloc.dart'; -import 'package:flutter_unit/widget_system/widget_detail/bloc/detail/detail_event.dart'; -import 'package:flutter_unit/widget_system/widget_detail/bloc/detail/detail_state.dart'; + +import 'package:flutter_unit/widget_system/blocs/widget_system_bloc.dart'; + import 'category_end_drawer.dart'; diff --git a/lib/widget_system/widget_home/view/background.dart b/lib/widget_system/views/widget_home_view/background.dart similarity index 100% rename from lib/widget_system/widget_home/view/background.dart rename to lib/widget_system/views/widget_home_view/background.dart diff --git a/lib/widget_system/widget_home/view/home_drawer.dart b/lib/widget_system/views/widget_home_view/home_drawer.dart similarity index 92% rename from lib/widget_system/widget_home/view/home_drawer.dart rename to lib/widget_system/views/widget_home_view/home_drawer.dart index ce8dedff..9ef04ac4 100644 --- a/lib/widget_system/widget_home/view/home_drawer.dart +++ b/lib/widget_system/views/widget_home_view/home_drawer.dart @@ -2,12 +2,11 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_unit/app/res/toly_icon.dart'; import 'package:flutter_unit/app/router/unit_router.dart'; -import 'package:flutter_unit/blocs/bloc_exp.dart'; -import 'package:flutter_unit/blocs/point/point_bloc.dart'; -import 'package:flutter_unit/blocs/point/point_event.dart'; +import 'package:flutter_unit/point_system/blocs/point_system_bloc.dart'; + import 'package:flutter_unit/views/components/flutter/no_div_expansion_tile.dart'; import 'package:flutter_unit/views/components/project/unit_drawer_header.dart'; -import 'package:flutter_unit/views/navigation/color_change_bloc.dart'; +import 'package:flutter_unit/app/blocs/color_change_bloc.dart'; /// create by 张风捷特烈 on 2020-03-26 /// contact me by email 1981462002@qq.com diff --git a/lib/widget_system/widget_home/view/home_page.dart b/lib/widget_system/views/widget_home_view/home_page.dart similarity index 89% rename from lib/widget_system/widget_home/view/home_page.dart rename to lib/widget_system/views/widget_home_view/home_page.dart index f031e245..3fd48954 100644 --- a/lib/widget_system/widget_home/view/home_page.dart +++ b/lib/widget_system/views/widget_home_view/home_page.dart @@ -3,12 +3,13 @@ import 'dart:math'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:flutter_unit/app/blocs/global/global_bloc.dart'; +import 'package:flutter_unit/app/blocs/global/global_state.dart'; import 'package:flutter_unit/app/res/cons.dart'; import 'package:flutter_unit/app/router/unit_router.dart'; import 'package:flutter_unit/app/utils/convert.dart'; -import 'package:flutter_unit/blocs/bloc_exp.dart'; -import 'package:flutter_unit/model/enums.dart'; -import 'package:flutter_unit/model/widget_model.dart'; +import 'package:flutter_unit/widget_system/repositories/model/enums.dart'; +import 'package:flutter_unit/widget_system/repositories/model/widget_model.dart'; import 'package:flutter_unit/views/components/permanent/feedback_widget.dart'; import 'package:flutter_unit/views/components/project/default/empty_shower.dart'; @@ -17,12 +18,8 @@ import 'package:flutter_unit/views/components/project/default/loading_shower.dar import 'package:flutter_unit/views/components/project/items/widget/home_item_support.dart'; import 'package:flutter_unit/views/components/project/no_more_widget.dart'; import 'package:flutter_unit/views/components/project/overlay_tool_wrapper.dart'; -import 'package:flutter_unit/views/navigation/color_change_bloc.dart'; -import 'package:flutter_unit/widget_system/widget_detail/bloc/detail/detail_bloc.dart'; -import 'package:flutter_unit/widget_system/widget_detail/bloc/detail/detail_event.dart'; -import 'package:flutter_unit/widget_system/widget_home/bloc/widgets_bloc.dart'; -import 'package:flutter_unit/widget_system/widget_home/bloc/widgets_event.dart'; -import 'package:flutter_unit/widget_system/widget_home/bloc/widgets_state.dart'; +import 'package:flutter_unit/app/blocs/color_change_bloc.dart'; +import 'package:flutter_unit/widget_system/blocs/widget_system_bloc.dart'; import 'toly_app_bar.dart'; import 'background.dart'; diff --git a/lib/widget_system/widget_home/view/toly_app_bar.dart b/lib/widget_system/views/widget_home_view/toly_app_bar.dart similarity index 100% rename from lib/widget_system/widget_home/view/toly_app_bar.dart rename to lib/widget_system/views/widget_home_view/toly_app_bar.dart diff --git a/lib/widget_system/views/widget_system_view.dart b/lib/widget_system/views/widget_system_view.dart new file mode 100644 index 00000000..466f35fe --- /dev/null +++ b/lib/widget_system/views/widget_system_view.dart @@ -0,0 +1,11 @@ +export './widget_home_view/home_page.dart'; +export './widget_home_view/home_drawer.dart'; + +export './widget_detail_view/widget_detail_page.dart'; +export './category_view/category_page.dart'; +export './category_view/collect_page.dart'; +export './category_view/home_right_drawer.dart'; +export './category_view/category_detail.dart'; +export './search_view/serach_page.dart'; + +