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: support custom image icon (#7236)

Morn42bd4884fdeb
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 7b2925b5b2..dd40470ab9 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,5 @@
+import 'dart:io';
+
import 'package:appflowy/plugins/base/emoji/emoji_picker.dart';
import 'package:appflowy/plugins/document/presentation/editor_plugins/base/emoji_picker_button.dart';
import 'package:appflowy/shared/icon_emoji_picker/flowy_icon_emoji_picker.dart';
@@ -5,8 +7,11 @@ import 'package:appflowy/shared/icon_emoji_picker/recent_icons.dart';
import 'package:appflowy/workspace/presentation/widgets/view_title_bar.dart';
import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
import 'package:flowy_infra_ui/style_widget/text_field.dart';
+import 'package:flutter/services.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:integration_test/integration_test.dart';
+import 'package:path/path.dart' as p;
+import 'package:path_provider/path_provider.dart';
import '../../shared/base.dart';
import '../../shared/common_operations.dart';
@@ -209,4 +214,49 @@ void main() {
);
}
});
+
+ testWidgets('Update page custom icon in title bar', (tester) async {
+ await tester.initializeAppFlowy();
+ await tester.tapAnonymousSignInButton();
+
+ /// prepare local image
+ final imagePath = await rootBundle.load('assets/test/images/sample.jpeg');
+ final tempDirectory = await getTemporaryDirectory();
+ final localImagePath = p.join(tempDirectory.path, 'sample.jpeg');
+ final imageFile = File(localImagePath)
+ ..writeAsBytesSync(imagePath.buffer.asUint8List());
+ final iconData = EmojiIconData.custom(imageFile.path);
+
+ // 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/mobile/document/icon_test.dart b/frontend/appflowy_flutter/integration_test/mobile/document/icon_test.dart
new file mode 100644
index 0000000000..1b94c65436
--- /dev/null
+++ b/frontend/appflowy_flutter/integration_test/mobile/document/icon_test.dart
@@ -0,0 +1,65 @@
+import 'dart:io';
+
+import 'package:appflowy/mobile/presentation/base/view_page/app_bar_buttons.dart';
+import 'package:appflowy/mobile/presentation/presentation.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.dart';
+import 'package:appflowy/shared/icon_emoji_picker/flowy_icon_emoji_picker.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:integration_test/integration_test.dart';
+import 'package:path/path.dart' as p;
+import 'package:path_provider/path_provider.dart';
+
+import '../../shared/emoji.dart';
+import '../../shared/util.dart';
+
+void main() {
+ IntegrationTestWidgetsFlutterBinding.ensureInitialized();
+
+ group('document title:', () {
+ testWidgets('update page custom icon in title bar', (tester) async {
+ await tester.launchInAnonymousMode();
+
+ /// prepare local image
+ final imagePath = await rootBundle.load('assets/test/images/sample.jpeg');
+ final tempDirectory = await getTemporaryDirectory();
+ final localImagePath = p.join(tempDirectory.path, 'sample.jpeg');
+ final imageFile = File(localImagePath)
+ ..writeAsBytesSync(imagePath.buffer.asUint8List());
+ final iconData = EmojiIconData.custom(imageFile.path);
+
+ /// create an empty page
+ await tester
+ .tapButton(find.byKey(BottomNavigationBarItemType.add.valueKey));
+
+ /// show Page style page
+ await tester.tapButton(find.byType(MobileViewPageLayoutButton));
+ final pageStyleIcon = find.byType(PageStyleIcon);
+ final iconInPageStyleIcon = find.descendant(
+ of: pageStyleIcon,
+ matching: find.byType(RawEmojiIconWidget),
+ );
+ expect(iconInPageStyleIcon, findsNothing);
+
+ /// show icon picker
+ await tester.tapButton(pageStyleIcon);
+
+ /// upload custom icon
+ await tester.pickImage(iconData);
+
+ /// check result
+ final documentPage = find.byType(MobileDocumentScreen);
+ final rawEmojiIconWidget = find
+ .descendant(
+ of: documentPage,
+ matching: find.byType(RawEmojiIconWidget),
+ )
+ .evaluate()
+ .first
+ .widget as RawEmojiIconWidget;
+ final iconDataInWidget = rawEmojiIconWidget.emoji;
+ expect(iconDataInWidget.type, FlowyIconType.custom);
+ });
+ });
+}
diff --git a/frontend/appflowy_flutter/integration_test/shared/common_operations.dart b/frontend/appflowy_flutter/integration_test/shared/common_operations.dart
index f188106f82..76d2d82b4a 100644
--- a/frontend/appflowy_flutter/integration_test/shared/common_operations.dart
+++ b/frontend/appflowy_flutter/integration_test/shared/common_operations.dart
@@ -671,6 +671,8 @@ extension CommonOperations on WidgetTester {
await tapEmoji(icon.emoji);
} else if (icon.type == FlowyIconType.icon) {
await tapIcon(icon);
+ } else if (icon.type == FlowyIconType.custom) {
+ await pickImage(icon);
}
await pumpAndSettle();
}
diff --git a/frontend/appflowy_flutter/integration_test/shared/emoji.dart b/frontend/appflowy_flutter/integration_test/shared/emoji.dart
index 2cd7e109c0..0f45098b23 100644
--- a/frontend/appflowy_flutter/integration_test/shared/emoji.dart
+++ b/frontend/appflowy_flutter/integration_test/shared/emoji.dart
@@ -3,8 +3,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/icon_uploader.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:cross_file/cross_file.dart';
+import 'package:desktop_drop/desktop_drop.dart';
+import 'package:flowy_infra_ui/style_widget/primary_rounded_button.dart';
import 'package:flowy_svg/flowy_svg.dart';
import 'package:flutter/material.dart';
import 'package:flutter_emoji_mart/flutter_emoji_mart.dart';
@@ -63,4 +67,41 @@ extension EmojiTestExtension on WidgetTester {
await tapButton(selectedColor);
}
}
+
+ Future<void> pickImage(EmojiIconData icon) async {
+ final pickTab = find.byType(PickerTab);
+ expect(pickTab, findsOneWidget);
+ await pumpAndSettle();
+
+ /// switch to custom tab
+ final iconTab = find.descendant(
+ of: pickTab,
+ matching: find.text(PickerTabType.custom.tr),
+ );
+ expect(iconTab, findsOneWidget);
+ await tapButton(iconTab);
+
+ /// mock for dragging image
+ final dropTarget = find.descendant(
+ of: find.byType(IconUploader),
+ matching: find.byType(DropTarget),
+ );
+ expect(dropTarget, findsOneWidget);
+ final dropTargetWidget = dropTarget.evaluate().first.widget as DropTarget;
+ dropTargetWidget.onDragDone?.call(
+ DropDoneDetails(
+ files: [XFile(icon.emoji)],
+ localPosition: Offset.zero,
+ globalPosition: Offset.zero,
+ ),
+ );
+ await pumpAndSettle(const Duration(seconds: 3));
+
+ /// confirm to upload
+ final confirmButton = find.descendant(
+ of: find.byType(IconUploader),
+ matching: find.byType(PrimaryRoundedButton),
+ );
+ await tapButton(confirmButton);
+ }
}
diff --git a/frontend/appflowy_flutter/integration_test/shared/expectation.dart b/frontend/appflowy_flutter/integration_test/shared/expectation.dart
index e1eedffaee..7e9fe4bc38 100644
--- a/frontend/appflowy_flutter/integration_test/shared/expectation.dart
+++ b/frontend/appflowy_flutter/integration_test/shared/expectation.dart
@@ -7,6 +7,7 @@ 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/appflowy_network_image.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';
@@ -21,6 +22,7 @@ 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:string_validator/string_validator.dart';
import 'package:universal_platform/universal_platform.dart';
import 'util.dart';
@@ -249,6 +251,20 @@ extension Expectation on WidgetTester {
),
);
expect(icon, findsOneWidget);
+ } else if (type == FlowyIconType.custom) {
+ if (isURL(data.emoji)) {
+ final image = find.descendant(
+ of: pageName,
+ matching: find.byType(FlowyNetworkImage),
+ );
+ expect(image, findsOneWidget);
+ } else {
+ final image = find.descendant(
+ of: pageName,
+ matching: find.byType(Image),
+ );
+ expect(image, findsOneWidget);
+ }
}
}
@@ -273,6 +289,20 @@ extension Expectation on WidgetTester {
),
);
expect(icon, findsOneWidget);
+ } else if (type == FlowyIconType.custom) {
+ if (isURL(data.emoji)) {
+ final image = find.descendant(
+ of: find.byType(ViewTitleBar),
+ matching: find.byType(FlowyNetworkImage),
+ );
+ expect(image, findsOneWidget);
+ } else {
+ final image = find.descendant(
+ of: find.byType(ViewTitleBar),
+ matching: find.byType(Image),
+ );
+ expect(image, findsOneWidget);
+ }
}
}
diff --git a/frontend/appflowy_flutter/lib/mobile/application/mobile_router.dart b/frontend/appflowy_flutter/lib/mobile/application/mobile_router.dart
index aa13d273a0..aa02495a49 100644
--- a/frontend/appflowy_flutter/lib/mobile/application/mobile_router.dart
+++ b/frontend/appflowy_flutter/lib/mobile/application/mobile_router.dart
@@ -39,7 +39,7 @@ extension MobileRouter on BuildContext {
}
}
if (tabs != null) {
- queryParameters[MobileDocumentScreen.viewSelectTabs] = tabs;
+ queryParameters[MobileDocumentScreen.viewSelectTabs] = tabs.join('-');
}
final uri = Uri(
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 6a08be9ea1..0535ec76b8 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
@@ -196,6 +196,7 @@ class _MobileViewPageState extends State<MobileViewPage> {
data: {
MobileDocumentScreen.viewFixedTitle: widget.fixedTitle,
MobileDocumentScreen.viewBlockId: widget.blockId,
+ MobileDocumentScreen.viewSelectTabs: widget.tabs,
},
);
},
diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/base/view_page/app_bar_buttons.dart b/frontend/appflowy_flutter/lib/mobile/presentation/base/view_page/app_bar_buttons.dart
index 4121d56c02..b01f72c371 100644
--- a/frontend/appflowy_flutter/lib/mobile/presentation/base/view_page/app_bar_buttons.dart
+++ b/frontend/appflowy_flutter/lib/mobile/presentation/base/view_page/app_bar_buttons.dart
@@ -128,9 +128,9 @@ class MobileViewPageLayoutButton extends StatelessWidget {
});
final ViewPB view;
+ final List<PickerTabType> tabs;
final bool isImmersiveMode;
final ValueListenable appBarOpacity;
- final List<PickerTabType> tabs;
@override
Widget build(BuildContext context) {
diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/home/section_folder/mobile_home_section_folder.dart b/frontend/appflowy_flutter/lib/mobile/presentation/home/section_folder/mobile_home_section_folder.dart
index d610b4452b..0079ed319a 100644
--- a/frontend/appflowy_flutter/lib/mobile/presentation/home/section_folder/mobile_home_section_folder.dart
+++ b/frontend/appflowy_flutter/lib/mobile/presentation/home/section_folder/mobile_home_section_folder.dart
@@ -3,6 +3,7 @@ import 'package:appflowy/mobile/application/mobile_router.dart';
import 'package:appflowy/mobile/presentation/bottom_sheet/bottom_sheet.dart';
import 'package:appflowy/mobile/presentation/home/section_folder/mobile_home_section_folder_header.dart';
import 'package:appflowy/mobile/presentation/page_item/mobile_view_item.dart';
+import 'package:appflowy/shared/icon_emoji_picker/tab.dart';
import 'package:appflowy/workspace/application/menu/sidebar_sections_bloc.dart';
import 'package:appflowy/workspace/application/sidebar/folder/folder_bloc.dart';
import 'package:appflowy/workspace/application/view/view_bloc.dart';
@@ -101,7 +102,14 @@ class _Pages extends StatelessWidget {
level: 0,
leftPadding: HomeSpaceViewSizes.leftPadding,
isFeedback: false,
- onSelected: context.pushView,
+ onSelected: (v) => context.pushView(
+ v,
+ tabs: [
+ PickerTabType.emoji,
+ PickerTabType.icon,
+ PickerTabType.custom,
+ ].map((e) => e.name).toList(),
+ ),
endActionPane: (context) {
final view = context.read<ViewBloc>().state.view;
return buildEndActionPane(
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 e589ce7cd2..638e20839e 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
@@ -11,6 +11,7 @@ import 'package:appflowy/plugins/document/presentation/editor_plugins/header/emo
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';
+import 'package:appflowy/shared/icon_emoji_picker/tab.dart';
import 'package:appflowy/util/string_extension.dart';
import 'package:appflowy/util/theme_extension.dart';
import 'package:appflowy/workspace/application/settings/appearance/appearance_cubit.dart';
@@ -81,7 +82,14 @@ class MobileViewPage extends StatelessWidget {
spaceRatio: 4,
),
child: AnimatedGestureDetector(
- onTapUp: () => context.pushView(view),
+ onTapUp: () => context.pushView(
+ view,
+ tabs: [
+ PickerTabType.emoji,
+ PickerTabType.icon,
+ PickerTabType.custom,
+ ].map((e) => e.name).toList(),
+ ),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
@@ -140,7 +148,8 @@ class MobileViewPage extends StatelessWidget {
final iconUrl = userProfile?.iconUrl;
if (iconUrl == null ||
iconUrl.isEmpty ||
- view.createdBy != userProfile?.id) {
+ view.createdBy != userProfile?.id ||
+ !isURL(iconUrl)) {
return const SizedBox.shrink();
}
@@ -182,7 +191,7 @@ class MobileViewPage extends StatelessWidget {
WidgetSpan(
child: SizedBox(
width: 20,
- child: EmojiIconWidget(
+ child: RawEmojiIconWidget(
emoji: icon,
emojiSize: 18.0,
),
@@ -206,7 +215,7 @@ class MobileViewPage extends StatelessWidget {
Widget _buildAuthor(BuildContext context, RecentViewState state) {
return FlowyText.regular(
// view.createdBy.toString(),
- 'Lucas',
+ '',
fontSize: 12.0,
color: Theme.of(context).hintColor,
overflow: TextOverflow.ellipsis,
diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/home/space/mobile_space.dart b/frontend/appflowy_flutter/lib/mobile/presentation/home/space/mobile_space.dart
index a6545ce053..e0dd520b2d 100644
--- a/frontend/appflowy_flutter/lib/mobile/presentation/home/space/mobile_space.dart
+++ b/frontend/appflowy_flutter/lib/mobile/presentation/home/space/mobile_space.dart
@@ -4,6 +4,7 @@ import 'package:appflowy/mobile/presentation/bottom_sheet/bottom_sheet.dart';
import 'package:appflowy/mobile/presentation/home/space/mobile_space_header.dart';
import 'package:appflowy/mobile/presentation/home/space/mobile_space_menu.dart';
import 'package:appflowy/mobile/presentation/page_item/mobile_view_item.dart';
+import 'package:appflowy/shared/icon_emoji_picker/tab.dart';
import 'package:appflowy/shared/list_extension.dart';
import 'package:appflowy/workspace/application/sidebar/folder/folder_bloc.dart';
import 'package:appflowy/workspace/application/sidebar/space/space_bloc.dart';
@@ -151,7 +152,14 @@ class _Pages extends StatelessWidget {
level: 0,
leftPadding: HomeSpaceViewSizes.leftPadding,
isFeedback: false,
- onSelected: context.pushView,
+ onSelected: (v) => context.pushView(
+ v,
+ tabs: [
+ PickerTabType.emoji,
+ PickerTabType.icon,
+ PickerTabType.custom,
+ ].map((e) => e.name).toList(),
+ ),
endActionPane: (context) {
final view = context.read<ViewBloc>().state.view;
final actions = [
diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/home/tab/mobile_space_tab.dart b/frontend/appflowy_flutter/lib/mobile/presentation/home/tab/mobile_space_tab.dart
index 9d78e39645..1a19845152 100644
--- a/frontend/appflowy_flutter/lib/mobile/presentation/home/tab/mobile_space_tab.dart
+++ b/frontend/appflowy_flutter/lib/mobile/presentation/home/tab/mobile_space_tab.dart
@@ -6,6 +6,7 @@ import 'package:appflowy/mobile/presentation/home/tab/_tab_bar.dart';
import 'package:appflowy/mobile/presentation/home/tab/space_order_bloc.dart';
import 'package:appflowy/mobile/presentation/presentation.dart';
import 'package:appflowy/mobile/presentation/setting/workspace/invite_members_screen.dart';
+import 'package:appflowy/shared/icon_emoji_picker/tab.dart';
import 'package:appflowy/workspace/application/menu/sidebar_sections_bloc.dart';
import 'package:appflowy/workspace/application/sidebar/folder/folder_bloc.dart';
import 'package:appflowy/workspace/application/sidebar/space/space_bloc.dart';
@@ -82,7 +83,14 @@ class _MobileSpaceTabState extends State<MobileSpaceTab>
listener: (context, state) {
final lastCreatedPage = state.lastCreatedRootView;
if (lastCreatedPage != null) {
- context.pushView(lastCreatedPage);
+ context.pushView(
+ lastCreatedPage,
+ tabs: [
+ PickerTabType.emoji,
+ PickerTabType.icon,
+ PickerTabType.custom,
+ ].map((e) => e.name).toList(),
+ );
}
},
),
diff --git a/frontend/appflowy_flutter/lib/plugins/ai_chat/application/chat_select_message_bloc.dart b/frontend/appflowy_flutter/lib/plugins/ai_chat/application/chat_select_message_bloc.dart
index 75eb99fa9f..90a2db168f 100644
--- a/frontend/appflowy_flutter/lib/plugins/ai_chat/application/chat_select_message_bloc.dart
+++ b/frontend/appflowy_flutter/lib/plugins/ai_chat/application/chat_select_message_bloc.dart
@@ -1,6 +1,5 @@
import 'package:appflowy/plugins/ai_chat/application/chat_entity.dart';
import 'package:appflowy/plugins/util.dart';
-import 'package:flutter/foundation.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_chat_core/flutter_chat_core.dart';
import 'package:freezed_annotation/freezed_annotation.dart';
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 cf32cad611..47f257d174 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
@@ -12,17 +12,20 @@ class MobileEmojiPickerScreen extends StatelessWidget {
super.key,
this.title,
this.selectedType,
+ this.documentId,
this.tabs = const [PickerTabType.emoji, PickerTabType.icon],
});
final PickerTabType? selectedType;
final String? title;
+ final String? documentId;
final List<PickerTabType> tabs;
static const routeName = '/emoji_picker';
static const pageTitle = 'title';
- static const iconSelectedType = 'iconSelectedType';
+ static const iconSelectedType = 'iconSelected_type';
static const selectTabs = 'tabs';
+ static const uploadDocumentId = 'document_id';
@override
Widget build(BuildContext context) {
@@ -33,6 +36,7 @@ class MobileEmojiPickerScreen extends StatelessWidget {
body: SafeArea(
child: FlowyIconEmojiPicker(
tabs: tabs,
+ documentId: documentId,
initialType: selectedType,
onSelectedEmoji: (r) {
context.pop<EmojiIconData>(r.data);
diff --git a/frontend/appflowy_flutter/lib/plugins/document/document.dart b/frontend/appflowy_flutter/lib/plugins/document/document.dart
index dcfc1906a3..38236b008b 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/document.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/document.dart
@@ -9,6 +9,7 @@ import 'package:appflowy/plugins/document/presentation/document_collaborators.da
import 'package:appflowy/plugins/shared/share/share_button.dart';
import 'package:appflowy/plugins/util.dart';
import 'package:appflowy/shared/feature_flags.dart';
+import 'package:appflowy/shared/icon_emoji_picker/tab.dart';
import 'package:appflowy/startup/plugin/plugin.dart';
import 'package:appflowy/workspace/application/view/view_ext.dart';
import 'package:appflowy/workspace/application/view_info/view_info_bloc.dart';
@@ -107,6 +108,7 @@ class DocumentPluginWidgetBuilder extends PluginWidgetBuilder
final ViewInfoBloc bloc;
final ViewPluginNotifier notifier;
+
ViewPB get view => notifier.view;
int? deletedViewIndex;
final Selection? initialSelection;
@@ -130,6 +132,12 @@ class DocumentPluginWidgetBuilder extends PluginWidgetBuilder
final fixedTitle = data?[MobileDocumentScreen.viewFixedTitle];
final blockId = initialBlockId ?? data?[MobileDocumentScreen.viewBlockId];
+ final tabs = data?[MobileDocumentScreen.viewSelectTabs] ??
+ const [
+ PickerTabType.emoji,
+ PickerTabType.icon,
+ PickerTabType.custom,
+ ];
return BlocProvider<ViewInfoBloc>.value(
value: bloc,
@@ -141,6 +149,7 @@ class DocumentPluginWidgetBuilder extends PluginWidgetBuilder
initialSelection: initialSelection,
initialBlockId: blockId,
fixedTitle: fixedTitle,
+ tabs: tabs,
),
),
);
diff --git a/frontend/appflowy_flutter/lib/plugins/document/document_page.dart b/frontend/appflowy_flutter/lib/plugins/document/document_page.dart
index 4689a72bfa..583af8af20 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/document_page.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/document_page.dart
@@ -10,6 +10,7 @@ import 'package:appflowy/plugins/document/presentation/editor_plugins/shared_con
import 'package:appflowy/plugins/document/presentation/editor_plugins/transaction_handler/editor_transaction_service.dart';
import 'package:appflowy/plugins/document/presentation/editor_style.dart';
import 'package:appflowy/shared/flowy_error_page.dart';
+import 'package:appflowy/shared/icon_emoji_picker/tab.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';
@@ -28,6 +29,7 @@ class DocumentPage extends StatefulWidget {
super.key,
required this.view,
required this.onDeleted,
+ required this.tabs,
this.initialSelection,
this.initialBlockId,
this.fixedTitle,
@@ -38,6 +40,7 @@ class DocumentPage extends StatefulWidget {
final Selection? initialSelection;
final String? initialBlockId;
final String? fixedTitle;
+ final List<PickerTabType> tabs;
@override
State<DocumentPage> createState() => _DocumentPageState();
@@ -210,6 +213,7 @@ class _DocumentPageState extends State<DocumentPage>
return DocumentImmersiveCover(
fixedTitle: widget.fixedTitle,
view: widget.view,
+ tabs: widget.tabs,
userProfilePB: userProfilePB,
);
}
@@ -217,6 +221,7 @@ class _DocumentPageState extends State<DocumentPage>
final page = editorState.document.root;
return DocumentCoverWidget(
node: page,
+ tabs: widget.tabs,
editorState: editorState,
view: widget.view,
onIconChanged: (icon) async => ViewBackendService.updateViewIcon(
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 c532dd5e52..e25710c137 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
@@ -22,6 +22,7 @@ class EmojiPickerButton extends StatelessWidget {
this.enable = true,
this.margin,
this.buttonSize,
+ this.documentId,
this.tabs = const [PickerTabType.emoji, PickerTabType.icon],
});
@@ -41,6 +42,7 @@ class EmojiPickerButton extends StatelessWidget {
final bool enable;
final EdgeInsets? margin;
final Size? buttonSize;
+ final String? documentId;
final List<PickerTabType> tabs;
@override
@@ -59,6 +61,7 @@ class EmojiPickerButton extends StatelessWidget {
enable: enable,
buttonSize: buttonSize,
tabs: tabs,
+ documentId: documentId,
);
}
@@ -70,6 +73,7 @@ class EmojiPickerButton extends StatelessWidget {
title: title,
margin: margin,
tabs: tabs,
+ documentId: documentId,
);
}
}
@@ -87,6 +91,7 @@ class _DesktopEmojiPickerButton extends StatelessWidget {
this.showBorder = true,
this.enable = true,
this.buttonSize,
+ this.documentId,
this.tabs = const [PickerTabType.emoji, PickerTabType.icon],
});
@@ -105,6 +110,7 @@ class _DesktopEmojiPickerButton extends StatelessWidget {
final bool showBorder;
final bool enable;
final Size? buttonSize;
+ final String? documentId;
final List<PickerTabType> tabs;
@override
@@ -126,6 +132,7 @@ class _DesktopEmojiPickerButton extends StatelessWidget {
child: FlowyIconEmojiPicker(
initialType: emoji.type.toPickerTabType(),
tabs: tabs,
+ documentId: documentId,
onSelectedEmoji: (r) {
onSubmitted(r, popoverController);
},
@@ -165,6 +172,7 @@ class _MobileEmojiPickerButton extends StatelessWidget {
this.enable = true,
this.title,
this.margin,
+ this.documentId,
this.tabs = const [PickerTabType.emoji, PickerTabType.icon],
});
@@ -177,6 +185,7 @@ class _MobileEmojiPickerButton extends StatelessWidget {
final String? title;
final bool enable;
final EdgeInsets? margin;
+ final String? documentId;
final List<PickerTabType> tabs;
@override
@@ -197,6 +206,7 @@ class _MobileEmojiPickerButton extends StatelessWidget {
queryParameters: {
MobileEmojiPickerScreen.pageTitle: title,
MobileEmojiPickerScreen.iconSelectedType: emoji.type.name,
+ MobileEmojiPickerScreen.uploadDocumentId: documentId,
MobileEmojiPickerScreen.selectTabs:
tabs.map((e) => e.name).toList(),
},
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 fcc03d6f26..c81c2f3be6 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
@@ -164,7 +164,8 @@ class _CalloutBlockComponentWidgetState
// get the emoji of the note block from the node's attributes or default to '📌'
EmojiIconData get emoji {
final icon = node.attributes[CalloutBlockKeys.icon];
- final type = node.attributes[CalloutBlockKeys.iconType];
+ final type =
+ node.attributes[CalloutBlockKeys.iconType] ?? FlowyIconType.emoji;
EmojiIconData result = EmojiIconData.emoji('📌');
try {
result = EmojiIconData(FlowyIconType.values.byName(type), icon);
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 7485bfe018..96d39d7500 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
@@ -11,6 +11,7 @@ import 'package:appflowy/plugins/document/presentation/editor_plugins/page_style
import 'package:appflowy/shared/appflowy_network_image.dart';
import 'package:appflowy/shared/flowy_gradient_colors.dart';
import 'package:appflowy/shared/google_fonts_extension.dart';
+import 'package:appflowy/shared/icon_emoji_picker/tab.dart';
import 'package:appflowy/util/string_extension.dart';
import 'package:appflowy/workspace/application/settings/appearance/base_appearance.dart';
import 'package:appflowy/workspace/application/view/view_bloc.dart';
@@ -36,12 +37,14 @@ class DocumentImmersiveCover extends StatefulWidget {
super.key,
required this.view,
required this.userProfilePB,
+ required this.tabs,
this.fixedTitle,
});
final ViewPB view;
final UserProfilePB userProfilePB;
final String? fixedTitle;
+ final List<PickerTabType> tabs;
@override
State<DocumentImmersiveCover> createState() => _DocumentImmersiveCoverState();
@@ -228,6 +231,8 @@ class _DocumentImmersiveCoverState extends State<DocumentImmersiveCover> {
child: Expanded(
child: FlowyIconEmojiPicker(
initialType: icon.type.toPickerTabType(),
+ tabs: widget.tabs,
+ documentId: widget.view.id,
onSelectedEmoji: (r) {
pageStyleIconBloc.add(
PageStyleIconEvent.updateIcon(r.data, true),
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 3a827b7ce0..a565fd4e43 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
@@ -17,6 +17,7 @@ import 'package:appflowy/plugins/document/presentation/editor_plugins/migration/
import 'package:appflowy/plugins/document/presentation/editor_style.dart';
import 'package:appflowy/shared/appflowy_network_image.dart';
import 'package:appflowy/shared/icon_emoji_picker/flowy_icon_emoji_picker.dart';
+import 'package:appflowy/shared/icon_emoji_picker/tab.dart';
import 'package:appflowy/workspace/application/view/view_ext.dart';
import 'package:appflowy/workspace/application/view/view_listener.dart';
import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
@@ -73,12 +74,14 @@ class DocumentCoverWidget extends StatefulWidget {
required this.editorState,
required this.onIconChanged,
required this.view,
+ required this.tabs,
});
final Node node;
final EditorState editorState;
final ValueChanged<EmojiIconData> onIconChanged;
final ViewPB view;
+ final List<PickerTabType> tabs;
@override
State<DocumentCoverWidget> createState() => _DocumentCoverWidgetState();
@@ -170,6 +173,8 @@ class _DocumentCoverWidgetState extends State<DocumentCoverWidget> {
hasIcon: hasIcon,
offset: offset,
isCoverTitleHovered: isCoverTitleHovered,
+ documentId: view.id,
+ tabs: widget.tabs,
),
),
if (hasCover)
@@ -223,6 +228,7 @@ class _DocumentCoverWidgetState extends State<DocumentCoverWidget> {
editorState: widget.editorState,
node: widget.node,
icon: viewIcon,
+ documentId: view.id,
onChangeIcon: (icon) => _saveIconOrCover(icon: icon),
),
);
@@ -339,7 +345,9 @@ class DocumentHeaderToolbar extends StatefulWidget {
required this.hasIcon,
required this.onIconOrCoverChanged,
required this.offset,
+ this.documentId,
required this.isCoverTitleHovered,
+ required this.tabs,
});
final Node node;
@@ -349,7 +357,9 @@ class DocumentHeaderToolbar extends StatefulWidget {
final void Function({(CoverType, String?)? cover, EmojiIconData? icon})
onIconOrCoverChanged;
final double offset;
+ final String? documentId;
final ValueNotifier<bool> isCoverTitleHovered;
+ final List<PickerTabType> tabs;
@override
State<DocumentHeaderToolbar> createState() => _DocumentHeaderToolbarState();
@@ -468,6 +478,8 @@ class _DocumentHeaderToolbarState extends State<DocumentHeaderToolbar> {
popupBuilder: (BuildContext popoverContext) {
isPopoverOpen = true;
return FlowyIconEmojiPicker(
+ tabs: widget.tabs,
+ documentId: widget.documentId,
onSelectedEmoji: (r) {
widget.onIconOrCoverChanged(icon: r.data);
if (!r.keepOpen) _popoverController.close();
@@ -836,11 +848,13 @@ class DocumentIcon extends StatefulWidget {
required this.editorState,
required this.icon,
required this.onChangeIcon,
+ this.documentId,
});
final Node node;
final EditorState editorState;
final EmojiIconData icon;
+ final String? documentId;
final ValueChanged<EmojiIconData> onChangeIcon;
@override
@@ -865,6 +879,12 @@ class _DocumentIconState extends State<DocumentIcon> {
popupBuilder: (BuildContext popoverContext) {
return FlowyIconEmojiPicker(
initialType: widget.icon.type.toPickerTabType(),
+ tabs: const [
+ PickerTabType.emoji,
+ PickerTabType.icon,
+ PickerTabType.custom,
+ ],
+ documentId: widget.documentId,
onSelectedEmoji: (r) {
widget.onChangeIcon(r.data);
if (!r.keepOpen) _popoverController.close();
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 4815a8406c..1d7f43004c 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
@@ -2,9 +2,12 @@ import 'dart:convert';
import 'dart:io';
import 'package:appflowy/plugins/base/emoji/emoji_text.dart';
+import 'package:appflowy/shared/appflowy_network_image.dart';
import 'package:appflowy/shared/icon_emoji_picker/icon_picker.dart';
+import 'package:appflowy/user/application/user_service.dart';
import 'package:appflowy_backend/log.dart';
import 'package:flutter/material.dart';
+import 'package:string_validator/string_validator.dart';
import '../../../../../shared/icon_emoji_picker/flowy_icon_emoji_picker.dart';
import '../../../../base/icon/icon_widget.dart';
@@ -103,6 +106,44 @@ class RawEmojiIconWidget extends StatelessWidget {
iconsData: iconData,
size: iconSize,
);
+ case FlowyIconType.custom:
+ final url = emoji.emoji;
+ if (isURL(url)) {
+ return SizedBox.square(
+ dimension: emojiSize,
+ child: FutureBuilder(
+ future: UserBackendService.getCurrentUserProfile(),
+ builder: (context, value) {
+ final userProfile = value.data?.fold(
+ (userProfile) => userProfile,
+ (l) => null,
+ );
+ if (userProfile == null) return const SizedBox.shrink();
+ return FlowyNetworkImage(
+ url: url,
+ width: emojiSize,
+ height: emojiSize,
+ userProfilePB: userProfile,
+ errorWidgetBuilder: (context, url, error) =>
+ const SizedBox.shrink(),
+ );
+ },
+ ),
+ );
+ }
+ final imageFile = File(url);
+ if (!imageFile.existsSync()) {
+ throw PathNotFoundException(url, const OSError());
+ }
+ return SizedBox.square(
+ dimension: emojiSize,
+ child: Image.file(
+ imageFile,
+ fit: BoxFit.cover,
+ width: emojiSize,
+ height: emojiSize,
+ ),
+ );
default:
return defaultEmoji;
}
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 7ca8f6b140..90a4c73013 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
@@ -9,6 +9,7 @@ import 'package:appflowy/plugins/document/presentation/editor_plugins/mention/mo
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/shared/icon_emoji_picker/tab.dart';
import 'package:appflowy/startup/startup.dart';
import 'package:appflowy/util/string_extension.dart';
import 'package:appflowy/workspace/application/action_navigation/action_navigation_bloc.dart';
@@ -339,6 +340,11 @@ Future<void> _handleTap(
await context.pushView(
view,
blockId: blockId,
+ tabs: [
+ PickerTabType.emoji,
+ PickerTabType.icon,
+ PickerTabType.custom,
+ ].map((e) => e.name).toList(),
);
}
} else {
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 7695d36b2f..a71b083c81 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
@@ -36,9 +36,9 @@ class _PageStyleIconState extends State<PageStyleIcon> {
..add(const PageStyleIconEvent.initial()),
child: BlocBuilder<PageStyleIconBloc, PageStyleIconState>(
builder: (context, state) {
- final icon = state.icon ?? EmojiIconData.none();
+ final icon = state.icon;
return GestureDetector(
- onTap: () => _showIconSelector(context, icon),
+ onTap: () => icon == null ? null : _showIconSelector(context, icon),
behavior: HitTestBehavior.opaque,
child: Container(
height: 52,
@@ -51,14 +51,14 @@ class _PageStyleIconState extends State<PageStyleIcon> {
const HSpace(16.0),
FlowyText(LocaleKeys.document_plugins_emoji.tr()),
const Spacer(),
- icon.isEmpty
+ (icon?.isEmpty ?? true)
? FlowyText(
LocaleKeys.pageStyle_none.tr(),
fontSize: 16.0,
)
: RawEmojiIconWidget(
- emoji: icon,
- emojiSize: 22.0,
+ emoji: icon!,
+ emojiSize: 16.0,
),
const HSpace(6.0),
const FlowySvg(FlowySvgs.m_page_style_arrow_right_s),
@@ -92,6 +92,7 @@ class _PageStyleIconState extends State<PageStyleIcon> {
child: Expanded(
child: FlowyIconEmojiPicker(
initialType: icon.type.toPickerTabType(),
+ documentId: widget.view.id,
tabs: widget.tabs,
onSelectedEmoji: (r) {
pageStyleIconBloc.add(
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 a930c8d87e..2578b6de07 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
@@ -34,11 +34,7 @@ class PageStyleIconBloc extends Bloc<PageStyleIconEvent, PageStyleIconState> {
);
},
updateIcon: (icon, shouldUpdateRemote) async {
- emit(
- state.copyWith(
- icon: icon,
- ),
- );
+ emit(state.copyWith(icon: icon));
if (shouldUpdateRemote && icon != null) {
await ViewBackendService.updateViewIcon(
viewId: view.id,
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 132e79e8e8..137ecbf94d 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
@@ -1,3 +1,5 @@
+import 'dart:math';
+
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';
@@ -9,6 +11,8 @@ import 'package:flutter/material.dart' hide Icon;
import 'package:flutter/services.dart';
import 'package:universal_platform/universal_platform.dart';
+import 'icon_uploader.dart';
+
extension ToProto on FlowyIconType {
ViewIconTypePB toProto() {
switch (this) {
@@ -60,6 +64,9 @@ class EmojiIconData {
factory EmojiIconData.icon(IconsData icon) =>
EmojiIconData(FlowyIconType.icon, icon.iconString);
+ factory EmojiIconData.custom(String url) =>
+ EmojiIconData(FlowyIconType.custom, url);
+
const EmojiIconData(
this.type,
this.emoji,
@@ -104,14 +111,19 @@ class FlowyIconEmojiPicker extends StatefulWidget {
super.key,
this.onSelectedEmoji,
this.initialType,
+ this.documentId,
this.enableBackgroundColorSelection = true,
- this.tabs = const [PickerTabType.emoji, PickerTabType.icon],
+ this.tabs = const [
+ PickerTabType.emoji,
+ PickerTabType.icon,
+ ],
});
final ValueChanged<SelectedEmojiIconResult>? onSelectedEmoji;
final bool enableBackgroundColorSelection;
final List<PickerTabType> tabs;
final PickerTabType? initialType;
+ final String? documentId;
@override
State<FlowyIconEmojiPicker> createState() => _FlowyIconEmojiPickerState();
@@ -127,13 +139,19 @@ class _FlowyIconEmojiPickerState extends State<FlowyIconEmojiPicker>
super.initState();
final initialType = widget.initialType;
if (initialType != null) {
- currentIndex = widget.tabs.indexOf(initialType);
+ currentIndex = max(widget.tabs.indexOf(initialType), 0);
}
controller = TabController(
initialIndex: currentIndex,
length: widget.tabs.length,
vsync: this,
);
+ controller.addListener(() {
+ final currentType = widget.tabs[currentIndex];
+ if (currentType == PickerTabType.custom) {
+ SystemChannels.textInput.invokeMethod('TextInput.hide');
+ }
+ });
}
@override
@@ -178,6 +196,8 @@ class _FlowyIconEmojiPickerState extends State<FlowyIconEmojiPicker>
return _buildEmojiPicker();
case PickerTabType.icon:
return _buildIconPicker();
+ case PickerTabType.custom:
+ return _buildIconUploader();
}
}).toList(),
),
@@ -219,6 +239,16 @@ class _FlowyIconEmojiPickerState extends State<FlowyIconEmojiPicker>
},
);
}
+
+ Widget _buildIconUploader() {
+ return IconUploader(
+ documentId: widget.documentId ?? '',
+ onUrl: (url) {
+ widget.onSelectedEmoji
+ ?.call(SelectedEmojiIconResult(EmojiIconData.custom(url), false));
+ },
+ );
+ }
}
class _RemoveIconButton extends StatelessWidget {
diff --git a/frontend/appflowy_flutter/lib/shared/icon_emoji_picker/icon_uploader.dart b/frontend/appflowy_flutter/lib/shared/icon_emoji_picker/icon_uploader.dart
new file mode 100644
index 0000000000..9ebcd78def
--- /dev/null
+++ b/frontend/appflowy_flutter/lib/shared/icon_emoji_picker/icon_uploader.dart
@@ -0,0 +1,194 @@
+import 'dart:io';
+
+import 'package:appflowy/generated/locale_keys.g.dart';
+import 'package:appflowy/plugins/document/presentation/editor_plugins/image/image_util.dart';
+import 'package:appflowy/shared/patterns/file_type_patterns.dart';
+import 'package:appflowy/shared/permission/permission_checker.dart';
+import 'package:appflowy/startup/startup.dart';
+import 'package:appflowy/user/application/user_service.dart';
+import 'package:appflowy/util/default_extensions.dart';
+import 'package:appflowy_backend/log.dart';
+import 'package:appflowy_backend/protobuf/flowy-user/auth.pbenum.dart';
+import 'package:desktop_drop/desktop_drop.dart';
+import 'package:dotted_border/dotted_border.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flowy_infra/file_picker/file_picker_service.dart';
+import 'package:flowy_infra_ui/style_widget/primary_rounded_button.dart';
+import 'package:flowy_infra_ui/style_widget/text.dart';
+import 'package:flutter/material.dart';
+import 'package:image_picker/image_picker.dart';
+import 'package:universal_platform/universal_platform.dart';
+
+@visibleForTesting
+class IconUploader extends StatefulWidget {
+ const IconUploader({
+ super.key,
+ required this.onUrl,
+ required this.documentId,
+ });
+
+ final ValueChanged<String> onUrl;
+ final String documentId;
+
+ @override
+ State<IconUploader> createState() => _IconUploaderState();
+}
+
+class _IconUploaderState extends State<IconUploader> {
+ bool isHovering = false;
+ bool isUploading = false;
+
+ final List<String> pickedImages = [];
+
+ @override
+ Widget build(BuildContext context) {
+ return Padding(
+ padding: const EdgeInsets.all(16),
+ child: Column(
+ children: [
+ Expanded(
+ child: DropTarget(
+ /// there is an issue with multiple DropTargets
+ /// see https://github.com/MixinNetwork/flutter-plugins/issues/2
+ enable: false,
+ onDragEntered: (_) => setState(() => isHovering = true),
+ onDragExited: (_) => setState(() => isHovering = false),
+ onDragDone: (details) => loadImage(details.files),
+ child: MouseRegion(
+ cursor: SystemMouseCursors.click,
+ child: GestureDetector(
+ behavior: HitTestBehavior.opaque,
+ onTap: () => pickImage(),
+ child: DottedBorder(
+ dashPattern: const [3, 3],
+ radius: const Radius.circular(8),
+ borderType: BorderType.RRect,
+ color: isHovering
+ ? Theme.of(context).colorScheme.primary
+ : Theme.of(context).hintColor,
+ child: Center(
+ child: pickedImages.isEmpty ? dragHint() : previewImage(),
+ ),
+ ),
+ ),
+ ),
+ ),
+ ),
+ Padding(
+ padding: const EdgeInsets.only(top: 16),
+ child: Align(
+ alignment: Alignment.centerRight,
+ child: _ConfirmButton(
+ onTap: uploadImage,
+ enable: pickedImages.isNotEmpty,
+ ),
+ ),
+ ),
+ ],
+ ),
+ );
+ }
+
+ Widget dragHint() => FlowyText(
+ LocaleKeys.document_imageBlock_upload_placeholder.tr(),
+ fontSize: 14,
+ fontWeight: FontWeight.w500,
+ color: Theme.of(context).hintColor,
+ );
+
+ Widget previewImage() => Image.file(
+ File(pickedImages.first),
+ width: 200,
+ height: 200,
+ fit: BoxFit.cover,
+ );
+
+ void loadImage(List<XFile> files) {
+ final imageFiles = files
+ .where(
+ (file) =>
+ file.mimeType?.startsWith('image/') ??
+ false || imgExtensionRegex.hasMatch(file.name),
+ )
+ .toList();
+ if (imageFiles.isEmpty) return;
+ if (mounted) {
+ setState(() {
+ pickedImages.clear();
+ pickedImages.add(imageFiles.first.path);
+ });
+ }
+ }
+
+ Future<void> pickImage() async {
+ if (UniversalPlatform.isDesktopOrWeb) {
+ // on desktop, the users can pick a image file from folder
+ final result = await getIt<FilePickerService>().pickFiles(
+ dialogTitle: '',
+ type: FileType.custom,
+ allowedExtensions: defaultImageExtensions,
+ );
+ loadImage(result?.files.map((f) => f.xFile).toList() ?? const []);
+ } else {
+ final photoPermission =
+ await PermissionChecker.checkPhotoPermission(context);
+ if (!photoPermission) {
+ Log.error('Has no permission to access the photo library');
+ return;
+ }
+ // on mobile, the users can pick a image file from camera or image library
+ final result = await ImagePicker().pickMultiImage();
+ loadImage(result);
+ }
+ }
+
+ Future<void> uploadImage() async {
+ if (pickedImages.isEmpty || isUploading) return;
+ isUploading = true;
+ String? result;
+ final userProfileResult = await UserBackendService.getCurrentUserProfile();
+ final userProfile = userProfileResult.fold(
+ (userProfile) => userProfile,
+ (l) => null,
+ );
+ final isLocalMode = (userProfile?.authenticator ?? AuthenticatorPB.Local) ==
+ AuthenticatorPB.Local;
+ if (isLocalMode) {
+ result = await saveImageToLocalStorage(pickedImages.first);
+ } else {
+ final (url, errorMsg) = await saveImageToCloudStorage(
+ pickedImages.first,
+ widget.documentId,
+ );
+ result = url;
+ if (errorMsg?.isNotEmpty ?? false) {
+ Log.error('upload icon image error :$errorMsg');
+ }
+ }
+ isUploading = false;
+ if (result?.isNotEmpty ?? false) {
+ widget.onUrl.call(result!);
+ }
+ }
+}
+
+class _ConfirmButton extends StatelessWidget {
+ const _ConfirmButton({required this.onTap, this.enable = true});
+
+ final VoidCallback onTap;
+ final bool enable;
+
+ @override
+ Widget build(BuildContext context) {
+ return SizedBox(
+ height: 32,
+ child: Opacity(
+ opacity: enable ? 1.0 : 0.5,
+ child: PrimaryRoundedButton(
+ text: LocaleKeys.button_confirm.tr(),
+ onTap: enable ? onTap : null,
+ ),
+ ),
+ );
+ }
+}
diff --git a/frontend/appflowy_flutter/lib/shared/icon_emoji_picker/tab.dart b/frontend/appflowy_flutter/lib/shared/icon_emoji_picker/tab.dart
index b74d1145c6..f28ae0f9a8 100644
--- a/frontend/appflowy_flutter/lib/shared/icon_emoji_picker/tab.dart
+++ b/frontend/appflowy_flutter/lib/shared/icon_emoji_picker/tab.dart
@@ -3,7 +3,8 @@ import 'package:flutter/material.dart';
enum PickerTabType {
emoji,
- icon;
+ icon,
+ custom;
String get tr {
switch (this) {
@@ -11,6 +12,8 @@ enum PickerTabType {
return 'Emojis';
case PickerTabType.icon:
return 'Icons';
+ case PickerTabType.custom:
+ return 'Upload';
}
}
}
diff --git a/frontend/appflowy_flutter/lib/startup/tasks/generate_router.dart b/frontend/appflowy_flutter/lib/startup/tasks/generate_router.dart
index 3e7792b3b9..b326276c56 100644
--- a/frontend/appflowy_flutter/lib/startup/tasks/generate_router.dart
+++ b/frontend/appflowy_flutter/lib/startup/tasks/generate_router.dart
@@ -289,6 +289,8 @@ GoRoute _mobileEmojiPickerPageRoute() {
final selectedType = state
.uri.queryParameters[MobileEmojiPickerScreen.iconSelectedType]
?.toPickerTabType();
+ final documentId =
+ state.uri.queryParameters[MobileEmojiPickerScreen.uploadDocumentId];
List<PickerTabType> tabs = [];
try {
tabs = selectTabs
@@ -300,11 +302,16 @@ GoRoute _mobileEmojiPickerPageRoute() {
}
return MaterialExtendedPage(
child: tabs.isEmpty
- ? MobileEmojiPickerScreen(title: title, selectedType: selectedType)
+ ? MobileEmojiPickerScreen(
+ title: title,
+ selectedType: selectedType,
+ documentId: documentId,
+ )
: MobileEmojiPickerScreen(
title: title,
selectedType: selectedType,
tabs: tabs,
+ documentId: documentId,
),
);
},
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 d39dbeedfa..34509dbb96 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
@@ -4,6 +4,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/shared/icon_emoji_picker/tab.dart';
import 'package:appflowy/startup/plugin/plugin.dart';
import 'package:appflowy/startup/startup.dart';
import 'package:appflowy/workspace/application/favorite/favorite_bloc.dart';
@@ -652,6 +653,12 @@ class _SingleInnerViewItemState extends State<SingleInnerViewItem> {
isIconPickerOpened = true;
return FlowyIconEmojiPicker(
initialType: iconData.type.toPickerTabType(),
+ tabs: const [
+ PickerTabType.emoji,
+ PickerTabType.icon,
+ PickerTabType.custom,
+ ],
+ documentId: widget.view.id,
onSelectedEmoji: (r) {
ViewBackendService.updateViewIcon(
viewId: widget.view.id,
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/view_more_action_button.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/view_more_action_button.dart
index 186c593572..a58aab2b2e 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/view_more_action_button.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/view_more_action_button.dart
@@ -1,5 +1,6 @@
import 'package:appflowy/generated/flowy_svgs.g.dart';
import 'package:appflowy/shared/icon_emoji_picker/flowy_icon_emoji_picker.dart';
+import 'package:appflowy/shared/icon_emoji_picker/tab.dart';
import 'package:appflowy/workspace/application/sidebar/folder/folder_bloc.dart';
import 'package:appflowy/workspace/application/sidebar/space/space_bloc.dart';
import 'package:appflowy/workspace/presentation/home/menu/sidebar/move_to/move_page_menu.dart';
@@ -176,6 +177,12 @@ class ViewMoreActionTypeWrapper extends CustomActionCell {
margin: const EdgeInsets.all(0),
clickHandler: PopoverClickHandler.gestureDetector,
popupBuilder: (_) => FlowyIconEmojiPicker(
+ tabs: const [
+ PickerTabType.emoji,
+ PickerTabType.icon,
+ PickerTabType.custom,
+ ],
+ documentId: sourceView.id,
initialType: sourceView.icon.toEmojiIconData().type.toPickerTabType(),
onSelectedEmoji: (result) => onTap(controller, result),
),
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 40c1a91def..8e339ca17c 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
@@ -64,6 +64,7 @@ class _RenameViewPopoverState extends State<RenameViewPopover> {
direction: PopoverDirection.bottomWithCenterAligned,
offset: const Offset(0, 18),
onSubmitted: _updateViewIcon,
+ documentId: widget.viewId,
tabs: widget.tabs,
),
),
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 03eabab65c..05657307f9 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
@@ -1,7 +1,6 @@
-import 'package:flutter/material.dart';
-
import 'package:appflowy/generated/flowy_svgs.g.dart';
import 'package:appflowy/generated/locale_keys.g.dart';
+import 'package:appflowy/shared/icon_emoji_picker/tab.dart';
import 'package:appflowy/startup/plugin/plugin.dart';
import 'package:appflowy/startup/startup.dart';
import 'package:appflowy/workspace/application/tabs/tabs_bloc.dart';
@@ -14,6 +13,7 @@ import 'package:appflowy/workspace/presentation/widgets/rename_view_popover.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:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import '../../../plugins/document/presentation/editor_plugins/header/emoji_icon_widget.dart';
@@ -285,6 +285,11 @@ class _ViewTitleState extends State<ViewTitle> {
popoverController: popoverController,
icon: widget.view.defaultIcon(),
emoji: state.icon,
+ tabs: const [
+ PickerTabType.emoji,
+ PickerTabType.icon,
+ PickerTabType.custom,
+ ],
);
},
child: SizedBox(