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

perf(neon,neon_files,neon_news,neon_notes,neon_notifications): lazy build NeonListView 

Signed-off-by: Nikolas Rimikis <leptopoda@users.noreply.github.com>
pull/585/head
Nikolas Rimikis 1 year ago
parent
56489f9da9
commit
84eeaf965e
No known key found for this signature in database
GPG Key ID: 85ED1DE9786A4FF2
9 changed files with 241 additions and 182 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. 100
      packages/neon/neon/lib/src/widgets/list_view.dart
  2. 40
      packages/neon/neon/lib/src/widgets/unified_search_results.dart
  3. 223
      packages/neon/neon_files/lib/widgets/browser_view.dart
  4. 18
      packages/neon/neon_news/lib/widgets/articles_view.dart
  5. 9
      packages/neon/neon_news/lib/widgets/feeds_view.dart
  6. 10
      packages/neon/neon_news/lib/widgets/folders_view.dart
  7. 9
      packages/neon/neon_notes/lib/widgets/categories_view.dart
  8. 7
      packages/neon/neon_notes/lib/widgets/notes_view.dart
  9. 7
      packages/neon/neon_notifications/lib/pages/main.dart

100
packages/neon/neon/lib/src/widgets/list_view.dart
Unescape View File

@ -2,65 +2,85 @@ import 'package:flutter/material.dart';
import 'package:neon/src/widgets/error.dart'; import 'package:neon/src/widgets/error.dart';
import 'package:neon/src/widgets/linear_progress_indicator.dart'; import 'package:neon/src/widgets/linear_progress_indicator.dart';
class NeonListView<T> extends StatelessWidget { class NeonListView extends StatelessWidget {
const NeonListView({ NeonListView({
required this.items,
required this.isLoading, required this.isLoading,
required this.error, required this.error,
required this.onRefresh, required this.onRefresh,
required this.builder, required final NullableIndexedWidgetBuilder itemBuilder,
final int? itemCount,
this.scrollKey,
this.topFixedChildren,
this.topScrollingChildren,
super.key,
}) : sliver = SliverList.builder(
itemCount: itemCount,
itemBuilder: itemBuilder,
);
const NeonListView.custom({
required this.isLoading,
required this.error,
required this.onRefresh,
required this.sliver,
this.scrollKey, this.scrollKey,
this.withFloatingActionButton = false,
this.topFixedChildren, this.topFixedChildren,
this.topScrollingChildren, this.topScrollingChildren,
super.key, super.key,
}); });
final Iterable<T>? items;
final bool isLoading; final bool isLoading;
final Object? error; final Object? error;
final RefreshCallback onRefresh; final RefreshCallback onRefresh;
final Widget Function(BuildContext, T data) builder;
final String? scrollKey; final String? scrollKey;
final bool withFloatingActionButton;
final List<Widget>? topFixedChildren; final List<Widget>? topFixedChildren;
final List<Widget>? topScrollingChildren; final List<Widget>? topScrollingChildren;
final Widget sliver;
@override @override
Widget build(final BuildContext context) => RefreshIndicator( Widget build(final BuildContext context) {
onRefresh: onRefresh, final refreshIndicatorKey = GlobalKey<RefreshIndicatorState>();
child: Column( final hasFloatingActionButton = Scaffold.maybeOf(context)?.hasFloatingActionButton ?? false;
children: [
...?topFixedChildren, return RefreshIndicator.adaptive(
NeonLinearProgressIndicator( key: refreshIndicatorKey,
margin: const EdgeInsets.symmetric( onRefresh: onRefresh,
horizontal: 10, child: CustomScrollView(
vertical: 5, key: scrollKey != null ? PageStorageKey<String>(scrollKey!) : null,
), primary: true,
visible: isLoading, slivers: [
if (topFixedChildren != null)
SliverList.builder(
itemCount: topFixedChildren!.length,
itemBuilder: (final context, final index) => topFixedChildren![index],
), ),
Expanded( if (isLoading)
child: Scrollbar( const SliverToBoxAdapter(
child: ListView( child: NeonLinearProgressIndicator(
primary: true, margin: EdgeInsets.symmetric(
key: scrollKey != null ? PageStorageKey<String>(scrollKey!) : null, horizontal: 10,
padding: withFloatingActionButton ? const EdgeInsets.only(bottom: 88) : null, vertical: 5,
children: [
...?topScrollingChildren,
NeonError(
error,
onRetry: onRefresh,
),
if (items != null) ...[
for (final item in items!) ...[
builder(context, item),
],
],
],
), ),
), ),
), ),
], if (error != null)
), SliverToBoxAdapter(
); child: NeonError(
error,
onRetry: () async => refreshIndicatorKey.currentState!.show(),
),
),
if (topScrollingChildren != null)
SliverList.builder(
itemCount: topScrollingChildren!.length,
itemBuilder: (final context, final index) => topScrollingChildren![index],
),
SliverPadding(
padding: hasFloatingActionButton ? const EdgeInsets.only(bottom: 88) : EdgeInsets.zero,
sliver: sliver,
),
],
),
);
}
} }

