aurora
/
nextcloud-neon
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

neon_files: get blocs via context

pull/377/head
Nikolas Rimikis 2 years ago
parent
d54fa66e70
commit
8299470612
No known key found for this signature in database
GPG Key ID: 85ED1DE9786A4FF2
6 changed files with 94 additions and 100 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 17
      packages/neon/neon_files/lib/dialogs/choose_create.dart
  2. 15
      packages/neon/neon_files/lib/dialogs/choose_folder.dart
  3. 3
      packages/neon/neon_files/lib/pages/details.dart
  4. 3
      packages/neon/neon_files/lib/pages/main.dart
  5. 64
      packages/neon/neon_files/lib/widgets/browser_view.dart
  6. 4
      packages/neon/neon_files/lib/widgets/file_preview.dart

17
packages/neon/neon_files/lib/dialogs/choose_create.dart
Unescape View File

@ -2,12 +2,10 @@ part of '../neon_files.dart';
class FilesChooseCreateDialog extends StatefulWidget { class FilesChooseCreateDialog extends StatefulWidget {
const FilesChooseCreateDialog({ const FilesChooseCreateDialog({
required this.bloc,
required this.basePath, required this.basePath,
super.key, super.key,
}); });
final FilesBloc bloc;
final List<String> basePath; final List<String> basePath;
@override @override
@ -15,6 +13,15 @@ class FilesChooseCreateDialog extends StatefulWidget {
} }
class _FilesChooseCreateDialogState extends State<FilesChooseCreateDialog> { class _FilesChooseCreateDialogState extends State<FilesChooseCreateDialog> {
late FilesBloc filesBloc;
@override
void initState() {
filesBloc = Provider.of<FilesBloc>(context, listen: false);
super.initState();
}
Future uploadFromPick(final FileType type) async { Future uploadFromPick(final FileType type) async {
final result = await FilePicker.platform.pickFiles( final result = await FilePicker.platform.pickFiles(
allowMultiple: true, allowMultiple: true,
@ -28,7 +35,7 @@ class _FilesChooseCreateDialogState extends State<FilesChooseCreateDialog> {
} }
Future upload(final File file) async { Future upload(final File file) async {
final sizeWarning = widget.bloc.options.uploadSizeWarning.value; final sizeWarning = filesBloc.options.uploadSizeWarning.value;
if (sizeWarning != null) { if (sizeWarning != null) {
final stat = file.statSync(); final stat = file.statSync();
if (stat.size > sizeWarning) { if (stat.size > sizeWarning) {
@ -45,7 +52,7 @@ class _FilesChooseCreateDialogState extends State<FilesChooseCreateDialog> {
} }
} }
} }
widget.bloc.uploadFile([...widget.basePath, p.basename(file.path)], file.path); filesBloc.uploadFile([...widget.basePath, p.basename(file.path)], file.path);
} }
@override @override
@ -111,7 +118,7 @@ class _FilesChooseCreateDialogState extends State<FilesChooseCreateDialog> {
builder: (final context) => const FilesCreateFolderDialog(), builder: (final context) => const FilesCreateFolderDialog(),
); );
if (result != null) { if (result != null) {
widget.bloc.browser.createFolder([...widget.basePath, ...result]); filesBloc.browser.createFolder([...widget.basePath, ...result]);
} }
}, },
), ),

15
packages/neon/neon_files/lib/dialogs/choose_folder.dart
Unescape View File

