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

Merge pull request #604 from nextcloud/feat/neon_files/sort_folders 

Feat/neon files/sort folders
pull/688/head
Nikolas Rimikis 1 year ago committed by GitHub
parent
f67a411c51 c4d38589a7
commit
d37dc793f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 210 additions and 181 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. 3
      packages/neon/neon_files/lib/dialogs/choose_folder.dart
  2. 1
      packages/neon/neon_files/lib/l10n/en.arb
  3. 6
      packages/neon/neon_files/lib/l10n/localizations.dart
  4. 3
      packages/neon/neon_files/lib/l10n/localizations_en.dart
  5. 10
      packages/neon/neon_files/lib/options.dart
  6. 15
      packages/neon/neon_files/lib/pages/main.dart
  7. 1
      packages/neon/neon_files/lib/sort/files.dart
  8. 230
      packages/neon/neon_files/lib/widgets/browser_view.dart
  9. 110
      packages/neon/neon_files/lib/widgets/file_list_tile.dart
  10. 11
      packages/nextcloud/lib/src/webdav/file.dart
  11. 1
      packages/nextcloud/pubspec.yaml

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

@ -25,8 +25,7 @@ class FilesChooseFolderDialog extends StatelessWidget {
child: FilesBrowserView( child: FilesBrowserView(
bloc: bloc, bloc: bloc,
filesBloc: filesBloc, filesBloc: filesBloc,
enableFileActions: false, mode: FilesBrowserMode.selectDirectory,
onlyShowDirectories: true,
), ),
), ),
StreamBuilder<List<String>>( StreamBuilder<List<String>>(

1
packages/neon/neon_files/lib/l10n/en.arb
Unescape View File

@ -77,6 +77,7 @@
"optionsFilesSortPropertyModifiedDate": "Last modified", "optionsFilesSortPropertyModifiedDate": "Last modified",
"optionsFilesSortPropertySize": "Size", "optionsFilesSortPropertySize": "Size",
"optionsFilesSortOrder": "Sort order of files", "optionsFilesSortOrder": "Sort order of files",
"optionsShowHiddenFiles": "Show hidden files",
"optionsShowPreviews": "Show previews for files", "optionsShowPreviews": "Show previews for files",
"optionsUploadQueueParallelism": "Upload queue parallelism", "optionsUploadQueueParallelism": "Upload queue parallelism",
"optionsDownloadQueueParallelism": "Download queue parallelism", "optionsDownloadQueueParallelism": "Download queue parallelism",

6
packages/neon/neon_files/lib/l10n/localizations.dart
Unescape View File

@ -305,6 +305,12 @@ abstract class AppLocalizations {
/// **'Sort order of files'** /// **'Sort order of files'**
String get optionsFilesSortOrder; String get optionsFilesSortOrder;
/// No description provided for @optionsShowHiddenFiles.
///
/// In en, this message translates to:
/// **'Show hidden files'**
String get optionsShowHiddenFiles;
/// No description provided for @optionsShowPreviews. /// No description provided for @optionsShowPreviews.
/// ///
/// In en, this message translates to: /// In en, this message translates to:

3
packages/neon/neon_files/lib/l10n/localizations_en.dart
Unescape View File

@ -122,6 +122,9 @@ class AppLocalizationsEn extends AppLocalizations {
@override @override
String get optionsFilesSortOrder => 'Sort order of files'; String get optionsFilesSortOrder => 'Sort order of files';
@override
String get optionsShowHiddenFiles => 'Show hidden files';
@override @override
String get optionsShowPreviews => 'Show previews for files'; String get optionsShowPreviews => 'Show previews for files';

10
packages/neon/neon_files/lib/options.dart
Unescape View File

@ -8,6 +8,7 @@ class FilesAppSpecificOptions extends NextcloudAppOptions {
super.options = [ super.options = [
filesSortPropertyOption, filesSortPropertyOption,
filesSortBoxOrderOption, filesSortBoxOrderOption,
showHiddenFilesOption,
showPreviewsOption, showPreviewsOption,
uploadQueueParallelism, uploadQueueParallelism,
downloadQueueParallelism, downloadQueueParallelism,
@ -43,6 +44,14 @@ class FilesAppSpecificOptions extends NextcloudAppOptions {
values: sortBoxOrderOptionValues, values: sortBoxOrderOptionValues,
); );
late final showHiddenFilesOption = ToggleOption(
storage: super.storage,
category: generalCategory,
key: 'show-hidden-files',
label: (final context) => AppLocalizations.of(context).optionsShowHiddenFiles,
defaultValue: false,
);
late final showPreviewsOption = ToggleOption( late final showPreviewsOption = ToggleOption(
storage: super.storage, storage: super.storage,
category: generalCategory, category: generalCategory,
@ -132,4 +141,5 @@ enum FilesSortProperty {
name, name,
modifiedDate, modifiedDate,
size, size,
isFolder,
} }

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

@ -27,21 +27,6 @@ class _FilesMainPageState extends State<FilesMainPage> {
body: FilesBrowserView( body: FilesBrowserView(
bloc: bloc.browser, bloc: bloc.browser,
filesBloc: bloc, filesBloc: bloc,
onPickFile: (final details) async {
final sizeWarning = bloc.options.downloadSizeWarning.value;
if (sizeWarning != null && details.size != null && details.size! > sizeWarning) {
if (!(await showConfirmationDialog(
context,
AppLocalizations.of(context).downloadConfirmSizeWarning(
filesize(sizeWarning),
filesize(details.size),
),
))) {
return;
}
}
bloc.openFile(details.path, details.etag!, details.mimeType);
},
), ),
floatingActionButton: FloatingActionButton( floatingActionButton: FloatingActionButton(
onPressed: () async { onPressed: () async {

1
packages/neon/neon_files/lib/sort/files.dart
Unescape View File

@ -5,6 +5,7 @@ final filesSortBox = SortBox<FilesSortProperty, WebDavFile>(
FilesSortProperty.name: (final file) => file.name.toLowerCase(), FilesSortProperty.name: (final file) => file.name.toLowerCase(),
FilesSortProperty.modifiedDate: (final file) => file.lastModified?.millisecondsSinceEpoch ?? 0, FilesSortProperty.modifiedDate: (final file) => file.lastModified?.millisecondsSinceEpoch ?? 0,
FilesSortProperty.size: (final file) => file.size ?? 0, FilesSortProperty.size: (final file) => file.size ?? 0,
FilesSortProperty.isFolder: (final file) => file.isDirectory ? 0 : 1,
}, },
{ {
FilesSortProperty.modifiedDate: { FilesSortProperty.modifiedDate: {

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

@ -1,21 +1,30 @@
part of '../neon_files.dart'; part of '../neon_files.dart';
/// Mode to operate the [FilesBrowserView] in.
enum FilesBrowserMode {
/// Default file browser mode.
///
/// When a file is selecteed it will be opened or downloaded.
browser,
/// Select directory.
selectDirectory,
/// Don't show file actions.
noActions,
}
class FilesBrowserView extends StatefulWidget { class FilesBrowserView extends StatefulWidget {
const FilesBrowserView({ const FilesBrowserView({
required this.bloc, required this.bloc,
required this.filesBloc, required this.filesBloc,
this.onPickFile, this.mode = FilesBrowserMode.browser,
this.enableFileActions = true,
this.onlyShowDirectories = false,
super.key, super.key,
// ignore: prefer_asserts_with_message });
}) : assert((onPickFile == null) == onlyShowDirectories);
final FilesBrowserBloc bloc; final FilesBrowserBloc bloc;
final FilesBloc filesBloc; final FilesBloc filesBloc;
final Function(FileDetails)? onPickFile; final FilesBrowserMode mode;
final bool enableFileActions;
final bool onlyShowDirectories;
@override @override
State<FilesBrowserView> createState() => _FilesBrowserViewState(); State<FilesBrowserView> createState() => _FilesBrowserViewState();
@ -24,11 +33,11 @@ class FilesBrowserView extends StatefulWidget {
class _FilesBrowserViewState extends State<FilesBrowserView> { class _FilesBrowserViewState extends State<FilesBrowserView> {
@override @override
void initState() { void initState() {
super.initState();
widget.bloc.errors.listen((final error) { widget.bloc.errors.listen((final error) {
NeonException.showSnackbar(context, error); NeonException.showSnackbar(context, error);
}); });
super.initState();
} }
@override @override
@ -53,115 +62,120 @@ class _FilesBrowserViewState extends State<FilesBrowserView> {
sortBox: filesSortBox, sortBox: filesSortBox,
sortPropertyOption: widget.bloc.options.filesSortPropertyOption, sortPropertyOption: widget.bloc.options.filesSortPropertyOption,
sortBoxOrderOption: widget.bloc.options.filesSortBoxOrderOption, sortBoxOrderOption: widget.bloc.options.filesSortBoxOrderOption,
presort: const {
(FilesSortProperty.isFolder, SortBoxOrder.ascending),
},
input: files.data, input: files.data,
builder: (final context, final sorted) => NeonListView<Widget>( builder: (final context, final sorted) => ValueListenableBuilder(
scrollKey: 'files-${pathSnapshot.requireData.join('/')}', valueListenable: widget.bloc.options.showHiddenFilesOption,
withFloatingActionButton: true, builder: (final context, final showHiddenFiles, final _) => NeonListView<Widget>(
items: [ scrollKey: 'files-${pathSnapshot.requireData.join('/')}',
for (final uploadTask in tasksSnapshot.requireData.whereType<FilesUploadTask>().where( withFloatingActionButton: true,
(final task) => items: [
sorted.where((final file) => _pathMatchesFile(task.path, file.name)).isEmpty, for (final uploadTask in tasksSnapshot.requireData.whereType<FilesUploadTask>().where(
)) ...[ (final task) =>
FileListTile( sorted.where((final file) => _pathMatchesFile(task.path, file.name)).isEmpty,
bloc: widget.filesBloc, )) ...[
browserBloc: widget.bloc, FileListTile(
details: FileDetails.fromUploadTask( bloc: widget.filesBloc,
task: uploadTask, browserBloc: widget.bloc,
details: FileDetails.fromUploadTask(
task: uploadTask,
),
mode: widget.mode,
), ),
enableFileActions: widget.enableFileActions, ],
onPickFile: widget.onPickFile, for (final file in sorted) ...[
), if ((widget.mode != FilesBrowserMode.selectDirectory || file.isDirectory) &&
], (!file.isHidden || showHiddenFiles)) ...[
for (final file in sorted) ...[ Builder(
if (!widget.onlyShowDirectories || file.isDirectory) ...[ builder: (final context) {
Builder( final matchingTask = tasksSnapshot.requireData
builder: (final context) { .firstWhereOrNull((final task) => _pathMatchesFile(task.path, file.name));
final matchingTask = tasksSnapshot.requireData
.firstWhereOrNull((final task) => _pathMatchesFile(task.path, file.name));
final details = matchingTask != null final details = matchingTask != null
? FileDetails.fromTask( ? FileDetails.fromTask(
task: matchingTask, task: matchingTask,
file: file, file: file,
) )
: FileDetails.fromWebDav( : FileDetails.fromWebDav(
file: file, file: file,
path: widget.bloc.path.value, path: widget.bloc.path.value,
); );
return FileListTile( return FileListTile(
bloc: widget.filesBloc, bloc: widget.filesBloc,
browserBloc: widget.bloc, browserBloc: widget.bloc,
details: details, details: details,
enableFileActions: widget.enableFileActions, mode: widget.mode,
onPickFile: widget.onPickFile, );
); },
}, ),
), ],
], ],
], ],
], isLoading: files.isLoading,
isLoading: files.isLoading, error: files.error,
error: files.error, onRefresh: widget.bloc.refresh,
onRefresh: widget.bloc.refresh, builder: (final context, final widget) => widget,
builder: (final context, final widget) => widget, topScrollingChildren: [
topScrollingChildren: [ Align(
Align( alignment: Alignment.topLeft,
alignment: Alignment.topLeft, child: Container(
child: Container( margin: const EdgeInsets.symmetric(
margin: const EdgeInsets.symmetric( horizontal: 10,
horizontal: 10, ),
), child: Wrap(
child: Wrap( crossAxisAlignment: WrapCrossAlignment.center,
crossAxisAlignment: WrapCrossAlignment.center, children: <Widget>[
children: <Widget>[ IconButton(
IconButton( padding: EdgeInsets.zero,
padding: EdgeInsets.zero, visualDensity: const VisualDensity(
visualDensity: const VisualDensity( horizontal: VisualDensity.minimumDensity,
horizontal: VisualDensity.minimumDensity, vertical: VisualDensity.minimumDensity,
vertical: VisualDensity.minimumDensity, ),
), tooltip: AppLocalizations.of(context).goToPath(''),
tooltip: AppLocalizations.of(context).goToPath(''), icon: const Icon(
icon: const Icon( Icons.house,
Icons.house, size: 30,
size: 30, ),
), onPressed: () {
onPressed: () { widget.bloc.setPath([]);
widget.bloc.setPath([]);
},
),
for (var i = 0; i < pathSnapshot.requireData.length; i++) ...[
Builder(
builder: (final context) {
final path = pathSnapshot.requireData.sublist(0, i + 1);
return Tooltip(
message: AppLocalizations.of(context).goToPath(path.join('/')),
excludeFromSemantics: true,
child: TextButton(
onPressed: () {
widget.bloc.setPath(path);
},
child: Text(
pathSnapshot.requireData[i],
semanticsLabel: AppLocalizations.of(context).goToPath(path.join('/')),
),
),
);
}, },
), ),
], for (var i = 0; i < pathSnapshot.requireData.length; i++) ...[
] Builder(
.intersperse( builder: (final context) {
const Icon( final path = pathSnapshot.requireData.sublist(0, i + 1);
Icons.keyboard_arrow_right, return Tooltip(
size: 30, message: AppLocalizations.of(context).goToPath(path.join('/')),
excludeFromSemantics: true,
child: TextButton(
onPressed: () {
widget.bloc.setPath(path);
},
child: Text(
pathSnapshot.requireData[i],
semanticsLabel: AppLocalizations.of(context).goToPath(path.join('/')),
),
),
);
},
), ),
) ],
.toList(), ]
.intersperse(
const Icon(
Icons.keyboard_arrow_right,
size: 30,
),
)
.toList(),
),
), ),
), ),
), ],
], ),
), ),
), ),
), ),

110
packages/neon/neon_files/lib/widgets/file_list_tile.dart
Unescape View File

@ -1,7 +1,9 @@
import 'package:filesize/filesize.dart'; import 'package:filesize/filesize.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
import 'package:neon/utils.dart';
import 'package:neon/widgets.dart'; import 'package:neon/widgets.dart';
import 'package:neon_files/l10n/localizations.dart';
import 'package:neon_files/neon_files.dart'; import 'package:neon_files/neon_files.dart';
import 'package:neon_files/widgets/actions.dart'; import 'package:neon_files/widgets/actions.dart';
@ -10,66 +12,72 @@ class FileListTile extends StatelessWidget {
required this.bloc, required this.bloc,
required this.browserBloc, required this.browserBloc,
required this.details, required this.details,
this.enableFileActions = true, this.mode = FilesBrowserMode.browser,
this.onPickFile,
super.key, super.key,
}); });
final FilesBloc bloc; final FilesBloc bloc;
final FilesBrowserBloc browserBloc; final FilesBrowserBloc browserBloc;
final FileDetails details; final FileDetails details;
final bool enableFileActions; final FilesBrowserMode mode;
final Function(FileDetails)? onPickFile;
@override Future<void> _onTap(final BuildContext context, final FileDetails details) async {
Widget build(final BuildContext context) { if (details.isDirectory) {
// When the ETag is null it means we are uploading this file right now browserBloc.setPath(details.path);
final onTap = details.isDirectory || details.etag != null } else if (mode == FilesBrowserMode.browser) {
? () { final sizeWarning = bloc.options.downloadSizeWarning.value;
if (details.isDirectory) { if (sizeWarning != null && details.size != null && details.size! > sizeWarning) {
browserBloc.setPath(details.path); if (!(await showConfirmationDialog(
} else { context,
onPickFile?.call(details); AppLocalizations.of(context).downloadConfirmSizeWarning(
} filesize(sizeWarning),
} filesize(details.size),
: null; ),
))) {
return;
}
}
bloc.openFile(details.path, details.etag!, details.mimeType);
}
}
return ListTile( @override
onTap: onTap, Widget build(final BuildContext context) => ListTile(
title: Text( // When the ETag is null it means we are uploading this file right now
details.name, onTap: details.isDirectory || details.etag != null ? () async => _onTap(context, details) : null,
overflow: TextOverflow.ellipsis, title: Text(
), details.name,
subtitle: Row( overflow: TextOverflow.ellipsis,
children: [ ),
if (details.lastModified != null) subtitle: Row(
RelativeTime( children: [
date: details.lastModified!, if (details.lastModified != null)
), RelativeTime(
if (details.size != null && details.size! > 0) ...[ date: details.lastModified!,
const SizedBox( ),
width: 10, if (details.size != null && details.size! > 0) ...[
), const SizedBox(
Text( width: 10,
filesize(details.size, 1), ),
style: DefaultTextStyle.of(context).style.copyWith( Text(
color: Colors.grey, filesize(details.size, 1),
), style: DefaultTextStyle.of(context).style.copyWith(
), color: Colors.grey,
),
),
],
], ],
], ),
), leading: _FileIcon(
leading: _FileIcon( details: details,
details: details, bloc: bloc,
bloc: bloc, ),
), trailing: !details.hasTask && mode != FilesBrowserMode.noActions
trailing: !details.hasTask && enableFileActions ? FileActions(details: details)
? FileActions(details: details) : const SizedBox.square(
: const SizedBox.square( dimension: 48,
dimension: 48, ),
), );
);
}
} }
class _FileIcon extends StatelessWidget { class _FileIcon extends StatelessWidget {

11
packages/nextcloud/lib/src/webdav/file.dart
Unescape View File

@ -83,12 +83,13 @@ class WebDavFile {
// normalised path (remove trailing slash) // normalised path (remove trailing slash)
final end = path.endsWith('/') ? path.length - 1 : path.length; final end = path.endsWith('/') ? path.length - 1 : path.length;
final segments = Uri.parse(path, 0, end).pathSegments; final segments = Uri.parse(path, 0, end).pathSegments;
if (segments.isNotEmpty) {
return segments.last; return segments.lastOrNull ?? '';
}
return '';
}(); }();
/// Returns if the file is a directory /// Whether the file is hidden.
late final bool isHidden = name.startsWith('.');
/// Whether the file is a directory
late final bool isDirectory = (isCollection ?? false) || path.endsWith('/'); late final bool isDirectory = (isCollection ?? false) || path.endsWith('/');
} }

1
packages/nextcloud/pubspec.yaml
Unescape View File

@ -8,6 +8,7 @@ environment:
dependencies: dependencies:
built_collection: ^5.1.1 built_collection: ^5.1.1
built_value: ^8.6.2 built_value: ^8.6.2
collection: ^1.17.2
crypto: ^3.0.3 crypto: ^3.0.3
crypton: ^2.2.0 crypton: ^2.2.0
dynamite_runtime: dynamite_runtime:

Write Preview
Loading…
Cancel
Save