40
packages/neon/neon/lib/src/widgets/unified_search_results.dart
Unescape View File

@ -29,22 +29,30 @@ class NeonUnifiedSearchResults extends StatelessWidget {
final bloc = accountsBloc.activeUnifiedSearchBloc; final bloc = accountsBloc.activeUnifiedSearchBloc;
return ResultBuilder.behaviorSubject( return ResultBuilder.behaviorSubject(
stream: bloc.results, stream: bloc.results,
builder: (final context, final results) => NeonListView( builder: (final context, final results) {
items: results.data?.entries, final values = results.data?.entries.toList();
isLoading: results.isLoading,
error: results.error, return NeonListView(
onRefresh: bloc.refresh, isLoading: results.isLoading,
builder: (final context, final snapshot) => AnimatedSize( error: results.error,
duration: const Duration(milliseconds: 100), onRefresh: bloc.refresh,
child: _buildProvider( itemCount: values?.length,
context, itemBuilder: (final context, final index) {
accountsBloc, final snapshot = values![index];
bloc,
snapshot.key, return AnimatedSize(
snapshot.value, duration: const Duration(milliseconds: 100),
), child: _buildProvider(
), context,
), accountsBloc,
bloc,
snapshot.key,
snapshot.value,
),
);
},
);
},
); );
} }

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

@ -68,108 +68,65 @@ class _FilesBrowserViewState extends State<FilesBrowserView> {
input: files.data, input: files.data,
builder: (final context, final sorted) => ValueListenableBuilder( builder: (final context, final sorted) => ValueListenableBuilder(
valueListenable: widget.bloc.options.showHiddenFilesOption, valueListenable: widget.bloc.options.showHiddenFilesOption,
builder: (final context, final showHiddenFiles, final _) => NeonListView<Widget>( builder: (final context, final showHiddenFiles, final _) {
scrollKey: 'files-${pathSnapshot.requireData.join('/')}', final uploadingTasks = tasksSnapshot.requireData
withFloatingActionButton: true, .whereType<FilesUploadTask>()
items: [ .where(
for (final uploadTask in tasksSnapshot.requireData.whereType<FilesUploadTask>().where( (final task) =>
(final task) => sorted.where((final file) => _pathMatchesFile(task.path, file.name)).isEmpty,
sorted.where((final file) => _pathMatchesFile(task.path, file.name)).isEmpty, )
)) ...[ .toList();
FileListTile(
bloc: widget.filesBloc, return NeonListView(
browserBloc: widget.bloc, scrollKey: 'files-${pathSnapshot.requireData.join('/')}',
details: FileDetails.fromUploadTask( itemCount: uploadingTasks.length + sorted.length,
task: uploadTask, itemBuilder: (final context, final index) {
), if (index < uploadingTasks.length) {
mode: widget.mode, return FileListTile(
), bloc: widget.filesBloc,
], browserBloc: widget.bloc,
for (final file in sorted) ...[ details: FileDetails.fromUploadTask(
task: uploadingTasks[index],
),
);
}
final file = sorted[index - uploadingTasks.length];
if ((widget.mode != FilesBrowserMode.selectDirectory || file.isDirectory) && if ((widget.mode != FilesBrowserMode.selectDirectory || file.isDirectory) &&
(!file.isHidden || showHiddenFiles)) ...[ (!file.isHidden || showHiddenFiles)) {
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
? FileDetails.fromTask(
final details = matchingTask != null task: matchingTask,
? FileDetails.fromTask( file: file,
task: matchingTask,
file: file,
)
: FileDetails.fromWebDav(
file: file,
path: widget.bloc.path.value,
);
return FileListTile(
bloc: widget.filesBloc,
browserBloc: widget.bloc,
details: details,
mode: widget.mode,
);
},
),
],
],
],
isLoading: files.isLoading,
error: files.error,
onRefresh: widget.bloc.refresh,
builder: (final context, final widget) => widget,
topScrollingChildren: [
Align(
alignment: Alignment.topLeft,
child: Container(
margin: const EdgeInsets.symmetric(
horizontal: 10,
),
child: Wrap(
crossAxisAlignment: WrapCrossAlignment.center,
children: <Widget>[
IconButton(
padding: EdgeInsets.zero,
tooltip: AppLocalizations.of(context).goToPath(''),
icon: const Icon(
Icons.house,
),
onPressed: () {
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('/')),
),
),
);
},
),
],
]
.intersperse(
const Icon(
Icons.keyboard_arrow_right,
),
) )
.toList(), : FileDetails.fromWebDav(
), file: file,
path: widget.bloc.path.value,
);
return FileListTile(
bloc: widget.filesBloc,
browserBloc: widget.bloc,
details: details,
);
}
return null;
},
isLoading: files.isLoading,
error: files.error,
onRefresh: widget.bloc.refresh,
topScrollingChildren: [
FileBrowserNavigator(
path: pathSnapshot.requireData,
bloc: widget.bloc,
), ),
), ],
], );
), },
), ),
), ),
), ),
@ -182,3 +139,71 @@ class _FilesBrowserViewState extends State<FilesBrowserView> {
path, path,
); );
} }
class FileBrowserNavigator extends StatelessWidget {
const FileBrowserNavigator({
required this.path,
required this.bloc,
super.key,
});
final List<String> path;
final FilesBrowserBloc bloc;
@override
Widget build(final BuildContext context) => Align(
alignment: Alignment.topLeft,
child: Container(
margin: const EdgeInsets.symmetric(
horizontal: 10,
),
child: Wrap(
crossAxisAlignment: WrapCrossAlignment.center,
children: <Widget>[
IconButton(
padding: EdgeInsets.zero,
visualDensity: const VisualDensity(
horizontal: VisualDensity.minimumDensity,
vertical: VisualDensity.minimumDensity,
),
tooltip: AppLocalizations.of(context).goToPath(''),
icon: const Icon(
Icons.house,
size: 30,
),
onPressed: () {
bloc.setPath([]);
},
),
for (var i = 0; i < path.length; i++) ...[
Builder(
builder: (final context) {
final path = this.path.sublist(0, i + 1);
return Tooltip(
message: AppLocalizations.of(context).goToPath(path.join('/')),
excludeFromSemantics: true,
child: TextButton(
onPressed: () {
bloc.setPath(path);
},
child: Text(
this.path[i],
semanticsLabel: AppLocalizations.of(context).goToPath(path.join('/')),
),
),
);
},
),
],
]
.intersperse(
const Icon(
Icons.keyboard_arrow_right,
size: 30,
),
)
.toList(),
),
),
);
}

