Bring projects, wikis, and teams together with AI. AppFlowy is the AI collaborative workspace where you achieve more without losing control of your data. The leading open source Notion alternative.
Dart blogconfluence-alternativecontent-managementcontent-servicesdocumentationflutternote-takingnotion-alternativeproject-managementtask-managementteam-collaborationwiki
feat: support recent section in icon picker (#7015)
Morne67e9cc6479d
diff --git a/frontend/appflowy_flutter/integration_test/desktop/database/database_row_page_test.dart b/frontend/appflowy_flutter/integration_test/desktop/database/database_row_page_test.dartindex fec272768c..8874cefb1c 100644--- a/frontend/appflowy_flutter/integration_test/desktop/database/database_row_page_test.dart+++ b/frontend/appflowy_flutter/integration_test/desktop/database/database_row_page_test.dart@@ -5,6 +5,7 @@ import 'package:appflowy/plugins/database/widgets/cell_editor/checklist_cell_ediimport 'package:appflowy/plugins/database/widgets/row/row_detail.dart';import 'package:appflowy/plugins/document/document_page.dart';import 'package:appflowy/plugins/document/presentation/editor_plugins/header/emoji_icon_widget.dart';+import 'package:appflowy/shared/icon_emoji_picker/recent_icons.dart';import 'package:appflowy/util/field_type_extension.dart';import 'package:appflowy_backend/protobuf/flowy-database2/field_entities.pbenum.dart';import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';@@ -21,7 +22,14 @@ import '../../shared/emoji.dart';import '../../shared/util.dart';void main() {- IntegrationTestWidgetsFlutterBinding.ensureInitialized();+ setUpAll(() {+ IntegrationTestWidgetsFlutterBinding.ensureInitialized();+ RecentIcons.enable = false;+ });++ tearDownAll(() {+ RecentIcons.enable = true;+ });group('grid row detail page:', () {testWidgets('opens', (tester) async {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.dartindex f04c2ee0e1..c9f844f374 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,6 +1,7 @@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/shared/icon_emoji_picker/recent_icons.dart';import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flutter/material.dart';@@ -12,7 +13,14 @@ import '../../shared/emoji.dart';import '../../shared/util.dart';void main() {- IntegrationTestWidgetsFlutterBinding.ensureInitialized();+ setUpAll(() {+ IntegrationTestWidgetsFlutterBinding.ensureInitialized();+ RecentIcons.enable = false;+ });++ tearDownAll(() {+ RecentIcons.enable = true;+ });group('cover image:', () {testWidgets('document cover tests', (tester) async {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.dartindex cd3cddd88e..7c7b9e1f1c 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,19 +1,32 @@+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';import 'package:appflowy/shared/icon_emoji_picker/icon_picker.dart';+import 'package:appflowy/shared/icon_emoji_picker/recent_icons.dart';import 'package:appflowy/workspace/presentation/home/menu/sidebar/space/space_icon_popup.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_test/flutter_test.dart';import 'package:integration_test/integration_test.dart';import '../../shared/base.dart';import '../../shared/common_operations.dart';+import '../../shared/emoji.dart';import '../../shared/expectation.dart';void main() {- IntegrationTestWidgetsFlutterBinding.ensureInitialized();-final emoji = EmojiIconData.emoji('😁');+ setUpAll(() {+ IntegrationTestWidgetsFlutterBinding.ensureInitialized();+ RecentIcons.enable = false;+ });++ tearDownAll(() {+ RecentIcons.enable = true;+ });+Future<EmojiIconData> loadIcon() async {await loadIconGroups();final groups = kIconGroups!;@@ -97,6 +110,53 @@ void main() {}});+ testWidgets('Emoji Search Bar Get Focus', (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,+ );++ await tester.openPage(+ value.name,+ layout: value,+ );+ final title = find.descendant(+ of: find.byType(ViewTitleBar),+ matching: find.text(value.name),+ );+ await tester.tapButton(title);+ await tester.tapButton(find.byType(EmojiPickerButton));++ final emojiPicker = find.byType(FlowyEmojiPicker);+ expect(emojiPicker, findsOneWidget);+ final textField = find.descendant(+ of: emojiPicker,+ matching: find.byType(FlowyTextField),+ );+ expect(textField, findsOneWidget);+ final textFieldWidget =+ textField.evaluate().first.widget as FlowyTextField;+ assert(textFieldWidget.focusNode!.hasFocus);+ await tester.tapEmoji(emoji.emoji);+ await tester.pumpAndSettle();+ tester.expectViewHasIcon(+ value.name,+ value,+ emoji,+ );+ }+ });+testWidgets('Update page icon in sidebar', (tester) async {await tester.initializeAppFlowy();await tester.tapAnonymousSignInButton();diff --git a/frontend/appflowy_flutter/lib/core/config/kv_keys.dart b/frontend/appflowy_flutter/lib/core/config/kv_keys.dartindex c0e7f63f6c..a80d08b76e 100644--- a/frontend/appflowy_flutter/lib/core/config/kv_keys.dart+++ b/frontend/appflowy_flutter/lib/core/config/kv_keys.dart@@ -109,4 +109,9 @@ class KVKeys {////// The value is a boolean stringstatic const String hasUpgradedSpace = 'hasUpgradedSpace060';++ /// The key for saving the recent icons+ ///+ /// The value is a json string of [RecentIcons]+ static const String recentIcons = 'kRecentIcons';}diff --git a/frontend/appflowy_flutter/lib/plugins/base/emoji/emoji_picker.dart b/frontend/appflowy_flutter/lib/plugins/base/emoji/emoji_picker.dartindex 43e7035e38..517a0d68fa 100644--- a/frontend/appflowy_flutter/lib/plugins/base/emoji/emoji_picker.dart+++ b/frontend/appflowy_flutter/lib/plugins/base/emoji/emoji_picker.dart@@ -1,6 +1,9 @@+import 'dart:math';+import 'package:appflowy/plugins/base/emoji/emoji_picker_header.dart';-import 'package:appflowy/shared/icon_emoji_picker/emoji_skin_tone.dart';import 'package:appflowy/shared/icon_emoji_picker/emoji_search_bar.dart';+import 'package:appflowy/shared/icon_emoji_picker/emoji_skin_tone.dart';+import 'package:appflowy/shared/icon_emoji_picker/recent_icons.dart';import 'package:flowy_infra/size.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';import 'package:flutter/material.dart';@@ -8,23 +11,27 @@ import 'package:flutter_emoji_mart/flutter_emoji_mart.dart';// use a global value to store the selected emoji to prevent reloading every time.EmojiData? kCachedEmojiData;+const _kRecentEmojiCategoryId = 'Recent';class FlowyEmojiPicker extends StatefulWidget {const FlowyEmojiPicker({super.key,required this.onEmojiSelected,this.emojiPerLine = 9,+ this.ensureFocus = false,});final EmojiSelectedCallback onEmojiSelected;final int emojiPerLine;+ final bool ensureFocus;@overrideState<FlowyEmojiPicker> createState() => _FlowyEmojiPickerState();}class _FlowyEmojiPickerState extends State<FlowyEmojiPicker> {- EmojiData? emojiData;+ late EmojiData emojiData;+ bool loaded = false;@overridevoid initState() {@@ -32,12 +39,12 @@ class _FlowyEmojiPickerState extends State<FlowyEmojiPicker> {// load the emoji data from cache if it's availableif (kCachedEmojiData != null) {- emojiData = kCachedEmojiData;+ loadEmojis(kCachedEmojiData!);} else {EmojiData.builtIn().then((value) {kCachedEmojiData = value;- setState(() => emojiData = value);+ loadEmojis(value);},);}@@ -45,7 +52,7 @@ class _FlowyEmojiPickerState extends State<FlowyEmojiPicker> {@overrideWidget build(BuildContext context) {- if (emojiData == null) {+ if (!loaded) {return const Center(child: SizedBox.square(dimension: 24.0,@@ -57,21 +64,19 @@ class _FlowyEmojiPickerState extends State<FlowyEmojiPicker> {}return EmojiPicker(- emojiData: emojiData!,+ emojiData: emojiData,configuration: EmojiPickerConfiguration(showTabs: false,defaultSkinTone: lastSelectedEmojiSkinTone ?? EmojiSkinTone.none,- perLine: widget.emojiPerLine,),- onEmojiSelected: widget.onEmojiSelected,- padding: const EdgeInsets.symmetric(horizontal: 16.0),- headerBuilder: (context, category) {- return FlowyEmojiHeader(- category: category,- );+ onEmojiSelected: (id, emoji) {+ widget.onEmojiSelected.call(id, emoji);+ RecentIcons.putEmoji(id);},+ padding: const EdgeInsets.symmetric(horizontal: 16.0),+ headerBuilder: (_, category) => FlowyEmojiHeader(category: category),itemBuilder: (context, emojiId, emoji, callback) {- final name = emojiData?.emojis[emojiId]?.name ?? '';+ final name = emojiData.emojis[emojiId]?.name ?? '';return SizedBox.square(dimension: 36.0,child: FlowyButton(@@ -79,6 +84,7 @@ class _FlowyEmojiPickerState extends State<FlowyEmojiPicker> {radius: Corners.s8Border,text: FlowyTooltip(message: name,+ preferBelow: false,child: FlowyText.emoji(emoji,fontSize: 24.0,@@ -92,7 +98,8 @@ class _FlowyEmojiPickerState extends State<FlowyEmojiPicker> {return Padding(padding: const EdgeInsets.symmetric(horizontal: 16.0),child: FlowyEmojiSearchBar(- emojiData: emojiData!,+ emojiData: emojiData,+ ensureFocus: widget.ensureFocus,onKeywordChanged: (value) {keyword.value = value;},@@ -105,4 +112,24 @@ class _FlowyEmojiPickerState extends State<FlowyEmojiPicker> {},);}++ void loadEmojis(EmojiData data) {+ RecentIcons.getEmojiIds().then((v) {+ if (v.isEmpty) {+ emojiData = data;+ setState(() => loaded = true);+ return;+ }+ final categories = List.of(data.categories);+ categories.insert(+ 0,+ Category(+ id: _kRecentEmojiCategoryId,+ emojiIds: v.sublist(0, min(widget.emojiPerLine, v.length)),+ ),+ );+ emojiData = EmojiData(categories: categories, emojis: data.emojis);+ setState(() => loaded = true);+ });+ }}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.dartdeleted file mode 100644index edeadf71d8..0000000000--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/icon/icon_selector.dart+++ /dev/null@@ -1,160 +0,0 @@-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';-import 'package:flutter_emoji_mart/flutter_emoji_mart.dart';--class IconSelector extends StatefulWidget {- const IconSelector({- super.key,- required this.scrollController,- });-- final ScrollController scrollController;-- @override- State<IconSelector> createState() => _IconSelectorState();-}--class _IconSelectorState extends State<IconSelector> {- EmojiData? emojiData;- List<String> availableEmojis = [];-- PageStyleIconBloc? pageStyleIconBloc;-- @override- void initState() {- super.initState();-- // load the emoji data from cache if it's available- if (kCachedEmojiData != null) {- emojiData = kCachedEmojiData;- availableEmojis = _setupAvailableEmojis(emojiData!);- } else {- EmojiData.builtIn().then(- (value) {- kCachedEmojiData = value;- setState(() {- emojiData = value;- availableEmojis = _setupAvailableEmojis(value);- });- },- );- }-- pageStyleIconBloc = context.read<PageStyleIconBloc>();- }-- @override- void dispose() {- pageStyleIconBloc?.close();- super.dispose();- }-- @override- Widget build(BuildContext context) {- if (emojiData == null) {- return const Center(child: CircularProgressIndicator());- }-- return RepaintBoundary(- child: BlocBuilder<PageStyleIconBloc, PageStyleIconState>(- builder: (_, state) => Column(- children: [- _buildSearchBar(context),- Expanded(- child: GridView.count(- crossAxisCount: 7,- controller: widget.scrollController,- children: [- for (final emoji in availableEmojis)- _buildEmoji(context, emoji, state.icon),- ],- ),- ),- ],- ),- ),- );- }-- Widget _buildEmoji(- BuildContext context,- String emoji,- EmojiIconData? selectedEmoji,- ) {- Widget child = SizedBox.square(- dimension: 24.0,- child: Center(- child: FlowyText.emoji(- emoji,- fontSize: 24,- ),- ),- );-- if (emoji == selectedEmoji?.emoji) {- child = Center(- child: Container(- width: 40,- height: 40,- decoration: ShapeDecoration(- shape: RoundedRectangleBorder(- side: const BorderSide(- width: 1.40,- strokeAlign: BorderSide.strokeAlignOutside,- color: Color(0xFF00BCF0),- ),- borderRadius: BorderRadius.circular(10),- ),- ),- child: child,- ),- );- }-- return GestureDetector(- onTap: () {- context.read<PageStyleIconBloc>().add(- PageStyleIconEvent.updateIcon(EmojiIconData.emoji(emoji), true),- );- },- child: child,- );- }-- List<String> _setupAvailableEmojis(EmojiData emojiData) {- final categories = emojiData.categories;- availableEmojis = categories- .map((e) => e.emojiIds.map((e) => emojiData.getEmojiById(e)))- .expand((e) => e)- .toList();- return availableEmojis;- }-- Widget _buildSearchBar(BuildContext context) {- return Padding(- padding: const EdgeInsets.symmetric(- vertical: 8.0,- horizontal: 12.0,- ),- child: FlowyMobileSearchTextField(- onChanged: (keyword) {- if (emojiData == null) {- return;- }-- final filtered = emojiData!.filterByKeyword(keyword);- final availableEmojis = _setupAvailableEmojis(filtered);-- setState(() {- this.availableEmojis = availableEmojis;- });- },- ),- );- }-}diff --git a/frontend/appflowy_flutter/lib/shared/icon_emoji_picker/emoji_search_bar.dart b/frontend/appflowy_flutter/lib/shared/icon_emoji_picker/emoji_search_bar.dartindex 5bc4dc8138..5604da1b33 100644--- a/frontend/appflowy_flutter/lib/shared/icon_emoji_picker/emoji_search_bar.dart+++ b/frontend/appflowy_flutter/lib/shared/icon_emoji_picker/emoji_search_bar.dart@@ -15,12 +15,14 @@ typedef EmojiSkinToneChanged = void Function(EmojiSkinTone skinTone);class FlowyEmojiSearchBar extends StatefulWidget {const FlowyEmojiSearchBar({super.key,+ this.ensureFocus = false,required this.emojiData,required this.onKeywordChanged,required this.onSkinToneChanged,required this.onRandomEmojiSelected,});+ final bool ensureFocus;final EmojiData emojiData;final EmojiKeywordChangedCallback onKeywordChanged;final EmojiSkinToneChanged onSkinToneChanged;@@ -51,6 +53,7 @@ class _FlowyEmojiSearchBarState extends State<FlowyEmojiSearchBar> {Expanded(child: _SearchTextField(onKeywordChanged: widget.onKeywordChanged,+ ensureFocus: widget.ensureFocus,),),const HSpace(8.0),@@ -111,9 +114,11 @@ class _RandomEmojiButton extends StatelessWidget {class _SearchTextField extends StatefulWidget {const _SearchTextField({required this.onKeywordChanged,+ this.ensureFocus = false,});final EmojiKeywordChangedCallback onKeywordChanged;+ final bool ensureFocus;@overrideState<_SearchTextField> createState() => _SearchTextFieldState();@@ -123,6 +128,17 @@ class _SearchTextFieldState extends State<_SearchTextField> {final TextEditingController controller = TextEditingController();final FocusNode focusNode = FocusNode();+ @override+ void initState() {+ super.initState();+ if (widget.ensureFocus) {+ Future.delayed(const Duration(milliseconds: 200), () {+ if (!mounted || focusNode.hasFocus) return;+ focusNode.requestFocus();+ });+ }+ }+@overridevoid dispose() {controller.dispose();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.dartindex ba8ba1eec8..727d0b8fba 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@@ -153,6 +153,7 @@ class _FlowyIconEmojiPickerState extends State<FlowyIconEmojiPicker>Widget _buildEmojiPicker() {return FlowyEmojiPicker(+ ensureFocus: true,emojiPerLine: _getEmojiPerLine(context),onEmojiSelected: (_, emoji) => widget.onSelectedEmoji?.call(EmojiIconData.emoji(emoji),diff --git a/frontend/appflowy_flutter/lib/shared/icon_emoji_picker/icon.dart b/frontend/appflowy_flutter/lib/shared/icon_emoji_picker/icon.dartindex 0dd0846978..7764d73838 100644--- a/frontend/appflowy_flutter/lib/shared/icon_emoji_picker/icon.dart+++ b/frontend/appflowy_flutter/lib/shared/icon_emoji_picker/icon.dart@@ -35,9 +35,12 @@ class IconGroup {String get displayName => name.replaceAll('_', ' ');IconGroup filter(String keyword) {+ final lowercaseKey = keyword.toLowerCase();final filteredIcons = icons.where(- (icon) => icon.keywords.any((k) => k.contains(keyword.toLowerCase())),+ (icon) =>+ icon.keywords.any((k) => k.contains(lowercaseKey)) ||+ icon.name.contains(lowercaseKey),).toList();return IconGroup(name: name, icons: filteredIcons);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.dartindex 20e8bf7fd5..75f5633ee5 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@@ -8,6 +8,7 @@ import 'package:appflowy/plugins/document/presentation/editor_plugins/base/strinimport '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/shared/icon_emoji_picker/recent_icons.dart';import 'package:appflowy/util/debounce.dart';import 'package:appflowy/workspace/presentation/home/menu/sidebar/space/space_icon_popup.dart';import 'package:appflowy_backend/log.dart';@@ -23,6 +24,7 @@ import 'icon_color_picker.dart';// cache the icon groups to avoid loading them multiple timesList<IconGroup>? kIconGroups;+const _kRecentIconGroupName = 'Recent';extension IconGroupFilter on List<IconGroup> {String? findSvgContent(String key) {@@ -78,31 +80,57 @@ class FlowyIconPicker extends StatefulWidget {super.key,required this.onSelectedIcon,required this.enableBackgroundColorSelection,+ this.iconPerLine = 9,});final bool enableBackgroundColorSelection;final ValueChanged<IconsData> onSelectedIcon;+ final int iconPerLine;@overrideState<FlowyIconPicker> createState() => _FlowyIconPickerState();}class _FlowyIconPickerState extends State<FlowyIconPicker> {- late final Future<List<IconGroup>> iconGroups;+ final List<IconGroup> iconGroups = [];+ bool loaded = false;final ValueNotifier<String> keyword = ValueNotifier('');final debounce = Debounce(duration: const Duration(milliseconds: 150));+ Future<void> loadIcons() async {+ final localIcons = await loadIconGroups();+ final recentIcons = await RecentIcons.getIcons();+ if (recentIcons.isNotEmpty) {+ iconGroups.add(+ IconGroup(+ name: _kRecentIconGroupName,+ icons: recentIcons.sublist(+ 0,+ min(recentIcons.length, widget.iconPerLine),+ ),+ ),+ );+ }+ iconGroups.addAll(localIcons);+ if (mounted) {+ setState(() {+ loaded = true;+ });+ }+ }+@overridevoid initState() {super.initState();-- iconGroups = loadIconGroups();+ loadIcons();}@overridevoid dispose() {keyword.dispose();debounce.dispose();+ iconGroups.clear();+ loaded = false;super.dispose();}@@ -137,24 +165,15 @@ class _FlowyIconPickerState extends State<FlowyIconPicker> {),),Expanded(- child: kIconGroups != null- ? _buildIcons(kIconGroups!)- : FutureBuilder(- future: iconGroups,- builder: (context, snapshot) {- if (snapshot.connectionState != ConnectionState.done) {- return const Center(- child: SizedBox.square(- dimension: 24.0,- child: CircularProgressIndicator(- strokeWidth: 2.0,- ),- ),- );- }- final iconGroups = snapshot.data as List<IconGroup>;- return _buildIcons(iconGroups);- },+ child: loaded+ ? _buildIcons(iconGroups)+ : const Center(+ child: SizedBox.square(+ dimension: 24.0,+ child: CircularProgressIndicator(+ strokeWidth: 2.0,+ ),+ ),),),],@@ -175,12 +194,14 @@ class _FlowyIconPickerState extends State<FlowyIconPicker> {enableBackgroundColorSelection:widget.enableBackgroundColorSelection,onSelectedIcon: widget.onSelectedIcon,+ iconPerLine: widget.iconPerLine,);}return IconPicker(iconGroups: iconGroups,enableBackgroundColorSelection: widget.enableBackgroundColorSelection,onSelectedIcon: widget.onSelectedIcon,+ iconPerLine: widget.iconPerLine,);},);@@ -220,9 +241,11 @@ class IconPicker extends StatefulWidget {required this.onSelectedIcon,required this.enableBackgroundColorSelection,required this.iconGroups,+ required this.iconPerLine,});final List<IconGroup> iconGroups;+ final int iconPerLine;final bool enableBackgroundColorSelection;final ValueChanged<IconsData> onSelectedIcon;@@ -250,43 +273,49 @@ class _IconPickerState extends State<IconPicker> {color: context.pickerTextColor,),const VSpace(4.0),- Wrap(- children: iconGroup.icons.map(- (icon) {- return widget.enableBackgroundColorSelection- ? _Icon(- icon: icon,- mutex: mutex,- onSelectedColor: (context, color) {- widget.onSelectedIcon(- IconsData(- iconGroup.name,- icon.content,- icon.name,- color,- ),- );- PopoverContainer.of(context).close();- },- )- : _IconNoBackground(- icon: icon,- onSelectedIcon: () {- widget.onSelectedIcon(- IconsData(- iconGroup.name,- icon.content,- icon.name,- null,- ),- );- },- );- },- ).toList(),+ GridView.builder(+ gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(+ crossAxisCount: widget.iconPerLine,+ ),+ itemCount: iconGroup.icons.length,+ shrinkWrap: true,+ itemBuilder: (context, index) {+ final icon = iconGroup.icons[index];+ return widget.enableBackgroundColorSelection+ ? _Icon(+ icon: icon,+ mutex: mutex,+ onSelectedColor: (context, color) {+ widget.onSelectedIcon(+ IconsData(+ iconGroup.name,+ icon.content,+ icon.name,+ color,+ ),+ );+ RecentIcons.putIcon(icon);+ PopoverContainer.of(context).close();+ },+ )+ : _IconNoBackground(+ icon: icon,+ onSelectedIcon: () {+ widget.onSelectedIcon(+ IconsData(+ iconGroup.name,+ icon.content,+ icon.name,+ null,+ ),+ );+ RecentIcons.putIcon(icon);+ },+ );+ },),const VSpace(12.0),- if (index == kIconGroups!.length - 1) ...[+ if (index == widget.iconGroups.length - 1) ...[const StreamlinePermit(),const VSpace(12.0),],diff --git a/frontend/appflowy_flutter/lib/shared/icon_emoji_picker/recent_icons.dart b/frontend/appflowy_flutter/lib/shared/icon_emoji_picker/recent_icons.dartnew file mode 100644index 0000000000..aae3937fac--- /dev/null+++ b/frontend/appflowy_flutter/lib/shared/icon_emoji_picker/recent_icons.dart@@ -0,0 +1,95 @@+import 'dart:convert';++import 'package:appflowy/shared/icon_emoji_picker/icon.dart';+import 'package:appflowy_backend/log.dart';+import 'package:flutter/foundation.dart';++import '../../core/config/kv.dart';+import '../../core/config/kv_keys.dart';+import '../../startup/startup.dart';+import 'flowy_icon_emoji_picker.dart';++class RecentIcons {+ static final Map<String, List<String>> _dataMap = {};+ static bool _loaded = false;+ static const maxLength = 20;++ /// To prevent the Recent Icon feature from affecting the unit tests of the Icon Selector.+ @visibleForTesting+ static bool enable = true;++ static Future<void> putEmoji(String id) async {+ await _put(FlowyIconType.emoji, id);+ }++ static Future<void> putIcon(Icon icon) async {+ await _put(+ FlowyIconType.icon,+ jsonEncode(+ Icon(name: icon.name, keywords: icon.keywords, content: icon.content)+ .toJson(),+ ),+ );+ }++ static Future<List<String>> getEmojiIds() async {+ await _load();+ return _dataMap[FlowyIconType.emoji.name] ?? [];+ }++ static Future<List<Icon>> getIcons() async {+ await _load();+ final iconList = _dataMap[FlowyIconType.icon.name] ?? [];+ try {+ return iconList+ .map((e) => Icon.fromJson(jsonDecode(e) as Map<String, dynamic>))+ .toList();+ } catch (e) {+ Log.error('RecentIcons getIcons with :$iconList', e);+ }+ return [];+ }++ static Future<void> _save() async {+ await getIt<KeyValueStorage>().set(+ KVKeys.recentIcons,+ jsonEncode(_dataMap),+ );+ }++ static Future<void> _load() async {+ if (_loaded || !enable) {+ return;+ }+ final storage = getIt<KeyValueStorage>();+ final value = await storage.get(KVKeys.recentIcons);+ if (value == null || value.isEmpty) {+ _loaded = true;+ return;+ }+ try {+ final data = jsonDecode(value) as Map;+ _dataMap+ ..clear()+ ..addAll(+ Map<String, List<String>>.from(+ data.map((k, v) => MapEntry(k, List<String>.from(v))),+ ),+ );+ } catch (e) {+ Log.error('RecentIcons load failed with: $value', e);+ }+ _loaded = true;+ }++ static Future<void> _put(FlowyIconType key, String value) async {+ await _load();+ if (!enable) return;+ final list = _dataMap[key.name] ?? [];+ list.remove(value);+ list.insert(0, value);+ if (list.length > maxLength) list.removeLast();+ _dataMap[key.name] = list;+ await _save();+ }+}diff --git a/frontend/appflowy_flutter/lib/startup/tasks/app_widget.dart b/frontend/appflowy_flutter/lib/startup/tasks/app_widget.dartindex 957c281d8a..a398db3061 100644--- a/frontend/appflowy_flutter/lib/startup/tasks/app_widget.dart+++ b/frontend/appflowy_flutter/lib/startup/tasks/app_widget.dart@@ -1,8 +1,5 @@import 'dart:io';-import 'package:flutter/material.dart';-import 'package:flutter/services.dart';-import 'package:appflowy/mobile/application/mobile_router.dart';import 'package:appflowy/plugins/document/application/document_appearance_cubit.dart';import 'package:appflowy/shared/clipboard_state.dart';@@ -26,6 +23,9 @@ import 'package:appflowy_backend/protobuf/flowy-user/protobuf.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra/theme.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';+import 'package:flutter/gestures.dart';+import 'package:flutter/material.dart';+import 'package:flutter/services.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:go_router/go_router.dart';import 'package:provider/provider.dart';@@ -216,31 +216,41 @@ class _ApplicationWidgetState extends State<ApplicationWidget> {create: (_) => ClipboardState(),dispose: (_, state) => state.dispose(),child: ToastificationWrapper(- child: MaterialApp.router(- builder: (context, child) => MediaQuery(- // use the 1.0 as the textScaleFactor to avoid the text size- // affected by the system setting.- data: MediaQuery.of(context).copyWith(- textScaler: TextScaler.linear(state.textScaleFactor),- ),- child: overlayManagerBuilder(- context,- !UniversalPlatform.isMobile && FeatureFlag.search.isOn- ? CommandPalette(- notifier: _commandPaletteNotifier,- child: child,- )- : child,+ child: Listener(+ onPointerSignal: (pointerSignal) {+ /// This is a workaround to deal with below question:+ /// When the mouse hovers over the tooltip, the scroll event is intercepted by it+ /// Here, we listen for the scroll event and then remove the tooltip to avoid that situation+ if (pointerSignal is PointerScrollEvent) {+ Tooltip.dismissAllToolTips();+ }+ },+ child: MaterialApp.router(+ builder: (context, child) => MediaQuery(+ // use the 1.0 as the textScaleFactor to avoid the text size+ // affected by the system setting.+ data: MediaQuery.of(context).copyWith(+ textScaler: TextScaler.linear(state.textScaleFactor),+ ),+ child: overlayManagerBuilder(+ context,+ !UniversalPlatform.isMobile && FeatureFlag.search.isOn+ ? CommandPalette(+ notifier: _commandPaletteNotifier,+ child: child,+ )+ : child,+ ),),+ debugShowCheckedModeBanner: false,+ theme: state.lightTheme,+ darkTheme: state.darkTheme,+ themeMode: state.themeMode,+ localizationsDelegates: context.localizationDelegates,+ supportedLocales: context.supportedLocales,+ locale: state.locale,+ routerConfig: routerConfig,),- debugShowCheckedModeBanner: false,- theme: state.lightTheme,- darkTheme: state.darkTheme,- themeMode: state.themeMode,- localizationsDelegates: context.localizationDelegates,- supportedLocales: context.supportedLocales,- locale: state.locale,- routerConfig: routerConfig,),),);@@ -267,7 +277,9 @@ class _ApplicationWidgetState extends State<ApplicationWidget> {class AppGlobals {static GlobalKey<NavigatorState> rootNavKey = GlobalKey();+static NavigatorState get nav => rootNavKey.currentState!;+static BuildContext get context => rootNavKey.currentContext!;}diff --git a/frontend/appflowy_flutter/pubspec.lock b/frontend/appflowy_flutter/pubspec.lockindex 98fc4c5359..87a5128960 100644--- a/frontend/appflowy_flutter/pubspec.lock+++ b/frontend/appflowy_flutter/pubspec.lock@@ -757,8 +757,8 @@ packages:dependency: "direct main"description:path: "."- ref: "38c2c42"- resolved-ref: "38c2c429212af6b72a0af829bb0dd3f3eb4ce2c7"+ ref: "8a9fa49"+ resolved-ref: "8a9fa491cb3b86baf78b0a33c2c37a29d1cae028"url: "https://github.com/LucasXu0/emoji_mart.git"source: gitversion: "1.0.2"diff --git a/frontend/appflowy_flutter/pubspec.yaml b/frontend/appflowy_flutter/pubspec.yamlindex 6d575a1245..8578d46042 100644--- a/frontend/appflowy_flutter/pubspec.yaml+++ b/frontend/appflowy_flutter/pubspec.yaml@@ -73,7 +73,7 @@ dependencies:flutter_emoji_mart:git:url: https://github.com/LucasXu0/emoji_mart.git- ref: "38c2c42"+ ref: "8a9fa49"flutter_math_fork: ^0.7.3flutter_slidable: ^3.0.0diff --git a/frontend/appflowy_flutter/test/unit_test/util/recent_icons_test.dart b/frontend/appflowy_flutter/test/unit_test/util/recent_icons_test.dartnew file mode 100644index 0000000000..9212467d84--- /dev/null+++ b/frontend/appflowy_flutter/test/unit_test/util/recent_icons_test.dart@@ -0,0 +1,93 @@+import 'package:appflowy/core/config/kv.dart';+import 'package:appflowy/shared/icon_emoji_picker/icon.dart';+import 'package:appflowy/shared/icon_emoji_picker/icon_picker.dart';+import 'package:appflowy/shared/icon_emoji_picker/recent_icons.dart';+import 'package:appflowy/startup/startup.dart';+import 'package:appflowy_backend/log.dart';+import 'package:collection/collection.dart';+import 'package:flutter_test/flutter_test.dart';+import 'package:shared_preferences/shared_preferences.dart';++void main() {+ setUpAll(() {+ TestWidgetsFlutterBinding.ensureInitialized();+ SharedPreferences.setMockInitialValues({});+ getIt.registerFactory<KeyValueStorage>(() => DartKeyValue());+ Log.shared.disableLog = true;+ });++ test('putEmoji', () async {+ List<String> emojiIds = await RecentIcons.getEmojiIds();+ assert(emojiIds.isEmpty);++ await RecentIcons.putEmoji('1');+ emojiIds = await RecentIcons.getEmojiIds();+ assert(emojiIds.equals(['1']));++ await RecentIcons.putEmoji('2');+ assert(emojiIds.equals(['2', '1']));++ await RecentIcons.putEmoji('1');+ emojiIds = await RecentIcons.getEmojiIds();+ assert(emojiIds.equals(['1', '2']));++ for (var i = 0; i < RecentIcons.maxLength; ++i) {+ await RecentIcons.putEmoji('${i + 100}');+ }+ emojiIds = await RecentIcons.getEmojiIds();+ assert(emojiIds.length == RecentIcons.maxLength);+ assert(+ emojiIds.equals(+ List.generate(RecentIcons.maxLength, (i) => '${i + 100}')+ .reversed+ .toList(),+ ),+ );+ });++ test('putIcons', () async {+ List<Icon> icons = await RecentIcons.getIcons();+ assert(icons.isEmpty);+ await loadIconGroups();+ final groups = kIconGroups!;+ final List<Icon> localIcons = [];+ for (final e in groups) {+ localIcons.addAll(e.icons);+ }++ bool equalIcon(Icon a, Icon b) =>+ a.name == b.name &&+ a.keywords.equals(b.keywords) &&+ a.content == b.content;++ await RecentIcons.putIcon(localIcons.first);+ icons = await RecentIcons.getIcons();+ assert(icons.length == 1);+ assert(equalIcon(icons.first, localIcons.first));++ await RecentIcons.putIcon(localIcons[1]);+ icons = await RecentIcons.getIcons();+ assert(icons.length == 2);+ assert(equalIcon(icons[0], localIcons[1]));+ assert(equalIcon(icons[1], localIcons[0]));++ await RecentIcons.putIcon(localIcons.first);+ icons = await RecentIcons.getIcons();+ assert(icons.length == 2);+ assert(equalIcon(icons[1], localIcons[1]));+ assert(equalIcon(icons[0], localIcons[0]));++ for (var i = 0; i < RecentIcons.maxLength; ++i) {+ await RecentIcons.putIcon(localIcons[10 + i]);+ }++ icons = await RecentIcons.getIcons();+ assert(icons.length == RecentIcons.maxLength);++ for (var i = 0; i < RecentIcons.maxLength; ++i) {+ assert(+ equalIcon(icons[RecentIcons.maxLength - i - 1], localIcons[10 + i]),+ );+ }+ });+}