Skip to content

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.

fix: improve calendar event button icon color and add confirm dialog (#7330)

Richard Shiuee4b57033b481
diff --git a/frontend/appflowy_flutter/integration_test/shared/database_test_op.dart b/frontend/appflowy_flutter/integration_test/shared/database_test_op.dart
index 676c96f042..5f27305fe5 100644
--- a/frontend/appflowy_flutter/integration_test/shared/database_test_op.dart
+++ b/frontend/appflowy_flutter/integration_test/shared/database_test_op.dart
@@ -1464,6 +1464,7 @@ extension AppFlowyDatabaseTest on WidgetTester {
);
await tapButton(button);
+ await tapButtonWithName(LocaleKeys.button_delete.tr());
}
Future<void> dragDropRescheduleCalendarEvent() async {
diff --git a/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/calendar_event_editor.dart b/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/calendar_event_editor.dart
index 40f57b5e9a..576e5d198c 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/calendar_event_editor.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/calendar/presentation/calendar_event_editor.dart
@@ -12,6 +12,7 @@ import 'package:appflowy/plugins/database/widgets/cell/editable_cell_builder.dar
import 'package:appflowy/plugins/database/widgets/cell/editable_cell_skeleton/text.dart';
import 'package:appflowy/plugins/database/widgets/row/accessory/cell_accessory.dart';
import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';
+import 'package:appflowy/workspace/presentation/widgets/dialogs.dart';
import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';
import 'package:collection/collection.dart';
import 'package:easy_localization/easy_localization.dart';
@@ -92,11 +93,11 @@ class EventEditorControls extends StatelessWidget {
message: LocaleKeys.calendar_duplicateEvent.tr(),
child: FlowyIconButton(
width: 20,
- icon: const FlowySvg(
+ icon: FlowySvg(
FlowySvgs.m_duplicate_s,
- size: Size.square(17),
+ size: const Size.square(16),
+ color: Theme.of(context).iconTheme.color,
),
- iconColorOnHover: Theme.of(context).colorScheme.onSecondary,
onPressed: () => context.read<CalendarBloc>().add(
CalendarEvent.duplicateEvent(
rowController.viewId,
@@ -108,20 +109,35 @@ class EventEditorControls extends StatelessWidget {
const HSpace(8.0),
FlowyIconButton(
width: 20,
- icon: const FlowySvg(FlowySvgs.delete_s),
- iconColorOnHover: Theme.of(context).colorScheme.onSecondary,
- onPressed: () => context.read<CalendarBloc>().add(
- CalendarEvent.deleteEvent(
- rowController.viewId,
- rowController.rowId,
- ),
- ),
+ icon: FlowySvg(
+ FlowySvgs.delete_s,
+ size: const Size.square(16),
+ color: Theme.of(context).iconTheme.color,
+ ),
+ onPressed: () {
+ showConfirmDeletionDialog(
+ context: context,
+ name: LocaleKeys.grid_row_label.tr(),
+ description: LocaleKeys.grid_row_deleteRowPrompt.tr(),
+ onConfirm: () {
+ context.read<CalendarBloc>().add(
+ CalendarEvent.deleteEvent(
+ rowController.viewId,
+ rowController.rowId,
+ ),
+ );
+ },
+ );
+ },
),
const HSpace(8.0),
FlowyIconButton(
width: 20,
- icon: const FlowySvg(FlowySvgs.full_view_s),
- iconColorOnHover: Theme.of(context).colorScheme.onSecondary,
+ icon: FlowySvg(
+ FlowySvgs.full_view_s,
+ size: const Size.square(16),
+ color: Theme.of(context).iconTheme.color,
+ ),
onPressed: () {
PopoverContainer.of(context).close();
onExpand.call();