18
packages/neon/neon_news/lib/widgets/articles_view.dart
Unescape View File

@ -34,9 +34,8 @@ class _NewsArticlesViewState extends State<NewsArticlesView> {
sortPropertyOption: widget.newsBloc.options.articlesSortPropertyOption, sortPropertyOption: widget.newsBloc.options.articlesSortPropertyOption,
sortBoxOrderOption: widget.newsBloc.options.articlesSortBoxOrderOption, sortBoxOrderOption: widget.newsBloc.options.articlesSortBoxOrderOption,
input: articles.data, input: articles.data,
builder: (final context, final sorted) => NeonListView<NewsArticle>( builder: (final context, final sorted) => NeonListView(
scrollKey: 'news-articles', scrollKey: 'news-articles',
items: feeds.hasData ? sorted : null,
isLoading: articles.isLoading || feeds.isLoading, isLoading: articles.isLoading || feeds.isLoading,
error: articles.error ?? feeds.error, error: articles.error ?? feeds.error,
onRefresh: () async { onRefresh: () async {
@ -45,11 +44,16 @@ class _NewsArticlesViewState extends State<NewsArticlesView> {
widget.newsBloc.refresh(), widget.newsBloc.refresh(),
]); ]);
}, },
builder: (final context, final article) => _buildArticle( itemCount: feeds.hasData ? sorted.length : null,
context, itemBuilder: (final context, final index) {
article, final article = sorted[index];
feeds.requireData.singleWhere((final feed) => feed.id == article.feedId),
), return _buildArticle(
context,
article,
feeds.requireData.singleWhere((final feed) => feed.id == article.feedId),
);
},
topFixedChildren: [ topFixedChildren: [
StreamBuilder<FilterType>( StreamBuilder<FilterType>(
stream: widget.bloc.filterType, stream: widget.bloc.filterType,

9
packages/neon/neon_news/lib/widgets/feeds_view.dart
Unescape View File

@ -22,16 +22,15 @@ class NewsFeedsView extends StatelessWidget {
input: folders.hasData input: folders.hasData
? feeds.data?.where((final f) => folderID == null || f.folderId == folderID).toList() ? feeds.data?.where((final f) => folderID == null || f.folderId == folderID).toList()
: null, : null,
builder: (final context, final sorted) => NeonListView<NewsFeed>( builder: (final context, final sorted) => NeonListView(
scrollKey: 'news-feeds', scrollKey: 'news-feeds',
withFloatingActionButton: true,
items: sorted,
isLoading: feeds.isLoading || folders.isLoading, isLoading: feeds.isLoading || folders.isLoading,
error: feeds.error ?? folders.error, error: feeds.error ?? folders.error,
onRefresh: bloc.refresh, onRefresh: bloc.refresh,
builder: (final context, final feed) => _buildFeed( itemCount: sorted.length,
itemBuilder: (final context, final index) => _buildFeed(
context, context,
feed, sorted[index],
folders.requireData, folders.requireData,
), ),
), ),

10
packages/neon/neon_news/lib/widgets/folders_view.dart
Unescape View File

@ -26,14 +26,16 @@ class NewsFoldersView extends StatelessWidget {
return (folder, feedCount, unreadCount); return (folder, feedCount, unreadCount);
}).toList() }).toList()
: null, : null,
builder: (final context, final sorted) => NeonListView<FolderFeedsWrapper>( builder: (final context, final sorted) => NeonListView(
scrollKey: 'news-folders', scrollKey: 'news-folders',
withFloatingActionButton: true,
items: sorted,
isLoading: feeds.isLoading || folders.isLoading, isLoading: feeds.isLoading || folders.isLoading,
error: feeds.error ?? folders.error, error: feeds.error ?? folders.error,
onRefresh: bloc.refresh, onRefresh: bloc.refresh,
builder: _buildFolder, itemCount: sorted.length,
itemBuilder: (final context, final index) => _buildFolder(
context,
sorted[index],
),
), ),
), ),
), ),

