Mirrored_Repos/AppFlowy
1
0
Fork 0
mirror of https://github.com/AppFlowy-IO/AppFlowy.git synced 2024-08-30 18:12:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: open next page when current page get deleted

Browse Source
This commit is contained in:
appflowy
2022-09-22 13:08:48 +08:00
parent bdf4e60b48
commit 37f85cebde
25 changed files with 312 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
frontend/app_flowy/lib/plugins/blank/blank.dart
View File

@ -9,7 +9,7 @@ import 'package:app_flowy/startup/plugin/plugin.dart';
class BlankPluginBuilder extends PluginBuilder {
@override
Plugin build(dynamic data) {
return BlankPagePlugin(pluginType: pluginType);
return BlankPagePlugin();
}
@override
@ -25,11 +25,6 @@ class BlankPluginConfig implements PluginConfig {
}
class BlankPagePlugin extends Plugin {
final PluginType _pluginType;
BlankPagePlugin({
required PluginType pluginType,
}) : _pluginType = pluginType;
@override
PluginDisplay get display => BlankPagePluginDisplay();
@ -37,7 +32,7 @@ class BlankPagePlugin extends Plugin {
PluginId get id => "BlankStack";
@override
PluginType get ty => _pluginType;
PluginType get ty => PluginType.blank;
}
class BlankPagePluginDisplay extends PluginDisplay with NavigationItem {
@ -46,7 +41,7 @@ class BlankPagePluginDisplay extends PluginDisplay with NavigationItem {
FlowyText.medium(LocaleKeys.blankPageTitle.tr(), fontSize: 12);
@override
Widget buildWidget() => const BlankPage();
Widget buildWidget(PluginContext context) => const BlankPage();
@override
List<NavigationItem> get navigationItems => [this];

28
frontend/app_flowy/lib/plugins/board/board.dart
View File

@ -1,3 +1,4 @@
import 'package:app_flowy/plugins/util.dart';
import 'package:app_flowy/workspace/presentation/home/home_stack.dart';
import 'package:app_flowy/workspace/presentation/widgets/left_bar_item.dart';
import 'package:flowy_sdk/protobuf/flowy-folder/view.pb.dart';
@ -35,34 +36,45 @@ class BoardPluginConfig implements PluginConfig {
}
class BoardPlugin extends Plugin {
final ViewPB _view;
@override
final ViewPluginNotifier notifier;
final PluginType _pluginType;
BoardPlugin({
required ViewPB view,
required PluginType pluginType,
}) : _pluginType = pluginType,
_view = view;
notifier = ViewPluginNotifier(view: view);
@override
PluginDisplay get display => GridPluginDisplay(view: _view);
PluginDisplay get display => GridPluginDisplay(notifier: notifier);
@override
PluginId get id => _view.id;
PluginId get id => notifier.view.id;
@override
PluginType get ty => _pluginType;
}
class GridPluginDisplay extends PluginDisplay {
final ViewPB _view;
GridPluginDisplay({required ViewPB view, Key? key}) : _view = view;
final ViewPluginNotifier notifier;
GridPluginDisplay({required this.notifier, Key? key});
ViewPB get view => notifier.view;
@override
Widget get leftBarItem => ViewLeftBarItem(view: _view);
Widget get leftBarItem => ViewLeftBarItem(view: view);
@override
Widget buildWidget() => BoardPage(view: _view);
Widget buildWidget(PluginContext context) {
notifier.isDeleted.addListener(() {
if (notifier.isDeleted.value) {
context.onDeleted(view);
}
});
return BoardPage(key: ValueKey(view.id), view: view);
}
@override
List<NavigationItem> get navigationItems => [this];

5
frontend/app_flowy/lib/plugins/board/presentation/board_page.dart
View File

@ -31,7 +31,10 @@ import 'toolbar/board_toolbar.dart';
class BoardPage extends StatelessWidget {
final ViewPB view;
BoardPage({required this.view, Key? key}) : super(key: ValueKey(view.id));
BoardPage({
required this.view,
Key? key,
}) : super(key: ValueKey(view.id));
@override
Widget build(BuildContext context) {

59
frontend/app_flowy/lib/plugins/doc/document.dart
View File

@ -1,10 +1,10 @@
library document_plugin;
import 'package:app_flowy/generated/locale_keys.g.dart';
import 'package:app_flowy/plugins/util.dart';
import 'package:app_flowy/startup/plugin/plugin.dart';
import 'package:app_flowy/startup/startup.dart';
import 'package:app_flowy/workspace/application/appearance.dart';
import 'package:app_flowy/workspace/application/view/view_listener.dart';
import 'package:app_flowy/plugins/doc/application/share_bloc.dart';
import 'package:app_flowy/workspace/presentation/home/home_stack.dart';
import 'package:app_flowy/workspace/presentation/home/toast.dart';
@ -14,7 +14,6 @@ import 'package:app_flowy/workspace/presentation/widgets/pop_up_action.dart';
import 'package:clipboard/clipboard.dart';
import 'package:dartz/dartz.dart' as dartz;
import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra/notifier.dart';
import 'package:flowy_infra/size.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flowy_infra_ui/widget/rounded_button.dart';
@ -48,63 +47,51 @@ class DocumentPluginBuilder extends PluginBuilder {
ViewDataTypePB get dataType => ViewDataTypePB.Text;
}
class DocumentPlugin implements Plugin {
late ViewPB _view;
ViewListener? _listener;
class DocumentPlugin extends Plugin<int> {
late PluginType _pluginType;
DocumentPlugin(
{required PluginType pluginType, required ViewPB view, Key? key})
: _view = view {
@override
final ViewPluginNotifier notifier;
DocumentPlugin({
required PluginType pluginType,
required ViewPB view,
Key? key,
}) : notifier = ViewPluginNotifier(view: view) {
_pluginType = pluginType;
_listener = getIt<ViewListener>(param1: view);
_listener?.start(onViewUpdated: (result) {
result.fold(
(newView) {
_view = newView;
display.notifier!.value = _view.hashCode;
},
(error) {},
);
});
}
@override
void dispose() {
_listener?.stop();
_listener = null;
}
@override
PluginDisplay<int> get display => DocumentPluginDisplay(view: _view);
PluginDisplay get display => DocumentPluginDisplay(notifier: notifier);
@override
PluginType get ty => _pluginType;
@override
PluginId get id => _view.id;
PluginId get id => notifier.view.id;
}
class DocumentPluginDisplay extends PluginDisplay<int> with NavigationItem {
final PublishNotifier<int> _displayNotifier = PublishNotifier<int>();
final ViewPB _view;
class DocumentPluginDisplay extends PluginDisplay with NavigationItem {
final ViewPluginNotifier notifier;
ViewPB get view => notifier.view;
DocumentPluginDisplay({required ViewPB view, Key? key}) : _view = view;
DocumentPluginDisplay({required this.notifier, Key? key});
@override
Widget buildWidget() => DocumentPage(view: _view, key: ValueKey(_view.id));
Widget buildWidget(PluginContext context) => DocumentPage(
view: view,
onDeleted: () => context.onDeleted(view),
key: ValueKey(view.id),
);
@override
Widget get leftBarItem => ViewLeftBarItem(view: _view);
Widget get leftBarItem => ViewLeftBarItem(view: view);
@override
Widget? get rightBarItem => DocumentShareButton(view: _view);
Widget? get rightBarItem => DocumentShareButton(view: view);
@override
List<NavigationItem> get navigationItems => [this];
@override
PublishNotifier<int>? get notifier => _displayNotifier;
}
class DocumentShareButton extends StatelessWidget {

16
frontend/app_flowy/lib/plugins/doc/document_page.dart
View File

@ -14,9 +14,14 @@ import 'application/doc_bloc.dart';
import 'styles.dart';
class DocumentPage extends StatefulWidget {
final VoidCallback onDeleted;
final ViewPB view;
DocumentPage({Key? key, required this.view}) : super(key: ValueKey(view.id));
DocumentPage({
required this.view,
required this.onDeleted,
Key? key,
}) : super(key: ValueKey(view.id));
@override
State<DocumentPage> createState() => _DocumentPageState();
@ -49,7 +54,8 @@ class _DocumentPageState extends State<DocumentPage> {
finish: (result) => result.successOrFail.fold(
(_) {
if (state.forceClose) {
return _renderAppPage();
widget.onDeleted();
return const SizedBox();
} else {
return _renderDocument(context, state);
}
@ -134,10 +140,4 @@ class _DocumentPageState extends State<DocumentPage> {
),
);
}
Widget _renderAppPage() {
return Container(
color: Colors.black,
);
}
}

28
frontend/app_flowy/lib/plugins/grid/grid.dart
View File

@ -1,4 +1,5 @@
import 'package:app_flowy/generated/locale_keys.g.dart';
import 'package:app_flowy/plugins/util.dart';
import 'package:app_flowy/startup/plugin/plugin.dart';
import 'package:app_flowy/workspace/presentation/home/home_stack.dart';
import 'package:app_flowy/workspace/presentation/widgets/left_bar_item.dart';
@ -37,34 +38,45 @@ class GridPluginConfig implements PluginConfig {
}
class GridPlugin extends Plugin {
final ViewPB _view;
@override
final ViewPluginNotifier notifier;
final PluginType _pluginType;
GridPlugin({
required ViewPB view,
required PluginType pluginType,
}) : _pluginType = pluginType,
_view = view;
notifier = ViewPluginNotifier(view: view);
@override
PluginDisplay get display => GridPluginDisplay(view: _view);
PluginDisplay get display => GridPluginDisplay(notifier: notifier);
@override
PluginId get id => _view.id;
PluginId get id => notifier.view.id;
@override
PluginType get ty => _pluginType;
}
class GridPluginDisplay extends PluginDisplay {
final ViewPB _view;
GridPluginDisplay({required ViewPB view, Key? key}) : _view = view;
final ViewPluginNotifier notifier;
ViewPB get view => notifier.view;
GridPluginDisplay({required this.notifier, Key? key});
@override
Widget get leftBarItem => ViewLeftBarItem(view: _view);
Widget get leftBarItem => ViewLeftBarItem(view: view);
@override
Widget buildWidget() => GridPage(view: _view);
Widget buildWidget(PluginContext context) {
notifier.isDeleted.addListener(() {
if (notifier.isDeleted.value) {
context.onDeleted(view);
}
});
return GridPage(key: ValueKey(view.id), view: view);
}
@override
List<NavigationItem> get navigationItems => [this];

7
frontend/app_flowy/lib/plugins/grid/presentation/grid_page.dart
View File

@ -29,8 +29,13 @@ import 'widgets/toolbar/grid_toolbar.dart';
class GridPage extends StatefulWidget {
final ViewPB view;
final VoidCallback? onDeleted;
GridPage({Key? key, required this.view}) : super(key: ValueKey(view.id));
GridPage({
required this.view,
this.onDeleted,
Key? key,
}) : super(key: ValueKey(view.id));
@override
State<GridPage> createState() => _GridPageState();

4
frontend/app_flowy/lib/plugins/trash/trash.dart
View File

@ -66,7 +66,9 @@ class TrashPluginDisplay extends PluginDisplay {
Widget? get rightBarItem => null;
@override
Widget buildWidget() => const TrashPage(key: ValueKey('TrashPage'));
Widget buildWidget(PluginContext context) => const TrashPage(
key: ValueKey('TrashPage'),
);
@override
List<NavigationItem> get navigationItems => [this];

44
frontend/app_flowy/lib/plugins/util.dart Normal file
View File

@ -0,0 +1,44 @@
import 'package:app_flowy/startup/plugin/plugin.dart';
import 'package:app_flowy/workspace/application/view/view_listener.dart';
import 'package:flowy_sdk/log.dart';
import 'package:flowy_sdk/protobuf/flowy-folder/view.pb.dart';
import 'package:flutter/material.dart';
class ViewPluginNotifier extends PluginNotifier {
final ViewListener? _viewListener;
ViewPB view;
@override
final ValueNotifier<bool> isDeleted = ValueNotifier(false);
@override
final ValueNotifier<int> isDisplayChanged = ValueNotifier(0);
ViewPluginNotifier({
required this.view,
}) : _viewListener = ViewListener(view: view) {
_viewListener?.start(onViewUpdated: (result) {
result.fold(
(updatedView) {
view = updatedView;
isDisplayChanged.value = updatedView.hashCode;
},
(err) => Log.error(err),
);
}, onViewMoveToTrash: (result) {
result.fold(
(deletedView) {
isDeleted.value = true;
},
(err) => Log.error(err),
);
});
}
@override
void dispose() {
isDeleted.dispose();
isDisplayChanged.dispose();
_viewListener?.stop();
}
}