Browse Source

fix(neon_files): empty browser view

Signed-off-by: Nikolas Rimikis <leptopoda@users.noreply.github.com>
pull/984/head
Nikolas Rimikis 1 year ago
parent
commit
1c4394d51d
No known key found for this signature in database
GPG Key ID: 85ED1DE9786A4FF2
  1. 47
      packages/neon/neon_files/lib/widgets/browser_view.dart

47
packages/neon/neon_files/lib/widgets/browser_view.dart

@ -43,13 +43,30 @@ class _FilesBrowserViewState extends State<FilesBrowserView> {
@override @override
Widget build(final BuildContext context) => ResultBuilder<List<WebDavFile>>.behaviorSubject( Widget build(final BuildContext context) => ResultBuilder<List<WebDavFile>>.behaviorSubject(
stream: widget.bloc.files, stream: widget.bloc.files,
builder: (final context, final files) => StreamBuilder<List<String>>( builder: (final context, final filesSnapshot) => StreamBuilder<List<String>>(
stream: widget.bloc.path, stream: widget.bloc.path,
builder: (final context, final pathSnapshot) => StreamBuilder<List<FilesTask>>( builder: (final context, final pathSnapshot) => StreamBuilder<List<FilesTask>>(
stream: widget.filesBloc.tasks, stream: widget.filesBloc.tasks,
builder: (final context, final tasksSnapshot) => !pathSnapshot.hasData || !tasksSnapshot.hasData builder: (final context, final tasksSnapshot) {
? const SizedBox() if (!pathSnapshot.hasData || !tasksSnapshot.hasData) {
: BackButtonListener( return const SizedBox();
}
return ValueListenableBuilder(
valueListenable: widget.bloc.options.showHiddenFilesOption,
builder: (final context, final showHiddenFiles, final _) {
final files = filesSnapshot.data?.where((final file) {
var hideFile = false;
if (widget.mode == FilesBrowserMode.selectDirectory && !file.isDirectory) {
hideFile = true;
}
if (!showHiddenFiles && file.isHidden) {
hideFile = true;
}
return !hideFile;
}).toList();
return BackButtonListener(
onBackButtonPressed: () async { onBackButtonPressed: () async {
final path = pathSnapshot.requireData; final path = pathSnapshot.requireData;
if (path.isNotEmpty) { if (path.isNotEmpty) {
@ -65,10 +82,8 @@ class _FilesBrowserViewState extends State<FilesBrowserView> {
presort: const { presort: const {
(FilesSortProperty.isFolder, SortBoxOrder.ascending), (FilesSortProperty.isFolder, SortBoxOrder.ascending),
}, },
input: files.data, input: files,
builder: (final context, final sorted) => ValueListenableBuilder( builder: (final context, final sorted) {
valueListenable: widget.bloc.options.showHiddenFilesOption,
builder: (final context, final showHiddenFiles, final _) {
final uploadingTasks = tasksSnapshot.requireData final uploadingTasks = tasksSnapshot.requireData
.whereType<FilesUploadTask>() .whereType<FilesUploadTask>()
.where( .where(
@ -90,10 +105,7 @@ class _FilesBrowserViewState extends State<FilesBrowserView> {
), ),
); );
} }
final file = sorted[index - uploadingTasks.length]; final file = sorted[index - uploadingTasks.length];
if ((widget.mode != FilesBrowserMode.selectDirectory || file.isDirectory) &&
(!file.isHidden || showHiddenFiles)) {
final matchingTask = tasksSnapshot.requireData final matchingTask = tasksSnapshot.requireData
.firstWhereOrNull((final task) => _pathMatchesFile(task.path, file.name)); .firstWhereOrNull((final task) => _pathMatchesFile(task.path, file.name));
@ -112,12 +124,9 @@ class _FilesBrowserViewState extends State<FilesBrowserView> {
browserBloc: widget.bloc, browserBloc: widget.bloc,
details: details, details: details,
); );
}
return null;
}, },
isLoading: files.isLoading, isLoading: filesSnapshot.isLoading,
error: files.error, error: filesSnapshot.error,
onRefresh: widget.bloc.refresh, onRefresh: widget.bloc.refresh,
topScrollingChildren: [ topScrollingChildren: [
FilesBrowserNavigator( FilesBrowserNavigator(
@ -128,8 +137,10 @@ class _FilesBrowserViewState extends State<FilesBrowserView> {
); );
}, },
), ),
), );
), },
);
},
), ),
), ),
); );

Loading…
Cancel
Save