Bring projects, wikis, and teams together with AI. AppFlowy is the AI collaborative workspace where you achieve more without losing control of your data. The leading open source Notion alternative.
Dart blogconfluence-alternativecontent-managementcontent-servicesdocumentationflutternote-takingnotion-alternativeproject-managementtask-managementteam-collaborationwiki
fix: show calendar layout (#2752)
Nathan.foood4e39389d2e9
diff --git a/frontend/appflowy_flutter/assets/images/grid/setting/calendar_layout.svg b/frontend/appflowy_flutter/assets/images/grid/setting/calendar_layout.svgnew file mode 100644index 0000000000..32423640d8--- /dev/null+++ b/frontend/appflowy_flutter/assets/images/grid/setting/calendar_layout.svg@@ -0,0 +1,12 @@+<?xml version="1.0" encoding="utf-8"?>++<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->+<svg fill="#000000" width="800px" height="800px" viewBox="-0.02 0 122.88 122.88" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="enable-background:new 0 0 122.84 122.88" xml:space="preserve">++<g>++<path d="M81.54,4.71c0-2.62,2.58-4.71,5.77-4.71c3.2,0,5.77,2.13,5.77,4.71V25.4c0,2.62-2.58,4.71-5.77,4.71 c-3.2,0-5.77-2.13-5.77-4.71V4.71L81.54,4.71z M20.4,89.87l7.55-0.47c0.16,1.22,0.5,2.16,1,2.79c0.82,1.04,1.99,1.56,3.51,1.56 c1.13,0,2.01-0.26,2.62-0.8C35.69,92.41,36,91.8,36,91.1c0-0.66-0.29-1.26-0.87-1.79c-0.58-0.53-1.93-1.02-4.06-1.49 c-3.49-0.78-5.96-1.82-7.45-3.12c-1.5-1.29-2.25-2.95-2.25-4.96c0-1.32,0.38-2.56,1.15-3.74c0.77-1.18,1.92-2.1,3.46-2.77 c1.54-0.67,3.65-1.01,6.32-1.01c3.29,0,5.79,0.61,7.52,1.84c1.72,1.22,2.75,3.17,3.08,5.84l-7.47,0.44 c-0.2-1.17-0.62-2.02-1.25-2.55c-0.64-0.53-1.52-0.8-2.64-0.8c-0.92,0-1.62,0.2-2.09,0.59c-0.47,0.39-0.7,0.87-0.7,1.43 c0,0.41,0.19,0.77,0.57,1.1c0.37,0.34,1.25,0.65,2.65,0.95c3.47,0.75,5.96,1.51,7.46,2.28c1.5,0.77,2.6,1.71,3.28,2.85 c0.68,1.13,1.02,2.4,1.02,3.81c0,1.65-0.46,3.17-1.37,4.56c-0.92,1.39-2.19,2.45-3.83,3.17c-1.64,0.72-3.7,1.08-6.19,1.08 c-4.37,0-7.4-0.84-9.09-2.53C21.58,94.6,20.62,92.46,20.4,89.87L20.4,89.87z M64.53,72.65h7.94v15.33c0,1.52-0.24,2.95-0.71,4.3 c-0.47,1.35-1.22,2.53-2.23,3.55c-1.01,1.01-2.07,1.72-3.18,2.13c-1.54,0.57-3.4,0.86-5.56,0.86c-1.25,0-2.62-0.09-4.1-0.26 c-1.48-0.17-2.72-0.52-3.71-1.04c-0.99-0.52-1.9-1.26-2.72-2.22c-0.83-0.96-1.39-1.95-1.69-2.96c-0.49-1.64-0.74-3.08-0.74-4.35 V72.65h7.94v15.69c0,1.4,0.39,2.5,1.16,3.28c0.78,0.79,1.86,1.19,3.23,1.19c1.36,0,2.43-0.39,3.21-1.17 c0.77-0.77,1.16-1.87,1.16-3.3V72.65L64.53,72.65z M77.85,72.65h7.42l9.65,14.21V72.65h7.51v25.73h-7.51l-9.59-14.13v14.13h-7.47 V72.65L77.85,72.65z M29.53,4.71c0-2.62,2.58-4.71,5.77-4.71c3.2,0,5.77,2.13,5.77,4.71V25.4c0,2.62-2.58,4.71-5.77,4.71 c-3.2,0-5.77-2.13-5.77-4.71V4.71L29.53,4.71z M7.56,44.09h107.62V22.66c0-0.8-0.31-1.55-0.84-2.04c-0.53-0.53-1.24-0.84-2.04-0.84 h-9.31c-1.78,0-3.2-2.63-3.2-4.41c0-1.78,1.42-3.2,3.2-3.2h10.53c2.58,0,4.88,1.07,6.57,2.75c1.69,1.69,2.75,4.04,2.75,6.57v92.06 c0,2.58-1.07,4.88-2.75,6.57c-1.69,1.69-4.04,2.75-6.57,2.75H9.33c-2.58,0-4.88-1.07-6.57-2.75C1.07,118.44,0,116.08,0,113.55 V21.49c0-2.58,1.07-4.88,2.75-6.57c1.69-1.69,4.04-2.75,6.57-2.75h11.28c1.78,0,3.2,1.42,3.2,3.2s-1.42,4.41-3.2,4.41H10.54 c-0.8,0-1.55,0.31-2.09,0.84c-0.53,0.53-0.84,1.24-0.84,2.09v21.43L7.56,44.09L7.56,44.09z M115.19,52.9H7.56v59.4 c0,0.8,0.31,1.55,0.84,2.09c0.53,0.53,1.24,0.84,2.09,0.84h101.76c0.8,0,1.55-0.31,2.09-0.84c0.53-0.53,0.84-1.24,0.84-2.09V52.9 L115.19,52.9z M50.36,19.73c-1.78,0-3.2-2.63-3.2-4.41c0-1.78,1.42-3.2,3.2-3.2h21.49c1.78,0,3.2,1.42,3.2,3.2 c0,1.78-1.42,4.41-3.2,4.41H50.36L50.36,19.73z"/>++</g>++</svg>\ No newline at end of filediff --git a/frontend/appflowy_flutter/assets/translations/en.json b/frontend/appflowy_flutter/assets/translations/en.jsonindex f19b688d2e..50bc5a4838 100644--- a/frontend/appflowy_flutter/assets/translations/en.json+++ b/frontend/appflowy_flutter/assets/translations/en.json@@ -459,7 +459,8 @@"layoutDateField": "Layout calendar by","noDateTitle": "No Date","noDateHint": "Unscheduled events will show up here",- "clickToAdd": "Click to add to the calendar"+ "clickToAdd": "Click to add to the calendar",+ "name": "Calendar layout"}}}\ No newline at end of filediff --git a/frontend/appflowy_flutter/lib/plugins/database_view/application/database_controller.dart b/frontend/appflowy_flutter/lib/plugins/database_view/application/database_controller.dartindex a628bae9b8..2e261a449e 100644--- a/frontend/appflowy_flutter/lib/plugins/database_view/application/database_controller.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/application/database_controller.dart@@ -80,6 +80,7 @@ class DatabaseController {final DatabaseViewBackendService _databaseViewBackendSvc;final FieldController fieldController;DatabaseLayoutPB? databaseLayout;+ DatabaseLayoutSettingPB? databaseLayoutSetting;late DatabaseViewCache _viewCache;// Callbacks@@ -92,17 +93,17 @@ class DatabaseController {RowCache get rowCache => _viewCache.rowCache;// Listener- final DatabaseGroupListener groupListener;- final DatabaseLayoutSettingListener layoutListener;- final DatabaseCalendarLayoutListener calendarLayoutListener;+ final DatabaseGroupListener _groupListener;+ final DatabaseLayoutSettingListener _layoutListener;+ final DatabaseCalendarLayoutListener _calendarLayoutListener;DatabaseController({required ViewPB view}): viewId = view.id,_databaseViewBackendSvc = DatabaseViewBackendService(viewId: view.id),fieldController = FieldController(viewId: view.id),- groupListener = DatabaseGroupListener(view.id),- layoutListener = DatabaseLayoutSettingListener(view.id),- calendarLayoutListener = DatabaseCalendarLayoutListener(view.id) {+ _groupListener = DatabaseGroupListener(view.id),+ _layoutListener = DatabaseLayoutSettingListener(view.id),+ _calendarLayoutListener = DatabaseCalendarLayoutListener(view.id) {_viewCache = DatabaseViewCache(viewId: viewId,fieldController: fieldController,@@ -224,7 +225,7 @@ class DatabaseController {Future<void> dispose() async {await _databaseViewBackendSvc.closeView();await fieldController.dispose();- await groupListener.stop();+ await _groupListener.stop();await _viewCache.dispose();_databaseCallbacks = null;_groupCallbacks = null;@@ -248,7 +249,12 @@ class DatabaseController {if (databaseLayout != null) {_databaseViewBackendSvc.getLayoutSetting(databaseLayout!).then((result) {result.fold(- (l) => _layoutCallbacks?.onLoadLayout(l),+ (newDatabaseLayoutSetting) {+ databaseLayoutSetting = newDatabaseLayoutSetting;+ databaseLayoutSetting?.freeze();++ _layoutCallbacks?.onLoadLayout(newDatabaseLayoutSetting);+ },(r) => Log.error(r),);});@@ -285,7 +291,7 @@ class DatabaseController {}void _listenOnGroupChanged() {- groupListener.start(+ _groupListener.start(onNumOfGroupsChanged: (result) {result.fold((changeset) {@@ -316,11 +322,14 @@ class DatabaseController {}void _listenOnLayoutChanged() {- layoutListener.start(+ _layoutListener.start(onLayoutChanged: (result) {result.fold(- (l) {- _layoutCallbacks?.onLayoutChanged(l);+ (newDatabaseLayoutSetting) {+ databaseLayoutSetting = newDatabaseLayoutSetting;+ databaseLayoutSetting?.freeze();++ _layoutCallbacks?.onLayoutChanged(newDatabaseLayoutSetting);},(r) => Log.error(r),);@@ -329,7 +338,7 @@ class DatabaseController {}void _listenOnCalendarLayoutChanged() {- calendarLayoutListener.start(+ _calendarLayoutListener.start(onCalendarLayoutChanged: (result) {result.fold((l) {diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/application/setting/setting_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/application/setting/setting_bloc.dartindex 1fde8adfcf..1e128f8c75 100644--- a/frontend/appflowy_flutter/lib/plugins/database_view/application/setting/setting_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/application/setting/setting_bloc.dart@@ -1,4 +1,5 @@import 'package:appflowy/generated/locale_keys.g.dart';+import 'package:appflowy_backend/protobuf/flowy-database2/setting_entities.pbenum.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';@@ -45,6 +46,7 @@ enum DatabaseSettingAction {showProperties,showLayout,showGroup,+ showCalendarLayout,}extension DatabaseSettingActionExtension on DatabaseSettingAction {@@ -56,6 +58,8 @@ extension DatabaseSettingActionExtension on DatabaseSettingAction {return 'grid/setting/database_layout';case DatabaseSettingAction.showGroup:return 'grid/setting/group';+ case DatabaseSettingAction.showCalendarLayout:+ return 'grid/setting/calendar_layout';}}@@ -67,6 +71,33 @@ extension DatabaseSettingActionExtension on DatabaseSettingAction {return LocaleKeys.grid_settings_databaseLayout.tr();case DatabaseSettingAction.showGroup:return LocaleKeys.grid_settings_group.tr();+ case DatabaseSettingAction.showCalendarLayout:+ return LocaleKeys.calendar_settings_name.tr();}}}++/// Returns the list of actions that should be shown for the given database layout.+List<DatabaseSettingAction> actionsForDatabaseLayout(DatabaseLayoutPB? layout) {+ switch (layout) {+ case DatabaseLayoutPB.Board:+ return [+ DatabaseSettingAction.showProperties,+ DatabaseSettingAction.showLayout,+ DatabaseSettingAction.showGroup,+ ];+ case DatabaseLayoutPB.Calendar:+ return [+ DatabaseSettingAction.showProperties,+ DatabaseSettingAction.showLayout,+ DatabaseSettingAction.showCalendarLayout,+ ];+ case DatabaseLayoutPB.Grid:+ return [+ DatabaseSettingAction.showProperties,+ DatabaseSettingAction.showLayout,+ ];+ default:+ return [];+ }+}diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/calendar/application/calendar_setting_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_view/calendar/application/calendar_setting_bloc.dartindex 247694a33c..1834de9224 100644--- a/frontend/appflowy_flutter/lib/plugins/database_view/calendar/application/calendar_setting_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/calendar/application/calendar_setting_bloc.dart@@ -1,3 +1,5 @@+import 'package:appflowy/plugins/database_view/application/layout/layout_setting_listener.dart';+import 'package:appflowy_backend/log.dart';import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';import 'package:bloc/bloc.dart';import 'package:dartz/dartz.dart';@@ -9,10 +11,19 @@ typedef DayOfWeek = int;class CalendarSettingBlocextends Bloc<CalendarSettingEvent, CalendarSettingState> {- CalendarSettingBloc({required CalendarLayoutSettingPB? layoutSettings})- : super(CalendarSettingState.initial(layoutSettings)) {+ final String viewId;+ final DatabaseLayoutSettingListener _listener;++ CalendarSettingBloc({+ required this.viewId,+ required CalendarLayoutSettingPB? layoutSettings,+ }) : _listener = DatabaseLayoutSettingListener(viewId),+ super(CalendarSettingState.initial(layoutSettings)) {on<CalendarSettingEvent>((event, emit) {event.when(+ init: () {+ _startListening();+ },performAction: (action) {emit(state.copyWith(selectedAction: Some(action)));},@@ -22,26 +33,33 @@ class CalendarSettingBloc);});}-}-@freezed-class CalendarSettingState with _$CalendarSettingState {- const factory CalendarSettingState({- required Option<CalendarSettingAction> selectedAction,- required Option<CalendarLayoutSettingPB> layoutSetting,- }) = _CalendarSettingState;+ void _startListening() {+ _listener.start(+ onLayoutChanged: (result) {+ if (isClosed) {+ return;+ }- factory CalendarSettingState.initial(- CalendarLayoutSettingPB? layoutSettings,- ) =>- CalendarSettingState(- selectedAction: none(),- layoutSetting: layoutSettings == null ? none() : Some(layoutSettings),- );+ result.fold(+ (setting) =>+ add(CalendarSettingEvent.updateLayoutSetting(setting.calendar)),+ (r) => Log.error(r),+ );+ },+ );+ }++ @override+ Future<void> close() async {+ await _listener.stop();+ return super.close();+ }}@freezedclass CalendarSettingEvent with _$CalendarSettingEvent {+ const factory CalendarSettingEvent.init() = _Init;const factory CalendarSettingEvent.performAction(CalendarSettingAction action,) = _PerformAction;@@ -54,3 +72,19 @@ enum CalendarSettingAction {properties,layout,}++@freezed+class CalendarSettingState with _$CalendarSettingState {+ const factory CalendarSettingState({+ required Option<CalendarSettingAction> selectedAction,+ required Option<CalendarLayoutSettingPB> layoutSetting,+ }) = _CalendarSettingState;++ factory CalendarSettingState.initial(+ CalendarLayoutSettingPB? layoutSettings,+ ) =>+ CalendarSettingState(+ selectedAction: none(),+ layoutSetting: layoutSettings == null ? none() : Some(layoutSettings),+ );+}diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/toolbar/calendar_layout_setting.dart b/frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/toolbar/calendar_layout_setting.dartindex 3dedb17807..8264b899f7 100644--- a/frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/toolbar/calendar_layout_setting.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/toolbar/calendar_layout_setting.dart@@ -15,17 +15,25 @@ import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:protobuf/protobuf.dart';-import 'calendar_setting.dart';+abstract class ICalendarSetting {+ /// Returns the current layout settings for the calendar view.+ CalendarLayoutSettingPB? getLayoutSetting();++ /// Updates the layout settings for the calendar view.+ void updateLayoutSettings(CalendarLayoutSettingPB layoutSettings);+}/// Widget that displays a list of settings that alters the appearance of the/// calendarclass CalendarLayoutSetting extends StatefulWidget {- final CalendarSettingContext settingContext;- final Function(CalendarLayoutSettingPB? layoutSettings) onUpdated;+ final String viewId;+ final FieldController fieldController;+ final ICalendarSetting calendarSettingController;const CalendarLayoutSetting({- required this.onUpdated,- required this.settingContext,+ required this.viewId,+ required this.fieldController,+ required this.calendarSettingController,super.key,});@@ -44,85 +52,90 @@ class _CalendarLayoutSettingState extends State<CalendarLayoutSetting> {@overrideWidget build(BuildContext context) {- return BlocBuilder<CalendarSettingBloc, CalendarSettingState>(- builder: (context, state) {- final CalendarLayoutSettingPB? settings = state.layoutSetting- .foldLeft(null, (previous, settings) => settings);-- if (settings == null) {- return const CircularProgressIndicator();- }- final availableSettings = _availableCalendarSettings(settings);+ return BlocProvider(+ create: (context) {+ return CalendarSettingBloc(+ viewId: widget.viewId,+ layoutSettings: widget.calendarSettingController.getLayoutSetting(),+ )..add(+ const CalendarSettingEvent.init(),+ );+ },+ child: BlocBuilder<CalendarSettingBloc, CalendarSettingState>(+ builder: (context, state) {+ final CalendarLayoutSettingPB? settings = state.layoutSetting+ .foldLeft(null, (previous, settings) => settings);- final items = availableSettings.map((setting) {- switch (setting) {- case CalendarLayoutSettingAction.showWeekNumber:- return ShowWeekNumber(- showWeekNumbers: settings.showWeekNumbers,- onUpdated: (showWeekNumbers) {- _updateLayoutSettings(- context,- showWeekNumbers: showWeekNumbers,- onUpdated: widget.onUpdated,- );- },- );- case CalendarLayoutSettingAction.showWeekends:- return ShowWeekends(- showWeekends: settings.showWeekends,- onUpdated: (showWeekends) {- _updateLayoutSettings(- context,- showWeekends: showWeekends,- onUpdated: widget.onUpdated,- );- },- );- case CalendarLayoutSettingAction.firstDayOfWeek:- return FirstDayOfWeek(- firstDayOfWeek: settings.firstDayOfWeek,- popoverMutex: popoverMutex,- onUpdated: (firstDayOfWeek) {- _updateLayoutSettings(- context,- onUpdated: widget.onUpdated,- firstDayOfWeek: firstDayOfWeek,- );- },- );- case CalendarLayoutSettingAction.layoutField:- return LayoutDateField(- fieldController: widget.settingContext.fieldController,- viewId: widget.settingContext.viewId,- fieldId: settings.fieldId,- popoverMutex: popoverMutex,- onUpdated: (fieldId) {- _updateLayoutSettings(- context,- onUpdated: widget.onUpdated,- layoutFieldId: fieldId,- );- },- );- default:- return const SizedBox();+ if (settings == null) {+ return const CircularProgressIndicator();}- }).toList();+ final availableSettings = _availableCalendarSettings(settings);+ final items = availableSettings.map((setting) {+ switch (setting) {+ case CalendarLayoutSettingAction.showWeekNumber:+ return ShowWeekNumber(+ showWeekNumbers: settings.showWeekNumbers,+ onUpdated: (showWeekNumbers) {+ _updateLayoutSettings(+ context,+ showWeekNumbers: showWeekNumbers,+ );+ },+ );+ case CalendarLayoutSettingAction.showWeekends:+ return ShowWeekends(+ showWeekends: settings.showWeekends,+ onUpdated: (showWeekends) {+ _updateLayoutSettings(+ context,+ showWeekends: showWeekends,+ );+ },+ );+ case CalendarLayoutSettingAction.firstDayOfWeek:+ return FirstDayOfWeek(+ firstDayOfWeek: settings.firstDayOfWeek,+ popoverMutex: popoverMutex,+ onUpdated: (firstDayOfWeek) {+ _updateLayoutSettings(+ context,+ firstDayOfWeek: firstDayOfWeek,+ );+ },+ );+ case CalendarLayoutSettingAction.layoutField:+ return LayoutDateField(+ fieldController: widget.fieldController,+ viewId: widget.viewId,+ fieldId: settings.fieldId,+ popoverMutex: popoverMutex,+ onUpdated: (fieldId) {+ _updateLayoutSettings(+ context,+ layoutFieldId: fieldId,+ );+ },+ );+ default:+ return const SizedBox();+ }+ }).toList();- return SizedBox(- width: 200,- child: ListView.separated(- shrinkWrap: true,- controller: ScrollController(),- itemCount: items.length,- separatorBuilder: (context, index) =>- VSpace(GridSize.typeOptionSeparatorHeight),- physics: StyledScrollPhysics(),- itemBuilder: (BuildContext context, int index) => items[index],- padding: const EdgeInsets.all(6.0),- ),- );- },+ return SizedBox(+ width: 200,+ child: ListView.separated(+ shrinkWrap: true,+ controller: ScrollController(),+ itemCount: items.length,+ separatorBuilder: (context, index) =>+ VSpace(GridSize.typeOptionSeparatorHeight),+ physics: StyledScrollPhysics(),+ itemBuilder: (BuildContext context, int index) => items[index],+ padding: const EdgeInsets.all(6.0),+ ),+ );+ },+ ),);}@@ -161,7 +174,6 @@ class _CalendarLayoutSettingState extends State<CalendarLayoutSetting> {void _updateLayoutSettings(BuildContext context, {- required Function(CalendarLayoutSettingPB? layoutSettings) onUpdated,bool? showWeekends,bool? showWeekNumbers,int? firstDayOfWeek,@@ -190,7 +202,8 @@ class _CalendarLayoutSettingState extends State<CalendarLayoutSetting> {context.read<CalendarSettingBloc>().add(CalendarSettingEvent.updateLayoutSetting(setting));- onUpdated(setting);++ widget.calendarSettingController.updateLayoutSettings(setting);}}diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/toolbar/calendar_setting.dart b/frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/toolbar/calendar_setting.dartdeleted file mode 100644index 4de67f3e86..0000000000--- a/frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/toolbar/calendar_setting.dart+++ /dev/null@@ -1,137 +0,0 @@-import 'package:appflowy/generated/locale_keys.g.dart';-import 'package:appflowy/plugins/database_view/application/field/field_controller.dart';-import 'package:appflowy/plugins/database_view/calendar/application/calendar_setting_bloc.dart';-import 'package:appflowy/plugins/database_view/grid/presentation/layout/sizes.dart';-import 'package:appflowy/plugins/database_view/widgets/field/grid_property.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';-import 'package:easy_localization/easy_localization.dart';-import 'package:flowy_infra/image.dart';-import 'package:flowy_infra_ui/style_widget/button.dart';-import 'package:flowy_infra_ui/style_widget/scrolling/styled_list.dart';-import 'package:flowy_infra_ui/style_widget/text.dart';-import 'package:flowy_infra_ui/widget/spacing.dart';-import 'package:flutter/material.dart';-import 'package:flutter_bloc/flutter_bloc.dart';-import 'package:styled_widget/styled_widget.dart';--import 'calendar_layout_setting.dart';--/// The highest-level widget shown in the popover triggered by clicking the-/// "Settings" button. Shows [AllCalendarSettings] by default, but replaces its-/// contents with the submenu when a category is selected.-class CalendarSetting extends StatelessWidget {- final CalendarSettingContext settingContext;- final CalendarLayoutSettingPB? layoutSettings;- final Function(CalendarLayoutSettingPB? layoutSettings) onUpdated;-- const CalendarSetting({- required this.onUpdated,- required this.layoutSettings,- required this.settingContext,- super.key,- });-- @override- Widget build(BuildContext context) {- return BlocProvider<CalendarSettingBloc>(- create: (context) => CalendarSettingBloc(layoutSettings: layoutSettings),- child: BlocBuilder<CalendarSettingBloc, CalendarSettingState>(- builder: (context, state) {- final CalendarSettingAction? action =- state.selectedAction.foldLeft(null, (previous, action) => action);- switch (action) {- case CalendarSettingAction.properties:- return DatabasePropertyList(- viewId: settingContext.viewId,- fieldController: settingContext.fieldController,- );- case CalendarSettingAction.layout:- return CalendarLayoutSetting(- onUpdated: onUpdated,- settingContext: settingContext,- );- default:- return const AllCalendarSettings().padding(all: 6.0);- }- },- ),- );- }-}--/// Shows all of the available categories of settings that can be set here.-/// For now, this only includes the Layout category.-class AllCalendarSettings extends StatelessWidget {- const AllCalendarSettings({super.key});-- @override- Widget build(BuildContext context) {- final items = CalendarSettingAction.values- .map((e) => _settingItem(context, e))- .toList();-- return SizedBox(- width: 140,- child: ListView.separated(- shrinkWrap: true,- controller: ScrollController(),- itemCount: items.length,- separatorBuilder: (context, index) =>- VSpace(GridSize.typeOptionSeparatorHeight),- physics: StyledScrollPhysics(),- itemBuilder: (BuildContext context, int index) => items[index],- ),- );- }-- Widget _settingItem(BuildContext context, CalendarSettingAction action) {- Widget? icon;- if (action.iconName() != null) {- icon = FlowySvg(- name: action.iconName()!,- );- }- return SizedBox(- height: GridSize.popoverItemHeight,- child: FlowyButton(- leftIcon: icon,- text: FlowyText.medium(action.title()),- onTap: () {- context- .read<CalendarSettingBloc>()- .add(CalendarSettingEvent.performAction(action));- },- ),- );- }-}--extension _SettingExtension on CalendarSettingAction {- String? iconName() {- switch (this) {- case CalendarSettingAction.properties:- return 'grid/setting/properties';- case CalendarSettingAction.layout:- return null;- }- }-- String title() {- switch (this) {- case CalendarSettingAction.properties:- return LocaleKeys.grid_settings_Properties.tr();- case CalendarSettingAction.layout:- return LocaleKeys.grid_settings_layout.tr();- }- }-}--class CalendarSettingContext {- final String viewId;- final FieldController fieldController;-- CalendarSettingContext({- required this.viewId,- required this.fieldController,- });-}diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/toolbar/calendar_toolbar.dart b/frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/toolbar/calendar_toolbar.dartindex 9592888ccc..42ee25acf7 100644--- a/frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/toolbar/calendar_toolbar.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/toolbar/calendar_toolbar.dart@@ -11,7 +11,6 @@ import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';import '../../application/calendar_bloc.dart';-import 'calendar_setting.dart';class CalendarToolbar extends StatelessWidget {const CalendarToolbar({super.key});@@ -33,52 +32,6 @@ class CalendarToolbar extends StatelessWidget {}}-class _SettingButton extends StatefulWidget {- const _SettingButton({Key? key}) : super(key: key);-- @override- State<StatefulWidget> createState() => _SettingButtonState();-}--class _SettingButtonState extends State<_SettingButton> {- @override- Widget build(BuildContext context) {- return AppFlowyPopover(- direction: PopoverDirection.bottomWithRightAligned,- constraints: BoxConstraints.loose(const Size(300, 400)),- margin: EdgeInsets.zero,- child: FlowyTextButton(- LocaleKeys.settings_title.tr(),- fillColor: Colors.transparent,- hoverColor: AFThemeExtension.of(context).lightGreyHover,- padding: GridSize.typeOptionContentInsets,- ),- popupBuilder: (BuildContext popoverContext) {- final bloc = context.watch<CalendarBloc>();- final settingContext = CalendarSettingContext(- viewId: bloc.viewId,- fieldController: bloc.fieldController,- );- return CalendarSetting(- settingContext: settingContext,- layoutSettings: bloc.state.settings.fold(- () => null,- (settings) => settings,- ),- onUpdated: (layoutSettings) {- if (layoutSettings == null) {- return;- }- context- .read<CalendarBloc>()- .add(CalendarEvent.updateCalendarLayoutSetting(layoutSettings));- },- );- }, // use blocbuilder- );- }-}-class _UnscheduleEventsButton extends StatefulWidget {const _UnscheduleEventsButton({Key? key}) : super(key: key);diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/toolbar/grid_setting.dart b/frontend/appflowy_flutter/lib/plugins/database_view/widgets/setting/database_setting.dartsimilarity index 68%rename from frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/toolbar/grid_setting.dartrename to frontend/appflowy_flutter/lib/plugins/database_view/widgets/setting/database_setting.dartindex f04d5d6314..f8a50b647d 100644--- a/frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/toolbar/grid_setting.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/widgets/setting/database_setting.dart@@ -1,6 +1,5 @@import 'package:appflowy/plugins/database_view/application/database_controller.dart';import 'package:appflowy/plugins/database_view/application/setting/setting_bloc.dart';-import 'package:appflowy_backend/protobuf/flowy-database2/setting_entities.pbenum.dart';import 'package:flowy_infra/image.dart';import 'package:flowy_infra/theme_extension.dart';import 'package:flowy_infra_ui/style_widget/button.dart';@@ -9,7 +8,7 @@ import 'package:flowy_infra_ui/style_widget/text.dart';import 'package:flowy_infra_ui/widget/spacing.dart';import 'package:flutter/material.dart';-import '../../layout/sizes.dart';+import '../../grid/presentation/layout/sizes.dart';class DatabaseSettingList extends StatelessWidget {final DatabaseController databaseContoller;@@ -22,33 +21,25 @@ class DatabaseSettingList extends StatelessWidget {@overrideWidget build(BuildContext context) {- final cells = DatabaseSettingAction.values.where((element) {- if (element == DatabaseSettingAction.showGroup) {- return databaseContoller.databaseLayout == DatabaseLayoutPB.Board;- } else {- return true;- }- }).map((action) {+ final cells = actionsForDatabaseLayout(databaseContoller.databaseLayout)+ .map((action) {return _SettingItem(action: action,onAction: (action) => onAction(action, databaseContoller),);}).toList();- return SizedBox(- width: 140,- child: ListView.separated(- shrinkWrap: true,- controller: ScrollController(),- itemCount: cells.length,- separatorBuilder: (context, index) {- return VSpace(GridSize.typeOptionSeparatorHeight);- },- physics: StyledScrollPhysics(),- itemBuilder: (BuildContext context, int index) {- return cells[index];- },- ),+ return ListView.separated(+ shrinkWrap: true,+ controller: ScrollController(),+ itemCount: cells.length,+ separatorBuilder: (context, index) {+ return VSpace(GridSize.typeOptionSeparatorHeight);+ },+ physics: StyledScrollPhysics(),+ itemBuilder: (BuildContext context, int index) {+ return cells[index];+ },);}}diff --git a/frontend/appflowy_flutter/lib/plugins/database_view/widgets/setting/setting_button.dart b/frontend/appflowy_flutter/lib/plugins/database_view/widgets/setting/setting_button.dartindex 89f6152b66..62d2371d45 100644--- a/frontend/appflowy_flutter/lib/plugins/database_view/widgets/setting/setting_button.dart+++ b/frontend/appflowy_flutter/lib/plugins/database_view/widgets/setting/setting_button.dart@@ -1,7 +1,9 @@import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy/plugins/database_view/application/database_controller.dart';import 'package:appflowy/plugins/database_view/application/setting/setting_bloc.dart';+import 'package:appflowy/plugins/database_view/calendar/presentation/toolbar/calendar_layout_setting.dart';import 'package:appflowy/plugins/database_view/widgets/group/database_group.dart';+import 'package:appflowy_backend/protobuf/flowy-database2/calendar_entities.pb.dart';import 'package:appflowy_popover/appflowy_popover.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/theme_extension.dart';@@ -12,7 +14,7 @@ import 'package:styled_widget/styled_widget.dart';import '../../grid/presentation/layout/sizes.dart';import '../../grid/presentation/widgets/toolbar/grid_layout.dart';import '../field/grid_property.dart';-import '../../grid/presentation/widgets/toolbar/grid_setting.dart';+import 'database_setting.dart';class SettingButton extends StatefulWidget {final DatabaseController databaseController;@@ -110,7 +112,31 @@ class _DatabaseSettingListPopoverStateviewId: widget.databaseController.viewId,fieldController: widget.databaseController.fieldController,);+ case DatabaseSettingAction.showCalendarLayout:+ return CalendarLayoutSetting(+ viewId: widget.databaseController.viewId,+ fieldController: widget.databaseController.fieldController,+ calendarSettingController: ICalendarSettingImpl(+ widget.databaseController,+ ),+ );}}}}++class ICalendarSettingImpl extends ICalendarSetting {+ final DatabaseController _databaseController;++ ICalendarSettingImpl(this._databaseController);++ @override+ void updateLayoutSettings(CalendarLayoutSettingPB layoutSettings) {+ _databaseController.updateCalenderLayoutSetting(layoutSettings);+ }++ @override+ CalendarLayoutSettingPB? getLayoutSetting() {+ return _databaseController.databaseLayoutSetting?.calendar;+ }+}diff --git a/frontend/rust-lib/flowy-database2/src/services/database/database_editor.rs b/frontend/rust-lib/flowy-database2/src/services/database/database_editor.rsindex 430f120d27..892d519579 100644--- a/frontend/rust-lib/flowy-database2/src/services/database/database_editor.rs+++ b/frontend/rust-lib/flowy-database2/src/services/database/database_editor.rs@@ -16,11 +16,11 @@ use lib_infra::future::{to_fut, Fut};use crate::entities::{CalendarEventPB, CellChangesetNotifyPB, CellPB, ChecklistCellDataPB, DatabaseFieldChangesetPB,- DatabasePB, DatabaseViewSettingPB, DeleteFilterParams, DeleteGroupParams, DeleteSortParams,- FieldChangesetParams, FieldIdPB, FieldPB, FieldType, GroupPB, IndexFieldPB, InsertedRowPB,- LayoutSettingParams, NoDateCalendarEventPB, RepeatedFilterPB, RepeatedGroupPB, RepeatedSortPB,- RowPB, RowsChangePB, SelectOptionCellDataPB, SelectOptionPB, UpdateFilterParams,- UpdateSortParams, UpdatedRowPB,+ DatabaseLayoutSettingPB, DatabasePB, DatabaseViewSettingPB, DeleteFilterParams,+ DeleteGroupParams, DeleteSortParams, FieldChangesetParams, FieldIdPB, FieldPB, FieldType,+ GroupPB, IndexFieldPB, InsertedRowPB, LayoutSettingParams, NoDateCalendarEventPB,+ RepeatedFilterPB, RepeatedGroupPB, RepeatedSortPB, RowPB, RowsChangePB, SelectOptionCellDataPB,+ SelectOptionPB, UpdateFilterParams, UpdateSortParams, UpdatedRowPB,};use crate::notification::{send_notification, DatabaseNotification};use crate::services::cell::{@@ -895,7 +895,7 @@ impl DatabaseEditor {pub async fn set_layout_setting(&self, view_id: &str, layout_setting: LayoutSettingParams) {if let Ok(view) = self.database_views.get_view_editor(view_id).await {let _ = view.v_set_layout_settings(layout_setting).await;- }+ };}pub async fn get_layout_setting(diff --git a/frontend/rust-lib/flowy-database2/src/services/database_view/view_editor.rs b/frontend/rust-lib/flowy-database2/src/services/database_view/view_editor.rsindex 6d79ecfa5e..f9abd8c11a 100644--- a/frontend/rust-lib/flowy-database2/src/services/database_view/view_editor.rs+++ b/frontend/rust-lib/flowy-database2/src/services/database_view/view_editor.rs@@ -630,14 +630,14 @@ impl DatabaseViewEditor {// if equal, send the DidUpdateLayoutSettings notificationif old_calendar_setting.field_id != new_field_id {send_notification(&self.view_id, DatabaseNotification::DidSetNewLayoutField)- .payload(layout_setting_pb)- .send();- } else {- send_notification(&self.view_id, DatabaseNotification::DidUpdateLayoutSettings)- .payload(layout_setting_pb)+ .payload(layout_setting_pb.clone()).send();}}++ send_notification(&self.view_id, DatabaseNotification::DidUpdateLayoutSettings)+ .payload(layout_setting_pb)+ .send();}}