@ -2,29 +2,25 @@ part of '../neon_files.dart';
class FilesChooseFolderDialog extends StatelessWidget { class FilesChooseFolderDialog extends StatelessWidget {
const FilesChooseFolderDialog({ const FilesChooseFolderDialog({
required this.bloc,
required this.filesBloc,
required this.originalPath, required this.originalPath,
super.key, super.key,
}); });
final FilesBrowserBloc bloc;
final FilesBloc filesBloc;
final List<String> originalPath; final List<String> originalPath;
@override @override
Widget build(final BuildContext context) => AlertDialog( Widget build(final BuildContext context) {
final bloc = Provider.of<FilesBloc>(context, listen: false).browser;
return AlertDialog(
title: Text(AppLocalizations.of(context).folderChoose), title: Text(AppLocalizations.of(context).folderChoose),
contentPadding: EdgeInsets.zero, contentPadding: EdgeInsets.zero,
content: SizedBox( content: SizedBox(
width: double.maxFinite, width: double.maxFinite,
child: Column( child: Column(
children: [ children: [
Expanded( const Expanded(
child: FilesBrowserView( child: FilesBrowserView(
bloc: bloc,
filesBloc: filesBloc,
enableFileActions: false, enableFileActions: false,
onlyShowDirectories: true, onlyShowDirectories: true,
), ),
@ -65,3 +61,4 @@ class FilesChooseFolderDialog extends StatelessWidget {
), ),
); );
} }
}

3
packages/neon/neon_files/lib/pages/details.dart
Unescape View File

@ -2,12 +2,10 @@ part of '../neon_files.dart';
class FilesDetailsPage extends StatelessWidget { class FilesDetailsPage extends StatelessWidget {
const FilesDetailsPage({ const FilesDetailsPage({
required this.bloc,
required this.details, required this.details,
super.key, super.key,
}); });
final FilesBloc bloc;
final FileDetails details; final FileDetails details;
@override @override
@ -24,7 +22,6 @@ class FilesDetailsPage extends StatelessWidget {
ColoredBox( ColoredBox(
color: Theme.of(context).colorScheme.primary, color: Theme.of(context).colorScheme.primary,
child: FilePreview( child: FilePreview(
bloc: bloc,
details: details, details: details,
color: Theme.of(context).colorScheme.onPrimary, color: Theme.of(context).colorScheme.onPrimary,
size: Size( size: Size(

3
packages/neon/neon_files/lib/pages/main.dart
Unescape View File

@ -25,8 +25,6 @@ class _FilesMainPageState extends State<FilesMainPage> {
@override @override
Widget build(final BuildContext context) => Scaffold( Widget build(final BuildContext context) => Scaffold(
body: FilesBrowserView( body: FilesBrowserView(
bloc: bloc.browser,
filesBloc: bloc,
onPickFile: (final details) async { onPickFile: (final details) async {
final sizeWarning = bloc.options.downloadSizeWarning.value; final sizeWarning = bloc.options.downloadSizeWarning.value;
if (sizeWarning != null && details.size > sizeWarning) { if (sizeWarning != null && details.size > sizeWarning) {
@ -50,7 +48,6 @@ class _FilesMainPageState extends State<FilesMainPage> {
await showDialog( await showDialog(
context: context, context: context,
builder: (final context) => FilesChooseCreateDialog( builder: (final context) => FilesChooseCreateDialog(
bloc: bloc,
basePath: bloc.browser.path.value, basePath: bloc.browser.path.value,
), ),
); );

64
packages/neon/neon_files/lib/widgets/browser_view.dart
Unescape View File

@ -2,8 +2,6 @@ part of '../neon_files.dart';
class FilesBrowserView extends StatefulWidget { class FilesBrowserView extends StatefulWidget {
const FilesBrowserView({ const FilesBrowserView({
required this.bloc,
required this.filesBloc,
this.onPickFile, this.onPickFile,
this.enableFileActions = true, this.enableFileActions = true,
this.onlyShowDirectories = false, this.onlyShowDirectories = false,
@ -11,8 +9,6 @@ class FilesBrowserView extends StatefulWidget {
// ignore: prefer_asserts_with_message // ignore: prefer_asserts_with_message
}) : assert((onPickFile == null) == onlyShowDirectories); }) : assert((onPickFile == null) == onlyShowDirectories);
final FilesBrowserBloc bloc;
final FilesBloc filesBloc;
final Function(FileDetails)? onPickFile; final Function(FileDetails)? onPickFile;
final bool enableFileActions; final bool enableFileActions;
final bool onlyShowDirectories; final bool onlyShowDirectories;
@ -22,24 +18,30 @@ class FilesBrowserView extends StatefulWidget {
} }
class _FilesBrowserViewState extends State<FilesBrowserView> { class _FilesBrowserViewState extends State<FilesBrowserView> {
late FilesBrowserBloc bloc;
late FilesBloc filesBloc;
@override @override
void initState() { void initState() {
super.initState(); super.initState();
widget.bloc.errors.listen((final error) { filesBloc = Provider.of<FilesBloc>(context, listen: false);
bloc = filesBloc.browser;
bloc.errors.listen((final error) {
NeonException.showSnackbar(context, error); NeonException.showSnackbar(context, error);
}); });
} }
@override @override
Widget build(final BuildContext context) => ResultBuilder<List<WebDavFile>>( Widget build(final BuildContext context) => ResultBuilder<List<WebDavFile>>(
stream: widget.bloc.files, stream: bloc.files,
builder: (final context, final files) => StreamBuilder<List<String>>( builder: (final context, final files) => StreamBuilder<List<String>>(
stream: widget.bloc.path, stream: bloc.path,
builder: (final context, final pathSnapshot) => StreamBuilder<List<UploadTask>>( builder: (final context, final pathSnapshot) => StreamBuilder<List<UploadTask>>(
stream: widget.filesBloc.uploadTasks, stream: filesBloc.uploadTasks,
builder: (final context, final uploadTasksSnapshot) => StreamBuilder<List<DownloadTask>>( builder: (final context, final uploadTasksSnapshot) => StreamBuilder<List<DownloadTask>>(
stream: widget.filesBloc.downloadTasks, stream: filesBloc.downloadTasks,
builder: (final context, final downloadTasksSnapshot) => !pathSnapshot.hasData || builder: (final context, final downloadTasksSnapshot) => !pathSnapshot.hasData ||
!uploadTasksSnapshot.hasData || !uploadTasksSnapshot.hasData ||
!downloadTasksSnapshot.hasData !downloadTasksSnapshot.hasData
@ -48,15 +50,15 @@ class _FilesBrowserViewState extends State<FilesBrowserView> {
onBackButtonPressed: () async { onBackButtonPressed: () async {
final path = pathSnapshot.data!; final path = pathSnapshot.data!;
if (path.isNotEmpty) { if (path.isNotEmpty) {
widget.bloc.setPath(path.sublist(0, path.length - 1)); bloc.setPath(path.sublist(0, path.length - 1));
return true; return true;
} }
return false; return false;
}, },
child: SortBoxBuilder<FilesSortProperty, WebDavFile>( child: SortBoxBuilder<FilesSortProperty, WebDavFile>(
sortBox: filesSortBox, sortBox: filesSortBox,
sortPropertyOption: widget.bloc.options.filesSortPropertyOption, sortPropertyOption: bloc.options.filesSortPropertyOption,
sortBoxOrderOption: widget.bloc.options.filesSortBoxOrderOption, sortBoxOrderOption: bloc.options.filesSortBoxOrderOption,
input: files.data, input: files.data,
builder: (final context, final sorted) => NeonListView<Widget>( builder: (final context, final sorted) => NeonListView<Widget>(
scrollKey: 'files-${pathSnapshot.data!.join('/')}', scrollKey: 'files-${pathSnapshot.data!.join('/')}',
@ -112,7 +114,7 @@ class _FilesBrowserViewState extends State<FilesBrowserView> {
builder: (final context, final downloadTaskProgressSnapshot) => _buildFile( builder: (final context, final downloadTaskProgressSnapshot) => _buildFile(
context: context, context: context,
details: FileDetails( details: FileDetails(
path: [...widget.bloc.path.value, file.name], path: [...bloc.path.value, file.name],
isDirectory: matchingUploadTasks.isEmpty && file.isDirectory, isDirectory: matchingUploadTasks.isEmpty && file.isDirectory,
size: matchingUploadTasks.isNotEmpty size: matchingUploadTasks.isNotEmpty
? matchingUploadTasks.first.size ? matchingUploadTasks.first.size
@ -138,7 +140,7 @@ class _FilesBrowserViewState extends State<FilesBrowserView> {
], ],
isLoading: files.loading, isLoading: files.loading,
error: files.error, error: files.error,
onRefresh: widget.bloc.refresh, onRefresh: bloc.refresh,
builder: (final context, final widget) => widget, builder: (final context, final widget) => widget,
topScrollingChildren: [ topScrollingChildren: [
Align( Align(
@ -162,7 +164,7 @@ class _FilesBrowserViewState extends State<FilesBrowserView> {
size: 30, size: 30,
), ),
onPressed: () { onPressed: () {
widget.bloc.setPath([]); bloc.setPath([]);
}, },
), ),
for (var i = 0; i < pathSnapshot.data!.length; i++) ...[ for (var i = 0; i < pathSnapshot.data!.length; i++) ...[
@ -174,7 +176,7 @@ class _FilesBrowserViewState extends State<FilesBrowserView> {
excludeFromSemantics: true, excludeFromSemantics: true,
child: TextButton( child: TextButton(
onPressed: () { onPressed: () {
widget.bloc.setPath(path); bloc.setPath(path);
}, },
child: Text( child: Text(
pathSnapshot.data![i], pathSnapshot.data![i],
@ -206,7 +208,7 @@ class _FilesBrowserViewState extends State<FilesBrowserView> {
); );
bool _pathMatchesFile(final List<String> path, final String name) => const ListEquality().equals( bool _pathMatchesFile(final List<String> path, final String name) => const ListEquality().equals(
[...widget.bloc.path.value, name], [...bloc.path.value, name],
path, path,
); );
@ -221,7 +223,7 @@ class _FilesBrowserViewState extends State<FilesBrowserView> {
onTap: details.isDirectory || details.etag != null onTap: details.isDirectory || details.etag != null
? () async { ? () async {
if (details.isDirectory) { if (details.isDirectory) {
widget.bloc.setPath(details.path); bloc.setPath(details.path);
} else { } else {
if (widget.onPickFile != null) { if (widget.onPickFile != null) {
widget.onPickFile!.call(details); widget.onPickFile!.call(details);
@ -269,7 +271,6 @@ class _FilesBrowserViewState extends State<FilesBrowserView> {
], ],
) )
: FilePreview( : FilePreview(
bloc: widget.filesBloc,
details: details, details: details,
withBackground: true, withBackground: true,
borderRadius: const BorderRadius.all(Radius.circular(8)), borderRadius: const BorderRadius.all(Radius.circular(8)),
@ -333,16 +334,15 @@ class _FilesBrowserViewState extends State<FilesBrowserView> {
switch (action) { switch (action) {
case FilesFileAction.toggleFavorite: case FilesFileAction.toggleFavorite:
if (details.isFavorite ?? false) { if (details.isFavorite ?? false) {
widget.filesBloc.removeFavorite(details.path); filesBloc.removeFavorite(details.path);
} else { } else {
widget.filesBloc.addFavorite(details.path); filesBloc.addFavorite(details.path);
} }
break; break;
case FilesFileAction.details: case FilesFileAction.details:
await Navigator.of(context).push( await Navigator.of(context).push(
MaterialPageRoute( MaterialPageRoute(
builder: (final context) => FilesDetailsPage( builder: (final context) => FilesDetailsPage(
bloc: widget.filesBloc,
details: details, details: details,
), ),
), ),
@ -357,45 +357,41 @@ class _FilesBrowserViewState extends State<FilesBrowserView> {
value: details.name, value: details.name,
); );
if (result != null) { if (result != null) {
widget.filesBloc.rename(details.path, result); filesBloc.rename(details.path, result);
} }
break; break;
case FilesFileAction.move: case FilesFileAction.move:
final b = widget.filesBloc.getNewFilesBrowserBloc(); final b = filesBloc.getNewFilesBrowserBloc();
final originalPath = details.path.sublist(0, details.path.length - 1); final originalPath = details.path.sublist(0, details.path.length - 1);
b.setPath(originalPath); b.setPath(originalPath);
final result = await showDialog<List<String>?>( final result = await showDialog<List<String>?>(
context: context, context: context,
builder: (final context) => FilesChooseFolderDialog( builder: (final context) => FilesChooseFolderDialog(
bloc: b,
filesBloc: widget.filesBloc,
originalPath: originalPath, originalPath: originalPath,
), ),
); );
b.dispose(); b.dispose();
if (result != null) { if (result != null) {
widget.filesBloc.move(details.path, result..add(details.name)); filesBloc.move(details.path, result..add(details.name));
} }
break; break;
case FilesFileAction.copy: case FilesFileAction.copy:
final b = widget.filesBloc.getNewFilesBrowserBloc(); final b = filesBloc.getNewFilesBrowserBloc();
final originalPath = details.path.sublist(0, details.path.length - 1); final originalPath = details.path.sublist(0, details.path.length - 1);
b.setPath(originalPath); b.setPath(originalPath);
final result = await showDialog<List<String>?>( final result = await showDialog<List<String>?>(
context: context, context: context,
builder: (final context) => FilesChooseFolderDialog( builder: (final context) => FilesChooseFolderDialog(
bloc: b,
filesBloc: widget.filesBloc,
originalPath: originalPath, originalPath: originalPath,
), ),
); );
b.dispose(); b.dispose();
if (result != null) { if (result != null) {
widget.filesBloc.copy(details.path, result..add(details.name)); filesBloc.copy(details.path, result..add(details.name));
} }
break; break;
case FilesFileAction.sync: case FilesFileAction.sync:
final sizeWarning = widget.bloc.options.downloadSizeWarning.value; final sizeWarning = bloc.options.downloadSizeWarning.value;
if (sizeWarning != null && details.size > sizeWarning) { if (sizeWarning != null && details.size > sizeWarning) {
// ignore: use_build_context_synchronously // ignore: use_build_context_synchronously
if (!(await showConfirmationDialog( if (!(await showConfirmationDialog(
@ -409,7 +405,7 @@ class _FilesBrowserViewState extends State<FilesBrowserView> {
return; return;
} }
} }
widget.filesBloc.syncFile(details.path); filesBloc.syncFile(details.path);
break; break;
case FilesFileAction.delete: case FilesFileAction.delete:
// ignore: use_build_context_synchronously // ignore: use_build_context_synchronously
@ -421,7 +417,7 @@ class _FilesBrowserViewState extends State<FilesBrowserView> {
// ignore: use_build_context_synchronously // ignore: use_build_context_synchronously
: AppLocalizations.of(context).fileDeleteConfirm(details.name), : AppLocalizations.of(context).fileDeleteConfirm(details.name),
)) { )) {
widget.filesBloc.delete(details.path); filesBloc.delete(details.path);
} }
break; break;
} }

4
packages/neon/neon_files/lib/widgets/file_preview.dart
Unescape View File

@ -2,7 +2,6 @@ part of '../neon_files.dart';
class FilePreview extends StatelessWidget { class FilePreview extends StatelessWidget {
const FilePreview({ const FilePreview({
required this.bloc,
required this.details, required this.details,
this.size = const Size.square(40), this.size = const Size.square(40),
this.color, this.color,
@ -14,7 +13,6 @@ class FilePreview extends StatelessWidget {
'withBackground needs to be true when borderRadius is set', 'withBackground needs to be true when borderRadius is set',
); );
final FilesBloc bloc;
final FileDetails details; final FileDetails details;
final Size size; final Size size;
final Color? color; final Color? color;
@ -26,7 +24,9 @@ class FilePreview extends StatelessWidget {
@override @override
Widget build(final BuildContext context) { Widget build(final BuildContext context) {
final bloc = Provider.of<FilesBloc>(context, listen: false);
final color = this.color ?? Theme.of(context).colorScheme.primary; final color = this.color ?? Theme.of(context).colorScheme.primary;
return SizedBox.fromSize( return SizedBox.fromSize(
size: size, size: size,
child: StreamBuilder<bool?>( child: StreamBuilder<bool?>(

Write Preview
Loading…
Cancel
Save