diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/file/file_block_component.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/file/file_block_component.dart index dc02b68503..5b1b3aa979 100644 --- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/file/file_block_component.dart +++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/file/file_block_component.dart @@ -208,9 +208,11 @@ class FileBlockComponentState extends State child: Row( children: [ const HSpace(10), - FlowySvg(FlowySvgs.slash_menu_icon_file_s, - color: Theme.of(context).hintColor, - size: const Size.square(24),), + FlowySvg( + FlowySvgs.slash_menu_icon_file_s, + color: Theme.of(context).hintColor, + size: const Size.square(24), + ), const HSpace(10), ..._buildTrailing(context), ], diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/file/file_upload_menu.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/file/file_upload_menu.dart index a25e5c9b7c..4baa8506fe 100644 --- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/file/file_upload_menu.dart +++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/file/file_upload_menu.dart @@ -142,7 +142,7 @@ class _FileUploadLocalState extends State<_FileUploadLocal> { borderType: BorderType.RRect, color: isDragging ? Theme.of(context).colorScheme.primary - : Colors.black, + : Theme.of(context).hintColor, child: Center( child: Column( mainAxisAlignment: MainAxisAlignment.center, @@ -153,7 +153,7 @@ class _FileUploadLocalState extends State<_FileUploadLocal> { LocaleKeys.document_plugins_file_dropFileToUpload .tr(), fontSize: 16, - color: Theme.of(context).colorScheme.primary, + color: Theme.of(context).hintColor, ), const VSpace(13.5), ] else ...[ @@ -164,6 +164,7 @@ class _FileUploadLocalState extends State<_FileUploadLocal> { maxLines: 2, lineHeight: 1.5, textAlign: TextAlign.center, + color: Theme.of(context).hintColor, ), ], ], @@ -208,6 +209,7 @@ class _FileUploadNetworkState extends State<_FileUploadNetwork> { alignment: Alignment.center, child: Column( children: [ + const VSpace(12), FlowyTextField( hintText: LocaleKeys.document_plugins_file_networkHint.tr(), onChanged: (value) => inputText = value, @@ -220,19 +222,25 @@ class _FileUploadNetworkState extends State<_FileUploadNetwork> { color: Theme.of(context).colorScheme.error, ), ], - const VSpace(8), + const VSpace(20), SizedBox( - width: 160, + height: 32, + width: 300, child: FlowyButton( + backgroundColor: Theme.of(context).colorScheme.primary, + hoverColor: + Theme.of(context).colorScheme.primary.withOpacity(0.9), showDefaultBoxDecorationOnMobile: true, - margin: const EdgeInsets.all(8.0), + margin: const EdgeInsets.all(5), text: FlowyText( LocaleKeys.document_plugins_file_networkAction.tr(), textAlign: TextAlign.center, + color: Theme.of(context).colorScheme.onPrimary, ), onTap: submit, ), ), + const VSpace(8), ], ), ); diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/image/upload_image_menu/upload_image_menu.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/image/upload_image_menu/upload_image_menu.dart index 8091452288..70b54e0da1 100644 --- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/image/upload_image_menu/upload_image_menu.dart +++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/image/upload_image_menu/upload_image_menu.dart @@ -121,34 +121,37 @@ class _UploadImageMenuState extends State { final type = values[currentTabIndex]; switch (type) { case UploadImageType.local: - return Padding( - padding: const EdgeInsets.all(8.0), - child: Container( - alignment: Alignment.center, - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(8), - border: Border.all( - color: Theme.of(context).colorScheme.outline, + return Column( + children: [ + Padding( + padding: const EdgeInsets.all(8.0), + child: Container( + alignment: Alignment.center, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(8), + border: Border.all( + color: Theme.of(context).colorScheme.outline, + ), + ), + constraints: constraints, + child: Column( + children: [ + UploadImageFileWidget( + allowMultipleImages: widget.allowMultipleImages, + onPickFiles: widget.onSelectedLocalImages, + ), + ], + ), ), ), - constraints: constraints, - child: Column( - children: [ - UploadImageFileWidget( - allowMultipleImages: widget.allowMultipleImages, - onPickFiles: widget.onSelectedLocalImages, - ), - if (widget.limitMaximumImageSize) ...[ - const VSpace(6.0), - FlowyText( - LocaleKeys.document_imageBlock_maximumImageSize.tr(), - fontSize: 12.0, - color: Theme.of(context).hintColor, - ), - ], - ], - ), - ), + // if (widget.limitMaximumImageSize) ...[ + // FlowyText( + // LocaleKeys.document_imageBlock_maximumImageSize.tr(), + // fontSize: 10.0, + // color: Theme.of(context).hintColor, + // ), + // ], + ], ); case UploadImageType.url: return Container( diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/sidebar.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/sidebar.dart index f6c75ff9d1..da49268c53 100644 --- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/sidebar.dart +++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/sidebar.dart @@ -1,4 +1,5 @@ import 'dart:async'; +import 'dart:io'; import 'package:appflowy/generated/flowy_svgs.g.dart'; import 'package:appflowy/generated/locale_keys.g.dart'; @@ -455,12 +456,28 @@ class _SidebarSearchButton extends StatelessWidget { @override Widget build(BuildContext context) { - return FlowyButton( - onTap: () => CommandPalette.of(context).toggle(), - leftIcon: const FlowySvg(FlowySvgs.search_s), - iconPadding: 12.0, - margin: const EdgeInsets.only(left: 8.0), - text: FlowyText.regular(LocaleKeys.search_label.tr()), + return FlowyTooltip( + richMessage: TextSpan( + children: [ + TextSpan( + text: '${LocaleKeys.search_sidebarSearchIcon.tr()}\n', + style: context.tooltipTextStyle(), + ), + TextSpan( + text: Platform.isMacOS ? '⌘+P' : 'Ctrl+P', + style: context + .tooltipTextStyle() + ?.copyWith(color: Theme.of(context).hintColor), + ), + ], + ), + child: FlowyButton( + onTap: () => CommandPalette.of(context).toggle(), + leftIcon: const FlowySvg(FlowySvgs.search_s), + iconPadding: 12.0, + margin: const EdgeInsets.only(left: 8.0), + text: FlowyText.regular(LocaleKeys.search_label.tr()), + ), ); } } diff --git a/frontend/resources/flowy_icons/16x/hide.svg b/frontend/resources/flowy_icons/16x/hide.svg index 45e81d8748..d76e4576df 100644 --- a/frontend/resources/flowy_icons/16x/hide.svg +++ b/frontend/resources/flowy_icons/16x/hide.svg @@ -1,4 +1,6 @@ - - + + + + diff --git a/frontend/resources/flowy_icons/16x/m_rename.svg b/frontend/resources/flowy_icons/16x/m_rename.svg index 98200fd061..8f7620a806 100644 --- a/frontend/resources/flowy_icons/16x/m_rename.svg +++ b/frontend/resources/flowy_icons/16x/m_rename.svg @@ -1,4 +1,13 @@ - - - + + + + + + + + + + + + diff --git a/frontend/resources/flowy_icons/16x/show.svg b/frontend/resources/flowy_icons/16x/show.svg new file mode 100644 index 0000000000..1124aee221 --- /dev/null +++ b/frontend/resources/flowy_icons/16x/show.svg @@ -0,0 +1,4 @@ + + + + diff --git a/frontend/resources/flowy_icons/24x/show.svg b/frontend/resources/flowy_icons/24x/show.svg index 3550115093..0d411e5cc4 100644 --- a/frontend/resources/flowy_icons/24x/show.svg +++ b/frontend/resources/flowy_icons/24x/show.svg @@ -1,4 +1,5 @@ - - + + + diff --git a/frontend/resources/translations/en.json b/frontend/resources/translations/en.json index 605ee9bc61..58b2d7cc24 100644 --- a/frontend/resources/translations/en.json +++ b/frontend/resources/translations/en.json @@ -1653,7 +1653,7 @@ "placeholderText": "Upload or embed a file", "placeholderDragging": "Drop the file to upload", "dropFileToUpload": "Drop the file to upload", - "fileUploadHint": "Drag and drop a file here\nor click to select a file.", + "fileUploadHint": "Drop a file here to upload\nor click to browse", "networkHint": "Paste a file link", "networkUrlInvalid": "Invalid URL, please correct the URL and try again", "networkAction": "Embed file link", @@ -1883,6 +1883,7 @@ }, "search": { "label": "Search", + "sidebarSearchIcon": "Search and quickly jump to a page", "placeholder": { "actions": "Search actions..." } @@ -2409,4 +2410,4 @@ "commentAddedSuccessfully": "Comment added successfully.", "commentAddedSuccessTip": "You've just added or replied to a comment. Would you like to jump to the top to see the latest comments?" } -} +} \ No newline at end of file