✨ 收藏夹完成

lib/app/res/cons.dart

@@ -3,7 +3,7 @@ import 'package:flutter_unit/app/style/TolyIcon.dart';
 import 'package:flutter_unit/components/permanent/code/highlighter_style.dart';
 
 class Cons {
-  static String version = 'V1.0.0';
+  static String version = 'V1.1.0';
 
   static const MENU_INFO = <String>["关于", "帮助", "问题反馈"]; //菜单栏
   static const ICONS_MAP = {

lib/app/router.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_unit/views/pages/about/about_me_page.dart';
 import 'package:flutter_unit/views/pages/about/about_app_page.dart';
+import 'package:flutter_unit/views/pages/collect/category_show.dart';
 import 'package:flutter_unit/views/pages/collect/collect_page.dart';
 import 'package:flutter_unit/views/pages/search/serach_page.dart';
 import 'package:flutter_unit/views/pages/setting/code_style_setting.dart';
@@ -33,6 +34,9 @@ class Router {
   static const String code_style_setting = 'CodeStyleSettingPage';
   static const String item_style_setting = 'ItemStyleSettingPage';
 
+
+  static const String category_show = 'CategoryShow';
+
   static const String attr = 'AttrUnitPage';
   static const String bug = 'BugUnitPage';
   static const String paint = 'PaintUnitPage';
@@ -75,6 +79,9 @@ class Router {
       case about_me:
         return Right2LeftRouter(child: AboutMePage());
 
+        case category_show:
+        return Right2LeftRouter(child: CategoryShow(model: settings.arguments,));
+
       default:
         return MaterialPageRoute(
             builder: (_) => Scaffold(

lib/app/utils/Toast.dart

@@ -3,10 +3,11 @@ import 'package:flutter/material.dart';
 
 class Toast {
   static toast(BuildContext context, String msg,
-      {duration = const Duration(milliseconds: 600)}) {
+      {duration = const Duration(milliseconds: 600),SnackBarAction action}) {
     Scaffold.of(context).showSnackBar(SnackBar(
       content: Text(msg),
       duration: duration,
+      action: action,
       backgroundColor: Theme.of(context).primaryColor,
     ));
   }

lib/blocs/category/category_bloc.dart

@@ -43,6 +43,10 @@ class CategoryBloc extends Bloc<CategoryEvent, CategoryState> {
       await repository.deleteCategory(event.id);
       add(EventLoadCategory());
     }
+    if (event is EventToggleWidget) {
+      await repository.toggleCategory(event.categoryId,event.widgetId);
+      add(EventLoadCategory());
+    }
 
     if (event is EventAddCategory) {
       var categoryPo = CategoryPo(
@@ -62,6 +66,7 @@ class CategoryBloc extends Bloc<CategoryEvent, CategoryState> {
       }
     }
 
+
 //    if (event is EventAddCategory) {
 //      var collectPo = CategoryPo(
 //          name: event.name,

lib/blocs/category/category_event.dart

@@ -15,6 +15,16 @@ class EventLoadCategory extends CategoryEvent{
   List<Object> get props => [];
 }
 
+class EventToggleWidget extends CategoryEvent{
+  final int widgetId;
+  final int categoryId;
+
+  EventToggleWidget({this.widgetId, this.categoryId});
+
+  @override
+  List<Object> get props => [widgetId,categoryId];
+}
+
 class EventDeleteCategory extends CategoryEvent{
   final int id;
 

lib/blocs/category/category_state.dart

@@ -1,5 +1,6 @@
 import 'package:equatable/equatable.dart';
 import 'package:flutter_unit/model/category_model.dart';
+import 'package:flutter_unit/model/widget_model.dart';
 
 /// create by 张风捷特烈 on 2020-04-21
 /// contact me by email [email protected]

lib/blocs/category_widget/category_widget_bloc.dart

@@ -0,0 +1,44 @@
+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/itf/category_repository.dart';
+
+import 'category_widget_event.dart';
+import 'category_widget_state.dart';
+
+/// create by 张风捷特烈 on 2020-04-21
+/// contact me by email [email protected]
+/// 说明:
+
+class CategoryWidgetBloc
+    extends Bloc<CategoryWidgetEvent, CategoryWidgetState> {
+  final CategoryBloc categoryBloc;
+
+  CategoryWidgetBloc({@required this.categoryBloc}) {
+    print('CategoryBloc');
+  }
+
+  CategoryRepository get repository => categoryBloc.repository;
+
+  @override
+  CategoryWidgetState get initialState => CategoryWidgetEmptyState(); //初始状态
+
+  @override
+  Stream<CategoryWidgetState> mapEventToState(
+      CategoryWidgetEvent event) async* {
+    if (event is EventLoadCategoryWidget) {
+      final widgets =
+          await repository.loadCategoryWidgets(categoryId: event.categoryId);
+      yield widgets.isNotEmpty
+          ? CategoryWidgetLoadedState(widgets)
+          : CategoryWidgetEmptyState();
+      categoryBloc.add(EventLoadCategory());
+    }
+
+    if (event is EventToggleCategoryWidget) {
+      await repository.toggleCategory(event.categoryId, event.widgetId);
+      add(EventLoadCategoryWidget(event.categoryId));
+    }
+  }
+}

lib/blocs/category_widget/category_widget_event.dart

@@ -0,0 +1,55 @@
+import 'package:equatable/equatable.dart';
+import 'package:flutter/material.dart';
+
+/// create by 张风捷特烈 on 2020-04-21
+/// contact me by email [email protected]
+/// 说明: 
+
+abstract class CategoryWidgetEvent extends Equatable{
+  @override
+  List<Object> get props => [];
+}
+
+//class EventLoadCategory extends CategoryWidgetEvent{
+//  @override
+//  List<Object> get props => [];
+//}
+
+class EventLoadCategoryWidget extends CategoryWidgetEvent{
+  final int categoryId;
+
+  EventLoadCategoryWidget(this.categoryId);
+
+  @override
+  List<Object> get props => [categoryId];
+}
+
+class EventToggleCategoryWidget extends CategoryWidgetEvent{
+  final int categoryId;
+  final int widgetId;
+
+  EventToggleCategoryWidget(this.categoryId,this.widgetId);
+
+  @override
+  List<Object> get props => [categoryId,widgetId];
+}
+
+//class EventDeleteCategory extends CategoryWidgetEvent{
+//  final int id;
+//
+//  EventDeleteCategory({@required this.id});
+//
+//  @override
+//  List<Object> get props => [id];
+//}
+//
+//class EventAddCategory extends CategoryWidgetEvent{
+//  final String name;
+//  final String info;
+//  final String color;
+//
+//  EventAddCategory({@required this.name, this.info, this.color});
+//
+//  @override
+//  List<Object> get props => [name,info,color];
+//}

lib/blocs/category_widget/category_widget_state.dart

@@ -0,0 +1,32 @@
+import 'package:equatable/equatable.dart';
+import 'package:flutter_unit/model/category_model.dart';
+import 'package:flutter_unit/model/widget_model.dart';
+
+/// create by 张风捷特烈 on 2020-04-21
+/// contact me by email [email protected]
+/// 说明: 
+
+class CategoryWidgetState extends Equatable{
+  @override
+  List<Object> get props => [];
+
+}
+
+
+class CategoryWidgetLoadedState extends CategoryWidgetState {
+  final List<WidgetModel> widgets;
+
+  CategoryWidgetLoadedState(this.widgets);
+
+  List<Object> get props => [widgets];
+
+}
+
+class CategoryWidgetEmptyState extends CategoryWidgetState{
+  List<Object> get props => [];
+}
+
+
+class AddCategoryFailed extends CategoryWidgetState{
+
+}

lib/components/permanent/circle_text.dart

@@ -45,7 +45,7 @@ class CircleText extends StatelessWidget {
               color: backgroundColor??Color(0xffD8F5FF),
             ),
             child: Text(
-              text.substring(0, 2),
+              text.length>2?text.substring(0, 2):text,
               style: TextStyle(
                 fontSize: fontSize,
                 color: color,

lib/main.dart

@@ -1,7 +1,6 @@
-
-
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_unit/blocs/category_widget/category_widget_bloc.dart';
 import 'package:flutter_unit/storage/app_storage.dart';
 import 'package:flutter_unit/views/pages/splash/unit_splash.dart';
 
@@ -56,10 +55,9 @@ class BlocWrapper extends StatelessWidget {
 
       BlocProvider<DetailBloc>(
           create: (_) => DetailBloc(repository: repository)),
-
-      BlocProvider<CategoryBloc>(create: (_) {
-        return CategoryBloc(repository: categoryRepo)..add(EventLoadCategory());
-      } ),
+      BlocProvider<CategoryBloc>(
+          create: (_) =>
+              CategoryBloc(repository: categoryRepo)..add(EventLoadCategory())),
 
       BlocProvider<CollectBloc>(
           create: (_) =>
@@ -75,19 +73,23 @@ class FlutterApp extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return BlocBuilder<GlobalBloc, GlobalState>(builder: (_, state) {
-      return MaterialApp(
-          title: 'Flutter Demo',
-          debugShowCheckedModeBanner: false,
-          onGenerateRoute: Router.generateRoute,
-          theme: ThemeData(
-            primarySwatch: state.themeColor,
-            fontFamily: state.fontFamily,
-          ),
-          home:
+      return BlocProvider<CategoryWidgetBloc>(
+        create: (_) => CategoryWidgetBloc(
+            categoryBloc: BlocProvider.of<CategoryBloc>(context)),
+        child: MaterialApp(
+            title: 'Flutter Demo',
+            debugShowCheckedModeBanner: false,
+            onGenerateRoute: Router.generateRoute,
+            theme: ThemeData(
+              primarySwatch: state.themeColor,
+              fontFamily: state.fontFamily,
+            ),
+            home:
 //      NavPage()
-              UnitSplash()
+                UnitSplash()
 //          UnitNavigation(),
-          );
+            ),
+      );
     });
   }
 }

lib/model/category_model.dart

@@ -35,7 +35,7 @@ class CategoryModel extends Equatable{
       info: po.info,
       createDate: DateFormat('yyyy-MM-dd HH:mm').format(po.created),
       imageCover: po.image,
-      count: 10,
+      count: po.count,
       color: ColorUtils.parse(po.color),
     );
   }
@@ -50,4 +50,11 @@ class CategoryModel extends Equatable{
     count,
     color,
   ];
+
+  @override
+  String toString() {
+    return 'CategoryModel{id: $id, name: $name, info: $info, createDate: $createDate, imageCover: $imageCover, count: $count, color: $color}';
+  }
+
+
 }

lib/repositories/impl/catagory_db_repository.dart

@@ -8,7 +8,7 @@ import 'package:flutter_unit/storage/po/widget_po.dart';
 
 /// create by 张风捷特烈 on 2020-04-21
 /// contact me by email [email protected]
-/// 说明: 
+/// 说明:
 
 class CategoryDbRepository implements CategoryRepository {
   final AppStorage storage;
@@ -20,43 +20,44 @@ class CategoryDbRepository implements CategoryRepository {
   }
 
   @override
-  Future<bool> addCategory(CategoryPo categoryPo) async{
+  Future<bool> addCategory(CategoryPo categoryPo) async {
     var success = await _collectDao.insert(categoryPo);
     return success != -1;
   }
 
   @override
-  Future<bool> check(int categoryId, int widgetId) async{
+  Future<bool> check(int categoryId, int widgetId) async {
     return await _collectDao.existWidgetInCollect(categoryId, widgetId);
-
   }
 
   @override
-  Future<void> deleteCategory(int id) async{
+  Future<void> deleteCategory(int id) async {
     await _collectDao.deleteCollect(id);
   }
 
   @override
-  Future<List<CategoryModel>> loadCategories() async{
+  Future<List<CategoryModel>> loadCategories() async {
     var data = await _collectDao.queryAll();
     var collects = data.map((e) => CategoryPo.fromJson(e)).toList();
     return collects.map(CategoryModel.fromPo).toList();
   }
 
   @override
-  Future<List<WidgetModel>> loadCategoryWidgets({int categoryId = 0}) async{
-    var rawData = await _collectDao.loadCollectWidgets(1);
+  Future<List<WidgetModel>> loadCategoryWidgets({int categoryId = 0}) async {
+    var rawData = await _collectDao.loadCollectWidgets(categoryId);
     var widgets = rawData.map((e) => WidgetPo.fromJson(e)).toList();
     return widgets.map(WidgetModel.fromPo).toList();
   }
 
   @override
-  Future<void> toggleCategory(int id) async{
-    return await _collectDao.toggleCollectDefault(id);
-
+  Future<void> toggleCategory(int categoryId, int widgetId) async {
+    return await _collectDao.toggleCollect( categoryId,  widgetId);
   }
 
-
+  @override
+  Future<List<int>> getCategoryByWidget(int widgetId) async {
+    return await _collectDao.categoryWidgetIds(widgetId);
+  }
 
 //
 //  @override
@@ -70,4 +71,4 @@ class CategoryDbRepository implements CategoryRepository {
 //  Future<bool> checkCollected(int collectId, int widgetId) async {
 //
 //  }
-}
+}