Skip to content

Commit

Permalink
chore: remove rename dialog logic (AppFlowy-IO#6906)
Browse files Browse the repository at this point in the history
  • Loading branch information
LucasXu0 authored Dec 2, 2024
1 parent e7491e5 commit d9bc97e
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 123 deletions.
1 change: 1 addition & 0 deletions frontend/appflowy_flutter/lib/core/config/kv_keys.dart
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ class KVKeys {
/// {'SidebarFolderCategoryType.value': true}
static const String expandedFolders = 'expandedFolders';

/// @deprecated in version 0.7.6
/// The key for saving if showing the rename dialog when creating a new file
///
/// The value is a boolean string.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
import 'package:appflowy/generated/locale_keys.g.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/tabs/tabs_bloc.dart';
import 'package:appflowy/workspace/application/user/user_workspace_bloc.dart';
import 'package:appflowy/workspace/presentation/home/home_sizes.dart';
import 'package:appflowy/workspace/presentation/home/menu/sidebar/folder/_folder_header.dart';
import 'package:appflowy/workspace/presentation/home/menu/sidebar/shared/rename_view_dialog.dart';
import 'package:appflowy/workspace/presentation/home/menu/view/view_item.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/services.dart';
Expand Down Expand Up @@ -78,23 +75,17 @@ class _SectionFolderState extends State<SectionFolder> {
onPressed: () =>
context.read<FolderBloc>().add(const FolderEvent.expandOrUnExpand()),
onAdded: () {
createViewAndShowRenameDialogIfNeeded(
context,
LocaleKeys.newPageText.tr(),
(_, __) {
context.read<SidebarSectionsBloc>().add(
SidebarSectionsEvent.createRootViewInSection(
name: '',
index: 0,
viewSection: widget.spaceType.toViewSectionPB,
),
);
context.read<SidebarSectionsBloc>().add(
SidebarSectionsEvent.createRootViewInSection(
name: '',
index: 0,
viewSection: widget.spaceType.toViewSectionPB,
),
);

context
.read<FolderBloc>()
.add(const FolderEvent.expandOrUnExpand(isExpanded: true));
},
);
context
.read<FolderBloc>()
.add(const FolderEvent.expandOrUnExpand(isExpanded: true));
},
);
}
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import 'package:appflowy/workspace/application/sidebar/space/space_bloc.dart';
import 'package:appflowy/workspace/application/user/user_workspace_bloc.dart';
import 'package:appflowy/workspace/presentation/home/home_sizes.dart';
import 'package:appflowy/workspace/presentation/home/hotkeys.dart';
import 'package:appflowy/workspace/presentation/home/menu/sidebar/shared/rename_view_dialog.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';
Expand Down Expand Up @@ -57,35 +56,28 @@ class _SidebarNewPageButtonState extends State<SidebarNewPageButton> {
}

Future<void> _createNewPage() async {
return createViewAndShowRenameDialogIfNeeded(
context,
LocaleKeys.newPageText.tr(),
(_, __) {
// if the workspace is collaborative, create the view in the private section by default.
final section =
context.read<UserWorkspaceBloc>().state.isCollabWorkspaceOn
? ViewSectionPB.Private
: ViewSectionPB.Public;
final spaceState = context.read<SpaceBloc>().state;
if (spaceState.spaces.isNotEmpty) {
context.read<SpaceBloc>().add(
const SpaceEvent.createPage(
name: '',
index: 0,
layout: ViewLayoutPB.Document,
openAfterCreate: true,
),
);
} else {
context.read<SidebarSectionsBloc>().add(
SidebarSectionsEvent.createRootViewInSection(
name: '',
viewSection: section,
index: 0,
),
);
}
},
);
// if the workspace is collaborative, create the view in the private section by default.
final section = context.read<UserWorkspaceBloc>().state.isCollabWorkspaceOn
? ViewSectionPB.Private
: ViewSectionPB.Public;
final spaceState = context.read<SpaceBloc>().state;
if (spaceState.spaces.isNotEmpty) {
context.read<SpaceBloc>().add(
const SpaceEvent.createPage(
name: '',
index: 0,
layout: ViewLayoutPB.Document,
openAfterCreate: true,
),
);
} else {
context.read<SidebarSectionsBloc>().add(
SidebarSectionsEvent.createRootViewInSection(
name: '',
viewSection: section,
index: 0,
),
);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import 'package:appflowy/workspace/application/view/prelude.dart';
import 'package:appflowy/workspace/application/view/view_ext.dart';
import 'package:appflowy/workspace/presentation/home/home_sizes.dart';
import 'package:appflowy/workspace/presentation/home/menu/menu_shared_state.dart';
import 'package:appflowy/workspace/presentation/home/menu/sidebar/shared/rename_view_dialog.dart';
import 'package:appflowy/workspace/presentation/home/menu/view/draggable_view_item.dart';
import 'package:appflowy/workspace/presentation/home/menu/view/view_action_type.dart';
import 'package:appflowy/workspace/presentation/home/menu/view/view_add_button.dart';
Expand Down Expand Up @@ -692,26 +691,18 @@ class _SingleInnerViewItemState extends State<SingleInnerViewItem> {
) {
final viewBloc = context.read<ViewBloc>();

if (createNewView) {
createViewAndShowRenameDialogIfNeeded(
context,
_convertLayoutToHintText(pluginBuilder.layoutType!),
(viewName, _) {
// the name of new document should be empty
if (pluginBuilder.layoutType == ViewLayoutPB.Document) {
viewName = '';
}
viewBloc.add(
ViewEvent.createView(
viewName,
pluginBuilder.layoutType!,
openAfterCreated: openAfterCreated,
section: widget.spaceType.toViewSectionPB,
),
);
},
);
}
// the name of new document should be empty
final viewName = pluginBuilder.layoutType != ViewLayoutPB.Document
? LocaleKeys.menuAppHeader_defaultNewPageName.tr()
: '';
viewBloc.add(
ViewEvent.createView(
viewName,
pluginBuilder.layoutType!,
openAfterCreated: openAfterCreated,
section: widget.spaceType.toViewSectionPB,
),
);

viewBloc.add(const ViewEvent.setIsExpanded(true));
}
Expand Down Expand Up @@ -815,22 +806,6 @@ class _SingleInnerViewItemState extends State<SingleInnerViewItem> {
),
);
}

String _convertLayoutToHintText(ViewLayoutPB layout) {
switch (layout) {
case ViewLayoutPB.Document:
return LocaleKeys.newDocumentText.tr();
case ViewLayoutPB.Grid:
return LocaleKeys.newGridText.tr();
case ViewLayoutPB.Board:
return LocaleKeys.newBoardText.tr();
case ViewLayoutPB.Calendar:
return LocaleKeys.newCalendarText.tr();
case ViewLayoutPB.Chat:
return LocaleKeys.chat_newChat.tr();
}
return LocaleKeys.newPageText.tr();
}
}

class _DotIconWidget extends StatelessWidget {
Expand Down

0 comments on commit d9bc97e

Please sign in to comment.