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.

feat: combine icons and emojis into one menu(#6806) (#6998)

Morndda396224903
diff --git a/frontend/appflowy_flutter/integration_test/desktop/document/document_find_menu_test.dart b/frontend/appflowy_flutter/integration_test/desktop/document/document_find_menu_test.dart
index adb2090563..2c7cbdacb5 100644
--- a/frontend/appflowy_flutter/integration_test/desktop/document/document_find_menu_test.dart
+++ b/frontend/appflowy_flutter/integration_test/desktop/document/document_find_menu_test.dart
@@ -155,7 +155,6 @@ void main() {
await tester.simulateKeyEvent(LogicalKeyboardKey.escape);
await tester.pumpAndSettle();
expect(find.byType(FindAndReplaceMenuWidget), findsNothing);
-
},
);
}
diff --git a/frontend/appflowy_flutter/integration_test/desktop/document/document_with_cover_image_test.dart b/frontend/appflowy_flutter/integration_test/desktop/document/document_with_cover_image_test.dart
index c365c1bad5..f04c2ee0e1 100644
--- a/frontend/appflowy_flutter/integration_test/desktop/document/document_with_cover_image_test.dart
+++ b/frontend/appflowy_flutter/integration_test/desktop/document/document_with_cover_image_test.dart
@@ -1,5 +1,6 @@
import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy/plugins/document/presentation/editor_plugins/header/document_cover_widget.dart';
+import 'package:appflowy/shared/icon_emoji_picker/flowy_icon_emoji_picker.dart';
import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
@@ -147,7 +148,7 @@ void main() {
tester.expectViewHasIcon(
gettingStarted,
ViewLayoutPB.Document,
- punch,
+ EmojiIconData.emoji(punch),
);
});
});
diff --git a/frontend/appflowy_flutter/integration_test/desktop/settings/sign_in_page_settings_test.dart b/frontend/appflowy_flutter/integration_test/desktop/settings/sign_in_page_settings_test.dart
index 7caf439b66..b7074be357 100644
--- a/frontend/appflowy_flutter/integration_test/desktop/settings/sign_in_page_settings_test.dart
+++ b/frontend/appflowy_flutter/integration_test/desktop/settings/sign_in_page_settings_test.dart
@@ -82,7 +82,7 @@ void main() {
// reset to appflowy cloud
await tester.tapButton(
findServerType(AuthenticatorType.appflowyCloudSelfHost),
- );
+ );
// change the server type to appflowy cloud
await tester.tapButton(
findServerType(AuthenticatorType.appflowyCloud),
diff --git a/frontend/appflowy_flutter/integration_test/desktop/sidebar/sidebar_icon_test.dart b/frontend/appflowy_flutter/integration_test/desktop/sidebar/sidebar_icon_test.dart
index bba172c27e..cd3cddd88e 100644
--- a/frontend/appflowy_flutter/integration_test/desktop/sidebar/sidebar_icon_test.dart
+++ b/frontend/appflowy_flutter/integration_test/desktop/sidebar/sidebar_icon_test.dart
@@ -1,3 +1,6 @@
+import 'package:appflowy/shared/icon_emoji_picker/flowy_icon_emoji_picker.dart';
+import 'package:appflowy/shared/icon_emoji_picker/icon_picker.dart';
+import 'package:appflowy/workspace/presentation/home/menu/sidebar/space/space_icon_popup.dart';
import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:integration_test/integration_test.dart';
@@ -9,75 +12,158 @@ import '../../shared/expectation.dart';
void main() {
IntegrationTestWidgetsFlutterBinding.ensureInitialized();
- const emoji = '😁';
-
- group('Icon:', () {
- testWidgets('Update page icon in sidebar', (tester) async {
- await tester.initializeAppFlowy();
- await tester.tapAnonymousSignInButton();
-
- // create document, board, grid and calendar views
- for (final value in ViewLayoutPB.values) {
- if (value == ViewLayoutPB.Chat) {
- continue;
- }
- await tester.createNewPageWithNameUnderParent(
- name: value.name,
- parentName: gettingStarted,
- layout: value,
- );
-
- // update its icon
- await tester.updatePageIconInSidebarByName(
- name: value.name,
- parentName: gettingStarted,
- layout: value,
- icon: emoji,
- );
-
- tester.expectViewHasIcon(
- value.name,
- value,
- emoji,
- );
+ final emoji = EmojiIconData.emoji('😁');
+
+ Future<EmojiIconData> loadIcon() async {
+ await loadIconGroups();
+ final groups = kIconGroups!;
+ final firstGroup = groups.first;
+ final firstIcon = firstGroup.icons.first;
+ return EmojiIconData.icon(
+ IconsData(
+ firstGroup.name,
+ firstIcon.content,
+ firstIcon.name,
+ builtInSpaceColors.first,
+ ),
+ );
+ }
+
+ testWidgets('Update page emoji in sidebar', (tester) async {
+ await tester.initializeAppFlowy();
+ await tester.tapAnonymousSignInButton();
+
+ // create document, board, grid and calendar views
+ for (final value in ViewLayoutPB.values) {
+ if (value == ViewLayoutPB.Chat) {
+ continue;
+ }
+ await tester.createNewPageWithNameUnderParent(
+ name: value.name,
+ parentName: gettingStarted,
+ layout: value,
+ );
+
+ // update its emoji
+ await tester.updatePageIconInSidebarByName(
+ name: value.name,
+ parentName: gettingStarted,
+ layout: value,
+ icon: emoji,
+ );
+
+ tester.expectViewHasIcon(
+ value.name,
+ value,
+ emoji,
+ );
+ }
+ });
+
+ testWidgets('Update page emoji in title bar', (tester) async {
+ await tester.initializeAppFlowy();
+ await tester.tapAnonymousSignInButton();
+
+ // create document, board, grid and calendar views
+ for (final value in ViewLayoutPB.values) {
+ if (value == ViewLayoutPB.Chat) {
+ continue;
+ }
+
+ await tester.createNewPageWithNameUnderParent(
+ name: value.name,
+ parentName: gettingStarted,
+ layout: value,
+ );
+
+ // update its emoji
+ await tester.updatePageIconInTitleBarByName(
+ name: value.name,
+ layout: value,
+ icon: emoji,
+ );
+
+ tester.expectViewHasIcon(
+ value.name,
+ value,
+ emoji,
+ );
+
+ tester.expectViewTitleHasIcon(
+ value.name,
+ value,
+ emoji,
+ );
+ }
+ });
+
+ testWidgets('Update page icon in sidebar', (tester) async {
+ await tester.initializeAppFlowy();
+ await tester.tapAnonymousSignInButton();
+ final iconData = await loadIcon();
+
+ // create document, board, grid and calendar views
+ for (final value in ViewLayoutPB.values) {
+ if (value == ViewLayoutPB.Chat) {
+ continue;
}
- });
-
- testWidgets('Update page icon in title bar', (tester) async {
- await tester.initializeAppFlowy();
- await tester.tapAnonymousSignInButton();
-
- // create document, board, grid and calendar views
- for (final value in ViewLayoutPB.values) {
- if (value == ViewLayoutPB.Chat) {
- continue;
- }
-
- await tester.createNewPageWithNameUnderParent(
- name: value.name,
- parentName: gettingStarted,
- layout: value,
- );
-
- // update its icon
- await tester.updatePageIconInTitleBarByName(
- name: value.name,
- layout: value,
- icon: emoji,
- );
-
- tester.expectViewHasIcon(
- value.name,
- value,
- emoji,
- );
-
- tester.expectViewTitleHasIcon(
- value.name,
- value,
- emoji,
- );
+ await tester.createNewPageWithNameUnderParent(
+ name: value.name,
+ parentName: gettingStarted,
+ layout: value,
+ );
+
+ // update its icon
+ await tester.updatePageIconInSidebarByName(
+ name: value.name,
+ parentName: gettingStarted,
+ layout: value,
+ icon: iconData,
+ );
+
+ tester.expectViewHasIcon(
+ value.name,
+ value,
+ iconData,
+ );
+ }
+ });
+
+ testWidgets('Update page icon in title bar', (tester) async {
+ await tester.initializeAppFlowy();
+ await tester.tapAnonymousSignInButton();
+ final iconData = await loadIcon();
+
+ // create document, board, grid and calendar views
+ for (final value in ViewLayoutPB.values) {
+ if (value == ViewLayoutPB.Chat) {
+ continue;
}
- });
+
+ await tester.createNewPageWithNameUnderParent(
+ name: value.name,
+ parentName: gettingStarted,
+ layout: value,
+ );
+
+ // update its icon
+ await tester.updatePageIconInTitleBarByName(
+ name: value.name,
+ layout: value,
+ icon: iconData,
+ );
+
+ tester.expectViewHasIcon(
+ value.name,
+ value,
+ iconData,
+ );
+
+ tester.expectViewTitleHasIcon(
+ value.name,
+ value,
+ iconData,
+ );
+ }
});
}
diff --git a/frontend/appflowy_flutter/integration_test/desktop/sidebar/sidebar_view_item_test.dart b/frontend/appflowy_flutter/integration_test/desktop/sidebar/sidebar_view_item_test.dart
index 6bc71b23e8..1400ccebe3 100644
--- a/frontend/appflowy_flutter/integration_test/desktop/sidebar/sidebar_view_item_test.dart
+++ b/frontend/appflowy_flutter/integration_test/desktop/sidebar/sidebar_view_item_test.dart
@@ -1,5 +1,6 @@
import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy/plugins/base/emoji/emoji_picker.dart';
+import 'package:appflowy/shared/icon_emoji_picker/flowy_icon_emoji_picker.dart';
import 'package:appflowy/workspace/presentation/home/menu/view/view_item.dart';
import 'package:appflowy_backend/protobuf/flowy-folder/protobuf.dart';
import 'package:easy_localization/easy_localization.dart';
@@ -38,7 +39,11 @@ void main() {
await tester.tapEmoji(emoji);
await tester.pumpAndSettle();
- tester.expectViewHasIcon(gettingStarted, ViewLayoutPB.Document, emoji);
+ tester.expectViewHasIcon(
+ gettingStarted,
+ ViewLayoutPB.Document,
+ EmojiIconData.emoji(emoji),
+ );
});
});
}
diff --git a/frontend/appflowy_flutter/integration_test/shared/common_operations.dart b/frontend/appflowy_flutter/integration_test/shared/common_operations.dart
index 0c4b05da4c..febb9ed721 100644
--- a/frontend/appflowy_flutter/integration_test/shared/common_operations.dart
+++ b/frontend/appflowy_flutter/integration_test/shared/common_operations.dart
@@ -10,6 +10,7 @@ import 'package:appflowy/plugins/document/presentation/editor_plugins/base/emoji
import 'package:appflowy/plugins/document/presentation/editor_plugins/mobile_toolbar_v3/add_block_toolbar_item.dart';
import 'package:appflowy/plugins/shared/share/share_button.dart';
import 'package:appflowy/shared/feature_flags.dart';
+import 'package:appflowy/shared/icon_emoji_picker/flowy_icon_emoji_picker.dart';
import 'package:appflowy/shared/text_field/text_filed_with_metric_lines.dart';
import 'package:appflowy/startup/startup.dart';
import 'package:appflowy/user/presentation/screens/screens.dart';
@@ -608,7 +609,7 @@ extension CommonOperations on WidgetTester {
required String name,
required String parentName,
required ViewLayoutPB layout,
- required String icon,
+ required EmojiIconData icon,
}) async {
final iconButton = find.descendant(
of: findPageName(
@@ -620,7 +621,11 @@ extension CommonOperations on WidgetTester {
find.byTooltip(LocaleKeys.document_plugins_cover_changeIcon.tr()),
);
await tapButton(iconButton);
- await tapEmoji(icon);
+ if (icon.type == FlowyIconType.emoji) {
+ await tapEmoji(icon.emoji);
+ } else if (icon.type == FlowyIconType.icon) {
+ await tapIcon(icon);
+ }
await pumpAndSettle();
}
@@ -628,7 +633,7 @@ extension CommonOperations on WidgetTester {
Future<void> updatePageIconInTitleBarByName({
required String name,
required ViewLayoutPB layout,
- required String icon,
+ required EmojiIconData icon,
}) async {
await openPage(
name,
@@ -640,7 +645,11 @@ extension CommonOperations on WidgetTester {
);
await tapButton(title);
await tapButton(find.byType(EmojiPickerButton));
- await tapEmoji(icon);
+ if (icon.type == FlowyIconType.emoji) {
+ await tapEmoji(icon.emoji);
+ } else if (icon.type == FlowyIconType.icon) {
+ await tapIcon(icon);
+ }
await pumpAndSettle();
}
diff --git a/frontend/appflowy_flutter/integration_test/shared/emoji.dart b/frontend/appflowy_flutter/integration_test/shared/emoji.dart
index d439a9b3f7..e6c756edb1 100644
--- a/frontend/appflowy_flutter/integration_test/shared/emoji.dart
+++ b/frontend/appflowy_flutter/integration_test/shared/emoji.dart
@@ -1,3 +1,12 @@
+import 'dart:convert';
+
+import 'package:appflowy/shared/icon_emoji_picker/flowy_icon_emoji_picker.dart';
+import 'package:appflowy/shared/icon_emoji_picker/icon_color_picker.dart';
+import 'package:appflowy/shared/icon_emoji_picker/icon_picker.dart';
+import 'package:appflowy/shared/icon_emoji_picker/tab.dart';
+import 'package:appflowy/workspace/presentation/home/menu/sidebar/space/space_icon_popup.dart';
+import 'package:flowy_svg/flowy_svg.dart';
+import 'package:flutter/material.dart';
import 'package:flutter_emoji_mart/flutter_emoji_mart.dart';
import 'package:flutter_test/flutter_test.dart';
@@ -11,4 +20,46 @@ extension EmojiTestExtension on WidgetTester {
);
await tapButton(emojiWidget);
}
+
+ Future<void> tapIcon(EmojiIconData icon) async {
+ final iconsData = IconsData.fromJson(jsonDecode(icon.emoji));
+ final pickTab = find.byType(PickerTab);
+ expect(pickTab, findsOneWidget);
+ await pumpAndSettle();
+ final iconTab = find.descendant(
+ of: pickTab,
+ matching: find.text(PickerTabType.icon.tr),
+ );
+ expect(iconTab, findsOneWidget);
+ expect(find.byType(FlowyIconPicker), findsNothing);
+ await tap(iconTab);
+ await pumpAndSettle();
+ expect(find.byType(FlowyIconPicker), findsOneWidget);
+ final selectedSvg = find.descendant(
+ of: find.byType(FlowyIconPicker),
+ matching: find.byWidgetPredicate(
+ (w) => w is FlowySvg && w.svgString == iconsData.iconContent,
+ ),
+ );
+ expect(find.byType(IconColorPicker), findsNothing);
+ await tapButton(selectedSvg);
+ final colorPicker = find.byType(IconColorPicker);
+ expect(colorPicker, findsOneWidget);
+ final selectedColor = find.descendant(
+ of: colorPicker,
+ matching: find.byWidgetPredicate((w) {
+ if (w is Container) {
+ final d = w.decoration;
+ if (d is ShapeDecoration) {
+ if (d.color ==
+ Color(int.parse(iconsData.color ?? builtInSpaceColors.first))) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }),
+ );
+ await tapButton(selectedColor);
+ }
}
diff --git a/frontend/appflowy_flutter/integration_test/shared/expectation.dart b/frontend/appflowy_flutter/integration_test/shared/expectation.dart
index e7625331ee..cd2f1e3133 100644
--- a/frontend/appflowy_flutter/integration_test/shared/expectation.dart
+++ b/frontend/appflowy_flutter/integration_test/shared/expectation.dart
@@ -1,3 +1,5 @@
+import 'dart:convert';
+
import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy/mobile/presentation/page_item/mobile_view_item.dart';
import 'package:appflowy/mobile/presentation/presentation.dart';
@@ -5,6 +7,8 @@ import 'package:appflowy/plugins/database/widgets/row/row_detail.dart';
import 'package:appflowy/plugins/document/presentation/banner.dart';
import 'package:appflowy/plugins/document/presentation/editor_plugins/header/document_cover_widget.dart';
import 'package:appflowy/plugins/document/presentation/editor_plugins/header/emoji_icon_widget.dart';
+import 'package:appflowy/shared/icon_emoji_picker/flowy_icon_emoji_picker.dart';
+import 'package:appflowy/shared/icon_emoji_picker/icon_picker.dart';
import 'package:appflowy/workspace/application/sidebar/folder/folder_bloc.dart';
import 'package:appflowy/workspace/presentation/home/home_stack.dart';
import 'package:appflowy/workspace/presentation/home/menu/view/view_item.dart';
@@ -14,6 +18,7 @@ import 'package:appflowy/workspace/presentation/widgets/view_title_bar.dart';
import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
+import 'package:flowy_svg/flowy_svg.dart';
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:universal_platform/universal_platform.dart';
@@ -117,7 +122,7 @@ extension Expectation on WidgetTester {
return;
}
final iconWidget = find.byWidgetPredicate(
- (widget) => widget is EmojiIconWidget && widget.emoji == emoji,
+ (widget) => widget is EmojiIconWidget && widget.emoji.emoji == emoji,
);
expect(iconWidget, findsOneWidget);
}
@@ -223,24 +228,52 @@ extension Expectation on WidgetTester {
);
}
- void expectViewHasIcon(String name, ViewLayoutPB layout, String emoji) {
+ void expectViewHasIcon(String name, ViewLayoutPB layout, EmojiIconData data) {
final pageName = findPageName(
name,
layout: layout,
);
- final icon = find.descendant(
- of: pageName,
- matching: find.text(emoji),
- );
- expect(icon, findsOneWidget);
+ final type = data.type;
+ if (type == FlowyIconType.emoji) {
+ final icon = find.descendant(
+ of: pageName,
+ matching: find.text(data.emoji),
+ );
+ expect(icon, findsOneWidget);
+ } else if (type == FlowyIconType.icon) {
+ final iconsData = IconsData.fromJson(jsonDecode(data.emoji));
+ final icon = find.descendant(
+ of: pageName,
+ matching: find.byWidgetPredicate(
+ (w) => w is FlowySvg && w.svgString == iconsData.iconContent,
+ ),
+ );
+ expect(icon, findsOneWidget);
+ }
}
- void expectViewTitleHasIcon(String name, ViewLayoutPB layout, String emoji) {
- final icon = find.descendant(
- of: find.byType(ViewTitleBar),
- matching: find.text(emoji),
- );
- expect(icon, findsOneWidget);
+ void expectViewTitleHasIcon(
+ String name,
+ ViewLayoutPB layout,
+ EmojiIconData data,
+ ) {
+ final type = data.type;
+ if (type == FlowyIconType.emoji) {
+ final icon = find.descendant(
+ of: find.byType(ViewTitleBar),
+ matching: find.text(data.emoji),
+ );
+ expect(icon, findsOneWidget);
+ } else if (type == FlowyIconType.icon) {
+ final iconsData = IconsData.fromJson(jsonDecode(data.emoji));
+ final icon = find.descendant(
+ of: find.byType(ViewTitleBar),
+ matching: find.byWidgetPredicate(
+ (w) => w is FlowySvg && w.svgString == iconsData.iconContent,
+ ),
+ );
+ expect(icon, findsOneWidget);
+ }
}
void expectSelectedReminder(ReminderOption option) {
diff --git a/frontend/appflowy_flutter/lib/mobile/application/recent/recent_view_bloc.dart b/frontend/appflowy_flutter/lib/mobile/application/recent/recent_view_bloc.dart
index 99098f930d..2d89b3b388 100644
--- a/frontend/appflowy_flutter/lib/mobile/application/recent/recent_view_bloc.dart
+++ b/frontend/appflowy_flutter/lib/mobile/application/recent/recent_view_bloc.dart
@@ -7,6 +7,8 @@ import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:freezed_annotation/freezed_annotation.dart';
+import '../../../shared/icon_emoji_picker/flowy_icon_emoji_picker.dart';
+
part 'recent_view_bloc.freezed.dart';
class RecentViewBloc extends Bloc<RecentViewEvent, RecentViewState> {
@@ -39,7 +41,7 @@ class RecentViewBloc extends Bloc<RecentViewEvent, RecentViewState> {
add(
RecentViewEvent.updateNameOrIcon(
view.name,
- view.icon.value,
+ view.icon.toEmojiIconData(),
),
);
@@ -61,7 +63,7 @@ class RecentViewBloc extends Bloc<RecentViewEvent, RecentViewState> {
emit(
state.copyWith(
name: view.name,
- icon: view.icon.value,
+ icon: view.icon.toEmojiIconData(),
),
);
}
@@ -72,7 +74,7 @@ class RecentViewBloc extends Bloc<RecentViewEvent, RecentViewState> {
emit(
state.copyWith(
name: view.name,
- icon: view.icon.value,
+ icon: view.icon.toEmojiIconData(),
coverTypeV2: cover.type,
coverValue: cover.value,
),
@@ -82,7 +84,7 @@ class RecentViewBloc extends Bloc<RecentViewEvent, RecentViewState> {
emit(
state.copyWith(
name: view.name,
- icon: view.icon.value,
+ icon: view.icon.toEmojiIconData(),
coverTypeV1: coverTypeV1,
coverValue: coverValue,
),
@@ -135,14 +137,17 @@ class RecentViewBloc extends Bloc<RecentViewEvent, RecentViewState> {
@freezed
class RecentViewEvent with _$RecentViewEvent {
const factory RecentViewEvent.initial() = Initial;
+
const factory RecentViewEvent.updateCover(
- CoverType coverTypeV1, // for the version under 0.5.5, including 0.5.5
+ CoverType coverTypeV1,
+ // for the version under 0.5.5, including 0.5.5
PageStyleCoverImageType? coverTypeV2, // for the version above 0.5.5
String? coverValue,
) = UpdateCover;
+
const factory RecentViewEvent.updateNameOrIcon(
String name,
- String icon,
+ EmojiIconData icon,
) = UpdateNameOrIcon;
}
@@ -150,12 +155,12 @@ class RecentViewEvent with _$RecentViewEvent {
class RecentViewState with _$RecentViewState {
const factory RecentViewState({
required String name,
- required String icon,
+ required EmojiIconData icon,
@Default(CoverType.none) CoverType coverTypeV1,
PageStyleCoverImageType? coverTypeV2,
@Default(null) String? coverValue,
}) = _RecentViewState;
factory RecentViewState.initial() =>
- const RecentViewState(name: '', icon: '');
+ RecentViewState(name: '', icon: EmojiIconData.none());
}
diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/base/mobile_view_page.dart b/frontend/appflowy_flutter/lib/mobile/presentation/base/mobile_view_page.dart
index 760911394e..6e0a77169b 100644
--- a/frontend/appflowy_flutter/lib/mobile/presentation/base/mobile_view_page.dart
+++ b/frontend/appflowy_flutter/lib/mobile/presentation/base/mobile_view_page.dart
@@ -7,7 +7,9 @@ import 'package:appflowy/mobile/presentation/presentation.dart';
import 'package:appflowy/mobile/presentation/widgets/flowy_mobile_state_container.dart';
import 'package:appflowy/plugins/document/application/prelude.dart';
import 'package:appflowy/plugins/document/presentation/document_collaborators.dart';
+import 'package:appflowy/plugins/document/presentation/editor_plugins/header/emoji_icon_widget.dart';
import 'package:appflowy/shared/feature_flags.dart';
+import 'package:appflowy/shared/icon_emoji_picker/flowy_icon_emoji_picker.dart';
import 'package:appflowy/startup/plugin/plugin.dart';
import 'package:appflowy/startup/startup.dart';
import 'package:appflowy/user/application/reminder/reminder_bloc.dart';
@@ -262,15 +264,14 @@ class _MobileViewPageState extends State<MobileViewPage> {
}
Widget _buildTitle(BuildContext context, ViewPB? view) {
- final icon = view?.icon.value;
+ final icon = view?.icon;
return Row(
mainAxisSize: MainAxisSize.min,
children: [
- if (icon != null && icon.isNotEmpty) ...[
- FlowyText.emoji(
- icon,
- fontSize: 15.0,
- figmaLineHeight: 18.0,
+ if (icon != null) ...[
+ EmojiIconWidget(
+ emoji: icon.toEmojiIconData(),
+ emojiSize: 15,
),
const HSpace(4),
],
diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/home/mobile_home_page_header.dart b/frontend/appflowy_flutter/lib/mobile/presentation/home/mobile_home_page_header.dart
index 39476cf707..27e1d3d341 100644
--- a/frontend/appflowy_flutter/lib/mobile/presentation/home/mobile_home_page_header.dart
+++ b/frontend/appflowy_flutter/lib/mobile/presentation/home/mobile_home_page_header.dart
@@ -228,7 +228,7 @@ class _UserIcon extends StatelessWidget {
fontSize: 26,
),
onTap: () async {
- final icon = await context.push<EmojiPickerResult>(
+ final icon = await context.push<EmojiIconData>(
Uri(
path: MobileEmojiPickerScreen.routeName,
queryParameters: {
diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/home/recent_folder/mobile_recent_view.dart b/frontend/appflowy_flutter/lib/mobile/presentation/home/recent_folder/mobile_recent_view.dart
index 18a0338fbb..b60d354ede 100644
--- a/frontend/appflowy_flutter/lib/mobile/presentation/home/recent_folder/mobile_recent_view.dart
+++ b/frontend/appflowy_flutter/lib/mobile/presentation/home/recent_folder/mobile_recent_view.dart
@@ -111,7 +111,7 @@ class MobileRecentView extends StatelessWidget {
padding: const EdgeInsets.only(left: 8.0),
child: state.icon.isNotEmpty
? EmojiText(
- emoji: state.icon,
+ emoji: state.icon.emoji,
fontSize: 30.0,
)
: SizedBox.square(
diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/home/shared/mobile_page_card.dart b/frontend/appflowy_flutter/lib/mobile/presentation/home/shared/mobile_page_card.dart
index f5e031666a..99bd4de494 100644
--- a/frontend/appflowy_flutter/lib/mobile/presentation/home/shared/mobile_page_card.dart
+++ b/frontend/appflowy_flutter/lib/mobile/presentation/home/shared/mobile_page_card.dart
@@ -7,6 +7,7 @@ import 'package:appflowy/mobile/application/page_style/document_page_style_bloc.
import 'package:appflowy/mobile/application/recent/recent_view_bloc.dart';
import 'package:appflowy/mobile/presentation/base/animated_gesture.dart';
import 'package:appflowy/mobile/presentation/bottom_sheet/bottom_sheet.dart';
+import 'package:appflowy/plugins/document/presentation/editor_plugins/header/emoji_icon_widget.dart';
import 'package:appflowy/plugins/document/presentation/editor_plugins/plugins.dart';
import 'package:appflowy/shared/appflowy_network_image.dart';
import 'package:appflowy/shared/flowy_gradient_colors.dart';
@@ -26,7 +27,6 @@ import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_slidable/flutter_slidable.dart';
-import 'package:google_fonts/google_fonts.dart';
import 'package:provider/provider.dart';
import 'package:string_validator/string_validator.dart';
import 'package:time/time.dart';
@@ -118,7 +118,7 @@ class MobileViewPage extends StatelessWidget {
}
Widget _buildNameAndLastViewed(BuildContext context, RecentViewState state) {
- final supportAvatar = isURL(state.icon);
+ final supportAvatar = isURL(state.icon.emoji);
if (!supportAvatar) {
return _buildLastViewed(context);
}
@@ -173,21 +173,19 @@ class MobileViewPage extends StatelessWidget {
Widget _buildTitle(BuildContext context, RecentViewState state) {
final name = state.name;
final icon = state.icon;
- final fontFamily = Platform.isAndroid || Platform.isLinux
- ? GoogleFonts.notoColorEmoji().fontFamily
- : null;
return RichText(
maxLines: 3,
overflow: TextOverflow.ellipsis,
text: TextSpan(
children: [
- TextSpan(
- text: icon,
- style: Theme.of(context).textTheme.bodyMedium!.copyWith(
- fontSize: 17.0,
- fontWeight: FontWeight.w600,
- fontFamily: fontFamily,
- ),
+ WidgetSpan(
+ child: SizedBox(
+ width: 20,
+ child: EmojiIconWidget(
+ emoji: icon,
+ emojiSize: 17.0,
+ ),
+ ),
),
if (icon.isNotEmpty) const WidgetSpan(child: HSpace(2.0)),
TextSpan(
diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/page_item/mobile_view_item.dart b/frontend/appflowy_flutter/lib/mobile/presentation/page_item/mobile_view_item.dart
index 69f0abe9ff..ee4a371eb5 100644
--- a/frontend/appflowy_flutter/lib/mobile/presentation/page_item/mobile_view_item.dart
+++ b/frontend/appflowy_flutter/lib/mobile/presentation/page_item/mobile_view_item.dart
@@ -2,6 +2,8 @@ import 'dart:io';
import 'package:appflowy/generated/flowy_svgs.g.dart';
import 'package:appflowy/mobile/application/mobile_router.dart';
+import 'package:appflowy/plugins/document/presentation/editor_plugins/header/emoji_icon_widget.dart';
+import 'package:appflowy/shared/icon_emoji_picker/flowy_icon_emoji_picker.dart';
import 'package:appflowy/workspace/application/sidebar/folder/folder_bloc.dart';
import 'package:appflowy/workspace/application/view/view_bloc.dart';
import 'package:appflowy/workspace/application/view/view_ext.dart';
@@ -121,6 +123,7 @@ class InnerMobileViewItem extends StatelessWidget {
final bool isDraggable;
final bool isExpanded;
final bool isFirstChild;
+
// identify if the view item is rendered as feedback widget inside DraggableItem
final bool isFeedback;
@@ -230,6 +233,7 @@ class SingleMobileInnerViewItem extends StatefulWidget {
final ViewPB view;
final ViewPB? parentView;
final bool isExpanded;
+
// identify if the view item is rendered as feedback widget inside DraggableItem
final bool isFeedback;
@@ -297,11 +301,9 @@ class _SingleMobileInnerViewItemState extends State<SingleMobileInnerViewItem> {
Widget _buildViewIcon() {
final icon = widget.view.icon.value.isNotEmpty
- ? FlowyText.emoji(
- widget.view.icon.value,
- fontSize: Platform.isAndroid ? 16.0 : 18.0,
- figmaLineHeight: 20.0,
- optimizeEmojiAlign: true,
+ ? EmojiIconWidget(
+ emoji: widget.view.icon.toEmojiIconData(),
+ emojiSize: Platform.isAndroid ? 16.0 : 18.0,
)
: Opacity(
opacity: 0.7,
diff --git a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_input/chat_mention_page_menu.dart b/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_input/chat_mention_page_menu.dart
index 180879b2b7..6f3eb2d6db 100644
--- a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_input/chat_mention_page_menu.dart
+++ b/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_input/chat_mention_page_menu.dart
@@ -1,6 +1,8 @@
import 'package:appflowy/generated/flowy_svgs.g.dart';
import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy/plugins/ai_chat/application/chat_input_control_cubit.dart';
+import 'package:appflowy/plugins/document/presentation/editor_plugins/header/emoji_icon_widget.dart';
+import 'package:appflowy/shared/icon_emoji_picker/flowy_icon_emoji_picker.dart';
import 'package:appflowy/workspace/application/view/view_ext.dart';
import 'package:appflowy/workspace/application/view_title/view_title_bar_bloc.dart';
import 'package:appflowy/workspace/presentation/home/menu/sidebar/space/space_icon.dart';
@@ -308,10 +310,9 @@ class MentionViewIcon extends StatelessWidget {
if (view.icon.value.isNotEmpty) {
return SizedBox(
width: 16.0,
- child: FlowyText.emoji(
- view.icon.value,
- fontSize: 14.0,
- figmaLineHeight: 21.0,
+ child: EmojiIconWidget(
+ emoji: view.icon.toEmojiIconData(),
+ emojiSize: 14,
),
);
}
diff --git a/frontend/appflowy_flutter/lib/plugins/base/emoji/emoji_picker_screen.dart b/frontend/appflowy_flutter/lib/plugins/base/emoji/emoji_picker_screen.dart
index ed9dccfcf9..513b0fd224 100644
--- a/frontend/appflowy_flutter/lib/plugins/base/emoji/emoji_picker_screen.dart
+++ b/frontend/appflowy_flutter/lib/plugins/base/emoji/emoji_picker_screen.dart
@@ -1,23 +1,40 @@
-import 'package:appflowy/plugins/base/icon/icon_picker_page.dart';
import 'package:appflowy/shared/icon_emoji_picker/flowy_icon_emoji_picker.dart';
+import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';
+import '../../../generated/locale_keys.g.dart';
+import '../../../mobile/presentation/base/app_bar/app_bar.dart';
+import '../../../shared/icon_emoji_picker/tab.dart';
+
class MobileEmojiPickerScreen extends StatelessWidget {
- const MobileEmojiPickerScreen({super.key, this.title});
+ const MobileEmojiPickerScreen({
+ super.key,
+ this.title,
+ this.tabs = const [PickerTabType.emoji, PickerTabType.icon],
+ });
final String? title;
+ final List<PickerTabType> tabs;
static const routeName = '/emoji_picker';
static const pageTitle = 'title';
+ static const selectTabs = 'tabs';
@override
Widget build(BuildContext context) {
- return IconPickerPage(
- title: title,
- onSelected: (result) {
- context.pop<EmojiPickerResult>(result);
- },
+ return Scaffold(
+ appBar: FlowyAppBar(
+ titleText: title ?? LocaleKeys.titleBar_pageIcon.tr(),
+ ),
+ body: SafeArea(
+ child: FlowyIconEmojiPicker(
+ tabs: tabs,
+ onSelectedEmoji: (r) {
+ context.pop<EmojiIconData>(r);
+ },
+ ),
+ ),
);
}
}
diff --git a/frontend/appflowy_flutter/lib/plugins/base/icon/icon_picker_page.dart b/frontend/appflowy_flutter/lib/plugins/base/icon/icon_picker_page.dart
deleted file mode 100644
index 6977141956..0000000000
--- a/frontend/appflowy_flutter/lib/plugins/base/icon/icon_picker_page.dart
+++ /dev/null
@@ -1,28 +0,0 @@
-import 'package:appflowy/generated/locale_keys.g.dart';
-import 'package:appflowy/mobile/presentation/base/app_bar/app_bar.dart';
-import 'package:appflowy/shared/icon_emoji_picker/flowy_icon_emoji_picker.dart';
-import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/material.dart';
-
-class IconPickerPage extends StatelessWidget {
- const IconPickerPage({
- super.key,
- this.title,
- required this.onSelected,
- });
-
- final void Function(EmojiPickerResult) onSelected;
- final String? title;
-
- @override
- Widget build(BuildContext context) {
- return Scaffold(
- appBar: FlowyAppBar(
- titleText: title ?? LocaleKeys.titleBar_pageIcon.tr(),
- ),
- body: SafeArea(
- child: FlowyIconEmojiPicker(onSelectedEmoji: onSelected),
- ),
- );
- }
-}
diff --git a/frontend/appflowy_flutter/lib/plugins/base/icon/icon_widget.dart b/frontend/appflowy_flutter/lib/plugins/base/icon/icon_widget.dart
new file mode 100644
index 0000000000..8f647e2a38
--- /dev/null
+++ b/frontend/appflowy_flutter/lib/plugins/base/icon/icon_widget.dart
@@ -0,0 +1,29 @@
+import 'package:appflowy/shared/icon_emoji_picker/icon_picker.dart';
+import 'package:flutter/material.dart';
+
+import '../../../generated/flowy_svgs.g.dart';
+
+class IconWidget extends StatelessWidget {
+ const IconWidget({
+ super.key,
+ required this.size,
+ required this.data,
+ });
+
+ final IconsData data;
+ final double size;
+
+ @override
+ Widget build(BuildContext context) {
+ final colorValue = int.tryParse(data.color ?? '');
+ Color? color;
+ if (colorValue != null) {
+ color = Color(colorValue);
+ }
+ return FlowySvg.string(
+ data.iconContent,
+ size: Size.square(size),
+ color: color,
+ );
+ }
+}
diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/card/container/card_container.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/card/container/card_container.dart
index 4e31df24b5..ba71fcd30b 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/card/container/card_container.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/card/container/card_container.dart
@@ -28,8 +28,7 @@ class RowCardContainer extends StatelessWidget {
create: (_) => _CardContainerNotifier(),
child: Consumer<_CardContainerNotifier>(
builder: (context, notifier, _) {
- final shouldBuildAccessory =
- buildAccessoryWhen?.call() ?? true;
+ final shouldBuildAccessory = buildAccessoryWhen?.call() ?? true;
return GestureDetector(
behavior: HitTestBehavior.opaque,
diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/field/field_editor.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/field/field_editor.dart
index 4a9fedcd94..88cd88ee68 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/field/field_editor.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/field/field_editor.dart
@@ -1,3 +1,4 @@
+import 'dart:convert';
import 'dart:typed_data';
import 'package:appflowy/generated/flowy_svgs.g.dart';
@@ -14,6 +15,7 @@ import 'package:appflowy/shared/icon_emoji_picker/tab.dart';
import 'package:appflowy/util/field_type_extension.dart';
import 'package:appflowy/workspace/presentation/widgets/dialogs.dart';
import 'package:appflowy/workspace/presentation/widgets/toggle/toggle.dart';
+import 'package:appflowy_backend/log.dart';
import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra/size.dart';
@@ -21,6 +23,7 @@ import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
+import '../../../../shared/icon_emoji_picker/icon_picker.dart';
import 'field_type_list.dart';
import 'type_option_editor/builder.dart';
@@ -603,16 +606,22 @@ class _FieldEditIconButtonState extends State<FieldEditIconButton> {
return FlowyIconEmojiPicker(
enableBackgroundColorSelection: false,
tabs: const [PickerTabType.icon],
- onSelectedIcon: (group, icon, _) {
- String newIcon = "";
- if (group != null && icon != null) {
- newIcon = '${group.name}/${icon.name}';
+ onSelectedEmoji: (r) {
+ if (r.type == FlowyIconType.icon) {
+ try {
+ final iconsData = IconsData.fromJson(jsonDecode(r.emoji));
+ context.read<FieldEditorBloc>().add(
+ FieldEditorEvent.updateIcon(
+ '${iconsData.groupName}/${iconsData.iconName}',
+ ),
+ );
+ } on FormatException catch (e) {
+ Log.warn('FieldEditIconButton onSelectedEmoji error:$e');
+ context
+ .read<FieldEditorBloc>()
+ .add(const FieldEditorEvent.updateIcon(''));
+ }
}
-
- context
- .read<FieldEditorBloc>()
- .add(FieldEditorEvent.updateIcon(newIcon));
-
PopoverContainer.of(popoverContext).close();
},
);
diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/row_banner.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/row_banner.dart
index 4e604d8c23..243eb5f027 100644
--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/row_banner.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/row_banner.dart
@@ -36,6 +36,7 @@ import 'package:go_router/go_router.dart';
import 'package:string_validator/string_validator.dart';
import 'package:universal_platform/universal_platform.dart';
+import '../../../../shared/icon_emoji_picker/tab.dart';
import '../../../document/presentation/editor_plugins/plugins.dart';
/// We have the cover height as public as it is used in the row_detail.dart file
@@ -151,7 +152,11 @@ class _RowBannerState extends State<RowBanner> {
? _toolbarHeight - _iconHeight / 2
: _toolbarHeight,
child: RowIcon(
- icon: state.rowMeta.icon,
+ ///TODO: avoid hardcoding for [FlowyIconType]
+ icon: EmojiIconData(
+ FlowyIconType.emoji,
+ state.rowMeta.icon,
+ ),
onIconChanged: (icon) {
if (icon == null || icon.isEmpty) {
context
@@ -497,6 +502,7 @@ class _RowHeaderToolbarState extends State<RowHeaderToolbar> {
popupBuilder: (_) {
isPopoverOpen = true;
return FlowyIconEmojiPicker(
+ tabs: const [PickerTabType.emoji],
onSelectedEmoji: (result) {
widget.onIconChanged(result.emoji);
popoverController.close();
@@ -514,7 +520,7 @@ class _RowHeaderToolbarState extends State<RowHeaderToolbar> {
),
onTap: () async {
if (!isDesktop) {
- final result = await context.push<EmojiPickerResult>(
+ final result = await context.push<EmojiIconData>(
MobileEmojiPickerScreen.routeName,
);
@@ -543,7 +549,7 @@ class RowIcon extends StatefulWidget {
required this.onIconChanged,
});
- final String icon;
+ final EmojiIconData icon;
final void Function(String?) onIconChanged;
@override
@@ -566,6 +572,7 @@ class _RowIconState extends State<RowIcon> {
constraints: BoxConstraints.loose(const Size(360, 380)),
margin: EdgeInsets.zero,
popupBuilder: (_) => FlowyIconEmojiPicker(
+ tabs: const [PickerTabType.emoji],
onSelectedEmoji: (result) {
controller.close();
widget.onIconChanged(result.emoji);
diff --git a/frontend/appflowy_flutter/lib/plugins/database_document/presentation/database_document_title.dart b/frontend/appflowy_flutter/lib/plugins/database_document/presentation/database_document_title.dart
index d1a0640446..04b8a30905 100644
--- a/frontend/appflowy_flutter/lib/plugins/database_document/presentation/database_document_title.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database_document/presentation/database_document_title.dart
@@ -6,6 +6,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/cells/cell_container.dart';
import 'package:appflowy/plugins/document/presentation/editor_plugins/base/emoji_picker_button.dart';
+import 'package:appflowy/plugins/document/presentation/editor_plugins/header/emoji_icon_widget.dart';
import 'package:appflowy/workspace/presentation/widgets/view_title_bar.dart';
import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
import 'package:collection/collection.dart';
@@ -14,6 +15,7 @@ import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
+import '../../../shared/icon_emoji_picker/flowy_icon_emoji_picker.dart';
import 'database_document_title_bloc.dart';
// This widget is largely copied from `workspace/presentation/widgets/view_title_bar.dart` intentionally instead of opting for an abstraction. We can make an abstraction after the view refactor is done and there's more clarity in that department.
@@ -163,8 +165,8 @@ class _TitleSkin extends IEditableTextCellSkin {
popupBuilder: (_) {
return RenameRowPopover(
textController: textEditingController,
- icon: state.icon ?? "",
- onUpdateIcon: (String icon) {
+ icon: state.icon ?? EmojiIconData.none(),
+ onUpdateIcon: (icon) {
context
.read<DatabaseDocumentTitleBloc>()
.add(DatabaseDocumentTitleEvent.updateIcon(icon));
@@ -179,11 +181,7 @@ class _TitleSkin extends IEditableTextCellSkin {
text: Row(
children: [
if (state.icon != null) ...[
- FlowyText.emoji(
- state.icon!,
- fontSize: 14.0,
- figmaLineHeight: 18.0,
- ),
+ RawEmojiIconWidget(emoji: state.icon!, emojiSize: 14),
const HSpace(4.0),
],
ConstrainedBox(
@@ -217,10 +215,10 @@ class RenameRowPopover extends StatefulWidget {
});
final TextEditingController textController;
- final String icon;
+ final EmojiIconData icon;
- final void Function(String name) onUpdateName;
- final void Function(String icon) onUpdateIcon;
+ final ValueChanged<String> onUpdateName;
+ final ValueChanged<EmojiIconData> onUpdateIcon;
@override
State<RenameRowPopover> createState() => _RenameRowPopoverState();
diff --git a/frontend/appflowy_flutter/lib/plugins/database_document/presentation/database_document_title_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database_document/presentation/database_document_title_bloc.dart
index f35f0ee8f6..2711274cb2 100644
--- a/frontend/appflowy_flutter/lib/plugins/database_document/presentation/database_document_title_bloc.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database_document/presentation/database_document_title_bloc.dart
@@ -12,6 +12,8 @@ import 'package:appflowy_result/appflowy_result.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:freezed_annotation/freezed_annotation.dart';
+import '../../../shared/icon_emoji_picker/flowy_icon_emoji_picker.dart';
+
part 'database_document_title_bloc.freezed.dart';
class DatabaseDocumentTitleBloc
@@ -57,7 +59,7 @@ class DatabaseDocumentTitleBloc
);
},
updateIcon: (icon) {
- _updateMeta(icon);
+ _updateMeta(icon.emoji);
},
);
});
@@ -67,7 +69,11 @@ class DatabaseDocumentTitleBloc
_metaListener.start(
callback: (rowMeta) {
if (!isClosed) {
- add(DatabaseDocumentTitleEvent.didUpdateRowIcon(rowMeta.icon));
+ add(
+ DatabaseDocumentTitleEvent.didUpdateRowIcon(
+ EmojiIconData.emoji(rowMeta.icon),
+ ),
+ );
}
},
);
@@ -116,7 +122,11 @@ class DatabaseDocumentTitleBloc
// initialize icon
if (rowInfo.rowMeta.icon.isNotEmpty) {
- add(DatabaseDocumentTitleEvent.didUpdateRowIcon(rowInfo.rowMeta.icon));
+ add(
+ DatabaseDocumentTitleEvent.didUpdateRowIcon(
+ EmojiIconData.emoji(rowInfo.rowMeta.icon),
+ ),
+ );
}
}
@@ -136,16 +146,19 @@ class DatabaseDocumentTitleEvent with _$DatabaseDocumentTitleEvent {
const factory DatabaseDocumentTitleEvent.didUpdateAncestors(
List<ViewPB> ancestors,
) = _DidUpdateAncestors;
+
const factory DatabaseDocumentTitleEvent.didUpdateRowTitleInfo(
DatabaseController databaseController,
RowController rowController,
String fieldId,
) = _DidUpdateRowTitleInfo;
+
const factory DatabaseDocumentTitleEvent.didUpdateRowIcon(
- String icon,
+ EmojiIconData icon,
) = _DidUpdateRowIcon;
+
const factory DatabaseDocumentTitleEvent.updateIcon(
- String icon,
+ EmojiIconData icon,
) = _UpdateIcon;
}
@@ -156,7 +169,7 @@ class DatabaseDocumentTitleState with _$DatabaseDocumentTitleState {
required DatabaseController? databaseController,
required RowController? rowController,
required String? fieldId,
- required String? icon,
+ required EmojiIconData? icon,
}) = _DatabaseDocumentTitleState;
factory DatabaseDocumentTitleState.initial() =>
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/base/emoji_picker_button.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/base/emoji_picker_button.dart
index 2d9a48206d..e2113cc1fb 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/base/emoji_picker_button.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/base/emoji_picker_button.dart
@@ -1,6 +1,6 @@
import 'package:appflowy/plugins/base/emoji/emoji_picker_screen.dart';
+import 'package:appflowy/plugins/document/presentation/editor_plugins/header/emoji_icon_widget.dart';
import 'package:appflowy/shared/icon_emoji_picker/flowy_icon_emoji_picker.dart';
-import 'package:appflowy/workspace/presentation/settings/widgets/emoji_picker/emoji_picker.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';
@@ -23,10 +23,11 @@ class EmojiPickerButton extends StatelessWidget {
this.buttonSize,
});
- final String emoji;
+ final EmojiIconData emoji;
final double emojiSize;
final Size emojiPickerSize;
- final void Function(String emoji, PopoverController? controller) onSubmitted;
+ final void Function(EmojiIconData emoji, PopoverController? controller)
+ onSubmitted;
final PopoverController popoverController = PopoverController();
final Widget? defaultIcon;
final Offset? offset;
@@ -81,10 +82,11 @@ class _DesktopEmojiPickerButton extends StatelessWidget {
this.buttonSize,
});
- final String emoji;
+ final EmojiIconData emoji;
final double emojiSize;
final Size emojiPickerSize;
- final void Function(String emoji, PopoverController? controller) onSubmitted;
+ final void Function(EmojiIconData emoji, PopoverController? controller)
+ onSubmitted;
final PopoverController popoverController = PopoverController();
final Widget? defaultIcon;
final Offset? offset;
@@ -93,8 +95,10 @@ class _DesktopEmojiPickerButton extends StatelessWidget {
final bool showBorder;
final bool enable;
final Size? buttonSize;
+
@override
Widget build(BuildContext context) {
+ final showDefault = emoji.isEmpty && defaultIcon != null;
return AppFlowyPopover(
controller: popoverController,
constraints: BoxConstraints.expand(
@@ -108,9 +112,10 @@ class _DesktopEmojiPickerButton extends StatelessWidget {
width: emojiPickerSize.width,
height: emojiPickerSize.height,
padding: const EdgeInsets.all(4.0),
- child: EmojiSelectionMenu(
- onSubmitted: (emoji) => onSubmitted(emoji, popoverController),
- onExit: () {},
+ child: FlowyIconEmojiPicker(
+ onSelectedEmoji: (r) {
+ onSubmitted(r, popoverController);
+ },
),
),
child: Container(
@@ -129,9 +134,9 @@ class _DesktopEmojiPickerButton extends StatelessWidget {
? EdgeInsets.zero
: const EdgeInsets.only(left: 2.0),
expandText: false,
- text: emoji.isEmpty && defaultIcon != null
+ text: showDefault
? defaultIcon!
- : FlowyText.emoji(emoji, fontSize: emojiSize),
+ : RawEmojiIconWidget(emoji: emoji, emojiSize: emojiSize),
onTap: enable ? popoverController.show : null,
),
),
@@ -149,9 +154,10 @@ class _MobileEmojiPickerButton extends StatelessWidget {
this.margin,
});
- final String emoji;
+ final EmojiIconData emoji;
final double emojiSize;
- final void Function(String emoji, PopoverController? controller) onSubmitted;
+ final void Function(EmojiIconData emoji, PopoverController? controller)
+ onSubmitted;
final String? title;
final bool enable;
final EdgeInsets? margin;
@@ -162,21 +168,20 @@ class _MobileEmojiPickerButton extends StatelessWidget {
useIntrinsicWidth: true,
margin:
margin ?? const EdgeInsets.symmetric(horizontal: 8.0, vertical: 6.0),
- text: FlowyText.emoji(
- emoji,
- fontSize: emojiSize,
- optimizeEmojiAlign: true,
+ text: RawEmojiIconWidget(
+ emoji: emoji,
+ emojiSize: emojiSize,
),
onTap: enable
? () async {
- final result = await context.push<EmojiPickerResult>(
+ final result = await context.push<EmojiIconData>(
Uri(
path: MobileEmojiPickerScreen.routeName,
queryParameters: {MobileEmojiPickerScreen.pageTitle: title},
).toString(),
);
if (result != null) {
- onSubmitted(result.emoji, null);
+ onSubmitted(result, null);
}
}
: null,
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/callout/callout_block_component.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/callout/callout_block_component.dart
index 598d2d0d3a..f4bd5cb21f 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/callout/callout_block_component.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/callout/callout_block_component.dart
@@ -1,5 +1,6 @@
import 'package:appflowy/generated/locale_keys.g.dart' show LocaleKeys;
import 'package:appflowy/generated/locale_keys.g.dart';
+import 'package:appflowy/shared/icon_emoji_picker/flowy_icon_emoji_picker.dart';
import 'package:appflowy_editor/appflowy_editor.dart';
import 'package:easy_localization/easy_localization.dart'
show StringTranslateExtension;
@@ -195,12 +196,12 @@ class _CalloutBlockComponentWidgetState
key: ValueKey(widget.node.id + emoji),
enable: editorState.editable,
title: '',
- emoji: emoji,
+ emoji: EmojiIconData.emoji(emoji),
emojiSize: emojiSize,
showBorder: false,
buttonSize: emojiButtonSize,
onSubmitted: (emoji, controller) {
- setEmoji(emoji);
+ setEmoji(emoji.emoji);
controller?.close();
},
),
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/cover/document_immersive_cover.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/cover/document_immersive_cover.dart
index 2bd973fb12..05c891bd1e 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/cover/document_immersive_cover.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/cover/document_immersive_cover.dart
@@ -7,7 +7,6 @@ import 'package:appflowy/plugins/document/application/prelude.dart';
import 'package:appflowy/plugins/document/presentation/editor_plugins/base/build_context_extension.dart';
import 'package:appflowy/plugins/document/presentation/editor_plugins/cover/document_immersive_cover_bloc.dart';
import 'package:appflowy/plugins/document/presentation/editor_plugins/header/emoji_icon_widget.dart';
-import 'package:appflowy/plugins/document/presentation/editor_plugins/icon/icon_selector.dart';
import 'package:appflowy/plugins/document/presentation/editor_plugins/page_style/_page_style_icon_bloc.dart';
import 'package:appflowy/shared/appflowy_network_image.dart';
import 'package:appflowy/shared/flowy_gradient_colors.dart';
@@ -27,6 +26,8 @@ import 'package:flowy_infra_ui/widget/ignore_parent_gesture.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
+import '../../../../../shared/icon_emoji_picker/flowy_icon_emoji_picker.dart';
+
double kDocumentCoverHeight = 98.0;
double kDocumentTitlePadding = 20.0;
@@ -199,7 +200,7 @@ class _DocumentImmersiveCoverState extends State<DocumentImmersiveCover> {
);
}
- Widget _buildIcon(BuildContext context, String icon) {
+ Widget _buildIcon(BuildContext context, EmojiIconData icon) {
return GestureDetector(
child: ConstrainedBox(
constraints: const BoxConstraints.tightFor(width: 34.0),
@@ -215,28 +216,23 @@ class _DocumentImmersiveCoverState extends State<DocumentImmersiveCover> {
context,
showDragHandle: true,
showDivider: false,
- showDoneButton: true,
showHeader: true,
title: LocaleKeys.titleBar_pageIcon.tr(),
backgroundColor: AFThemeExtension.of(context).background,
enableDraggableScrollable: true,
minChildSize: 0.6,
initialChildSize: 0.61,
- showRemoveButton: true,
- onRemove: () {
- pageStyleIconBloc.add(
- const PageStyleIconEvent.updateIcon('', true),
- );
- },
scrollableWidgetBuilder: (_, controller) {
return BlocProvider.value(
value: pageStyleIconBloc,
child: Expanded(
- child: Scrollbar(
- controller: controller,
- child: IconSelector(
- scrollController: controller,
- ),
+ child: FlowyIconEmojiPicker(
+ onSelectedEmoji: (r) {
+ pageStyleIconBloc.add(
+ PageStyleIconEvent.updateIcon(r, true),
+ );
+ Navigator.pop(context);
+ },
),
),
);
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/cover/document_immersive_cover_bloc.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/cover/document_immersive_cover_bloc.dart
index bd2692e172..ee8952dc11 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/cover/document_immersive_cover_bloc.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/cover/document_immersive_cover_bloc.dart
@@ -5,6 +5,8 @@ import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:freezed_annotation/freezed_annotation.dart';
+import '../../../../../shared/icon_emoji_picker/flowy_icon_emoji_picker.dart';
+
part 'document_immersive_cover_bloc.freezed.dart';
class DocumentImmersiveCoverBloc
@@ -20,7 +22,7 @@ class DocumentImmersiveCoverBloc
add(
DocumentImmersiveCoverEvent.updateCoverAndIcon(
view.cover,
- view.icon.value,
+ EmojiIconData.fromViewIconPB(view.icon),
view.name,
),
);
@@ -29,7 +31,7 @@ class DocumentImmersiveCoverBloc
add(
DocumentImmersiveCoverEvent.updateCoverAndIcon(
view.cover,
- view.icon.value,
+ EmojiIconData.fromViewIconPB(view.icon),
view.name,
),
);
@@ -63,9 +65,10 @@ class DocumentImmersiveCoverBloc
@freezed
class DocumentImmersiveCoverEvent with _$DocumentImmersiveCoverEvent {
const factory DocumentImmersiveCoverEvent.initial() = Initial;
+
const factory DocumentImmersiveCoverEvent.updateCoverAndIcon(
PageStyleCover? cover,
- String? icon,
+ EmojiIconData? icon,
String? name,
) = UpdateCoverAndIcon;
}
@@ -73,7 +76,7 @@ class DocumentImmersiveCoverEvent with _$DocumentImmersiveCoverEvent {
@freezed
class DocumentImmersiveCoverState with _$DocumentImmersiveCoverState {
const factory DocumentImmersiveCoverState({
- @Default(null) String? icon,
+ @Default(null) EmojiIconData? icon,
required PageStyleCover cover,
@Default('') String name,
}) = _DocumentImmersiveCoverState;
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/header/document_cover_widget.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/header/document_cover_widget.dart
index 8e84d17523..54feee3d90 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/header/document_cover_widget.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/header/document_cover_widget.dart
@@ -77,7 +77,7 @@ class DocumentCoverWidget extends StatefulWidget {
final Node node;
final EditorState editorState;
- final void Function(String icon) onIconChanged;
+ final ValueChanged<EmojiIconData> onIconChanged;
final ViewPB view;
@override
@@ -88,16 +88,22 @@ class _DocumentCoverWidgetState extends State<DocumentCoverWidget> {
CoverType get coverType => CoverType.fromString(
widget.node.attributes[DocumentHeaderBlockKeys.coverType],
);
+
String? get coverDetails =>
widget.node.attributes[DocumentHeaderBlockKeys.coverDetails];
+
String? get icon => widget.node.attributes[DocumentHeaderBlockKeys.icon];
- bool get hasIcon => viewIcon.isNotEmpty;
+
+ bool get hasIcon => viewIcon.emoji.isNotEmpty;
+
bool get hasCover =>
coverType != CoverType.none ||
(cover != null && cover?.type != PageStyleCoverImageType.none);
+
RenderBox? get _renderBox => context.findRenderObject() as RenderBox?;
- String viewIcon = '';
+ EmojiIconData viewIcon = EmojiIconData.none();
+
PageStyleCover? cover;
late ViewPB view;
late final ViewListener viewListener;
@@ -114,8 +120,8 @@ class _DocumentCoverWidgetState extends State<DocumentCoverWidget> {
@override
void initState() {
super.initState();
- final value = widget.view.icon.value;
- viewIcon = value.isNotEmpty ? value : icon ?? '';
+ final icon = widget.view.icon;
+ viewIcon = EmojiIconData.fromViewIconPB(icon);
cover = widget.view.cover;
view = widget.view;
widget.node.addListener(_reload);
@@ -126,7 +132,7 @@ class _DocumentCoverWidgetState extends State<DocumentCoverWidget> {
..start(
onViewUpdated: (view) {
setState(() {
- viewIcon = view.icon.value;
+ viewIcon = EmojiIconData.fromViewIconPB(view.icon);
cover = view.cover;
view = view;
});
@@ -268,7 +274,10 @@ class _DocumentCoverWidgetState extends State<DocumentCoverWidget> {
return height;
}
- void _saveIconOrCover({(CoverType, String?)? cover, String? icon}) async {
+ void _saveIconOrCover({
+ (CoverType, String?)? cover,
+ EmojiIconData? icon,
+ }) async {
final transaction = widget.editorState.transaction;
final coverType = widget.node.attributes[DocumentHeaderBlockKeys.coverType];
final coverDetails =
@@ -285,7 +294,7 @@ class _DocumentCoverWidgetState extends State<DocumentCoverWidget> {
attributes[DocumentHeaderBlockKeys.coverDetails] = cover.$2;
}
if (icon != null) {
- attributes[DocumentHeaderBlockKeys.icon] = icon;
+ attributes[DocumentHeaderBlockKeys.icon] = icon.emoji;
widget.onIconChanged(icon);
}
@@ -337,7 +346,7 @@ class DocumentHeaderToolbar extends StatefulWidget {
final EditorState editorState;
final bool hasCover;
final bool hasIcon;
- final void Function({(CoverType, String?)? cover, String? icon})
+ final void Function({(CoverType, String?)? cover, EmojiIconData? icon})
onIconOrCoverChanged;
final double offset;
final ValueNotifier<bool> isCoverTitleHovered;
@@ -416,7 +425,7 @@ class _DocumentHeaderToolbarState extends State<DocumentHeaderToolbar> {
if (widget.hasIcon) {
children.add(
FlowyButton(
- onTap: () => widget.onIconOrCoverChanged(icon: ""),
+ onTap: () => widget.onIconOrCoverChanged(icon: EmojiIconData.none()),
useIntrinsicWidth: true,
leftIcon: const FlowySvg(FlowySvgs.add_icon_s),
iconPadding: 4.0,
@@ -438,11 +447,11 @@ class _DocumentHeaderToolbarState extends State<DocumentHeaderToolbar> {
onTap: UniversalPlatform.isDesktop
? null
: () async {
- final result = await context.push<EmojiPickerResult>(
+ final result = await context.push<EmojiIconData>(
MobileEmojiPickerScreen.routeName,
);
if (result != null) {
- widget.onIconOrCoverChanged(icon: result.emoji);
+ widget.onIconOrCoverChanged(icon: result);
}
},
);
@@ -460,7 +469,7 @@ class _DocumentHeaderToolbarState extends State<DocumentHeaderToolbar> {
isPopoverOpen = true;
return FlowyIconEmojiPicker(
onSelectedEmoji: (result) {
- widget.onIconOrCoverChanged(icon: result.emoji);
+ widget.onIconOrCoverChanged(icon: result);
_popoverController.close();
},
);
@@ -817,8 +826,8 @@ class DocumentIcon extends StatefulWidget {
final Node node;
final EditorState editorState;
- final String icon;
- final void Function(String icon) onChangeIcon;
+ final EmojiIconData icon;
+ final ValueChanged<EmojiIconData> onChangeIcon;
@override
State<DocumentIcon> createState() => _DocumentIconState();
@@ -844,7 +853,7 @@ class _DocumentIconState extends State<DocumentIcon> {
popupBuilder: (BuildContext popoverContext) {
return FlowyIconEmojiPicker(
onSelectedEmoji: (result) {
- widget.onChangeIcon(result.emoji);
+ widget.onChangeIcon(result);
_popoverController.close();
},
);
@@ -854,11 +863,11 @@ class _DocumentIconState extends State<DocumentIcon> {
child = GestureDetector(
child: child,
onTap: () async {
- final result = await context.push<EmojiPickerResult>(
+ final result = await context.push<EmojiIconData>(
MobileEmojiPickerScreen.routeName,
);
if (result != null) {
- widget.onChangeIcon(result.emoji);
+ widget.onChangeIcon(result);
}
},
);
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/header/emoji_icon_widget.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/header/emoji_icon_widget.dart
index d85ccac645..77b0c158f5 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/header/emoji_icon_widget.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/header/emoji_icon_widget.dart
@@ -1,6 +1,13 @@
+import 'dart:convert';
+
import 'package:appflowy/plugins/base/emoji/emoji_text.dart';
+import 'package:appflowy/shared/icon_emoji_picker/icon_picker.dart';
+import 'package:appflowy_backend/log.dart';
import 'package:flutter/material.dart';
+import '../../../../../shared/icon_emoji_picker/flowy_icon_emoji_picker.dart';
+import '../../../../base/icon/icon_widget.dart';
+
class EmojiIconWidget extends StatefulWidget {
const EmojiIconWidget({
super.key,
@@ -8,7 +15,7 @@ class EmojiIconWidget extends StatefulWidget {
this.emojiSize = 60,
});
- final String emoji;
+ final EmojiIconData emoji;
final double emojiSize;
@override
@@ -32,10 +39,9 @@ class _EmojiIconWidgetState extends State<EmojiIconWidget> {
borderRadius: BorderRadius.circular(8),
),
alignment: Alignment.center,
- child: EmojiText(
+ child: RawEmojiIconWidget(
emoji: widget.emoji,
- fontSize: widget.emojiSize,
- textAlign: TextAlign.center,
+ emojiSize: widget.emojiSize,
),
),
);
@@ -48,3 +54,44 @@ class _EmojiIconWidgetState extends State<EmojiIconWidget> {
});
}
}
+
+class RawEmojiIconWidget extends StatelessWidget {
+ const RawEmojiIconWidget({
+ super.key,
+ required this.emoji,
+ required this.emojiSize,
+ });
+
+ final EmojiIconData emoji;
+ final double emojiSize;
+
+ @override
+ Widget build(BuildContext context) {
+ final defaultEmoji = EmojiText(
+ emoji: '❓',
+ fontSize: emojiSize,
+ textAlign: TextAlign.center,
+ );
+ try {
+ switch (emoji.type) {
+ case FlowyIconType.emoji:
+ return EmojiText(
+ emoji: emoji.emoji,
+ fontSize: emojiSize,
+ textAlign: TextAlign.center,
+ );
+ case FlowyIconType.icon:
+ final iconData = IconsData.fromJson(jsonDecode(emoji.emoji));
+ return IconWidget(
+ data: iconData,
+ size: emojiSize,
+ );
+ default:
+ return defaultEmoji;
+ }
+ } catch (e) {
+ Log.error("Display widget error: $e");
+ return defaultEmoji;
+ }
+ }
+}
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/icon/icon_selector.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/icon/icon_selector.dart
index 5da4528a3c..edeadf71d8 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/icon/icon_selector.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/icon/icon_selector.dart
@@ -1,6 +1,7 @@
import 'package:appflowy/mobile/presentation/widgets/flowy_mobile_search_text_field.dart';
import 'package:appflowy/plugins/base/emoji/emoji_picker.dart';
import 'package:appflowy/plugins/document/presentation/editor_plugins/page_style/_page_style_icon_bloc.dart';
+import 'package:appflowy/shared/icon_emoji_picker/flowy_icon_emoji_picker.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
@@ -83,7 +84,7 @@ class _IconSelectorState extends State<IconSelector> {
Widget _buildEmoji(
BuildContext context,
String emoji,
- String? selectedEmoji,
+ EmojiIconData? selectedEmoji,
) {
Widget child = SizedBox.square(
dimension: 24.0,
@@ -95,7 +96,7 @@ class _IconSelectorState extends State<IconSelector> {
),
);
- if (emoji == selectedEmoji) {
+ if (emoji == selectedEmoji?.emoji) {
child = Center(
child: Container(
width: 40,
@@ -118,7 +119,7 @@ class _IconSelectorState extends State<IconSelector> {
return GestureDetector(
onTap: () {
context.read<PageStyleIconBloc>().add(
- PageStyleIconEvent.updateIcon(emoji, true),
+ PageStyleIconEvent.updateIcon(EmojiIconData.emoji(emoji), true),
);
},
child: child,
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/mention/mention_page_block.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/mention/mention_page_block.dart
index 7feae9849b..fce317cd48 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/mention/mention_page_block.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/mention/mention_page_block.dart
@@ -2,11 +2,13 @@ import 'package:appflowy/generated/flowy_svgs.g.dart';
import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy/mobile/application/mobile_router.dart';
import 'package:appflowy/plugins/document/application/document_bloc.dart';
+import 'package:appflowy/plugins/document/presentation/editor_plugins/header/emoji_icon_widget.dart';
import 'package:appflowy/plugins/document/presentation/editor_plugins/mention/mention_block.dart';
import 'package:appflowy/plugins/document/presentation/editor_plugins/mention/mention_page_bloc.dart';
import 'package:appflowy/plugins/document/presentation/editor_plugins/mention/mobile_page_selector_sheet.dart';
import 'package:appflowy/plugins/trash/application/trash_service.dart';
import 'package:appflowy/shared/clipboard_state.dart';
+import 'package:appflowy/shared/icon_emoji_picker/flowy_icon_emoji_picker.dart';
import 'package:appflowy/startup/startup.dart';
import 'package:appflowy/workspace/application/action_navigation/action_navigation_bloc.dart';
import 'package:appflowy/workspace/application/action_navigation/navigation_action.dart';
@@ -474,12 +476,9 @@ class _MentionPageBlockContent extends StatelessWidget {
Stack(
children: [
view.icon.value.isNotEmpty
- ? FlowyText.emoji(
- view.icon.value,
- fontSize: emojiSize,
- lineHeight: textStyle?.height,
- optimizeEmojiAlign: true,
- color: AFThemeExtension.of(context).strongText,
+ ? EmojiIconWidget(
+ emoji: view.icon.toEmojiIconData(),
+ emojiSize: emojiSize,
)
: view.defaultIcon(size: Size.square(iconSize + 2.0)),
if (!isChildPage) ...[
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/mention/mobile_page_selector_sheet.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/mention/mobile_page_selector_sheet.dart
index c8a392fb71..f3578f185e 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/mention/mobile_page_selector_sheet.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/mention/mobile_page_selector_sheet.dart
@@ -3,7 +3,8 @@ import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy/mobile/presentation/base/flowy_search_text_field.dart';
import 'package:appflowy/mobile/presentation/bottom_sheet/show_mobile_bottom_sheet.dart';
import 'package:appflowy/mobile/presentation/widgets/widgets.dart';
-import 'package:appflowy/plugins/base/emoji/emoji_text.dart';
+import 'package:appflowy/plugins/document/presentation/editor_plugins/header/emoji_icon_widget.dart';
+import 'package:appflowy/shared/icon_emoji_picker/flowy_icon_emoji_picker.dart';
import 'package:appflowy/workspace/application/view/view_ext.dart';
import 'package:appflowy/workspace/application/view/view_service.dart';
import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
@@ -119,11 +120,9 @@ class _MobilePageSelectorBodyState extends State<_MobilePageSelectorBody> {
final view = filtered.elementAt(index);
return FlowyOptionTile.checkbox(
leftIcon: view.icon.value.isNotEmpty
- ? EmojiText(
- emoji: view.icon.value,
- fontSize: 18,
- textAlign: TextAlign.center,
- lineHeight: 1.3,
+ ? RawEmojiIconWidget(
+ emoji: view.icon.toEmojiIconData(),
+ emojiSize: 18,
)
: FlowySvg(
view.layout.icon,
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/page_style/_page_style_icon.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/page_style/_page_style_icon.dart
index 3f3ed87522..6b640be1c4 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/page_style/_page_style_icon.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/page_style/_page_style_icon.dart
@@ -1,7 +1,7 @@
import 'package:appflowy/generated/flowy_svgs.g.dart';
import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy/mobile/presentation/bottom_sheet/bottom_sheet.dart';
-import 'package:appflowy/plugins/document/presentation/editor_plugins/icon/icon_selector.dart';
+import 'package:appflowy/plugins/document/presentation/editor_plugins/header/emoji_icon_widget.dart';
import 'package:appflowy/plugins/document/presentation/editor_plugins/page_style/_page_style_icon_bloc.dart';
import 'package:appflowy/plugins/document/presentation/editor_plugins/page_style/_page_style_util.dart';
import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
@@ -10,7 +10,8 @@ import 'package:flowy_infra/theme_extension.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:go_router/go_router.dart';
+
+import '../../../../../shared/icon_emoji_picker/flowy_icon_emoji_picker.dart';
class PageStyleIcon extends StatefulWidget {
const PageStyleIcon({
@@ -32,9 +33,9 @@ class _PageStyleIconState extends State<PageStyleIcon> {
..add(const PageStyleIconEvent.initial()),
child: BlocBuilder<PageStyleIconBloc, PageStyleIconState>(
builder: (context, state) {
- final icon = state.icon ?? '';
+ final icon = state.icon ?? EmojiIconData.none();
return GestureDetector(
- onTap: () => _showIconSelector(context, icon),
+ onTap: () => _showIconSelector(context),
behavior: HitTestBehavior.opaque,
child: Container(
height: 52,
@@ -47,10 +48,11 @@ class _PageStyleIconState extends State<PageStyleIcon> {
const HSpace(16.0),
FlowyText(LocaleKeys.document_plugins_emoji.tr()),
const Spacer(),
- FlowyText(
- icon.isNotEmpty ? icon : LocaleKeys.pageStyle_none.tr(),
- color: icon.isEmpty ? context.pageStyleTextColor : null,
- fontSize: icon.isNotEmpty ? 22.0 : 16.0,
+ RawEmojiIconWidget(
+ emoji: icon.isNotEmpty
+ ? icon
+ : EmojiIconData.emoji(LocaleKeys.pageStyle_none.tr()),
+ emojiSize: icon.isNotEmpty ? 22.0 : 16.0,
),
const HSpace(6.0),
const FlowySvg(FlowySvgs.m_page_style_arrow_right_s),
@@ -64,37 +66,31 @@ class _PageStyleIconState extends State<PageStyleIcon> {
);
}
- void _showIconSelector(BuildContext context, String selectedIcon) {
- context.pop();
-
+ void _showIconSelector(BuildContext context) {
+ Navigator.pop(context);
final pageStyleIconBloc = PageStyleIconBloc(view: widget.view)
..add(const PageStyleIconEvent.initial());
showMobileBottomSheet(
context,
showDragHandle: true,
showDivider: false,
- showDoneButton: true,
showHeader: true,
title: LocaleKeys.titleBar_pageIcon.tr(),
backgroundColor: AFThemeExtension.of(context).background,
enableDraggableScrollable: true,
minChildSize: 0.6,
initialChildSize: 0.61,
- showRemoveButton: true,
- onRemove: () {
- pageStyleIconBloc.add(
- const PageStyleIconEvent.updateIcon('', true),
- );
- },
- scrollableWidgetBuilder: (_, controller) {
+ scrollableWidgetBuilder: (ctx, controller) {
return BlocProvider.value(
value: pageStyleIconBloc,
child: Expanded(
- child: Scrollbar(
- controller: controller,
- child: IconSelector(
- scrollController: controller,
- ),
+ child: FlowyIconEmojiPicker(
+ onSelectedEmoji: (r) {
+ pageStyleIconBloc.add(
+ PageStyleIconEvent.updateIcon(r, true),
+ );
+ Navigator.pop(ctx);
+ },
),
),
);
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/page_style/_page_style_icon_bloc.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/page_style/_page_style_icon_bloc.dart
index 4d8b0ebf81..a930c8d87e 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/page_style/_page_style_icon_bloc.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/page_style/_page_style_icon_bloc.dart
@@ -1,3 +1,4 @@
+import 'package:appflowy/shared/icon_emoji_picker/flowy_icon_emoji_picker.dart';
import 'package:appflowy/workspace/application/view/view_listener.dart';
import 'package:appflowy/workspace/application/view/view_service.dart';
import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
@@ -17,7 +18,7 @@ class PageStyleIconBloc extends Bloc<PageStyleIconEvent, PageStyleIconState> {
initial: () async {
add(
PageStyleIconEvent.updateIcon(
- view.icon.value,
+ view.icon.toEmojiIconData(),
false,
),
);
@@ -25,7 +26,7 @@ class PageStyleIconBloc extends Bloc<PageStyleIconEvent, PageStyleIconState> {
onViewUpdated: (view) {
add(
PageStyleIconEvent.updateIcon(
- view.icon.value,
+ view.icon.toEmojiIconData(),
false,
),
);
@@ -63,8 +64,9 @@ class PageStyleIconBloc extends Bloc<PageStyleIconEvent, PageStyleIconState> {
@freezed
class PageStyleIconEvent with _$PageStyleIconEvent {
const factory PageStyleIconEvent.initial() = Initial;
+
const factory PageStyleIconEvent.updateIcon(
- String? icon,
+ EmojiIconData? icon,
bool shouldUpdateRemote,
) = UpdateIconInner;
}
@@ -72,7 +74,7 @@ class PageStyleIconEvent with _$PageStyleIconEvent {
@freezed
class PageStyleIconState with _$PageStyleIconState {
const factory PageStyleIconState({
- @Default(null) String? icon,
+ @Default(null) EmojiIconData? icon,
}) = _PageStyleIconState;
factory PageStyleIconState.initial() => const PageStyleIconState();
diff --git a/frontend/appflowy_flutter/lib/plugins/inline_actions/handlers/inline_page_reference.dart b/frontend/appflowy_flutter/lib/plugins/inline_actions/handlers/inline_page_reference.dart
index 130509d644..ff9e751e3f 100644
--- a/frontend/appflowy_flutter/lib/plugins/inline_actions/handlers/inline_page_reference.dart
+++ b/frontend/appflowy_flutter/lib/plugins/inline_actions/handlers/inline_page_reference.dart
@@ -2,12 +2,14 @@ import 'dart:async';
import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy/plugins/document/presentation/editor_plugins/base/insert_page_command.dart';
+import 'package:appflowy/plugins/document/presentation/editor_plugins/header/emoji_icon_widget.dart';
import 'package:appflowy/plugins/document/presentation/editor_plugins/mention/mention_block.dart';
import 'package:appflowy/plugins/document/presentation/editor_plugins/mention/mention_page_block.dart';
import 'package:appflowy/plugins/inline_actions/inline_actions_menu.dart';
import 'package:appflowy/plugins/inline_actions/inline_actions_result.dart';
import 'package:appflowy/plugins/inline_actions/service_handler.dart';
import 'package:appflowy/shared/flowy_error_page.dart';
+import 'package:appflowy/shared/icon_emoji_picker/flowy_icon_emoji_picker.dart';
import 'package:appflowy/shared/list_extension.dart';
import 'package:appflowy/startup/startup.dart';
import 'package:appflowy/workspace/application/recent/cached_recent_service.dart';
@@ -17,7 +19,6 @@ import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';
import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
import 'package:appflowy_editor/appflowy_editor.dart';
import 'package:easy_localization/easy_localization.dart';
-import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flowy_infra_ui/widget/dialog/styled_dialogs.dart';
import 'package:flutter/material.dart';
@@ -235,11 +236,9 @@ class InlinePageReferenceService extends InlineActionsDelegate {
keywords: [view.nameOrDefault.toLowerCase()],
label: view.nameOrDefault,
icon: (onSelected) => view.icon.value.isNotEmpty
- ? FlowyText.emoji(
- view.icon.value,
- fontSize: 14,
- figmaLineHeight: 18.0,
- // optimizeEmojiAlign: true,
+ ? EmojiIconWidget(
+ emoji: view.icon.toEmojiIconData(),
+ emojiSize: 14,
)
: view.defaultIcon(),
onSelected: (context, editorState, menu, replace) => insertPage
@@ -247,15 +246,15 @@ class InlinePageReferenceService extends InlineActionsDelegate {
: _onInsertLinkRef(view, context, editorState, menu, replace),
);
- // Future<InlineActionsMenuItem?> _fromSearchResult(
- // SearchResultPB result,
- // ) async {
- // final viewRes = await ViewBackendService.getView(result.viewId);
- // final view = viewRes.toNullable();
- // if (view == null) {
- // return null;
- // }
-
- // return _fromView(view);
- // }
+// Future<InlineActionsMenuItem?> _fromSearchResult(
+// SearchResultPB result,
+// ) async {
+// final viewRes = await ViewBackendService.getView(result.viewId);
+// final view = viewRes.toNullable();
+// if (view == null) {
+// return null;
+// }
+
+// return _fromView(view);
+// }
}
diff --git a/frontend/appflowy_flutter/lib/shared/icon_emoji_picker/flowy_icon_emoji_picker.dart b/frontend/appflowy_flutter/lib/shared/icon_emoji_picker/flowy_icon_emoji_picker.dart
index 14e2979ac2..ba8ba1eec8 100644
--- a/frontend/appflowy_flutter/lib/shared/icon_emoji_picker/flowy_icon_emoji_picker.dart
+++ b/frontend/appflowy_flutter/lib/shared/icon_emoji_picker/flowy_icon_emoji_picker.dart
@@ -2,14 +2,12 @@ import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy/plugins/base/emoji/emoji_picker.dart';
import 'package:appflowy/shared/icon_emoji_picker/icon_picker.dart';
import 'package:appflowy/shared/icon_emoji_picker/tab.dart';
-import 'package:appflowy_backend/protobuf/flowy-folder/icon.pbenum.dart';
+import 'package:appflowy_backend/protobuf/flowy-folder/icon.pb.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter/material.dart' hide Icon;
import 'package:universal_platform/universal_platform.dart';
-import 'icon.dart';
-
extension ToProto on FlowyIconType {
ViewIconTypePB toProto() {
switch (this) {
@@ -23,40 +21,72 @@ extension ToProto on FlowyIconType {
}
}
+extension FromProto on ViewIconTypePB {
+ FlowyIconType fromProto() {
+ switch (this) {
+ case ViewIconTypePB.Emoji:
+ return FlowyIconType.emoji;
+ case ViewIconTypePB.Icon:
+ return FlowyIconType.icon;
+ case ViewIconTypePB.Url:
+ return FlowyIconType.custom;
+ default:
+ return FlowyIconType.custom;
+ }
+ }
+}
+
+extension ToEmojiIconData on ViewIconPB {
+ EmojiIconData toEmojiIconData() => EmojiIconData(ty.fromProto(), value);
+}
+
enum FlowyIconType {
emoji,
icon,
custom;
}
-class EmojiPickerResult {
- factory EmojiPickerResult.none() =>
- const EmojiPickerResult(FlowyIconType.icon, '');
+class EmojiIconData {
+ factory EmojiIconData.none() => const EmojiIconData(FlowyIconType.icon, '');
- factory EmojiPickerResult.emoji(String emoji) =>
- EmojiPickerResult(FlowyIconType.emoji, emoji);
+ factory EmojiIconData.emoji(String emoji) =>
+ EmojiIconData(FlowyIconType.emoji, emoji);
- const EmojiPickerResult(
+ factory EmojiIconData.icon(IconsData icon) =>
+ EmojiIconData(FlowyIconType.icon, icon.iconString);
+
+ const EmojiIconData(
this.type,
this.emoji,
);
final FlowyIconType type;
final String emoji;
+
+ static EmojiIconData fromViewIconPB(ViewIconPB v) {
+ return EmojiIconData(v.ty.fromProto(), v.value);
+ }
+
+ ViewIconPB toViewIcon() {
+ return ViewIconPB()
+ ..ty = type.toProto()
+ ..value = emoji;
+ }
+
+ bool get isEmpty => emoji.isEmpty;
+
+ bool get isNotEmpty => emoji.isNotEmpty;
}
class FlowyIconEmojiPicker extends StatefulWidget {
const FlowyIconEmojiPicker({
super.key,
this.onSelectedEmoji,
- this.onSelectedIcon,
this.enableBackgroundColorSelection = true,
- this.tabs = const [PickerTabType.emoji],
+ this.tabs = const [PickerTabType.emoji, PickerTabType.icon],
});
- final void Function(EmojiPickerResult result)? onSelectedEmoji;
- final void Function(IconGroup? group, Icon? icon, String? color)?
- onSelectedIcon;
+ final ValueChanged<EmojiIconData>? onSelectedEmoji;
final bool enableBackgroundColorSelection;
final List<PickerTabType> tabs;
@@ -97,14 +127,7 @@ class _FlowyIconEmojiPickerState extends State<FlowyIconEmojiPicker>
),
_RemoveIconButton(
onTap: () {
- final currentTab = widget.tabs[currentIndex];
- if (currentTab == PickerTabType.emoji) {
- widget.onSelectedEmoji?.call(
- EmojiPickerResult.none(),
- );
- } else {
- widget.onSelectedIcon?.call(null, null, null);
- }
+ widget.onSelectedEmoji?.call(EmojiIconData.none());
},
),
],
@@ -132,7 +155,7 @@ class _FlowyIconEmojiPickerState extends State<FlowyIconEmojiPicker>
return FlowyEmojiPicker(
emojiPerLine: _getEmojiPerLine(context),
onEmojiSelected: (_, emoji) => widget.onSelectedEmoji?.call(
- EmojiPickerResult.emoji(emoji),
+ EmojiIconData.emoji(emoji),
),
);
}
@@ -148,8 +171,8 @@ class _FlowyIconEmojiPickerState extends State<FlowyIconEmojiPicker>
Widget _buildIconPicker() {
return FlowyIconPicker(
enableBackgroundColorSelection: widget.enableBackgroundColorSelection,
- onSelectedIcon: (iconGroup, icon, color) {
- widget.onSelectedIcon?.call(iconGroup, icon, color);
+ onSelectedIcon: (result) {
+ widget.onSelectedEmoji?.call(result.toEmojiIconData());
},
);
}
diff --git a/frontend/appflowy_flutter/lib/shared/icon_emoji_picker/icon_picker.dart b/frontend/appflowy_flutter/lib/shared/icon_emoji_picker/icon_picker.dart
index bbcb34895d..20e8bf7fd5 100644
--- a/frontend/appflowy_flutter/lib/shared/icon_emoji_picker/icon_picker.dart
+++ b/frontend/appflowy_flutter/lib/shared/icon_emoji_picker/icon_picker.dart
@@ -5,6 +5,7 @@ import 'package:appflowy/core/helpers/url_launcher.dart';
import 'package:appflowy/generated/flowy_svgs.g.dart';
import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy/plugins/document/presentation/editor_plugins/base/string_extension.dart';
+import 'package:appflowy/shared/icon_emoji_picker/flowy_icon_emoji_picker.dart';
import 'package:appflowy/shared/icon_emoji_picker/icon.dart';
import 'package:appflowy/shared/icon_emoji_picker/icon_search_bar.dart';
import 'package:appflowy/util/debounce.dart';
@@ -80,7 +81,7 @@ class FlowyIconPicker extends StatefulWidget {
});
final bool enableBackgroundColorSelection;
- final void Function(IconGroup group, Icon icon, String? color) onSelectedIcon;
+ final ValueChanged<IconsData> onSelectedIcon;
@override
State<FlowyIconPicker> createState() => _FlowyIconPickerState();
@@ -119,7 +120,14 @@ class _FlowyIconPickerState extends State<FlowyIconPicker> {
return;
}
final color = generateRandomSpaceColor();
- widget.onSelectedIcon(value.$1, value.$2, color);
+ widget.onSelectedIcon(
+ IconsData(
+ value.$1.name,
+ value.$2.content,
+ value.$2.name,
+ color,
+ ),
+ );
},
onKeywordChanged: (keyword) => {
debounce.call(() {
@@ -179,6 +187,33 @@ class _FlowyIconPickerState extends State<FlowyIconPicker> {
}
}
+class IconsData {
+ IconsData(this.groupName, this.iconContent, this.iconName, this.color);
+
+ final String groupName;
+ final String iconContent;
+ final String iconName;
+ final String? color;
+
+ String get iconString => jsonEncode({
+ 'groupName': groupName,
+ 'iconContent': iconContent,
+ 'iconName': iconName,
+ if (color != null) 'color': color,
+ });
+
+ EmojiIconData toEmojiIconData() => EmojiIconData.icon(this);
+
+ static IconsData fromJson(dynamic json) {
+ return IconsData(
+ json['groupName'],
+ json['iconContent'],
+ json['iconName'],
+ json['color'],
+ );
+ }
+}
+
class IconPicker extends StatefulWidget {
const IconPicker({
super.key,
@@ -189,7 +224,7 @@ class IconPicker extends StatefulWidget {
final List<IconGroup> iconGroups;
final bool enableBackgroundColorSelection;
- final void Function(IconGroup group, Icon icon, String? color) onSelectedIcon;
+ final ValueChanged<IconsData> onSelectedIcon;
@override
State<IconPicker> createState() => _IconPickerState();
@@ -223,14 +258,28 @@ class _IconPickerState extends State<IconPicker> {
icon: icon,
mutex: mutex,
onSelectedColor: (context, color) {
- widget.onSelectedIcon(iconGroup, icon, color);
+ widget.onSelectedIcon(
+ IconsData(
+ iconGroup.name,
+ icon.content,
+ icon.name,
+ color,
+ ),
+ );
PopoverContainer.of(context).close();
},
)
: _IconNoBackground(
icon: icon,
onSelectedIcon: () {
- widget.onSelectedIcon(iconGroup, icon, null);
+ widget.onSelectedIcon(
+ IconsData(
+ iconGroup.name,
+ icon.content,
+ icon.name,
+ null,
+ ),
+ );
},
);
},
diff --git a/frontend/appflowy_flutter/lib/startup/tasks/generate_router.dart b/frontend/appflowy_flutter/lib/startup/tasks/generate_router.dart
index 3b7d1f5bad..27bfdcee5b 100644
--- a/frontend/appflowy_flutter/lib/startup/tasks/generate_router.dart
+++ b/frontend/appflowy_flutter/lib/startup/tasks/generate_router.dart
@@ -37,6 +37,8 @@ import 'package:go_router/go_router.dart';
import 'package:sheet/route.dart';
import 'package:universal_platform/universal_platform.dart';
+import '../../shared/icon_emoji_picker/tab.dart';
+
GoRouter generateRouter(Widget child) {
return GoRouter(
navigatorKey: AppGlobals.rootNavKey,
@@ -281,10 +283,16 @@ GoRoute _mobileEmojiPickerPageRoute() {
pageBuilder: (context, state) {
final title =
state.uri.queryParameters[MobileEmojiPickerScreen.pageTitle];
+ final selectTabs =
+ state.uri.queryParameters[MobileEmojiPickerScreen.selectTabs] ?? '';
+ final tabs = selectTabs
+ .split('-')
+ .map((e) => PickerTabType.values.byName(e))
+ .toList();
return MaterialExtendedPage(
- child: MobileEmojiPickerScreen(
- title: title,
- ),
+ child: tabs.isEmpty
+ ? MobileEmojiPickerScreen(title: title)
+ : MobileEmojiPickerScreen(title: title, tabs: tabs),
);
},
);
diff --git a/frontend/appflowy_flutter/lib/user/presentation/screens/sign_in_screen/widgets/third_party_sign_in_button.dart b/frontend/appflowy_flutter/lib/user/presentation/screens/sign_in_screen/widgets/third_party_sign_in_button.dart
index 36d83ea3bc..35d16b031f 100644
--- a/frontend/appflowy_flutter/lib/user/presentation/screens/sign_in_screen/widgets/third_party_sign_in_button.dart
+++ b/frontend/appflowy_flutter/lib/user/presentation/screens/sign_in_screen/widgets/third_party_sign_in_button.dart
@@ -153,7 +153,6 @@ class MobileThirdPartySignInButton extends StatelessWidget {
}
}
-
class DesktopSignInButton extends StatelessWidget {
const DesktopSignInButton({
super.key,
@@ -217,4 +216,4 @@ class DesktopSignInButton extends StatelessWidget {
),
);
}
-}
\ No newline at end of file
+}
diff --git a/frontend/appflowy_flutter/lib/workspace/application/settings/ai/download_model_bloc.dart b/frontend/appflowy_flutter/lib/workspace/application/settings/ai/download_model_bloc.dart
index 0a1fce251b..8be68e813e 100644
--- a/frontend/appflowy_flutter/lib/workspace/application/settings/ai/download_model_bloc.dart
+++ b/frontend/appflowy_flutter/lib/workspace/application/settings/ai/download_model_bloc.dart
@@ -109,7 +109,8 @@ class DownloadModelState with _$DownloadModelState {
// bigger than 1 GB then show download big file prompt
String? bigFileDownloadPrompt;
if (model.fileSize > 1 * 1024 * 1024 * 1024) {
- bigFileDownloadPrompt = LocaleKeys.settings_aiPage_keys_downloadBigFilePrompt.tr();
+ bigFileDownloadPrompt =
+ LocaleKeys.settings_aiPage_keys_downloadBigFilePrompt.tr();
}
return DownloadModelState(
model: model,
diff --git a/frontend/appflowy_flutter/lib/workspace/application/view/view_bloc.dart b/frontend/appflowy_flutter/lib/workspace/application/view/view_bloc.dart
index c6c35672b9..30a32bbd2d 100644
--- a/frontend/appflowy_flutter/lib/workspace/application/view/view_bloc.dart
+++ b/frontend/appflowy_flutter/lib/workspace/application/view/view_bloc.dart
@@ -3,6 +3,7 @@ import 'dart:convert';
import 'package:appflowy/core/config/kv.dart';
import 'package:appflowy/core/config/kv_keys.dart';
+import 'package:appflowy/shared/icon_emoji_picker/flowy_icon_emoji_picker.dart';
import 'package:appflowy/startup/startup.dart';
import 'package:appflowy/workspace/application/favorite/favorite_listener.dart';
import 'package:appflowy/workspace/application/recent/cached_recent_service.dart';
@@ -243,7 +244,7 @@ class ViewBloc extends Bloc<ViewEvent, ViewState> {
updateIcon: (value) async {
await ViewBackendService.updateViewIcon(
viewId: view.id,
- viewIcon: value.icon ?? '',
+ viewIcon: view.icon.toEmojiIconData(),
);
},
collapseAllPages: (value) async {
@@ -437,11 +438,17 @@ class ViewBloc extends Bloc<ViewEvent, ViewState> {
@freezed
class ViewEvent with _$ViewEvent {
const factory ViewEvent.initial() = Initial;
+
const factory ViewEvent.setIsEditing(bool isEditing) = SetEditing;
+
const factory ViewEvent.setIsExpanded(bool isExpanded) = SetIsExpanded;
+
const factory ViewEvent.rename(String newName) = Rename;
+
const factory ViewEvent.delete() = Delete;
+
const factory ViewEvent.duplicate() = Duplicate;
+
const factory ViewEvent.move(
ViewPB from,
String newParentId,
@@ -449,6 +456,7 @@ class ViewEvent with _$ViewEvent {
ViewSectionPB? fromSection,
ViewSectionPB? toSection,
) = Move;
+
const factory ViewEvent.createView(
String name,
ViewLayoutPB layoutType, {
@@ -456,17 +464,23 @@ class ViewEvent with _$ViewEvent {
@Default(true) bool openAfterCreated,
ViewSectionPB? section,
}) = CreateView;
+
const factory ViewEvent.viewDidUpdate(
FlowyResult<ViewPB, FlowyError> result,
) = ViewDidUpdate;
+
const factory ViewEvent.viewUpdateChildView(ViewPB result) =
ViewUpdateChildView;
+
const factory ViewEvent.updateViewVisibility(
ViewPB view,
bool isPublic,
) = UpdateViewVisibility;
+
const factory ViewEvent.updateIcon(String? icon) = UpdateIcon;
+
const factory ViewEvent.collapseAllPages() = CollapseAllPages;
+
// this event will unpublish the page and all its child pages if they are published
const factory ViewEvent.unpublish({required bool sync}) = Unpublish;
}
diff --git a/frontend/appflowy_flutter/lib/workspace/application/view/view_service.dart b/frontend/appflowy_flutter/lib/workspace/application/view/view_service.dart
index 3971256799..d20aed8c1b 100644
--- a/frontend/appflowy_flutter/lib/workspace/application/view/view_service.dart
+++ b/frontend/appflowy_flutter/lib/workspace/application/view/view_service.dart
@@ -2,6 +2,7 @@ import 'dart:async';
import 'package:appflowy/plugins/document/presentation/editor_plugins/mention/mention_page_bloc.dart';
import 'package:appflowy/plugins/trash/application/trash_service.dart';
+import 'package:appflowy/shared/icon_emoji_picker/flowy_icon_emoji_picker.dart';
import 'package:appflowy_backend/dispatch/dispatch.dart';
import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';
import 'package:appflowy_backend/protobuf/flowy-folder/protobuf.dart';
@@ -190,12 +191,9 @@ class ViewBackendService {
static Future<FlowyResult<void, FlowyError>> updateViewIcon({
required String viewId,
- required String viewIcon,
- ViewIconTypePB iconType = ViewIconTypePB.Emoji,
+ required EmojiIconData viewIcon,
}) {
- final icon = ViewIconPB()
- ..ty = iconType
- ..value = viewIcon;
+ final icon = viewIcon.toViewIcon();
final payload = UpdateViewIconPayloadPB.create()
..viewId = viewId
..icon = icon;
diff --git a/frontend/appflowy_flutter/lib/workspace/application/view_title/view_title_bloc.dart b/frontend/appflowy_flutter/lib/workspace/application/view_title/view_title_bloc.dart
index 384e2773f9..fdb9dc9321 100644
--- a/frontend/appflowy_flutter/lib/workspace/application/view_title/view_title_bloc.dart
+++ b/frontend/appflowy_flutter/lib/workspace/application/view_title/view_title_bloc.dart
@@ -3,6 +3,8 @@ import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:freezed_annotation/freezed_annotation.dart';
+import '../../../shared/icon_emoji_picker/flowy_icon_emoji_picker.dart';
+
part 'view_title_bloc.freezed.dart';
class ViewTitleBloc extends Bloc<ViewTitleEvent, ViewTitleState> {
@@ -17,7 +19,7 @@ class ViewTitleBloc extends Bloc<ViewTitleEvent, ViewTitleState> {
emit(
state.copyWith(
name: view.name,
- icon: view.icon.value,
+ icon: view.icon.toEmojiIconData(),
view: view,
),
);
@@ -27,7 +29,7 @@ class ViewTitleBloc extends Bloc<ViewTitleEvent, ViewTitleState> {
add(
ViewTitleEvent.updateNameOrIcon(
view.name,
- view.icon.value,
+ view.icon.toEmojiIconData(),
view,
),
);
@@ -61,9 +63,10 @@ class ViewTitleBloc extends Bloc<ViewTitleEvent, ViewTitleState> {
@freezed
class ViewTitleEvent with _$ViewTitleEvent {
const factory ViewTitleEvent.initial() = Initial;
+
const factory ViewTitleEvent.updateNameOrIcon(
String name,
- String icon,
+ EmojiIconData icon,
ViewPB? view,
) = UpdateNameOrIcon;
}
@@ -72,9 +75,12 @@ class ViewTitleEvent with _$ViewTitleEvent {
class ViewTitleState with _$ViewTitleState {
const factory ViewTitleState({
required String name,
- required String icon,
+ required EmojiIconData icon,
@Default(null) ViewPB? view,
}) = _ViewTitleState;
- factory ViewTitleState.initial() => const ViewTitleState(name: '', icon: '');
+ factory ViewTitleState.initial() => ViewTitleState(
+ name: '',
+ icon: EmojiIconData.none(),
+ );
}
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/command_palette/widgets/recent_views_list.dart b/frontend/appflowy_flutter/lib/workspace/presentation/command_palette/widgets/recent_views_list.dart
index e139b8ea1c..b0f87005d2 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/command_palette/widgets/recent_views_list.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/command_palette/widgets/recent_views_list.dart
@@ -1,5 +1,7 @@
import 'package:appflowy/generated/flowy_svgs.g.dart';
import 'package:appflowy/generated/locale_keys.g.dart';
+import 'package:appflowy/plugins/document/presentation/editor_plugins/header/emoji_icon_widget.dart';
+import 'package:appflowy/shared/icon_emoji_picker/flowy_icon_emoji_picker.dart';
import 'package:appflowy/workspace/application/recent/recent_views_bloc.dart';
import 'package:appflowy/workspace/application/view/view_ext.dart';
import 'package:appflowy/workspace/presentation/command_palette/widgets/recent_view_tile.dart';
@@ -44,9 +46,9 @@ class RecentViewsList extends StatelessWidget {
final view = recentViews[index - 1];
final icon = view.icon.value.isNotEmpty
- ? Text(
- view.icon.value,
- style: const TextStyle(fontSize: 18.0),
+ ? EmojiIconWidget(
+ emoji: view.icon.toEmojiIconData(),
+ emojiSize: 18.0,
)
: FlowySvg(view.iconData, size: const Size.square(20));
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/sidebar_space_header.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/sidebar_space_header.dart
index 007facbc6b..03b96c9607 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/sidebar_space_header.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/sidebar_space_header.dart
@@ -1,7 +1,9 @@
+import 'dart:convert';
import 'dart:io';
import 'package:appflowy/generated/locale_keys.g.dart';
-import 'package:appflowy/shared/icon_emoji_picker/icon.dart';
+import 'package:appflowy/shared/icon_emoji_picker/flowy_icon_emoji_picker.dart';
+import 'package:appflowy/shared/icon_emoji_picker/icon_picker.dart';
import 'package:appflowy/workspace/application/sidebar/space/space_bloc.dart';
import 'package:appflowy/workspace/presentation/home/home_sizes.dart';
import 'package:appflowy/workspace/presentation/home/menu/sidebar/space/manage_space_popup.dart';
@@ -10,6 +12,7 @@ import 'package:appflowy/workspace/presentation/home/menu/sidebar/space/space_ac
import 'package:appflowy/workspace/presentation/home/menu/sidebar/space/space_more_popup.dart';
import 'package:appflowy/workspace/presentation/home/menu/view/view_add_button.dart';
import 'package:appflowy/workspace/presentation/widgets/dialogs.dart';
+import 'package:appflowy_backend/log.dart';
import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
@@ -170,19 +173,23 @@ class _SidebarSpaceHeaderState extends State<SidebarSpaceHeader> {
await _showRenameDialog();
break;
case SpaceMoreActionType.changeIcon:
- final (IconGroup? group, Icon? icon, String? iconColor) = data;
-
- final groupName = group?.name;
- final iconName = icon?.name;
- final name = groupName != null && iconName != null
- ? '$groupName/$iconName'
- : null;
- context.read<SpaceBloc>().add(
- SpaceEvent.changeIcon(
- icon: name,
- iconColor: iconColor,
- ),
- );
+ final result = data as EmojiIconData;
+ if (data.type == FlowyIconType.icon) {
+ try {
+ final iconsData = IconsData.fromJson(jsonDecode(result.emoji));
+ context.read<SpaceBloc>().add(
+ SpaceEvent.changeIcon(
+ icon: '${iconsData.groupName}/${iconsData.iconName}',
+ iconColor: iconsData.color,
+ ),
+ );
+ } on FormatException catch (e) {
+ context
+ .read<SpaceBloc>()
+ .add(const SpaceEvent.changeIcon(icon: ''));
+ Log.warn('SidebarSpaceHeader changeIcon error:$e');
+ }
+ }
break;
case SpaceMoreActionType.manage:
_showManageSpaceDialog(context);
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/space_icon_popup.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/space_icon_popup.dart
index 95cb8111f5..82410b387e 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/space_icon_popup.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/space_icon_popup.dart
@@ -1,3 +1,4 @@
+import 'dart:convert';
import 'dart:math';
import 'package:appflowy/generated/flowy_svgs.g.dart';
@@ -6,6 +7,7 @@ import 'package:appflowy/shared/icon_emoji_picker/flowy_icon_emoji_picker.dart';
import 'package:appflowy/shared/icon_emoji_picker/icon_picker.dart';
import 'package:appflowy/shared/icon_emoji_picker/tab.dart';
import 'package:appflowy/workspace/presentation/home/menu/sidebar/space/space_icon.dart';
+import 'package:appflowy_backend/log.dart';
import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
@@ -80,19 +82,23 @@ class _SpaceIconPopupState extends State<SpaceIconPopup> {
popupBuilder: (context) {
return FlowyIconEmojiPicker(
tabs: const [PickerTabType.icon],
- onSelectedIcon: (group, icon, color) {
- if (group == null || icon == null) {
- selectedIcon.value = null;
- } else {
- selectedIcon.value = '${group.name}/${icon.name}';
+ onSelectedEmoji: (r) {
+ if (r.type == FlowyIconType.icon) {
+ try {
+ final iconsData = IconsData.fromJson(jsonDecode(r.emoji));
+ final color = iconsData.color;
+ selectedIcon.value =
+ '${iconsData.groupName}/${iconsData.iconName}';
+ if (color != null) {
+ selectedColor.value = color;
+ }
+ widget.onIconChanged(selectedIcon.value, selectedColor.value);
+ } on FormatException catch (e) {
+ selectedIcon.value = '';
+ widget.onIconChanged(selectedIcon.value, selectedColor.value);
+ Log.warn('SpaceIconPopup onSelectedEmoji error:$e');
+ }
}
-
- if (color != null) {
- selectedColor.value = color;
- }
-
- widget.onIconChanged(selectedIcon.value, selectedColor.value);
-
PopoverContainer.of(context).close();
},
);
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/space_more_popup.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/space_more_popup.dart
index 588dee5398..e4c3a97a66 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/space_more_popup.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/space_more_popup.dart
@@ -125,9 +125,7 @@ class SpaceMoreActionTypeWrapper extends CustomActionCell {
popupBuilder: (context) {
return FlowyIconEmojiPicker(
tabs: const [PickerTabType.icon],
- onSelectedIcon: (group, icon, color) {
- onTap(controller, (group, icon, color));
- },
+ onSelectedEmoji: (r) => onTap(controller, r),
);
},
child: child,
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/workspace/_sidebar_workspace_icon.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/workspace/_sidebar_workspace_icon.dart
index 9669ac217d..12dec42026 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/workspace/_sidebar_workspace_icon.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/workspace/_sidebar_workspace_icon.dart
@@ -9,6 +9,8 @@ import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';
import 'package:universal_platform/universal_platform.dart';
+import '../../../../../../shared/icon_emoji_picker/tab.dart';
+
class WorkspaceIcon extends StatefulWidget {
const WorkspaceIcon({
super.key,
@@ -29,7 +31,7 @@ class WorkspaceIcon extends StatefulWidget {
final bool enableEdit;
final double fontSize;
final double? emojiSize;
- final void Function(EmojiPickerResult) onSelected;
+ final void Function(EmojiIconData) onSelected;
final double borderRadius;
final Alignment? alignment;
final double figmaLineHeight;
@@ -93,6 +95,7 @@ class _WorkspaceIconState extends State<WorkspaceIcon> {
clickHandler: PopoverClickHandler.gestureDetector,
margin: const EdgeInsets.all(0),
popupBuilder: (_) => FlowyIconEmojiPicker(
+ tabs: const [PickerTabType.emoji],
onSelectedEmoji: (result) {
widget.onSelected(result);
controller.close();
@@ -107,12 +110,13 @@ class _WorkspaceIconState extends State<WorkspaceIcon> {
return GestureDetector(
onTap: () async {
- final result = await context.push<EmojiPickerResult>(
+ final result = await context.push<EmojiIconData>(
Uri(
path: MobileEmojiPickerScreen.routeName,
queryParameters: {
MobileEmojiPickerScreen.pageTitle:
LocaleKeys.settings_workspacePage_workspaceIcon_title.tr(),
+ MobileEmojiPickerScreen.selectTabs: [PickerTabType.emoji.name],
},
).toString(),
);
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/view_item.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/view_item.dart
index f54fc66c8d..d6b5dfe297 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/view_item.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/view_item.dart
@@ -2,6 +2,7 @@ import 'dart:async';
import 'package:appflowy/generated/flowy_svgs.g.dart';
import 'package:appflowy/generated/locale_keys.g.dart';
+import 'package:appflowy/plugins/document/presentation/editor_plugins/header/emoji_icon_widget.dart';
import 'package:appflowy/shared/icon_emoji_picker/flowy_icon_emoji_picker.dart';
import 'package:appflowy/startup/plugin/plugin.dart';
import 'package:appflowy/startup/startup.dart';
@@ -30,7 +31,6 @@ import 'package:flowy_infra_ui/style_widget/hover.dart';
import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:universal_platform/universal_platform.dart';
typedef ViewItemOnSelected = void Function(BuildContext context, ViewPB view);
typedef ViewItemLeftIconBuilder = Widget Function(
@@ -117,6 +117,7 @@ class ViewItem extends StatelessWidget {
// custom the left icon widget, if it's null, the default expand/collapse icon will be used
final ViewItemLeftIconBuilder? leftIconBuilder;
+
// custom the right icon widget, if it's null, the default ... and + button will be used
final ViewItemRightIconsBuilder? rightIconsBuilder;
@@ -245,6 +246,7 @@ class InnerViewItem extends StatefulWidget {
final bool isDraggable;
final bool isExpanded;
final bool isFirstChild;
+
// identify if the view item is rendered as feedback widget inside DraggableItem
final bool isFeedback;
@@ -445,6 +447,7 @@ class SingleInnerViewItem extends StatefulWidget {
final ViewPB view;
final ViewPB? parentView;
final bool isExpanded;
+
// identify if the view item is rendered as feedback widget inside DraggableItem
final bool isFeedback;
@@ -603,7 +606,7 @@ class _SingleInnerViewItemState extends State<SingleInnerViewItem> {
popupBuilder: (_) => RenameViewPopover(
viewId: widget.view.id,
name: widget.view.name,
- emoji: widget.view.icon.value,
+ emoji: widget.view.icon.toEmojiIconData(),
popoverController: popoverController,
showIconChanger: false,
),
@@ -615,14 +618,9 @@ class _SingleInnerViewItemState extends State<SingleInnerViewItem> {
}
Widget _buildViewIconButton() {
- // using same line height on macos will result the emoji not aligned vertically with the text
- final height = UniversalPlatform.isMacOS ? 20.0 : 18.0;
- final icon = widget.view.icon.value.isNotEmpty
- ? FlowyText.emoji(
- widget.view.icon.value,
- fontSize: 16.0,
- figmaLineHeight: height,
- )
+ final iconData = widget.view.icon.toEmojiIconData();
+ final icon = iconData.isNotEmpty
+ ? RawEmojiIconWidget(emoji: iconData, emojiSize: 16.0)
: Opacity(opacity: 0.6, child: widget.view.defaultIcon());
return AppFlowyPopover(
@@ -646,8 +644,7 @@ class _SingleInnerViewItemState extends State<SingleInnerViewItem> {
onSelectedEmoji: (result) {
ViewBackendService.updateViewIcon(
viewId: widget.view.id,
- viewIcon: result.emoji,
- iconType: result.type.toProto(),
+ viewIcon: result,
);
controller.close();
},
@@ -773,14 +770,13 @@ class _SingleInnerViewItemState extends State<SingleInnerViewItem> {
context.read<ViewBloc>().add(const ViewEvent.collapseAllPages());
break;
case ViewMoreActionType.changeIcon:
- if (data is! EmojiPickerResult) {
+ if (data is! EmojiIconData) {
return;
}
final result = data;
await ViewBackendService.updateViewIcon(
viewId: widget.view.id,
- viewIcon: result.emoji,
- iconType: result.type.toProto(),
+ viewIcon: result,
);
break;
case ViewMoreActionType.moveTo:
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/account/account_user_profile.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/account/account_user_profile.dart
index 90c4b6c2ba..bd08501ae4 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/account/account_user_profile.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/account/account_user_profile.dart
@@ -11,6 +11,8 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
+import '../../../../../shared/icon_emoji_picker/tab.dart';
+
// Account name and account avatar
class AccountUserProfile extends StatefulWidget {
const AccountUserProfile({
@@ -142,6 +144,7 @@ class _AccountUserProfileState extends State<AccountUserProfile> {
width: 360,
margin: const EdgeInsets.all(0),
child: FlowyIconEmojiPicker(
+ tabs: const [PickerTabType.emoji],
onSelectedEmoji: (r) {
context
.read<SettingsUserViewBloc>()
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/sites/published_page/published_view_settings_dialog.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/sites/published_page/published_view_settings_dialog.dart
index 554029b924..b7f3cecebf 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/sites/published_page/published_view_settings_dialog.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/sites/published_page/published_view_settings_dialog.dart
@@ -220,5 +220,4 @@ class _PublishedViewSettingsDialogState
},
);
}
-
}
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/widgets/rename_view_popover.dart b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/rename_view_popover.dart
index ab67ecb5b4..ccea2f895c 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/widgets/rename_view_popover.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/rename_view_popover.dart
@@ -6,6 +6,8 @@ import 'package:flowy_infra_ui/widget/spacing.dart';
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
+import '../../../shared/icon_emoji_picker/flowy_icon_emoji_picker.dart';
+
class RenameViewPopover extends StatefulWidget {
const RenameViewPopover({
super.key,
@@ -20,7 +22,7 @@ class RenameViewPopover extends StatefulWidget {
final String viewId;
final String name;
final PopoverController popoverController;
- final String emoji;
+ final EmojiIconData emoji;
final Widget? icon;
final bool showIconChanger;
@@ -88,7 +90,10 @@ class _RenameViewPopoverState extends State<RenameViewPopover> {
}
}
- Future<void> _updateViewIcon(String emoji, PopoverController? _) async {
+ Future<void> _updateViewIcon(
+ EmojiIconData emoji,
+ PopoverController? _,
+ ) async {
await ViewBackendService.updateViewIcon(
viewId: widget.viewId,
viewIcon: emoji,
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/widgets/view_title_bar.dart b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/view_title_bar.dart
index 63b498c2f2..03eabab65c 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/widgets/view_title_bar.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/view_title_bar.dart
@@ -16,6 +16,8 @@ import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
+import '../../../plugins/document/presentation/editor_plugins/header/emoji_icon_widget.dart';
+
// space name > ... > view_title
class ViewTitleBar extends StatelessWidget {
const ViewTitleBar({
@@ -306,11 +308,7 @@ class _ViewTitleState extends State<ViewTitle> {
child: Row(
children: [
if (state.icon.isNotEmpty) ...[
- FlowyText.emoji(
- state.icon,
- fontSize: 14.0,
- figmaLineHeight: 18.0,
- ),
+ RawEmojiIconWidget(emoji: state.icon, emojiSize: 14.0),
const HSpace(4.0),
],
if (state.view?.isSpace == true && spaceIcon != null) ...[
diff --git a/frontend/appflowy_flutter/packages/flowy_infra/lib/colorscheme/dandelion.dart b/frontend/appflowy_flutter/packages/flowy_infra/lib/colorscheme/dandelion.dart
index ce01205129..2aa455b404 100644
--- a/frontend/appflowy_flutter/packages/flowy_infra/lib/colorscheme/dandelion.dart
+++ b/frontend/appflowy_flutter/packages/flowy_infra/lib/colorscheme/dandelion.dart
@@ -86,7 +86,6 @@ class DandelionColorScheme extends FlowyColorScheme {
scrollbarColor: const Color(0x3F171717),
scrollbarHoverColor: const Color(0x7F171717),
lightIconColor: const Color(0xFF8F959E),
-
);
const DandelionColorScheme.dark()
@@ -145,6 +144,5 @@ class DandelionColorScheme extends FlowyColorScheme {
scrollbarColor: const Color(0x40FFFFFF),
scrollbarHoverColor: const Color(0x80FFFFFF),
lightIconColor: const Color(0xFF8F959E),
-
);
}
diff --git a/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/snap_bar.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/snap_bar.dart
index 8752a5985f..c889496f17 100644
--- a/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/snap_bar.dart
+++ b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/snap_bar.dart
@@ -9,7 +9,8 @@ void showSnapBar(BuildContext context, String title, {VoidCallback? onClosed}) {
ScaffoldMessenger.of(context)
.showSnackBar(
SnackBar(
- backgroundColor: Theme.of(context).colorScheme.surfaceContainerHighest,
+ backgroundColor:
+ Theme.of(context).colorScheme.surfaceContainerHighest,
duration: const Duration(milliseconds: 8000),
content: FlowyText(
title,