implemented internal file sharing and saving, added server-side file references, refactored share pickers for unified flows, and updated UI branding labels
This commit is contained in:
@@ -2,8 +2,11 @@ import 'package:flutter/material.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
import 'package:persistent_bottom_nav_bar_v2/persistent_bottom_nav_bar_v2.dart';
|
||||
|
||||
import '../../../api/errors/error_mapper.dart';
|
||||
import '../../../routing/app_routes.dart';
|
||||
import '../../../share_intent/internal_share_actions.dart';
|
||||
import '../../../share_intent/pending_share.dart';
|
||||
import '../../../share_intent/remote_file_ref.dart';
|
||||
import '../../../share_intent/share_intent_listener.dart';
|
||||
import '../../../state/app/infrastructure/loadable_state/loadable_state.dart';
|
||||
import '../../../state/app/infrastructure/loadable_state/view/loadable_state_consumer.dart';
|
||||
@@ -11,28 +14,57 @@ import '../../../state/app/infrastructure/utility_widgets/bloc_module.dart';
|
||||
import '../../../state/app/modules/files/bloc/files_bloc.dart';
|
||||
import '../../../state/app/modules/files/bloc/files_state.dart';
|
||||
import '../../../state/app/modules/settings/bloc/settings_cubit.dart';
|
||||
import '../../../widget/info_dialog.dart';
|
||||
import '../../../widget/placeholder_view.dart';
|
||||
import '../files/data/sort_options.dart';
|
||||
import '../files/files_upload_dialog.dart';
|
||||
import '../files/widgets/add_file_menu.dart';
|
||||
import '../files/widgets/files_sort_actions.dart';
|
||||
|
||||
class ShareFolderPicker extends StatelessWidget {
|
||||
final PendingShare share;
|
||||
typedef _FolderConfirmedCallback =
|
||||
Future<void> Function(BuildContext context, List<String> targetPath);
|
||||
|
||||
const ShareFolderPicker({super.key, required this.share});
|
||||
class ShareFolderPicker extends StatelessWidget {
|
||||
final String _fabLabel;
|
||||
final _FolderConfirmedCallback _onConfirm;
|
||||
|
||||
const ShareFolderPicker._({
|
||||
required String fabLabel,
|
||||
required _FolderConfirmedCallback onConfirm,
|
||||
}) : _fabLabel = fabLabel,
|
||||
_onConfirm = onConfirm;
|
||||
|
||||
/// External share-intent flow: upload local files into the chosen folder.
|
||||
factory ShareFolderPicker.forExternalShare({required PendingShare share}) =>
|
||||
ShareFolderPicker._(
|
||||
fabLabel: 'Hier hochladen',
|
||||
onConfirm: (ctx, target) => _externalUploadFlow(ctx, target, share),
|
||||
);
|
||||
|
||||
/// In-app save flow: server-to-server WebDAV-copy of an existing file into
|
||||
/// the chosen folder.
|
||||
factory ShareFolderPicker.forInternalSave({required RemoteFileRef file}) =>
|
||||
ShareFolderPicker._(
|
||||
fabLabel: 'Hierhin kopieren',
|
||||
onConfirm: (ctx, target) => _internalCopyFlow(ctx, target, file),
|
||||
);
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) =>
|
||||
BlocModule<FilesBloc, LoadableState<FilesState>>(
|
||||
create: (_) => FilesBloc(),
|
||||
child: (context, _, _) => _ShareFolderPickerView(share: share),
|
||||
child: (context, _, _) =>
|
||||
_ShareFolderPickerView(fabLabel: _fabLabel, onConfirm: _onConfirm),
|
||||
);
|
||||
}
|
||||
|
||||
class _ShareFolderPickerView extends StatefulWidget {
|
||||
final PendingShare share;
|
||||
const _ShareFolderPickerView({required this.share});
|
||||
final String fabLabel;
|
||||
final _FolderConfirmedCallback onConfirm;
|
||||
const _ShareFolderPickerView({
|
||||
required this.fabLabel,
|
||||
required this.onConfirm,
|
||||
});
|
||||
|
||||
@override
|
||||
State<_ShareFolderPickerView> createState() => _ShareFolderPickerViewState();
|
||||
@@ -60,25 +92,6 @@ class _ShareFolderPickerViewState extends State<_ShareFolderPickerView> {
|
||||
bloc.setPath(currentPath.sublist(0, currentPath.length - 1));
|
||||
}
|
||||
|
||||
Future<void> _uploadHere(List<String> currentPath) async {
|
||||
await pushScreen(
|
||||
context,
|
||||
withNavBar: false,
|
||||
screen: FilesUploadDialog(
|
||||
filePaths: widget.share.filePaths,
|
||||
remotePath: currentPath.join('/'),
|
||||
onUploadFinished: (_) => _afterUploaded(currentPath),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
void _afterUploaded(List<String> targetPath) {
|
||||
ShareIntentListener.instance.clear();
|
||||
if (!mounted) return;
|
||||
Navigator.of(context).popUntil((route) => route.isFirst);
|
||||
AppRoutes.openFolder(context, targetPath);
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final bloc = context.read<FilesBloc>();
|
||||
@@ -138,9 +151,9 @@ class _ShareFolderPickerViewState extends State<_ShareFolderPickerView> {
|
||||
),
|
||||
floatingActionButton: FloatingActionButton.extended(
|
||||
heroTag: 'shareUploadHere',
|
||||
onPressed: () => _uploadHere(currentPath),
|
||||
onPressed: () => widget.onConfirm(context, currentPath),
|
||||
icon: const Icon(Icons.upload),
|
||||
label: const Text('Hier hochladen'),
|
||||
label: Text(widget.fabLabel),
|
||||
),
|
||||
body: LoadableStateConsumer<FilesBloc, FilesState>(
|
||||
isReady: (state) => state.listing != null,
|
||||
@@ -185,3 +198,59 @@ class _ShareFolderPickerViewState extends State<_ShareFolderPickerView> {
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Future<void> _externalUploadFlow(
|
||||
BuildContext context,
|
||||
List<String> targetPath,
|
||||
PendingShare share,
|
||||
) async {
|
||||
await pushScreen(
|
||||
context,
|
||||
withNavBar: false,
|
||||
screen: FilesUploadDialog(
|
||||
filePaths: share.filePaths,
|
||||
remotePath: targetPath.join('/'),
|
||||
onUploadFinished: (_) => _afterExternalUploaded(context, targetPath),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
void _afterExternalUploaded(BuildContext context, List<String> targetPath) {
|
||||
ShareIntentListener.instance.clear();
|
||||
if (!context.mounted) return;
|
||||
_finishWithFolder(context, targetPath);
|
||||
}
|
||||
|
||||
/// Closes any picker pages stacked on top of the current tab and jumps to
|
||||
/// the chosen folder. Shared by external upload + internal copy flows.
|
||||
void _finishWithFolder(BuildContext context, List<String> targetPath) {
|
||||
Navigator.of(context).popUntil((route) => route.isFirst);
|
||||
AppRoutes.openFolder(context, targetPath);
|
||||
}
|
||||
|
||||
Future<void> _internalCopyFlow(
|
||||
BuildContext context,
|
||||
List<String> targetPath,
|
||||
RemoteFileRef file,
|
||||
) async {
|
||||
final bool ok;
|
||||
try {
|
||||
ok = await copyRemoteFileTo(
|
||||
context: context,
|
||||
source: file,
|
||||
targetFolderPath: targetPath.join('/'),
|
||||
);
|
||||
} catch (e) {
|
||||
if (context.mounted) {
|
||||
InfoDialog.show(
|
||||
context,
|
||||
errorToUserMessage(e),
|
||||
title: 'Kopieren fehlgeschlagen',
|
||||
copyable: true,
|
||||
);
|
||||
}
|
||||
return;
|
||||
}
|
||||
if (!ok || !context.mounted) return;
|
||||
_finishWithFolder(context, targetPath);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user