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: some notification center launch review issues (#7825)

Morn66fac524c114
diff --git a/frontend/appflowy_flutter/integration_test/desktop/document/document_with_date_reminder_test.dart b/frontend/appflowy_flutter/integration_test/desktop/document/document_with_date_reminder_test.dart
index ccfdbae76e..73c4680138 100644
--- a/frontend/appflowy_flutter/integration_test/desktop/document/document_with_date_reminder_test.dart
+++ b/frontend/appflowy_flutter/integration_test/desktop/document/document_with_date_reminder_test.dart
@@ -237,11 +237,11 @@ void main() {
await tester.tapButton(find.byType(MentionDateBlock));
await tester.pumpAndSettle();
- // set date to be fifteenth of the next month
+ // set date to be fifteenth of the last month
await tester.tap(
find.descendant(
of: find.byType(DesktopAppFlowyDatePicker),
- matching: find.byFlowySvg(FlowySvgs.arrow_right_s),
+ matching: find.byFlowySvg(FlowySvgs.arrow_left_s),
),
);
await tester.pumpAndSettle();
@@ -275,9 +275,9 @@ void main() {
timeFormat: UserTimeFormatPB.TwentyFourHour,
);
final now = DateTime.now();
- final fifteenthOfNextMonth = DateTime(now.year, now.month + 1, 15);
+ final fifteenthOfLastMonth = DateTime(now.year, now.month - 1, 15);
final formattedDate =
- dateTimeSettings.dateFormat.formatDate(fifteenthOfNextMonth, false);
+ dateTimeSettings.dateFormat.formatDate(fifteenthOfLastMonth, false);
expect(find.byType(MentionDateBlock), findsOneWidget);
expect(find.text('@$formattedDate'), findsOneWidget);
@@ -378,11 +378,11 @@ void main() {
await tester.tapButton(find.byType(MentionDateBlock));
await tester.pumpAndSettle();
- // set date to be fifteenth of the next month
+ // set date to be fifteenth of the last month
await tester.tap(
find.descendant(
of: find.byType(DesktopAppFlowyDatePicker),
- matching: find.byFlowySvg(FlowySvgs.arrow_right_s),
+ matching: find.byFlowySvg(FlowySvgs.arrow_left_s),
),
);
await tester.pumpAndSettle();
@@ -416,9 +416,9 @@ void main() {
timeFormat: UserTimeFormatPB.TwentyFourHour,
);
final now = DateTime.now();
- final fifteenthOfNextMonth = DateTime(now.year, now.month + 1, 15);
+ final fifteenthOfLastMonth = DateTime(now.year, now.month - 1, 15);
final formattedDate =
- dateTimeSettings.dateFormat.formatDate(fifteenthOfNextMonth, false);
+ dateTimeSettings.dateFormat.formatDate(fifteenthOfLastMonth, false);
expect(find.byType(MentionDateBlock), findsOneWidget);
expect(find.text('@$formattedDate'), findsOneWidget);
diff --git a/frontend/appflowy_flutter/integration_test/mobile/document/toolbar_test.dart b/frontend/appflowy_flutter/integration_test/mobile/document/toolbar_test.dart
index badb892fa5..090aa8303a 100644
--- a/frontend/appflowy_flutter/integration_test/mobile/document/toolbar_test.dart
+++ b/frontend/appflowy_flutter/integration_test/mobile/document/toolbar_test.dart
@@ -128,7 +128,12 @@ void main() {
/// remove the link
await tester.tapButton(find.byFlowySvg(FlowySvgs.toolbar_link_unlink_m));
final node = editorState.getNodeAtPath([0]);
- expect(node?.delta?.toJson(), [{'insert': testText}]);
+ expect(
+ node?.delta?.toJson(),
+ [
+ {'insert': testText},
+ ],
+ );
});
});
}
diff --git a/frontend/appflowy_flutter/lib/mobile/application/notification/notification_reminder_bloc.dart b/frontend/appflowy_flutter/lib/mobile/application/notification/notification_reminder_bloc.dart
index 2a7e893e58..3c3da4201b 100644
--- a/frontend/appflowy_flutter/lib/mobile/application/notification/notification_reminder_bloc.dart
+++ b/frontend/appflowy_flutter/lib/mobile/application/notification/notification_reminder_bloc.dart
@@ -30,7 +30,7 @@ class NotificationReminderBloc
add(const NotificationReminderEvent.reset());
},
reset: () async {
- final createdAt = await _getCreatedAt(
+ final scheduledAt = await _getScheduledAt(
reminder,
dateFormat,
timeFormat,
@@ -40,7 +40,7 @@ class NotificationReminderBloc
if (view == null) {
emit(
NotificationReminderState(
- createdAt: createdAt,
+ scheduledAt: scheduledAt,
pageTitle: '',
reminderContent: '',
isLocked: false,
@@ -57,7 +57,7 @@ class NotificationReminderBloc
if (node != null) {
emit(
NotificationReminderState(
- createdAt: createdAt,
+ scheduledAt: scheduledAt,
pageTitle: view.nameOrDefault,
isLocked: view.isLocked,
view: view,
@@ -71,7 +71,7 @@ class NotificationReminderBloc
} else if (layout.isDatabaseView) {
emit(
NotificationReminderState(
- createdAt: createdAt,
+ scheduledAt: scheduledAt,
pageTitle: view.nameOrDefault,
isLocked: view.isLocked,
view: view,
@@ -89,20 +89,16 @@ class NotificationReminderBloc
late final UserDateFormatPB dateFormat;
late final UserTimeFormatPB timeFormat;
- Future<String> _getCreatedAt(
+ Future<String> _getScheduledAt(
ReminderPB reminder,
UserDateFormatPB dateFormat,
UserTimeFormatPB timeFormat,
) async {
- final rCreatedAt = reminder.createdAt;
- final createdAt = rCreatedAt != null
- ? _formatTimestamp(
- rCreatedAt,
- timeFormat: timeFormat,
- dateFormate: dateFormat,
- )
- : '';
- return createdAt;
+ return _formatTimestamp(
+ reminder.scheduledAt.toInt() * 1000,
+ timeFormat: timeFormat,
+ dateFormate: dateFormat,
+ );
}
Future<ViewPB?> _getView(ReminderPB reminder) async {
@@ -204,7 +200,7 @@ class NotificationReminderState with _$NotificationReminderState {
const NotificationReminderState._();
const factory NotificationReminderState({
- required String createdAt,
+ required String scheduledAt,
required String pageTitle,
required String reminderContent,
required bool isLocked,
@@ -217,7 +213,7 @@ class NotificationReminderState with _$NotificationReminderState {
factory NotificationReminderState.initial() =>
const NotificationReminderState(
- createdAt: '',
+ scheduledAt: '',
pageTitle: '',
reminderContent: '',
isLocked: false,
diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/mobile_bottom_navigation_bar.dart b/frontend/appflowy_flutter/lib/mobile/presentation/mobile_bottom_navigation_bar.dart
index 2f44a4c2e9..0b59adf364 100644
--- a/frontend/appflowy_flutter/lib/mobile/presentation/mobile_bottom_navigation_bar.dart
+++ b/frontend/appflowy_flutter/lib/mobile/presentation/mobile_bottom_navigation_bar.dart
@@ -6,10 +6,10 @@ import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy/mobile/presentation/notifications/mobile_notifications_screen.dart';
import 'package:appflowy/mobile/presentation/widgets/navigation_bar_button.dart';
import 'package:appflowy/shared/popup_menu/appflowy_popup_menu.dart';
-import 'package:appflowy/shared/red_dot.dart';
import 'package:appflowy/startup/startup.dart';
import 'package:appflowy/user/application/reminder/reminder_bloc.dart';
import 'package:appflowy/util/theme_extension.dart';
+import 'package:appflowy/workspace/presentation/notifications/number_red_dot.dart';
import 'package:appflowy/workspace/presentation/widgets/dialogs.dart';
import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
import 'package:appflowy_editor/appflowy_editor.dart';
@@ -175,23 +175,28 @@ class _NotificationNavigationBarItemIcon extends StatelessWidget {
final hasUnreads = state.reminders.any(
(reminder) => !reminder.isRead,
);
- return Stack(
- children: [
- isActive
- ? const FlowySvg(
- FlowySvgs.m_home_active_notification_m,
- blendMode: null,
- )
- : const FlowySvg(
- FlowySvgs.m_home_notification_m,
- ),
- if (hasUnreads)
- const Positioned(
- top: 2,
- right: 4,
- child: NotificationRedDot(),
+ return SizedBox(
+ width: 40,
+ height: 40,
+ child: Stack(
+ children: [
+ Center(
+ child: isActive
+ ? const FlowySvg(
+ FlowySvgs.m_home_active_notification_m,
+ blendMode: null,
+ )
+ : const FlowySvg(
+ FlowySvgs.m_home_notification_m,
+ ),
),
- ],
+ if (hasUnreads)
+ const Align(
+ alignment: Alignment.topRight,
+ child: NumberedRedDot.mobile(),
+ ),
+ ],
+ ),
);
},
),
diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/notifications/mobile_notifications_page.dart b/frontend/appflowy_flutter/lib/mobile/presentation/notifications/mobile_notifications_page.dart
index 33c2eb3905..effefb0d96 100644
--- a/frontend/appflowy_flutter/lib/mobile/presentation/notifications/mobile_notifications_page.dart
+++ b/frontend/appflowy_flutter/lib/mobile/presentation/notifications/mobile_notifications_page.dart
@@ -126,7 +126,6 @@ class _NotificationScreenContent extends StatelessWidget {
onAction: _onAction,
onReadChanged: _onReadChanged,
actionBar: InboxActionBar(
- hasUnreads: state.hasUnreads,
showUnreadsOnly: filterState.showUnreadsOnly,
),
),
diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/notifications/widgets/multi_select_notification_item.dart b/frontend/appflowy_flutter/lib/mobile/presentation/notifications/widgets/multi_select_notification_item.dart
index ea57d5d391..25b18b82cb 100644
--- a/frontend/appflowy_flutter/lib/mobile/presentation/notifications/widgets/multi_select_notification_item.dart
+++ b/frontend/appflowy_flutter/lib/mobile/presentation/notifications/widgets/multi_select_notification_item.dart
@@ -101,9 +101,7 @@ class _InnerNotificationItem extends StatelessWidget {
NotificationCheckIcon(
isSelected: mSelectedNotificationIds.value.contains(reminder.id),
),
- const HSpace(3.0),
- !reminder.isRead ? const UnreadRedDot() : const HSpace(6.0),
- const HSpace(3.0),
+ const HSpace(12.0),
NotificationIcon(reminder: reminder),
const HSpace(12.0),
Expanded(
diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/notifications/widgets/notification_item.dart b/frontend/appflowy_flutter/lib/mobile/presentation/notifications/widgets/notification_item.dart
index ddcf5c02e3..84163f5ab6 100644
--- a/frontend/appflowy_flutter/lib/mobile/presentation/notifications/widgets/notification_item.dart
+++ b/frontend/appflowy_flutter/lib/mobile/presentation/notifications/widgets/notification_item.dart
@@ -48,14 +48,19 @@ class NotificationItem extends StatelessWidget {
return const SizedBox.shrink();
}
- final child = Padding(
- padding: const EdgeInsets.symmetric(vertical: 8),
- child: _SlidableNotificationItem(
- tabType: tabType,
- reminder: reminder,
- child: _InnerNotificationItem(
+ final child = GestureDetector(
+ onLongPress: () {
+ context.onMoreAction();
+ },
+ child: Padding(
+ padding: const EdgeInsets.all(8),
+ child: _SlidableNotificationItem(
tabType: tabType,
reminder: reminder,
+ child: _InnerNotificationItem(
+ tabType: tabType,
+ reminder: reminder,
+ ),
),
),
);
@@ -102,14 +107,11 @@ class _InnerNotificationItem extends StatelessWidget {
return Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
- const HSpace(8.0),
- !reminder.isRead ? const UnreadRedDot() : const HSpace(6.0),
- const HSpace(4.0),
+ const HSpace(10.0),
NotificationIcon(reminder: reminder),
const HSpace(12.0),
- Expanded(
- child: NotificationContent(reminder: reminder),
- ),
+ Expanded(child: NotificationContent(reminder: reminder)),
+ const HSpace(6.0),
],
);
}
diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/notifications/widgets/shared.dart b/frontend/appflowy_flutter/lib/mobile/presentation/notifications/widgets/shared.dart
index bce8e138ca..cc423c30b6 100644
--- a/frontend/appflowy_flutter/lib/mobile/presentation/notifications/widgets/shared.dart
+++ b/frontend/appflowy_flutter/lib/mobile/presentation/notifications/widgets/shared.dart
@@ -10,11 +10,11 @@ import 'package:appflowy/workspace/application/view/view_ext.dart';
import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
import 'package:appflowy_backend/protobuf/flowy-user/protobuf.dart';
import 'package:appflowy_editor/appflowy_editor.dart';
+import 'package:appflowy_ui/appflowy_ui.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:universal_platform/universal_platform.dart';
const _kNotificationIconHeight = 36.0;
@@ -22,12 +22,15 @@ class NotificationIcon extends StatelessWidget {
const NotificationIcon({
super.key,
required this.reminder,
+ this.atSize = 12,
});
final ReminderPB reminder;
+ final double atSize;
@override
Widget build(BuildContext context) {
+ final theme = AppFlowyTheme.of(context);
return SizedBox(
width: 42,
height: 36,
@@ -45,13 +48,13 @@ class NotificationIcon extends StatelessWidget {
height: 20,
decoration: BoxDecoration(
shape: BoxShape.circle,
- color: Theme.of(context).cardColor,
+ color: theme.fillColorScheme.primary,
),
child: Center(
- child: FlowyText(
- '@',
- fontSize: 12,
- figmaLineHeight: 14,
+ child: FlowySvg(
+ FlowySvgs.notification_icon_at_s,
+ size: Size.square(atSize),
+ color: theme.iconColorScheme.primary,
),
),
),
@@ -88,14 +91,15 @@ class UnreadRedDot extends StatelessWidget {
@override
Widget build(BuildContext context) {
- return const SizedBox(
+ final theme = AppFlowyTheme.of(context);
+ return SizedBox(
height: _kNotificationIconHeight,
child: Center(
child: SizedBox.square(
- dimension: 6.0,
+ dimension: 7.0,
child: DecoratedBox(
decoration: ShapeDecoration(
- color: Color(0xFFFF6331),
+ color: theme.borderColorScheme.errorThick,
shape: OvalBorder(),
),
),
@@ -118,6 +122,8 @@ class NotificationContent extends StatefulWidget {
}
class _NotificationContentState extends State<NotificationContent> {
+ AppFlowyThemeData get theme => AppFlowyTheme.of(context);
+
@override
void didUpdateWidget(covariant NotificationContent oldWidget) {
super.didUpdateWidget(oldWidget);
@@ -141,14 +147,11 @@ class _NotificationContentState extends State<NotificationContent> {
mainAxisSize: MainAxisSize.min,
children: [
// title & time
- _buildHeader(state.createdAt, !widget.reminder.isRead),
+ _buildHeader(state.scheduledAt, !widget.reminder.isRead),
// page name
_buildPageName(context, state.isLocked, state.pageTitle),
// content
- Padding(
- padding: const EdgeInsets.only(right: 16.0),
- child: _buildContent(view, nodes: state.nodes),
- ),
+ _buildContent(view, nodes: state.nodes),
],
);
},
@@ -175,6 +178,8 @@ class _NotificationContentState extends State<NotificationContent> {
fontSize: 14,
figmaLineHeight: 22,
color: context.notificationItemTextColor,
+ maxLines: 3,
+ overflow: TextOverflow.ellipsis,
),
);
}
@@ -191,6 +196,7 @@ class _NotificationContentState extends State<NotificationContent> {
LocaleKeys.settings_notifications_titles_reminder.tr(),
fontSize: 14,
figmaLineHeight: 20,
+ color: theme.textColorScheme.primary,
),
Spacer(),
if (createAt.isNotEmpty)
@@ -198,7 +204,7 @@ class _NotificationContentState extends State<NotificationContent> {
createAt,
fontSize: 12,
figmaLineHeight: 18,
- color: context.notificationItemTextColor,
+ color: theme.textColorScheme.secondary,
),
if (unread) ...[
HSpace(4),
@@ -225,19 +231,25 @@ class _NotificationContentState extends State<NotificationContent> {
LocaleKeys.notificationHub_mentionedYou.tr(),
fontSize: 12,
figmaLineHeight: 18,
- color: context.notificationItemTextColor,
+ color: theme.textColorScheme.secondary,
),
const NotificationEllipse(),
if (isLocked)
Padding(
padding: EdgeInsets.only(right: 5),
- child: FlowySvg(FlowySvgs.notification_lock_s),
+ child: FlowySvg(
+ FlowySvgs.notification_lock_s,
+ color: theme.iconColorScheme.secondary,
+ ),
+ ),
+ Flexible(
+ child: FlowyText.regular(
+ pageTitle,
+ fontSize: 12,
+ figmaLineHeight: 18,
+ color: theme.textColorScheme.secondary,
+ overflow: TextOverflow.ellipsis,
),
- FlowyText.regular(
- pageTitle,
- fontSize: 12,
- figmaLineHeight: 18,
- color: context.notificationItemTextColor,
),
],
),
@@ -254,7 +266,7 @@ class NotificationEllipse extends StatelessWidget {
return Container(
width: 2.50,
height: 2.50,
- margin: const EdgeInsets.symmetric(horizontal: 5.0),
+ margin: const EdgeInsets.symmetric(horizontal: 6.0),
decoration: ShapeDecoration(
color: context.notificationItemTextColor,
shape: const OvalBorder(),
@@ -310,11 +322,7 @@ class NotificationDocumentContent extends StatelessWidget {
styleCustomizer: styleCustomizer,
// the editor is not editable in the chat
editable: false,
- customHeadingPadding: UniversalPlatform.isDesktop
- ? EdgeInsets.zero
- : EdgeInsets.symmetric(
- vertical: EditorStyleCustomizer.nodeHorizontalPadding,
- ),
+ customPadding: (node) => EdgeInsets.zero,
);
return IgnorePointer(
diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/notifications/widgets/slide_actions.dart b/frontend/appflowy_flutter/lib/mobile/presentation/notifications/widgets/slide_actions.dart
index af3f574c8e..6216ab9a05 100644
--- a/frontend/appflowy_flutter/lib/mobile/presentation/notifications/widgets/slide_actions.dart
+++ b/frontend/appflowy_flutter/lib/mobile/presentation/notifications/widgets/slide_actions.dart
@@ -76,41 +76,43 @@ enum NotificationPaneActionType {
topLeft: Radius.circular(10),
bottomLeft: Radius.circular(10),
),
- onPressed: (context) {
- final reminderBloc = context.read<ReminderBloc>();
- final notificationReminderBloc =
- context.read<NotificationReminderBloc>();
-
- showMobileBottomSheet(
- context,
- showDragHandle: true,
- showDivider: false,
- useRootNavigator: true,
- backgroundColor: Theme.of(context).colorScheme.surface,
- builder: (_) {
- return MultiBlocProvider(
- providers: [
- BlocProvider.value(value: reminderBloc),
- BlocProvider.value(value: notificationReminderBloc),
- ],
- child: _NotificationMoreActions(
- onClickMultipleChoice: () {
- Future.delayed(const Duration(milliseconds: 250), () {
- bottomNavigationBarType.value =
- BottomNavigationBarActionType
- .notificationMultiSelect;
- });
- },
- ),
- );
- },
- );
- },
+ onPressed: (context) => context.onMoreAction(),
);
}
}
}
+extension NotificationPaneActionExtension on BuildContext {
+ void onMoreAction() {
+ final reminderBloc = read<ReminderBloc>();
+ final notificationReminderBloc = read<NotificationReminderBloc>();
+
+ showMobileBottomSheet(
+ this,
+ showDragHandle: true,
+ showDivider: false,
+ useRootNavigator: true,
+ backgroundColor: Theme.of(this).colorScheme.surface,
+ builder: (_) {
+ return MultiBlocProvider(
+ providers: [
+ BlocProvider.value(value: reminderBloc),
+ BlocProvider.value(value: notificationReminderBloc),
+ ],
+ child: _NotificationMoreActions(
+ onClickMultipleChoice: () {
+ Future.delayed(const Duration(milliseconds: 250), () {
+ bottomNavigationBarType.value =
+ BottomNavigationBarActionType.notificationMultiSelect;
+ });
+ },
+ ),
+ );
+ },
+ );
+ }
+}
+
class _NotificationMoreActions extends StatelessWidget {
const _NotificationMoreActions({
required this.onClickMultipleChoice,
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_configuration.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_configuration.dart
index 5e7eefc24e..78b414462a 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_configuration.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_configuration.dart
@@ -68,10 +68,13 @@ Map<String, BlockComponentBuilder> buildBlockComponentBuilders({
bool editable = true,
ShowPlaceholder? showParagraphPlaceholder,
String Function(Node)? placeholderText,
- EdgeInsets? customHeadingPadding,
+ EdgeInsets Function(Node node)? customPadding,
bool alwaysDistributeSimpleTableColumnWidths = false,
}) {
- final configuration = _buildDefaultConfiguration(context);
+ final configuration = _buildDefaultConfiguration(
+ context,
+ padding: customPadding,
+ );
final builders = _buildBlockComponentBuilderMap(
context,
configuration: configuration,
@@ -97,7 +100,10 @@ Map<String, BlockComponentBuilder> buildBlockComponentBuilders({
return builders;
}
-BlockComponentConfiguration _buildDefaultConfiguration(BuildContext context) {
+BlockComponentConfiguration _buildDefaultConfiguration(
+ BuildContext context, {
+ EdgeInsets Function(Node node)? padding,
+}) {
final configuration = BlockComponentConfiguration(
padding: (node) {
if (UniversalPlatform.isMobile) {
@@ -117,7 +123,7 @@ BlockComponentConfiguration _buildDefaultConfiguration(BuildContext context) {
right: EditorStyleCustomizer.nodeHorizontalPadding,
);
}
- return edgeInsets;
+ return padding?.call(node) ?? edgeInsets;
}
return const EdgeInsets.symmetric(vertical: 5.0);
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/link_embed/link_embed_block_component.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/link_embed/link_embed_block_component.dart
index baf9702a36..e619a8bcae 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/link_embed/link_embed_block_component.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/link_embed/link_embed_block_component.dart
@@ -136,7 +136,7 @@ class LinkEmbedBlockComponentState
height: 450,
key: widgetKey,
decoration: BoxDecoration(
- color: isIdle ? Theme.of(context).cardColor : fillSceme.tertiaryHover,
+ color: fillSceme.quaternary,
borderRadius: BorderRadius.all(Radius.circular(16)),
border: Border.all(color: borderScheme.greyTertiary),
),
@@ -276,7 +276,7 @@ class LinkEmbedBlockComponentState
TextSpan(
text: '$url ',
style: TextStyle(
- color: textSceme.primary,
+ color: textSceme.secondary,
fontSize: 14,
height: 20 / 14,
fontWeight: FontWeight.w700,
@@ -287,7 +287,7 @@ class LinkEmbedBlockComponentState
.document_plugins_linkPreview_linkPreviewMenu_unableToDisplay
.tr(),
style: TextStyle(
- color: textSceme.primary,
+ color: textSceme.secondary,
fontSize: 14,
height: 20 / 14,
fontWeight: FontWeight.w400,
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/mention/mention_date_block.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/mention/mention_date_block.dart
index 20f60be23d..ba58d2d31f 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/mention/mention_date_block.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/mention/mention_date_block.dart
@@ -62,10 +62,27 @@ class MentionDateBlock extends StatefulWidget {
class _MentionDateBlockState extends State<MentionDateBlock> {
late bool _includeTime = widget.includeTime;
late DateTime? parsedDate = DateTime.tryParse(widget.date);
+ late String? _reminderId = widget.reminderId;
+
+ ReminderPB? getReminder(BuildContext context) {
+ if (!context.mounted) return null;
+ final reminderBloc = context.read<ReminderBloc?>();
+ return reminderBloc?.state.serverReminders
+ .firstWhereOrNull((r) => r.id == _reminderId);
+ }
@override
void didUpdateWidget(covariant oldWidget) {
parsedDate = DateTime.tryParse(widget.date);
+ if (widget.reminderId != oldWidget.reminderId) {
+ _reminderId = widget.reminderId;
+ }
+ if (widget.includeTime != oldWidget.includeTime) {
+ _includeTime = widget.includeTime;
+ }
+ if (widget.date != oldWidget.date) {
+ parsedDate = DateTime.tryParse(widget.date);
+ }
super.didUpdateWidget(oldWidget);
}
@@ -89,9 +106,6 @@ class _MentionDateBlockState extends State<MentionDateBlock> {
builder: (context, appearance) =>
BlocBuilder<ReminderBloc, ReminderState>(
builder: (context, state) {
- final reminder = state.reminders
- .firstWhereOrNull((r) => r.id == widget.reminderId);
-
final formattedDate = appearance.dateFormat
.formatDate(parsedDate!, _includeTime, appearance.timeFormat);
@@ -108,7 +122,7 @@ class _MentionDateBlockState extends State<MentionDateBlock> {
if (widget.reminderOption != ReminderOption.none) {
_updateReminder(
widget.reminderOption,
- reminder,
+ context,
includeTime,
);
} else if (dateTime != null) {
@@ -125,7 +139,7 @@ class _MentionDateBlockState extends State<MentionDateBlock> {
if (widget.reminderOption != ReminderOption.none) {
_updateReminder(
widget.reminderOption,
- reminder,
+ context,
_includeTime,
);
} else {
@@ -133,10 +147,11 @@ class _MentionDateBlockState extends State<MentionDateBlock> {
}
},
onReminderSelected: (reminderOption) =>
- _updateReminder(reminderOption, reminder),
+ _updateReminder(reminderOption, context, _includeTime),
);
Color? color;
+ final reminder = getReminder(context);
if (reminder != null) {
if (reminder.type == ReminderType.today) {
color = Theme.of(context).isLightMode
@@ -158,7 +173,6 @@ class _MentionDateBlockState extends State<MentionDateBlock> {
_showDatePicker(
context: context,
offset: details.globalPosition,
- reminder: reminder,
options: options,
);
},
@@ -176,7 +190,7 @@ class _MentionDateBlockState extends State<MentionDateBlock> {
),
const HSpace(4),
FlowySvg(
- widget.reminderId != null
+ _reminderId != null
? FlowySvgs.reminder_clock_s
: FlowySvgs.date_s,
size: Size.square(iconSize),
@@ -198,7 +212,7 @@ class _MentionDateBlockState extends State<MentionDateBlock> {
ReminderOption? reminderOption,
}) {
final rId = reminderId ??
- (reminderOption == ReminderOption.none ? null : widget.reminderId);
+ (reminderOption == ReminderOption.none ? null : _reminderId);
final transaction = widget.editorState.transaction
..formatText(
@@ -224,22 +238,22 @@ class _MentionDateBlockState extends State<MentionDateBlock> {
void _updateReminder(
ReminderOption reminderOption,
- ReminderPB? reminder, [
+ BuildContext context, [
bool includeTime = false,
]) {
final rootContext = widget.editorState.document.root.context;
if (parsedDate == null || rootContext == null) {
return;
}
-
- if (widget.reminderId != null) {
+ final reminder = getReminder(context);
+ if (reminder != null) {
_updateBlock(
parsedDate!,
includeTime: includeTime,
reminderOption: reminderOption,
);
- if (ReminderOption.none == reminderOption && reminder != null) {
+ if (ReminderOption.none == reminderOption) {
// Delete existing reminder
return rootContext
.read<ReminderBloc>()
@@ -250,7 +264,7 @@ class _MentionDateBlockState extends State<MentionDateBlock> {
return rootContext.read<ReminderBloc>().add(
ReminderEvent.update(
ReminderUpdate(
- id: widget.reminderId!,
+ id: reminder.id,
scheduledAt:
reminderOption.getNotificationDateTime(parsedDate!),
date: parsedDate!,
@@ -260,6 +274,7 @@ class _MentionDateBlockState extends State<MentionDateBlock> {
}
final reminderId = nanoid();
+ _reminderId = reminderId;
_updateBlock(
parsedDate!,
includeTime: includeTime,
@@ -293,7 +308,6 @@ class _MentionDateBlockState extends State<MentionDateBlock> {
required BuildContext context,
required DatePickerOptions options,
required Offset offset,
- ReminderPB? reminder,
}) {
if (!widget.editorState.editable) {
return;
@@ -315,10 +329,7 @@ class _MentionDateBlockState extends State<MentionDateBlock> {
options: options,
includeTime: _includeTime,
reminderOption: widget.reminderOption,
- onReminderSelected: (option) => _updateReminder(
- option,
- reminder,
- ),
+ onReminderSelected: (option) => _updateReminder(option, context),
),
),
);
diff --git a/frontend/appflowy_flutter/lib/shared/red_dot.dart b/frontend/appflowy_flutter/lib/shared/red_dot.dart
deleted file mode 100644
index 149cadae04..0000000000
--- a/frontend/appflowy_flutter/lib/shared/red_dot.dart
+++ /dev/null
@@ -1,25 +0,0 @@
-import 'package:flutter/widgets.dart';
-
-class NotificationRedDot extends StatelessWidget {
- const NotificationRedDot({
- super.key,
- this.size = 6,
- });
-
- final double size;
-
- @override
- Widget build(BuildContext context) {
- return Container(
- width: size,
- height: size,
- clipBehavior: Clip.antiAlias,
- decoration: ShapeDecoration(
- color: const Color(0xFFFF2214),
- shape: RoundedRectangleBorder(
- borderRadius: BorderRadius.circular(20),
- ),
- ),
- );
- }
-}
diff --git a/frontend/appflowy_flutter/lib/user/application/reminder/reminder_bloc.dart b/frontend/appflowy_flutter/lib/user/application/reminder/reminder_bloc.dart
index 24f53e48e8..d80b5144e5 100644
--- a/frontend/appflowy_flutter/lib/user/application/reminder/reminder_bloc.dart
+++ b/frontend/appflowy_flutter/lib/user/application/reminder/reminder_bloc.dart
@@ -1,22 +1,27 @@
import 'dart:async';
import 'package:appflowy/generated/locale_keys.g.dart';
+import 'package:appflowy/plugins/document/application/document_data_pb_extension.dart';
+import 'package:appflowy/plugins/document/application/document_service.dart';
+import 'package:appflowy/plugins/document/presentation/editor_plugins/mention/mention_block.dart';
import 'package:appflowy/shared/list_extension.dart';
import 'package:appflowy/startup/startup.dart';
import 'package:appflowy/user/application/reminder/reminder_extension.dart';
import 'package:appflowy/user/application/reminder/reminder_service.dart';
-import 'package:appflowy/user/application/user_settings_service.dart';
import 'package:appflowy/util/int64_extension.dart';
import 'package:appflowy/workspace/application/action_navigation/action_navigation_bloc.dart';
import 'package:appflowy/workspace/application/action_navigation/navigation_action.dart';
-import 'package:appflowy/workspace/application/notification/notification_service.dart';
+import 'package:appflowy/workspace/application/view/view_service.dart';
import 'package:appflowy_backend/log.dart';
import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
import 'package:appflowy_backend/protobuf/flowy-user/protobuf.dart';
+import 'package:appflowy_editor/appflowy_editor.dart';
+import 'package:appflowy_result/appflowy_result.dart';
import 'package:bloc/bloc.dart';
import 'package:collection/collection.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:fixnum/fixnum.dart';
+import 'package:flutter/material.dart';
import 'package:freezed_annotation/freezed_annotation.dart';
import 'package:protobuf/protobuf.dart';
@@ -29,13 +34,22 @@ class ReminderBloc extends Bloc<ReminderEvent, ReminderState> {
_actionBloc = getIt<ActionNavigationBloc>();
_reminderService = const ReminderService();
timer = _periodicCheck();
+ _listener = AppLifecycleListener(
+ onResume: () {
+ if (!isClosed) {
+ add(const ReminderEvent.refresh());
+ add(const ReminderEvent.resetTimer());
+ }
+ },
+ );
_dispatch();
}
late final ActionNavigationBloc _actionBloc;
late final ReminderService _reminderService;
- late final Timer timer;
+ Timer? timer;
+ late final AppLifecycleListener _listener;
void _dispatch() {
on<ReminderEvent>(
@@ -43,15 +57,26 @@ class ReminderBloc extends Bloc<ReminderEvent, ReminderState> {
await event.when(
started: () async {
Log.info('Start fetching reminders');
-
final result = await _reminderService.fetchReminders();
-
- result.fold(
- (reminders) {
- Log.info('Fetched reminders on startup: ${reminders.length}');
- emit(state.copyWith(reminders: reminders));
+ await result.fold(
+ (reminders) async {
+ final availableReminders =
+ await filterAvailableReminders(reminders);
+ Log.info(
+ 'Fetched reminders on startup: ${availableReminders.length}',
+ );
+ if (!isClosed && !emit.isDone) {
+ emit(
+ state.copyWith(
+ reminders: availableReminders,
+ serverReminders: reminders,
+ ),
+ );
+ }
+ },
+ (error) async {
+ Log.error('Failed to fetch reminders: $error');
},
- (error) => Log.error('Failed to fetch reminders: $error'),
);
},
remove: (reminderId) async {
@@ -62,9 +87,7 @@ class ReminderBloc extends Bloc<ReminderEvent, ReminderState> {
result.fold(
(_) {
Log.info('Removed reminder: $reminderId');
- final reminders = [...state.reminders];
- reminders.removeWhere((e) => e.id == reminderId);
- emit(state.copyWith(reminders: reminders));
+ if (!isClosed) add(ReminderEvent.refresh());
},
(error) => Log.error(
'Failed to remove reminder($reminderId): $error',
@@ -81,19 +104,41 @@ class ReminderBloc extends Bloc<ReminderEvent, ReminderState> {
});
}
+ final containReminder = [
+ ...state.serverReminders,
+ ...state.reminders,
+ ].where((e) => e.id == reminder.id).firstOrNull !=
+ null;
+ if (containReminder) {
+ Log.error('Reminder: ${reminder.id} failed to be added again');
+ return;
+ }
+
final result = await _reminderService.addReminder(
reminder: reminder,
);
return result.fold(
- (_) {
+ (_) async {
Log.info('Added reminder: ${reminder.id}');
Log.info('Before adding reminder: ${state.reminders.length}');
- final reminders = [...state.reminders, reminder];
- Log.info('After adding reminder: ${reminders.length}');
- emit(state.copyWith(reminders: reminders));
+ final reminderIds = [
+ ...state.serverReminders,
+ ...state.reminders,
+ ].map((e) => e.id).toSet();
+ final showRightNow = !DateTime.now()
+ .isBefore(reminder.scheduledAt.toDateTime()) &&
+ !reminder.isRead;
+
+ if (!reminderIds.contains(reminder.id) && showRightNow) {
+ final reminders = [...state.reminders, reminder];
+ Log.info('After adding reminder: ${reminders.length}');
+ emit(state.copyWith(reminders: reminders));
+ }
+ },
+ (error) {
+ Log.error('Failed to add reminder: $error');
},
- (error) => Log.error('Failed to add reminder: $error'),
);
},
addById: (reminderId, objectId, scheduledAt, meta) async => add(
@@ -125,19 +170,29 @@ class ReminderBloc extends Bloc<ReminderEvent, ReminderState> {
Log.info('Updating reminder: ${reminder.id}');
- failureOrUnit.fold(
- (_) {
- Log.info('Updated reminder: ${reminder.id}');
- final index =
- state.reminders.indexWhere((r) => r.id == reminder.id);
- final reminders = [...state.reminders];
+ await failureOrUnit.fold((_) async {
+ Log.info('Updated reminder: ${reminder.id}');
+ final index =
+ state.reminders.indexWhere((r) => r.id == reminder.id);
+ if (index == -1) return;
+ final reminders = [...state.reminders];
+ if (await checkReminderAvailable(
+ reminder,
+ [...state.serverReminders, ...state.reminders]
+ .map((e) => e.id)
+ .toSet(),
+ )) {
reminders.replaceRange(index, index + 1, [newReminder]);
emit(state.copyWith(reminders: reminders));
- },
- (error) => Log.error(
+ } else {
+ reminders.removeAt(index);
+ emit(state.copyWith(reminders: reminders));
+ }
+ }, (error) {
+ Log.error(
'Failed to update reminder(${reminder.id}): $error',
- ),
- );
+ );
+ });
},
pressReminder: (reminderId, path, view) {
final reminder =
@@ -243,19 +298,44 @@ class ReminderBloc extends Bloc<ReminderEvent, ReminderState> {
refresh: () async {
final result = await _reminderService.fetchReminders();
- result.fold(
- (reminders) {
- Log.info('Fetched reminders on refresh: ${reminders.length}');
- emit(state.copyWith(reminders: reminders));
+ await result.fold(
+ (reminders) async {
+ final availableReminders =
+ await filterAvailableReminders(reminders);
+ Log.info(
+ 'Fetched reminders on refresh: ${availableReminders.length}',
+ );
+ if (!isClosed && !emit.isDone) {
+ emit(
+ state.copyWith(
+ reminders: availableReminders,
+ serverReminders: reminders,
+ ),
+ );
+ }
+ },
+ (error) {
+ Log.error('Failed to fetch reminders: $error');
},
- (error) => Log.error('Failed to fetch reminders: $error'),
);
},
+ resetTimer: () {
+ timer?.cancel();
+ timer = _periodicCheck();
+ },
);
},
);
}
+ @override
+ Future<void> close() async {
+ Log.info('ReminderBloc closed');
+ _listener.dispose();
+ timer?.cancel();
+ await super.close();
+ }
+
/// Mark the reminder as read
///
/// If the [reminderIds] is null, all unread reminders will be marked as read
@@ -348,42 +428,104 @@ class ReminderBloc extends Bloc<ReminderEvent, ReminderState> {
Timer _periodicCheck() {
return Timer.periodic(
- const Duration(minutes: 1),
+ const Duration(seconds: 30),
(_) async {
- final now = DateTime.now();
+ if (!isClosed) add(const ReminderEvent.refresh());
+ },
+ );
+ }
- for (final reminder in state.upcomingReminders) {
- if (reminder.isAck) {
- continue;
- }
+ Future<bool> checkReminderAvailable(
+ ReminderPB reminder,
+ Set<String> reminderIds, {
+ Set<String>? removedIds,
+ }) async {
+ /// blockId is null means no node
+ final blockId = reminder.meta[ReminderMetaKeys.blockId];
+ if (blockId == null) {
+ removedIds?.add(reminder.id);
+ return false;
+ }
- final scheduledAt = reminder.scheduledAt.toDateTime();
+ /// check if schedule time is comming
+ final scheduledAt = reminder.scheduledAt.toDateTime();
+ if (!DateTime.now().isAfter(scheduledAt) && !reminder.isRead) {
+ return false;
+ }
- if (scheduledAt.isBefore(now)) {
- final notificationSettings =
- await UserSettingsBackendService().getNotificationSettings();
- if (notificationSettings.notificationsEnabled) {
- NotificationMessage(
- identifier: reminder.id,
- title: LocaleKeys.reminderNotification_title.tr(),
- body: LocaleKeys.reminderNotification_message.tr(),
- onClick: () => _actionBloc.add(
- ActionNavigationEvent.performAction(
- action: NavigationAction(objectId: reminder.objectId),
- ),
- ),
- );
- }
+ /// check if view is not null
+ final viewId = reminder.objectId;
+ final view =
+ await ViewBackendService.getView(viewId).fold((s) => s, (_) => null);
+ if (view == null) {
+ removedIds?.add(reminder.id);
+ return false;
+ }
- add(
- ReminderEvent.update(
- ReminderUpdate(id: reminder.id, isAck: true),
- ),
- );
+ /// check if document is not null
+ final document = await DocumentService()
+ .openDocument(documentId: viewId)
+ .fold((s) => s.toDocument(), (_) => null);
+ if (document == null) {
+ removedIds?.add(reminder.id);
+ return false;
+ }
+ Node? searchById(Node current, String id) {
+ if (current.id == id) {
+ return current;
+ }
+ if (current.children.isNotEmpty) {
+ for (final child in current.children) {
+ final node = searchById(child, id);
+
+ if (node != null) {
+ return node;
}
}
- },
- );
+ }
+ return null;
+ }
+
+ /// check if node is not null
+ final node = searchById(document.root, blockId);
+ if (node == null) {
+ removedIds?.add(reminder.id);
+ return false;
+ }
+ final textInserts = node.delta?.whereType<TextInsert>();
+ if (textInserts == null) return false;
+ for (final text in textInserts) {
+ final mention =
+ text.attributes?[MentionBlockKeys.mention] as Map<String, dynamic>?;
+ final reminderId = mention?[MentionBlockKeys.reminderId] as String?;
+ if (reminderIds.contains(reminderId)) {
+ return true;
+ }
+ }
+
+ removedIds?.add(reminder.id);
+ return false;
+ }
+
+ Future<List<ReminderPB>> filterAvailableReminders(
+ List<ReminderPB> reminders,
+ ) async {
+ final List<ReminderPB> availableReminders = [];
+ final reminderIds = reminders.map((e) => e.id).toSet();
+ final removedIds = <String>{};
+ for (final r in reminders) {
+ if (await checkReminderAvailable(
+ r,
+ reminderIds,
+ removedIds: removedIds,
+ )) {
+ availableReminders.add(r);
+ }
+ }
+ for (final id in removedIds) {
+ add(ReminderEvent.remove(reminderId: id));
+ }
+ return availableReminders;
}
}
@@ -434,6 +576,7 @@ class ReminderEvent with _$ReminderEvent {
// Event to refresh reminders
const factory ReminderEvent.refresh() = _Refresh;
+ const factory ReminderEvent.resetTimer() = _ResetTimer;
}
/// Object used to merge updates with
@@ -492,37 +635,34 @@ class ReminderUpdate {
}
class ReminderState {
- ReminderState({List<ReminderPB>? reminders}) {
- _reminders = reminders ?? [];
-
+ ReminderState({
+ List<ReminderPB>? reminders,
+ this.serverReminders = const [],
+ }) {
+ _reminders = [];
pastReminders = [];
upcomingReminders = [];
- if (_reminders.isEmpty) {
- hasUnreads = false;
+ if (reminders?.isEmpty ?? true) {
return;
}
final now = DateTime.now();
- bool hasUnreadReminders = false;
- for (final reminder in _reminders) {
- final scheduledDate = DateTime.fromMillisecondsSinceEpoch(
- reminder.scheduledAt.toInt() * 1000,
- );
+ for (final ReminderPB reminder in reminders ?? []) {
+ final scheduledDate = reminder.scheduledAt.toDateTime();
if (scheduledDate.isBefore(now)) {
pastReminders.add(reminder);
-
- if (!hasUnreadReminders && !reminder.isRead) {
- hasUnreadReminders = true;
- }
} else {
upcomingReminders.add(reminder);
}
}
- hasUnreads = hasUnreadReminders;
+ pastReminders.sort((a, b) => a.scheduledAt.compareTo(b.scheduledAt));
+ upcomingReminders.sort((a, b) => a.scheduledAt.compareTo(b.scheduledAt));
+ _reminders
+ .addAll([...List.of(pastReminders), ...List.of(upcomingReminders)]);
}
late final List<ReminderPB> _reminders;
@@ -530,8 +670,14 @@ class ReminderState {
late final List<ReminderPB> pastReminders;
late final List<ReminderPB> upcomingReminders;
- late final bool hasUnreads;
-
- ReminderState copyWith({List<ReminderPB>? reminders}) =>
- ReminderState(reminders: reminders ?? _reminders);
+ final List<ReminderPB> serverReminders;
+
+ ReminderState copyWith({
+ List<ReminderPB>? reminders,
+ List<ReminderPB>? serverReminders,
+ }) =>
+ ReminderState(
+ reminders: reminders ?? _reminders,
+ serverReminders: serverReminders ?? this.serverReminders,
+ );
}
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/desktop_home_screen.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/desktop_home_screen.dart
index 39055bf93b..a02d25d209 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/desktop_home_screen.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/desktop_home_screen.dart
@@ -276,7 +276,7 @@ class DesktopHomeScreen extends StatelessWidget {
.animatedPanelX(
closeX: -layout.notificationPanelWidth,
isClosed: !layout.showNotificationPanel,
- curve: Curves.easeOutQuad,
+ curve: Curves.easeInOut,
duration: layout.animDuration.inMilliseconds * 0.001,
)
.positioned(
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/header/sidebar_top_menu.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/header/sidebar_top_menu.dart
index d2ff49b073..c076297e47 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/header/sidebar_top_menu.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/header/sidebar_top_menu.dart
@@ -64,18 +64,23 @@ class SidebarTopMenu extends StatelessWidget {
}
Widget _buildCollapseMenuButton(BuildContext context) {
+ final settingState = context.read<HomeSettingBloc?>()?.state;
+ final isNotificationPanelCollapsed =
+ settingState?.isNotificationPanelCollapsed ?? true;
+
final textSpan = TextSpan(
children: [
TextSpan(
- text: '${LocaleKeys.sideBar_closeSidebar.tr()}\n',
+ text: LocaleKeys.sideBar_closeSidebar.tr(),
style: context.tooltipTextStyle(),
),
- TextSpan(
- text: Platform.isMacOS ? '⌘+.' : 'Ctrl+\\',
- style: context
- .tooltipTextStyle()
- ?.copyWith(color: Theme.of(context).hintColor),
- ),
+ if (isNotificationPanelCollapsed)
+ TextSpan(
+ text: '\n${Platform.isMacOS ? '⌘+.' : 'Ctrl+\\'}',
+ style: context
+ .tooltipTextStyle()
+ ?.copyWith(color: Theme.of(context).hintColor),
+ ),
],
);
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/header/sidebar_user.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/header/sidebar_user.dart
index 47f273c149..82260e8118 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/header/sidebar_user.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/header/sidebar_user.dart
@@ -49,7 +49,7 @@ class SidebarUser extends StatelessWidget {
Expanded(child: _buildUserName(context, state)),
UserSettingButton(),
const HSpace(8.0),
- const NotificationButton(),
+ NotificationButton(key: ValueKey(userProfile.id)),
const HSpace(10.0),
],
),
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/shared/sidebar_setting.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/shared/sidebar_setting.dart
index 6ffc61af4a..8986cc63fd 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/shared/sidebar_setting.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/shared/sidebar_setting.dart
@@ -85,7 +85,7 @@ class _UserSettingButtonState extends State<UserSettingButton> {
@override
Widget build(BuildContext context) {
return SizedBox.square(
- dimension: 24.0,
+ dimension: 28.0,
child: FlowyTooltip(
message: LocaleKeys.settings_menu_open.tr(),
child: BlocProvider.value(
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/workspace/sidebar_workspace.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/workspace/sidebar_workspace.dart
index cc1577aeba..58dd5ffd23 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/workspace/sidebar_workspace.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/workspace/sidebar_workspace.dart
@@ -1,6 +1,7 @@
import 'package:appflowy/generated/flowy_svgs.g.dart';
import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy/shared/loading.dart';
+import 'package:appflowy/workspace/application/home/home_setting_bloc.dart';
import 'package:appflowy/workspace/application/user/user_workspace_bloc.dart';
import 'package:appflowy/workspace/presentation/home/menu/sidebar/shared/sidebar_setting.dart';
import 'package:appflowy/workspace/presentation/home/menu/sidebar/workspace/_sidebar_workspace_icon.dart';
@@ -86,7 +87,10 @@ class _SidebarWorkspaceState extends State<SidebarWorkspace> {
isHover: onHover,
),
const HSpace(8.0),
- NotificationButton(isHover: onHover),
+ NotificationButton(
+ isHover: onHover,
+ key: ValueKey(currentWorkspace.workspaceId),
+ ),
const HSpace(4.0),
],
),
@@ -104,6 +108,11 @@ class _SidebarWorkspaceState extends State<SidebarWorkspace> {
return;
}
+ final settingBloc = context.read<HomeSettingBloc?>();
+ if (settingBloc?.state.isNotificationPanelCollapsed == false) {
+ settingBloc?.add(HomeSettingEvent.collapseNotificationPanel());
+ }
+
final actionType = actionResult.actionType;
final result = actionResult.result;
final isLoading = actionResult.isLoading;
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/navigation.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/navigation.dart
index 610889f157..cfb6706c3f 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/navigation.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/navigation.dart
@@ -110,11 +110,7 @@ class FlowyNavigation extends StatelessWidget {
),
Align(
alignment: Alignment.topRight,
- child: NumberedRedDot(
- size: 14,
- fontSize: 8,
- figmaLineHeight: 10,
- ),
+ child: NumberedRedDot.desktop(),
),
],
),
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/notifications/notification_panel.dart b/frontend/appflowy_flutter/lib/workspace/presentation/notifications/notification_panel.dart
index 78243ae52d..534e5aa51f 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/notifications/notification_panel.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/notifications/notification_panel.dart
@@ -2,13 +2,11 @@ import 'dart:io';
import 'package:appflowy/generated/flowy_svgs.g.dart';
import 'package:appflowy/generated/locale_keys.g.dart';
-import 'package:appflowy/startup/startup.dart';
import 'package:appflowy/user/application/reminder/reminder_bloc.dart';
import 'package:appflowy/workspace/application/home/home_setting_bloc.dart';
import 'package:appflowy/workspace/presentation/widgets/dialogs.dart';
-import 'package:appflowy_backend/protobuf/flowy-folder/protobuf.dart';
-import 'package:appflowy_backend/protobuf/flowy-user/reminder.pb.dart';
import 'package:appflowy_editor/appflowy_editor.dart';
+import 'package:appflowy_ui/appflowy_ui.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
@@ -27,7 +25,6 @@ class NotificationPanel extends StatefulWidget {
class _NotificationPanelState extends State<NotificationPanel>
with SingleTickerProviderStateMixin {
late TabController tabController;
- final ReminderBloc reminderBloc = getIt<ReminderBloc>();
final PopoverController moreActionController = PopoverController();
final tabs = [
@@ -52,47 +49,46 @@ class _NotificationPanelState extends State<NotificationPanel>
@override
Widget build(BuildContext context) {
final settingBloc = context.read<HomeSettingBloc>();
+ final theme = AppFlowyTheme.of(context);
return GestureDetector(
- onTap: () => settingBloc.add(HomeSettingEvent.collapseNotificationPanel()),
+ onTap: () =>
+ settingBloc.add(HomeSettingEvent.collapseNotificationPanel()),
child: Container(
color: Colors.transparent,
child: Align(
alignment: Alignment.centerLeft,
- child: Container(
- width: 380,
- decoration: BoxDecoration(
- color: Theme.of(context).cardColor,
- boxShadow: [
- BoxShadow(
- blurRadius: 24,
- offset: Offset(8, 0),
- spreadRadius: 8,
- color: Color(0x1F23290A),
- ),
- ],
- ),
- padding: EdgeInsets.symmetric(vertical: 14),
- child: Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- buildTitle(
- context: context,
- onHide: () =>
- settingBloc.add(HomeSettingEvent.collapseNotificationPanel()),
- ),
- const VSpace(12),
- NotificationTabBar(
- tabController: tabController,
- tabs: tabs,
- ),
- const VSpace(14),
- Expanded(
- child: TabBarView(
- controller: tabController,
- children: tabs.map((e) => NotificationTab(tabType: e)).toList(),
+ child: GestureDetector(
+ onTap: () {},
+ child: Container(
+ width: 380,
+ decoration: BoxDecoration(
+ color: theme.backgroundColorScheme.primary,
+ boxShadow: theme.shadow.small,
+ ),
+ padding: EdgeInsets.symmetric(vertical: 14),
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ buildTitle(
+ context: context,
+ onHide: () => settingBloc
+ .add(HomeSettingEvent.collapseNotificationPanel()),
+ ),
+ const VSpace(12),
+ NotificationTabBar(
+ tabController: tabController,
+ tabs: tabs,
),
- ),
- ],
+ const VSpace(14),
+ Expanded(
+ child: TabBarView(
+ controller: tabController,
+ children:
+ tabs.map((e) => NotificationTab(tabType: e)).toList(),
+ ),
+ ),
+ ],
+ ),
),
),
),
@@ -196,7 +192,7 @@ class _NotificationPanelState extends State<NotificationPanel>
onTap: () {
showToastNotification(
message: LocaleKeys
- .notificationHub_markAllAsArchievedSucceedToast
+ .notificationHub_markAllAsArchivedSucceedToast
.tr(),
);
context
@@ -227,16 +223,4 @@ class _NotificationPanelState extends State<NotificationPanel>
],
);
}
-
- void onAction(ReminderPB reminder, int? path, ViewPB? view) {
- reminderBloc.add(
- ReminderEvent.pressReminder(reminderId: reminder.id, path: path),
- );
- }
-
- void onReadChanged(ReminderPB reminder, bool isRead) {
- reminderBloc.add(
- ReminderEvent.update(ReminderUpdate(id: reminder.id, isRead: isRead)),
- );
- }
}
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/notifications/number_red_dot.dart b/frontend/appflowy_flutter/lib/workspace/presentation/notifications/number_red_dot.dart
index 48360b2d28..b59953fb1f 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/notifications/number_red_dot.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/notifications/number_red_dot.dart
@@ -1,21 +1,38 @@
import 'package:appflowy/user/application/reminder/reminder_bloc.dart';
-import 'package:flowy_infra_ui/flowy_infra_ui.dart';
+import 'package:appflowy_ui/appflowy_ui.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
class NumberedRedDot extends StatelessWidget {
+ const NumberedRedDot.desktop({
+ super.key,
+ this.fontSize = 10,
+ }) : size = const NumberedSize(
+ min: Size.square(14),
+ middle: Size(17, 14),
+ max: Size(24, 14),
+ );
+
+ const NumberedRedDot.mobile({
+ super.key,
+ this.fontSize = 14,
+ }) : size = const NumberedSize(
+ min: Size.square(20),
+ middle: Size(26, 20),
+ max: Size(35, 20),
+ );
+
const NumberedRedDot({
super.key,
- this.size = 18,
- this.fontSize = 12,
- this.figmaLineHeight = 14,
+ required this.size,
+ required this.fontSize,
});
- final double size;
+ final NumberedSize size;
final double fontSize;
- final double figmaLineHeight;
@override
Widget build(BuildContext context) {
+ final theme = AppFlowyTheme.of(context);
return BlocBuilder<ReminderBloc, ReminderState>(
builder: (context, state) {
int unreadReminder = 0;
@@ -23,19 +40,30 @@ class NumberedRedDot extends StatelessWidget {
if (!reminder.isRead) unreadReminder++;
}
if (unreadReminder == 0) return SizedBox.shrink();
+ final overNumber = unreadReminder > 99;
+ Size size = this.size.min;
+ if (unreadReminder >= 10 && unreadReminder <= 99) {
+ size = this.size.middle;
+ } else if (unreadReminder > 99) {
+ size = this.size.max;
+ }
return Container(
- width: size,
- height: size,
+ width: size.width,
+ height: size.height,
decoration: BoxDecoration(
- color: Colors.red,
- borderRadius: BorderRadius.all(Radius.circular(16)),
+ color: theme.borderColorScheme.errorThick,
+ borderRadius: BorderRadius.all(Radius.circular(size.height / 2)),
),
child: Center(
- child: FlowyText.medium(
- '$unreadReminder',
- color: Colors.white,
- fontSize: fontSize,
- figmaLineHeight: figmaLineHeight,
+ child: Text(
+ overNumber ? '99+' : '$unreadReminder',
+ textAlign: TextAlign.center,
+ style: TextStyle(
+ fontWeight: FontWeight.w500,
+ color: Colors.white,
+ fontSize: fontSize,
+ height: 1,
+ ),
),
),
);
@@ -43,3 +71,15 @@ class NumberedRedDot extends StatelessWidget {
);
}
}
+
+class NumberedSize {
+ const NumberedSize({
+ required this.min,
+ required this.middle,
+ required this.max,
+ });
+
+ final Size min;
+ final Size middle;
+ final Size max;
+}
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/notifications/widgets/inbox_action_bar.dart b/frontend/appflowy_flutter/lib/workspace/presentation/notifications/widgets/inbox_action_bar.dart
index 988ca40fca..a458491ec7 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/notifications/widgets/inbox_action_bar.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/notifications/widgets/inbox_action_bar.dart
@@ -13,11 +13,9 @@ import 'package:flutter_bloc/flutter_bloc.dart';
class InboxActionBar extends StatelessWidget {
const InboxActionBar({
super.key,
- required this.hasUnreads,
required this.showUnreadsOnly,
});
- final bool hasUnreads;
final bool showUnreadsOnly;
@override
@@ -36,11 +34,9 @@ class InboxActionBar extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
_MarkAsReadButton(
- onMarkAllRead: !hasUnreads
- ? null
- : () => context
- .read<ReminderBloc>()
- .add(const ReminderEvent.markAllRead()),
+ onMarkAllRead: () => context
+ .read<ReminderBloc>()
+ .add(const ReminderEvent.markAllRead()),
),
_ToggleUnreadsButton(
showUnreadsOnly: showUnreadsOnly,
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/notifications/widgets/notification_button.dart b/frontend/appflowy_flutter/lib/workspace/presentation/notifications/widgets/notification_button.dart
index 6452f06a30..47871b17a9 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/notifications/widgets/notification_button.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/notifications/widgets/notification_button.dart
@@ -72,36 +72,32 @@ class _NotificationButtonState extends State<NotificationButton> {
List<ReminderPB> reminders,
VoidCallback onTap,
) {
- int unreadReminder = 0;
- for (final reminder in reminders) {
- if (!reminder.isRead) unreadReminder++;
- }
- if (unreadReminder > 0) {
- return MouseRegion(
- cursor: SystemMouseCursors.click,
- child: GestureDetector(
- onTap: onTap,
- child: Container(
- height: 24,
- padding: EdgeInsets.all(3),
- child: NumberedRedDot(),
- ),
- ),
- );
- }
-
return SizedBox.square(
- dimension: 24.0,
- child: FlowyButton(
- useIntrinsicWidth: true,
- margin: EdgeInsets.zero,
- text: FlowySvg(
- FlowySvgs.notification_s,
- color:
- widget.isHover ? Theme.of(context).colorScheme.onSurface : null,
- opacity: 0.7,
- ),
- onTap: onTap,
+ dimension: 28.0,
+ child: Stack(
+ children: [
+ Center(
+ child: SizedBox.square(
+ dimension: 28.0,
+ child: FlowyButton(
+ useIntrinsicWidth: true,
+ margin: EdgeInsets.zero,
+ text: FlowySvg(
+ FlowySvgs.notification_s,
+ color: widget.isHover
+ ? Theme.of(context).colorScheme.onSurface
+ : null,
+ opacity: 0.7,
+ ),
+ onTap: onTap,
+ ),
+ ),
+ ),
+ Align(
+ alignment: Alignment.topRight,
+ child: NumberedRedDot.desktop(),
+ ),
+ ],
),
);
}
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/notifications/widgets/notification_content_v2.dart b/frontend/appflowy_flutter/lib/workspace/presentation/notifications/widgets/notification_content_v2.dart
new file mode 100644
index 0000000000..404709c034
--- /dev/null
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/notifications/widgets/notification_content_v2.dart
@@ -0,0 +1,135 @@
+import 'package:appflowy/generated/flowy_svgs.g.dart';
+import 'package:appflowy/generated/locale_keys.g.dart';
+import 'package:appflowy/mobile/application/notification/notification_reminder_bloc.dart';
+import 'package:appflowy/mobile/application/page_style/document_page_style_bloc.dart';
+import 'package:appflowy/mobile/presentation/notifications/widgets/shared.dart';
+import 'package:appflowy/workspace/application/view/view_ext.dart';
+import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
+import 'package:appflowy_backend/protobuf/flowy-user/reminder.pb.dart';
+import 'package:appflowy_editor/appflowy_editor.dart';
+import 'package:appflowy_ui/appflowy_ui.dart';
+import 'package:easy_localization/easy_localization.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';
+
+class NotificationItemContentV2 extends StatelessWidget {
+ const NotificationItemContentV2({super.key, required this.reminder});
+ final ReminderPB reminder;
+
+ @override
+ Widget build(BuildContext context) {
+ return BlocBuilder<NotificationReminderBloc, NotificationReminderState>(
+ builder: (context, state) {
+ final view = state.view;
+ if (view == null) {
+ return const SizedBox.shrink();
+ }
+ final theme = AppFlowyTheme.of(context);
+
+ return Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ _buildHeader(state.scheduledAt, theme),
+ _buildPageName(context, state.isLocked, state.pageTitle, theme),
+ _buildContent(view, state.nodes, theme),
+ ],
+ );
+ },
+ );
+ }
+
+ Widget _buildHeader(String createAt, AppFlowyThemeData theme) {
+ return SizedBox(
+ height: 22,
+ child: Row(
+ children: [
+ FlowyText.medium(
+ LocaleKeys.settings_notifications_titles_reminder.tr(),
+ fontSize: 14,
+ figmaLineHeight: 22,
+ color: theme.textColorScheme.primary,
+ ),
+ Spacer(),
+ if (createAt.isNotEmpty)
+ FlowyText.regular(
+ createAt,
+ fontSize: 12,
+ figmaLineHeight: 16,
+ color: theme.textColorScheme.secondary,
+ ),
+ if (!reminder.isRead) ...[
+ HSpace(4),
+ const UnreadRedDot(),
+ ],
+ ],
+ ),
+ );
+ }
+
+ Widget _buildPageName(
+ BuildContext context,
+ bool isLocked,
+ String pageTitle,
+ AppFlowyThemeData theme,
+ ) {
+ return SizedBox(
+ height: 18,
+ child: Row(
+ children: [
+ FlowyText.regular(
+ LocaleKeys.notificationHub_mentionedYou.tr(),
+ fontSize: 12,
+ figmaLineHeight: 18,
+ color: theme.textColorScheme.secondary,
+ ),
+ const NotificationEllipse(),
+ if (isLocked)
+ Padding(
+ padding: EdgeInsets.only(right: 5),
+ child: FlowySvg(
+ FlowySvgs.notification_lock_s,
+ color: theme.iconColorScheme.secondary,
+ ),
+ ),
+ Flexible(
+ child: FlowyText.regular(
+ pageTitle,
+ fontSize: 12,
+ figmaLineHeight: 18,
+ color: theme.textColorScheme.secondary,
+ overflow: TextOverflow.ellipsis,
+ ),
+ ),
+ ],
+ ),
+ );
+ }
+
+ Widget _buildContent(
+ ViewPB view,
+ List<Node>? nodes,
+ AppFlowyThemeData theme,
+ ) {
+ if (view.layout.isDocumentView && nodes != null) {
+ return IntrinsicHeight(
+ child: BlocProvider(
+ create: (context) => DocumentPageStyleBloc(view: view),
+ child: NotificationDocumentContent(reminder: reminder, nodes: nodes),
+ ),
+ );
+ } else if (view.layout.isDatabaseView) {
+ return FlowyText(
+ reminder.message,
+ fontSize: 14,
+ figmaLineHeight: 22,
+ color: theme.textColorScheme.primary,
+ maxLines: 3,
+ overflow: TextOverflow.ellipsis,
+ );
+ }
+ return const SizedBox.shrink();
+ }
+}
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/notifications/widgets/notification_item_v2.dart b/frontend/appflowy_flutter/lib/workspace/presentation/notifications/widgets/notification_item_v2.dart
index a3745005b9..453d51825b 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/notifications/widgets/notification_item_v2.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/notifications/widgets/notification_item_v2.dart
@@ -15,12 +15,15 @@ import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';
import 'package:appflowy_backend/protobuf/flowy-user/protobuf.dart';
import 'package:appflowy_editor/appflowy_editor.dart';
import 'package:appflowy_result/appflowy_result.dart';
+import 'package:appflowy_ui/appflowy_ui.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flowy_infra_ui/style_widget/hover.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
+import 'notification_content_v2.dart';
+
class NotificationItemV2 extends StatelessWidget {
const NotificationItemV2({
super.key,
@@ -60,58 +63,62 @@ class NotificationItemV2 extends StatelessWidget {
}
final child = Padding(
- padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 16),
+ padding: const EdgeInsets.fromLTRB(16, 14, 14, 10),
child: _InnerNotificationItem(
tabType: tabType,
reminder: reminder,
),
);
- return FlowyHover(
- style: HoverStyle(
- hoverColor: Theme.of(context).colorScheme.secondary,
- borderRadius: BorderRadius.zero,
- ),
- resetHoverOnRebuild: false,
- builder: (context, hover) {
- return GestureDetector(
- behavior: HitTestBehavior.translucent,
- child: Stack(
- children: [
- child,
- if (hover) buildActions(context),
- ],
- ),
- onTap: () async {
- final view = state.view;
- if (view == null) {
- return;
- }
+ return Padding(
+ padding: const EdgeInsets.symmetric(horizontal: 8),
+ child: FlowyHover(
+ style: HoverStyle(
+ hoverColor: Theme.of(context).colorScheme.secondary,
+ borderRadius: BorderRadius.all(Radius.circular(8)),
+ ),
+ resetHoverOnRebuild: false,
+ builder: (context, hover) {
+ return GestureDetector(
+ behavior: HitTestBehavior.translucent,
+ child: Stack(
+ children: [
+ child,
+ if (hover) buildActions(context),
+ ],
+ ),
+ onTap: () async {
+ final view = state.view;
+ if (view == null) {
+ return;
+ }
- homeSetting.add(HomeSettingEvent.collapseNotificationPanel());
+ homeSetting
+ .add(HomeSettingEvent.collapseNotificationPanel());
- final documentFuture = DocumentService().openDocument(
- documentId: reminder.objectId,
- );
+ final documentFuture = DocumentService().openDocument(
+ documentId: reminder.objectId,
+ );
- final blockId = reminder.meta[ReminderMetaKeys.blockId];
+ final blockId = reminder.meta[ReminderMetaKeys.blockId];
- int? path;
- if (blockId != null) {
- final node =
- await _getNodeFromDocument(documentFuture, blockId);
- path = node?.path.first;
- }
+ int? path;
+ if (blockId != null) {
+ final node =
+ await _getNodeFromDocument(documentFuture, blockId);
+ path = node?.path.first;
+ }
- reminderBloc.add(
- ReminderEvent.pressReminder(
- reminderId: reminder.id,
- path: path,
- ),
- );
- },
- );
- },
+ reminderBloc.add(
+ ReminderEvent.pressReminder(
+ reminderId: reminder.id,
+ path: path,
+ ),
+ );
+ },
+ );
+ },
+ ),
);
},
),
@@ -119,11 +126,12 @@ class NotificationItemV2 extends StatelessWidget {
}
Widget buildActions(BuildContext context) {
- const borderColor = Color(0x1F23291F);
+ final theme = AppFlowyTheme.of(context);
+ final borderColor = theme.borderColorScheme.primary;
final decoration = BoxDecoration(
border: Border.all(color: borderColor),
borderRadius: BorderRadius.all(Radius.circular(6)),
- color: Theme.of(context).cardColor,
+ color: theme.surfaceColorScheme.primary,
);
Widget child;
@@ -133,7 +141,7 @@ class NotificationItemV2 extends StatelessWidget {
height: 28,
decoration: decoration,
child: FlowyIconButton(
- tooltipText: LocaleKeys.notificationHub_unarchievedTooltip.tr(),
+ tooltipText: LocaleKeys.notificationHub_unarchiveTooltip.tr(),
icon: FlowySvg(FlowySvgs.notification_unarchive_s),
onPressed: () {
context.read<ReminderBloc>().add(
@@ -180,7 +188,7 @@ class NotificationItemV2 extends StatelessWidget {
HSpace(6),
],
FlowyIconButton(
- tooltipText: LocaleKeys.notificationHub_archievedTooltip.tr(),
+ tooltipText: LocaleKeys.notificationHub_archivedTooltip.tr(),
icon: FlowySvg(
FlowySvgs.notification_archive_s,
),
@@ -198,8 +206,7 @@ class NotificationItemV2 extends StatelessWidget {
);
showToastNotification(
- message: LocaleKeys
- .notificationHub_markAsArchievedSucceedToast
+ message: LocaleKeys.notificationHub_markAsArchivedSucceedToast
.tr(),
);
},
@@ -209,8 +216,8 @@ class NotificationItemV2 extends StatelessWidget {
);
}
return Positioned(
- top: 12,
- right: 14,
+ top: 8,
+ right: 8,
child: child,
);
}
@@ -269,10 +276,10 @@ class _InnerNotificationItem extends StatelessWidget {
return Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
- NotificationIcon(reminder: reminder),
+ NotificationIcon(reminder: reminder, atSize: 14),
const HSpace(12.0),
Expanded(
- child: NotificationContent(reminder: reminder),
+ child: NotificationItemContentV2(reminder: reminder),
),
],
);
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/notifications/widgets/notification_tab.dart b/frontend/appflowy_flutter/lib/workspace/presentation/notifications/widgets/notification_tab.dart
index 251ec7cb30..77ee64db55 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/notifications/widgets/notification_tab.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/notifications/widgets/notification_tab.dart
@@ -1,8 +1,9 @@
-import 'package:appflowy/generated/flowy_svgs.g.dart';
import 'package:appflowy/generated/locale_keys.g.dart';
+import 'package:appflowy/mobile/presentation/notifications/widgets/empty.dart';
import 'package:appflowy/shared/list_extension.dart';
import 'package:appflowy/user/application/reminder/reminder_bloc.dart';
import 'package:appflowy/user/application/reminder/reminder_extension.dart';
+import 'package:appflowy/util/int64_extension.dart';
import 'package:appflowy/workspace/presentation/widgets/dialogs.dart';
import 'package:appflowy_backend/appflowy_backend.dart';
import 'package:appflowy_backend/protobuf/flowy-user/protobuf.dart';
@@ -38,19 +39,14 @@ class _NotificationTabState extends State<NotificationTab>
builder: (context, state) {
final reminders = _filterReminders(state.reminders);
- if (reminders.isEmpty) return EmptyNotificationsWidget();
+ if (reminders.isEmpty) return EmptyNotification(type: widget.tabType);
final dateTimeNow = DateTime.now();
final List<ReminderPB> todayReminders = [];
final List<ReminderPB> olderReminders = [];
for (final reminder in reminders) {
- final createAt = reminder.createdAt;
- if (createAt == null) {
- olderReminders.add(reminder);
- continue;
- }
- final dateTimeCreate = DateTime.fromMillisecondsSinceEpoch(createAt);
- if (dateTimeNow.difference(dateTimeCreate).inDays < 1) {
+ final scheduledAt = reminder.scheduledAt.toDateTime();
+ if (dateTimeNow.difference(scheduledAt).inDays < 1) {
todayReminders.add(reminder);
} else {
olderReminders.add(reminder);
@@ -97,6 +93,7 @@ class _NotificationTabState extends State<NotificationTab>
figmaLineHeight: 18,
),
),
+ const VSpace(4),
...List.generate(reminders.length, (index) {
final reminder = reminders[index];
return NotificationItemV2(
@@ -144,24 +141,3 @@ class _NotificationTabState extends State<NotificationTab>
}
}
}
-
-class EmptyNotificationsWidget extends StatelessWidget {
- const EmptyNotificationsWidget({super.key});
-
- @override
- Widget build(BuildContext context) {
- return Column(
- mainAxisAlignment: MainAxisAlignment.center,
- children: [
- const FlowySvg(FlowySvgs.m_empty_notification_xl),
- const VSpace(12.0),
- FlowyText(
- LocaleKeys.notificationHub_noNotifications.tr(),
- fontSize: 16.0,
- figmaLineHeight: 24.0,
- fontWeight: FontWeight.w500,
- ),
- ],
- );
- }
-}
diff --git a/frontend/appflowy_flutter/packages/appflowy_ui/lib/appflowy_ui.dart b/frontend/appflowy_flutter/packages/appflowy_ui/lib/appflowy_ui.dart
index 61117dbe3c..1bb3cd135e 100644
--- a/frontend/appflowy_flutter/packages/appflowy_ui/lib/appflowy_ui.dart
+++ b/frontend/appflowy_flutter/packages/appflowy_ui/lib/appflowy_ui.dart
@@ -1,3 +1,3 @@
export 'src/component/component.dart';
export 'src/theme/data/appflowy_default/primitive.dart';
-export 'src/theme/theme.dart';
\ No newline at end of file
+export 'src/theme/theme.dart';
diff --git a/frontend/appflowy_flutter/packages/appflowy_ui/lib/src/theme/data/appflowy_default/semantic.dart b/frontend/appflowy_flutter/packages/appflowy_ui/lib/src/theme/data/appflowy_default/semantic.dart
index 1600edd721..d24b69ff2c 100644
--- a/frontend/appflowy_flutter/packages/appflowy_ui/lib/src/theme/data/appflowy_default/semantic.dart
+++ b/frontend/appflowy_flutter/packages/appflowy_ui/lib/src/theme/data/appflowy_default/semantic.dart
@@ -27,7 +27,7 @@ class AppFlowyDefaultTheme implements AppFlowyThemeBuilder {
final textColorScheme = AppFlowyTextColorScheme(
primary: AppFlowyPrimitiveTokens.neutral1000,
secondary: AppFlowyPrimitiveTokens.neutral600,
- tertiary: AppFlowyPrimitiveTokens.neutral400,
+ tertiary: AppFlowyPrimitiveTokens.neutral500,
quaternary: AppFlowyPrimitiveTokens.neutral200,
inverse: AppFlowyPrimitiveTokens.neutralWhite,
onFill: AppFlowyPrimitiveTokens.neutralWhite,
@@ -83,7 +83,7 @@ class AppFlowyDefaultTheme implements AppFlowyThemeBuilder {
);
final fillColorScheme = AppFlowyFillColorScheme(
- primary: AppFlowyPrimitiveTokens.neutral1000,
+ primary: AppFlowyPrimitiveTokens.neutral100,
primaryHover: AppFlowyPrimitiveTokens.neutral900,
secondary: AppFlowyPrimitiveTokens.neutral600,
secondaryHover: AppFlowyPrimitiveTokens.neutral500,
@@ -183,7 +183,7 @@ class AppFlowyDefaultTheme implements AppFlowyThemeBuilder {
final textColorScheme = AppFlowyTextColorScheme(
primary: AppFlowyPrimitiveTokens.neutral200,
- secondary: AppFlowyPrimitiveTokens.neutral400,
+ secondary: AppFlowyPrimitiveTokens.neutral500,
tertiary: AppFlowyPrimitiveTokens.neutral600,
quaternary: AppFlowyPrimitiveTokens.neutral1000,
inverse: AppFlowyPrimitiveTokens.neutral1000,
@@ -240,7 +240,7 @@ class AppFlowyDefaultTheme implements AppFlowyThemeBuilder {
);
final fillColorScheme = AppFlowyFillColorScheme(
- primary: AppFlowyPrimitiveTokens.neutral100,
+ primary: AppFlowyPrimitiveTokens.neutral900,
primaryHover: AppFlowyPrimitiveTokens.neutral200,
secondary: AppFlowyPrimitiveTokens.neutral300,
secondaryHover: AppFlowyPrimitiveTokens.neutral400,
diff --git a/frontend/appflowy_flutter/test/bloc_test/grid_test/cell/date_cell_bloc_test.dart b/frontend/appflowy_flutter/test/bloc_test/grid_test/cell/date_cell_bloc_test.dart
index 71a4dcb3e6..144497055e 100644
--- a/frontend/appflowy_flutter/test/bloc_test/grid_test/cell/date_cell_bloc_test.dart
+++ b/frontend/appflowy_flutter/test/bloc_test/grid_test/cell/date_cell_bloc_test.dart
@@ -263,13 +263,10 @@ void main() {
expect(reminderBloc.state.reminders.length, 0);
final now = DateTime.now();
- final threeDaysFromToday = DateTime(now.year, now.month, now.day + 3);
- final fourDaysFromToday = DateTime(now.year, now.month, now.day + 4);
- final fiveDaysFromToday = DateTime(now.year, now.month, now.day + 5);
+ final yesterday = DateTime(now.year, now.month, now.day - 1);
- bloc.add(DateCellEditorEvent.updateDateTime(threeDaysFromToday));
+ bloc.add(DateCellEditorEvent.updateDateTime(yesterday));
await gridResponseFuture();
-
bloc.add(
const DateCellEditorEvent.setReminderOption(
ReminderOption.onDayOfEvent,
@@ -281,79 +278,43 @@ void main() {
expect(
reminderBloc.state.reminders.first.scheduledAt,
Int64(
- threeDaysFromToday
- .add(const Duration(hours: 9))
- .millisecondsSinceEpoch ~/
+ yesterday.add(const Duration(hours: 9)).millisecondsSinceEpoch ~/
1000,
),
);
+ bloc.add(
+ const DateCellEditorEvent.setReminderOption(ReminderOption.none),
+ );
+ await gridResponseFuture();
+ expect(reminderBloc.state.reminders.length, 0);
reminderBloc.add(const ReminderEvent.refresh());
await gridResponseFuture();
+ expect(reminderBloc.state.reminders.length, 0);
+ });
- expect(reminderBloc.state.reminders.length, 1);
- expect(
- reminderBloc.state.reminders.first.scheduledAt,
- Int64(
- threeDaysFromToday
- .add(const Duration(hours: 9))
- .millisecondsSinceEpoch ~/
- 1000,
- ),
+ test('set reminder option with later time', () async {
+ final reminderBloc = ReminderBloc();
+ final bloc = DateCellEditorBloc(
+ cellController: cellController,
+ reminderBloc: reminderBloc,
);
-
- bloc.add(DateCellEditorEvent.updateDateTime(fourDaysFromToday));
await gridResponseFuture();
- expect(reminderBloc.state.reminders.length, 1);
- expect(
- reminderBloc.state.reminders.first.scheduledAt,
- Int64(
- fourDaysFromToday
- .add(const Duration(hours: 9))
- .millisecondsSinceEpoch ~/
- 1000,
- ),
- );
- bloc.add(DateCellEditorEvent.updateDateTime(fiveDaysFromToday));
- await gridResponseFuture();
- reminderBloc.add(const ReminderEvent.refresh());
- await gridResponseFuture();
- expect(reminderBloc.state.reminders.length, 1);
- expect(
- reminderBloc.state.reminders.first.scheduledAt,
- Int64(
- fiveDaysFromToday
- .add(const Duration(hours: 9))
- .millisecondsSinceEpoch ~/
- 1000,
- ),
- );
+ expect(reminderBloc.state.reminders.length, 0);
+ final now = DateTime.now();
+ final threeDaysFromToday = DateTime(now.year, now.month, now.day + 3);
+
+ bloc.add(DateCellEditorEvent.updateDateTime(threeDaysFromToday));
+ await gridResponseFuture();
bloc.add(
const DateCellEditorEvent.setReminderOption(
- ReminderOption.twoDaysBefore,
+ ReminderOption.onDayOfEvent,
),
);
await gridResponseFuture();
- expect(reminderBloc.state.reminders.length, 1);
- expect(
- reminderBloc.state.reminders.first.scheduledAt,
- Int64(
- threeDaysFromToday
- .add(const Duration(hours: 9))
- .millisecondsSinceEpoch ~/
- 1000,
- ),
- );
- bloc.add(
- const DateCellEditorEvent.setReminderOption(ReminderOption.none),
- );
- await gridResponseFuture();
- expect(reminderBloc.state.reminders.length, 0);
- reminderBloc.add(const ReminderEvent.refresh());
- await gridResponseFuture();
expect(reminderBloc.state.reminders.length, 0);
});
@@ -366,7 +327,9 @@ void main() {
await gridResponseFuture();
final now = DateTime.now();
- final today = DateTime(now.year, now.month, now.day);
+ final yesterday = DateTime(now.year, now.month, now.day - 1);
+ bloc.add(DateCellEditorEvent.updateDateTime(yesterday));
+ await gridResponseFuture();
bloc.add(
const DateCellEditorEvent.setReminderOption(
ReminderOption.onDayOfEvent,
@@ -374,12 +337,13 @@ void main() {
);
await gridResponseFuture();
- expect(bloc.state.dateTime, today);
+ expect(bloc.state.dateTime, yesterday);
expect(reminderBloc.state.reminders.length, 1);
expect(
reminderBloc.state.reminders.first.scheduledAt,
Int64(
- today.add(const Duration(hours: 9)).millisecondsSinceEpoch ~/ 1000,
+ yesterday.add(const Duration(hours: 9)).millisecondsSinceEpoch ~/
+ 1000,
),
);
diff --git a/frontend/resources/flowy_icons/16x/notification_icon_at.svg b/frontend/resources/flowy_icons/16x/notification_icon_at.svg
new file mode 100644
index 0000000000..7dd6ab47e2
--- /dev/null
+++ b/frontend/resources/flowy_icons/16x/notification_icon_at.svg
@@ -0,0 +1,5 @@
+<svg width="14" height="15" viewBox="0 0 14 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g opacity="0.8">
+<path d="M8.9601 5.53961V7.98961C8.9601 8.37948 9.11497 8.75338 9.39065 9.02906C9.66633 9.30474 10.0402 9.45961 10.4301 9.45961C10.82 9.45961 11.1939 9.30474 11.4695 9.02906C11.7452 8.75338 11.9001 8.37948 11.9001 7.98961V7.49961C11.9001 6.39579 11.5274 5.32431 10.8424 4.45876C10.1574 3.5932 9.20018 2.9843 8.12589 2.73069C7.0516 2.47709 5.92315 2.59364 4.92337 3.06146C3.92359 3.52929 3.11105 4.32098 2.61741 5.30827C2.12377 6.29555 1.97794 7.42059 2.20354 8.50111C2.42915 9.58163 3.01298 10.5543 3.86044 11.2616C4.7079 11.9689 5.76934 12.3693 6.87279 12.398C7.97624 12.4266 9.05704 12.0819 9.9401 11.4196M5.0401 7.49961C5.0401 8.01943 5.2466 8.51796 5.61417 8.88554C5.98174 9.25311 6.48027 9.45961 7.0001 9.45961C7.51992 9.45961 8.01845 9.25311 8.38602 8.88554C8.7536 8.51796 8.96009 8.01943 8.96009 7.49961C8.96009 6.97978 8.7536 6.48125 8.38602 6.11368C8.01845 5.74611 7.51992 5.53961 7.0001 5.53961C6.48027 5.53961 5.98174 5.74611 5.61417 6.11368C5.2466 6.48125 5.0401 6.97978 5.0401 7.49961Z" stroke="#21232A" stroke-linecap="round" stroke-linejoin="round"/>
+</g>
+</svg>
diff --git a/frontend/resources/translations/en.json b/frontend/resources/translations/en.json
index 86841c0b5a..d7ecc61450 100644
--- a/frontend/resources/translations/en.json
+++ b/frontend/resources/translations/en.json
@@ -2462,13 +2462,13 @@
"viewNotifications": "View notifications",
"noNotifications": "No notifications yet",
"mentionedYou": "Mentioned you",
- "archievedTooltip": "Archieve this notification",
- "unarchievedTooltip": "Unarchieved this notification",
- "markAsReadTooltip": "Mark as read this notification",
- "markAsArchievedSucceedToast": "Archive successful",
- "markAllAsArchievedSucceedToast": "Archive all successful",
- "markAsReadSucceedToast": "Mark as read successful",
- "markAllAsReadSucceedToast": "Mark all as read successful",
+ "archivedTooltip": "Archive this notification",
+ "unarchiveTooltip": "Unarchive this notification",
+ "markAsReadTooltip": "Mark this notification as read",
+ "markAsArchivedSucceedToast": "Archived successfully",
+ "markAllAsArchivedSucceedToast": "Archived all successfully",
+ "markAsReadSucceedToast": "Mark as read successfully",
+ "markAllAsReadSucceedToast": "Mark all as read successfully",
"today": "Today",
"older": "Older",
"mobile": {