9
packages/neon/neon_notes/lib/widgets/categories_view.dart
Unescape View File

@ -25,13 +25,16 @@ class NotesCategoriesView extends StatelessWidget {
), ),
) )
.toList(), .toList(),
builder: (final context, final sorted) => NeonListView<NoteCategory>( builder: (final context, final sorted) => NeonListView(
scrollKey: 'notes-categories', scrollKey: 'notes-categories',
items: sorted,
isLoading: notes.isLoading, isLoading: notes.isLoading,
error: notes.error, error: notes.error,
onRefresh: bloc.refresh, onRefresh: bloc.refresh,
builder: _buildCategory, itemCount: sorted.length,
itemBuilder: (final context, final index) => _buildCategory(
context,
sorted[index],
),
), ),
), ),
); );

7
packages/neon/neon_notes/lib/widgets/notes_view.dart
Unescape View File

@ -21,14 +21,13 @@ class NotesView extends StatelessWidget {
sortPropertyOption: bloc.options.notesSortPropertyOption, sortPropertyOption: bloc.options.notesSortPropertyOption,
sortBoxOrderOption: bloc.options.notesSortBoxOrderOption, sortBoxOrderOption: bloc.options.notesSortBoxOrderOption,
input: category != null ? notes.data?.where((final note) => note.category == category).toList() : notes.data, input: category != null ? notes.data?.where((final note) => note.category == category).toList() : notes.data,
builder: (final context, final sorted) => NeonListView<NotesNote>( builder: (final context, final sorted) => NeonListView(
scrollKey: 'notes-notes', scrollKey: 'notes-notes',
withFloatingActionButton: true,
items: sorted,
isLoading: notes.isLoading, isLoading: notes.isLoading,
error: notes.error, error: notes.error,
onRefresh: bloc.refresh, onRefresh: bloc.refresh,
builder: _buildNote, itemCount: sorted.length,
itemBuilder: (final context, final index) => _buildNote(context, sorted[index]),
), ),
), ),
); );

7
packages/neon/neon_notifications/lib/pages/main.dart
Unescape View File

@ -35,14 +35,13 @@ class _NotificationsMainPageState extends State<NotificationsMainPage> {
tooltip: AppLocalizations.of(context).notificationsDismissAll, tooltip: AppLocalizations.of(context).notificationsDismissAll,
child: const Icon(MdiIcons.checkAll), child: const Icon(MdiIcons.checkAll),
), ),
body: NeonListView<NotificationsNotification>( body: NeonListView(
scrollKey: 'notifications-notifications', scrollKey: 'notifications-notifications',
withFloatingActionButton: true,
items: notifications.data,
isLoading: notifications.isLoading, isLoading: notifications.isLoading,
error: notifications.error, error: notifications.error,
onRefresh: bloc.refresh, onRefresh: bloc.refresh,
builder: _buildNotification, itemCount: notifications.data?.length,
itemBuilder: (final context, final index) => _buildNotification(context, notifications.data![index]),
), ),
), ),
); );

Write Preview
Loading…
Cancel
Save