From 42548d93eced8095665d40f67b43307d28a6b2a9 Mon Sep 17 00:00:00 2001 From: squidrye Date: Fri, 22 Sep 2023 20:14:09 +0530 Subject: [PATCH] feat: localization --- .../home/menu/view/view_action_type.dart | 18 ++++-------------- .../presentation/home/menu/view/view_item.dart | 12 ------------ .../menu/view/view_more_action_button.dart | 2 -- .../presentation/home/tabs/flowy_tab.dart | 4 ++-- frontend/resources/translations/en.json | 7 ++++++- 5 files changed, 12 insertions(+), 31 deletions(-) diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/view_action_type.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/view_action_type.dart index 2c1568c09839..6365c83b9ca2 100644 --- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/view_action_type.dart +++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/view_action_type.dart @@ -14,8 +14,6 @@ enum ViewMoreActionType { openInNewTab, splitRight, splitDown, - splitUp, - splitLeft, } extension ViewMoreActionTypeExtension on ViewMoreActionType { @@ -38,13 +36,9 @@ extension ViewMoreActionTypeExtension on ViewMoreActionType { case ViewMoreActionType.openInNewTab: return LocaleKeys.disclosureAction_openNewTab.tr(); case ViewMoreActionType.splitDown: - return 'Split Down'; + return LocaleKeys.disclosureAction_splitDown.tr(); case ViewMoreActionType.splitRight: - return 'Split Right'; - case ViewMoreActionType.splitLeft: - return 'Split Left'; - case ViewMoreActionType.splitUp: - return 'Split Up'; + return LocaleKeys.disclosureAction_splitRight.tr(); } } @@ -68,13 +62,9 @@ extension ViewMoreActionTypeExtension on ViewMoreActionType { return const FlowySvg(FlowySvgs.full_view_s); case ViewMoreActionType.splitDown: - return const Icon(Icons.horizontal_split); + return const Icon(Icons.horizontal_split, size: 20); case ViewMoreActionType.splitRight: - return const Icon(Icons.vertical_split); - case ViewMoreActionType.splitUp: - return const Icon(Icons.horizontal_split); - case ViewMoreActionType.splitLeft: - return const Icon(Icons.vertical_split); + return const Icon(Icons.vertical_split, size: 20); } } } 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 d34932122d42..4db2d548e3db 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 @@ -423,18 +423,6 @@ class _SingleInnerViewItemState extends State { plugin: widget.view.plugin(), splitDirection: SplitDirection.right, ); - - case ViewMoreActionType.splitLeft: - context.read().split( - plugin: widget.view.plugin(), - splitDirection: SplitDirection.left, - ); - - case ViewMoreActionType.splitUp: - context.read().split( - plugin: widget.view.plugin(), - splitDirection: SplitDirection.up, - ); default: throw UnsupportedError('$action is not supported'); } 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 897e2909ac9b..72c3434623a6 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 @@ -32,8 +32,6 @@ class ViewMoreActionButton extends StatelessWidget { : ViewMoreActionType.favorite, ViewMoreActionType.splitDown, ViewMoreActionType.splitRight, - ViewMoreActionType.splitLeft, - ViewMoreActionType.splitUp, ]; return PopoverActionList( direction: PopoverDirection.bottomWithCenterAligned, diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/tabs/flowy_tab.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/tabs/flowy_tab.dart index 939837c96c04..2dead6e7c72e 100644 --- a/frontend/appflowy_flutter/lib/workspace/presentation/home/tabs/flowy_tab.dart +++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/tabs/flowy_tab.dart @@ -1,6 +1,6 @@ import 'package:appflowy/generated/flowy_svgs.g.dart'; import 'package:appflowy/workspace/application/panes/panes.dart'; -import 'package:appflowy/workspace/application/tabs/tabs.dart'; +import 'package:appflowy/workspace/application/tabs/tabs_controller.dart'; import 'package:appflowy/workspace/presentation/home/home_sizes.dart'; import 'package:appflowy/workspace/presentation/home/home_stack.dart'; import 'package:flowy_infra/theme_extension.dart'; @@ -87,6 +87,6 @@ class _FlowyTabState extends State { } void _closeTab([TapUpDetails? details]) => - Provider.of(context, listen: false) + Provider.of(context, listen: false) .closeView(widget.pageManager.plugin.id); } diff --git a/frontend/resources/translations/en.json b/frontend/resources/translations/en.json index 0e525bc45f0e..3d4957657991 100644 --- a/frontend/resources/translations/en.json +++ b/frontend/resources/translations/en.json @@ -87,7 +87,11 @@ "openNewTab": "Open in a new tab", "moveTo": "Move to", "addToFavorites": "Add to Favorites", - "copyLink": "Copy Link" + "copyLink": "Copy Link", + "splitDown": "Split Down", + "splitRight": "Split Right", + "splitLeft": "Split Left", + "splitUp": "Split Up" }, "blankPageTitle": "Blank page", "newPageText": "New page", @@ -95,6 +99,7 @@ "newGridText": "New grid", "newCalendarText": "New calendar", "newBoardText": "New board", + "readOnlyViewText":"Read only view", "trash": { "text": "Trash", "restoreAll": "Restore All",