From c5963bc765f01876e398b83cd8c6d3480d4572f4 Mon Sep 17 00:00:00 2001 From: appflowy Date: Wed, 7 Sep 2022 20:32:30 +0800 Subject: [PATCH 1/2] fix: default name when create a new field --- .../lib/plugins/grid/application/field/field_editor_bloc.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/app_flowy/lib/plugins/grid/application/field/field_editor_bloc.dart b/frontend/app_flowy/lib/plugins/grid/application/field/field_editor_bloc.dart index aa40e98e92..d7b024d67d 100644 --- a/frontend/app_flowy/lib/plugins/grid/application/field/field_editor_bloc.dart +++ b/frontend/app_flowy/lib/plugins/grid/application/field/field_editor_bloc.dart @@ -35,7 +35,7 @@ class FieldEditorBloc extends Bloc { emit(state.copyWith(name: name)); }, didReceiveFieldChanged: (FieldPB field) { - emit(state.copyWith(field: Some(field))); + emit(state.copyWith(field: Some(field), name: field.name)); }, ); }, From 8632b141ad54586ed7c759582f7265d41040471d Mon Sep 17 00:00:00 2001 From: appflowy Date: Wed, 7 Sep 2022 20:52:25 +0800 Subject: [PATCH 2/2] fix: adjust board dark mode UI --- .../board/presentation/board_page.dart | 59 +++++++++++-------- .../presentation/toolbar/board_toolbar.dart | 2 +- 2 files changed, 37 insertions(+), 24 deletions(-) diff --git a/frontend/app_flowy/lib/plugins/board/presentation/board_page.dart b/frontend/app_flowy/lib/plugins/board/presentation/board_page.dart index 1f4df9468a..c6c1d57c98 100644 --- a/frontend/app_flowy/lib/plugins/board/presentation/board_page.dart +++ b/frontend/app_flowy/lib/plugins/board/presentation/board_page.dart @@ -9,6 +9,7 @@ import 'package:app_flowy/plugins/grid/application/field/field_controller.dart'; import 'package:app_flowy/plugins/grid/application/row/row_data_controller.dart'; import 'package:app_flowy/plugins/grid/presentation/widgets/cell/cell_builder.dart'; import 'package:app_flowy/plugins/grid/presentation/widgets/row/row_detail.dart'; +import 'package:app_flowy/workspace/application/appearance.dart'; import 'package:appflowy_board/appflowy_board.dart'; import 'package:easy_localization/easy_localization.dart'; import 'package:flowy_infra/image.dart'; @@ -21,6 +22,7 @@ import 'package:flowy_sdk/protobuf/flowy-grid/block_entities.pb.dart'; import 'package:flowy_sdk/protobuf/flowy-grid/field_entities.pb.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:provider/provider.dart'; import '../../grid/application/row/row_cache.dart'; import '../application/board_bloc.dart'; import 'card/card.dart'; @@ -88,34 +90,37 @@ class _BoardContentState extends State { children: [const _ToolbarBlocAdaptor(), _buildBoard(context)], ); - return Container( - color: context.read().surface, - child: Padding( - padding: const EdgeInsets.symmetric(horizontal: 20), - child: column, - ), + return Padding( + padding: const EdgeInsets.symmetric(horizontal: 20), + child: column, ); }, ), ); } - Expanded _buildBoard(BuildContext context) { - return Expanded( - child: AppFlowyBoard( - boardScrollController: scrollManager, - scrollController: ScrollController(), - controller: context.read().boardController, - headerBuilder: _buildHeader, - footerBuilder: _buildFooter, - cardBuilder: (_, column, columnItem) => _buildCard( - context, - column, - columnItem, - ), - groupConstraints: const BoxConstraints.tightFor(width: 300), - config: AppFlowyBoardConfig( - groupBackgroundColor: HexColor.fromHex('#F7F8FC'), + Widget _buildBoard(BuildContext context) { + return ChangeNotifierProvider.value( + value: Provider.of(context, listen: true), + child: Selector( + selector: (ctx, notifier) => notifier.theme, + builder: (ctx, theme, child) => Expanded( + child: AppFlowyBoard( + boardScrollController: scrollManager, + scrollController: ScrollController(), + controller: context.read().boardController, + headerBuilder: _buildHeader, + footerBuilder: _buildFooter, + cardBuilder: (_, column, columnItem) => _buildCard( + context, + column, + columnItem, + ), + groupConstraints: const BoxConstraints.tightFor(width: 300), + config: AppFlowyBoardConfig( + groupBackgroundColor: theme.bg1, + ), + ), ), ), ); @@ -320,7 +325,15 @@ class _ToolbarBlocAdaptor extends StatelessWidget { fieldController: bloc.fieldController, ); - return BoardToolbar(toolbarContext: toolbarContext); + return ChangeNotifierProvider.value( + value: Provider.of(context, listen: true), + child: Selector( + selector: (ctx, notifier) => notifier.theme, + builder: (ctx, theme, child) { + return BoardToolbar(toolbarContext: toolbarContext); + }, + ), + ); }, ); } diff --git a/frontend/app_flowy/lib/plugins/board/presentation/toolbar/board_toolbar.dart b/frontend/app_flowy/lib/plugins/board/presentation/toolbar/board_toolbar.dart index ce3bd188d0..f8cc0d30ca 100644 --- a/frontend/app_flowy/lib/plugins/board/presentation/toolbar/board_toolbar.dart +++ b/frontend/app_flowy/lib/plugins/board/presentation/toolbar/board_toolbar.dart @@ -56,7 +56,7 @@ class _SettingButton extends StatelessWidget { onPressed: () {}, icon: Padding( padding: const EdgeInsets.symmetric(vertical: 3.0, horizontal: 3.0), - child: svgWidget("grid/setting/setting"), + child: svgWidget("grid/setting/setting", color: theme.iconColor), ), ), popupBuilder: (BuildContext popoverContext) {