@@ -9,6 +9,7 @@ import 'package:app_flowy/plugins/grid/application/field/field_controller.dart';
99import 'package:app_flowy/plugins/grid/application/row/row_data_controller.dart' ;
1010import 'package:app_flowy/plugins/grid/presentation/widgets/cell/cell_builder.dart' ;
1111import 'package:app_flowy/plugins/grid/presentation/widgets/row/row_detail.dart' ;
12+ import 'package:app_flowy/workspace/application/appearance.dart' ;
1213import 'package:appflowy_board/appflowy_board.dart' ;
1314import 'package:easy_localization/easy_localization.dart' ;
1415import 'package:flowy_infra/image.dart' ;
@@ -20,6 +21,7 @@ import 'package:flowy_sdk/protobuf/flowy-grid/block_entities.pb.dart';
2021import 'package:flowy_sdk/protobuf/flowy-grid/field_entities.pb.dart' ;
2122import 'package:flutter/material.dart' ;
2223import 'package:flutter_bloc/flutter_bloc.dart' ;
24+ import 'package:provider/provider.dart' ;
2325import '../../grid/application/row/row_cache.dart' ;
2426import '../application/board_bloc.dart' ;
2527import 'card/card.dart' ;
@@ -87,34 +89,37 @@ class _BoardContentState extends State<BoardContent> {
8789 children: [const _ToolbarBlocAdaptor (), _buildBoard (context)],
8890 );
8991
90- return Container (
91- color: context.read <AppTheme >().surface,
92- child: Padding (
93- padding: const EdgeInsets .symmetric (horizontal: 20 ),
94- child: column,
95- ),
92+ return Padding (
93+ padding: const EdgeInsets .symmetric (horizontal: 20 ),
94+ child: column,
9695 );
9796 },
9897 ),
9998 );
10099 }
101100
102- Expanded _buildBoard (BuildContext context) {
103- return Expanded (
104- child: AppFlowyBoard (
105- boardScrollController: scrollManager,
106- scrollController: ScrollController (),
107- controller: context.read <BoardBloc >().boardController,
108- headerBuilder: _buildHeader,
109- footerBuilder: _buildFooter,
110- cardBuilder: (_, column, columnItem) => _buildCard (
111- context,
112- column,
113- columnItem,
114- ),
115- groupConstraints: const BoxConstraints .tightFor (width: 300 ),
116- config: AppFlowyBoardConfig (
117- groupBackgroundColor: HexColor .fromHex ('#F7F8FC' ),
101+ Widget _buildBoard (BuildContext context) {
102+ return ChangeNotifierProvider .value (
103+ value: Provider .of <AppearanceSettingModel >(context, listen: true ),
104+ child: Selector <AppearanceSettingModel , AppTheme >(
105+ selector: (ctx, notifier) => notifier.theme,
106+ builder: (ctx, theme, child) => Expanded (
107+ child: AppFlowyBoard (
108+ boardScrollController: scrollManager,
109+ scrollController: ScrollController (),
110+ controller: context.read <BoardBloc >().boardController,
111+ headerBuilder: _buildHeader,
112+ footerBuilder: _buildFooter,
113+ cardBuilder: (_, column, columnItem) => _buildCard (
114+ context,
115+ column,
116+ columnItem,
117+ ),
118+ groupConstraints: const BoxConstraints .tightFor (width: 300 ),
119+ config: AppFlowyBoardConfig (
120+ groupBackgroundColor: theme.bg1,
121+ ),
122+ ),
118123 ),
119124 ),
120125 );
@@ -315,7 +320,15 @@ class _ToolbarBlocAdaptor extends StatelessWidget {
315320 fieldController: bloc.fieldController,
316321 );
317322
318- return BoardToolbar (toolbarContext: toolbarContext);
323+ return ChangeNotifierProvider .value (
324+ value: Provider .of <AppearanceSettingModel >(context, listen: true ),
325+ child: Selector <AppearanceSettingModel , AppTheme >(
326+ selector: (ctx, notifier) => notifier.theme,
327+ builder: (ctx, theme, child) {
328+ return BoardToolbar (toolbarContext: toolbarContext);
329+ },
330+ ),
331+ );
319332 },
320333 );
321334 }
0 commit comments