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

Merge pull request #81 from jld3103/cleanup/listviews 

neon: Cleanup listviews
pull/83/head
jld3103 3 years ago committed by GitHub
parent
c4d470efbb e5af3a1b4b
commit
7ed481a4f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 329 additions and 423 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 126
      packages/neon/lib/src/apps/files/widgets/browser_view.dart
  2. 1
      packages/neon/lib/src/apps/news/app.dart
  3. 56
      packages/neon/lib/src/apps/news/widgets/articles_view.dart
  4. 52
      packages/neon/lib/src/apps/news/widgets/feeds_view.dart
  5. 52
      packages/neon/lib/src/apps/news/widgets/folders_view.dart
  6. 1
      packages/neon/lib/src/apps/notes/app.dart
  7. 40
      packages/neon/lib/src/apps/notes/widgets/categories_view.dart
  8. 55
      packages/neon/lib/src/apps/notes/widgets/notes_view.dart
  9. 1
      packages/neon/lib/src/apps/notifications/app.dart
  10. 36
      packages/neon/lib/src/apps/notifications/pages/main.dart
  11. 6
      packages/neon/lib/src/utils/sort_box_builder.dart
  12. 54
      packages/neon/lib/src/widgets/custom_listview.dart

126
packages/neon/lib/src/apps/files/widgets/browser_view.dart
Unescape View File

@ -80,68 +80,17 @@ class _FilesBrowserViewState extends State<FilesBrowserView> {
child: const Icon(Icons.add),
)
: null,
body: RefreshIndicator(
onRefresh: () async {
widget.bloc.refresh();
},
child: Column(
children: [
ExceptionWidget(
filesError,
onRetry: () {
widget.bloc.refresh();
},
),
CustomLinearProgressIndicator(
visible: filesLoading,
),
Align(
alignment: Alignment.topLeft,
child: Container(
margin: const EdgeInsets.symmetric(
horizontal: 10,
),
child: Wrap(
crossAxisAlignment: WrapCrossAlignment.center,
children: <Widget>[
SizedBox(
height: 40,
child: InkWell(
onTap: () {
widget.bloc.setPath([]);
},
child: const Icon(Icons.house),
),
),
for (var i = 0; i < pathSnapshot.data!.length; i++) ...[
InkWell(
onTap: () {
widget.bloc.setPath(pathSnapshot.data!.sublist(0, i + 1));
},
child: Text(pathSnapshot.data![i]),
),
],
]
.intersperse(
const Icon(
Icons.keyboard_arrow_right,
size: 40,
),
)
.toList(),
),
),
),
if (filesData != null) ...[
Builder(
builder: (final context) {
final uploadTasksWithoutExistingFile = uploadTasksSnapshot.data!.where(
body: CustomListView<Widget>(
scrollKey: 'files-${pathSnapshot.data!.join('/')}',
withFloatingActionButton: true,
items: [
for (final uploadTask in filesData == null
? <UploadTask>[]
: uploadTasksSnapshot.data!.where(
(final task) => filesData
.where((final file) => _pathMatchesFile(task.path, file.name))
.isEmpty,
);
final widgets = [
for (final uploadTask in uploadTasksWithoutExistingFile) ...[
)) ...[
StreamBuilder<int>(
stream: uploadTask.progress,
builder: (final context, final uploadTaskProgressSnapshot) =>
@ -164,6 +113,7 @@ class _FilesBrowserViewState extends State<FilesBrowserView> {
),
),
],
if (filesData != null) ...[
for (final file in filesData) ...[
if (!widget.onlyShowDirectories || file.isDirectory) ...[
Builder(
@ -182,8 +132,7 @@ class _FilesBrowserViewState extends State<FilesBrowserView> {
stream: matchingDownloadTasks.isNotEmpty
? matchingDownloadTasks.first.progress
: Stream.value(null),
builder: (final context, final downloadTaskProgressSnapshot) =>
_buildFile(
builder: (final context, final downloadTaskProgressSnapshot) => _buildFile(
context: context,
details: FileDetails(
path: [...widget.bloc.path.value, file.name],
@ -196,10 +145,8 @@ class _FilesBrowserViewState extends State<FilesBrowserView> {
lastModified: matchingUploadTasks.isNotEmpty
? matchingUploadTasks.first.lastModified
: file.lastModified!,
hasPreview:
matchingUploadTasks.isNotEmpty ? null : file.hasPreview,
isFavorite:
matchingUploadTasks.isNotEmpty ? null : file.favorite,
hasPreview: matchingUploadTasks.isNotEmpty ? null : file.hasPreview,
isFavorite: matchingUploadTasks.isNotEmpty ? null : file.favorite,
),
uploadProgress: uploadTaskProgressSnapshot.data,
downloadProgress: downloadTaskProgressSnapshot.data,
@ -210,29 +157,58 @@ class _FilesBrowserViewState extends State<FilesBrowserView> {
),
],
],
];
return Expanded(
child: CustomListView<Widget>(
scrollKey: 'files-${pathSnapshot.data!.join('/')}',
withFloatingActionButton: true,
items: widgets,
],
],
isLoading: filesLoading,
error: filesError,
onRetry: () {
widget.bloc.refresh();
},
onRefresh: () async {
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>[
SizedBox(
height: 40,
child: InkWell(
onTap: () {
widget.bloc.setPath([]);
},
child: const Icon(Icons.house),
),
),
for (var i = 0; i < pathSnapshot.data!.length; i++) ...[
InkWell(
onTap: () {
widget.bloc.setPath(pathSnapshot.data!.sublist(0, i + 1));
},
child: Text(pathSnapshot.data![i]),
),
],
]
.intersperse(
const SizedBox(
height: 10,
const Icon(
Icons.keyboard_arrow_right,
size: 40,
),
)
.toList(),
),
),
),
],
),
),
),
),
),

1
packages/neon/lib/src/apps/news/app.dart
Unescape View File

@ -8,7 +8,6 @@ import 'package:flutter_html/flutter_html.dart';
import 'package:flutter_rx_bloc/flutter_rx_bloc.dart';
import 'package:html/dom.dart' as html_dom;
import 'package:html/parser.dart' as html_parser;
import 'package:intersperse/intersperse.dart';
import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
import 'package:neon/l10n/localizations.dart';
import 'package:neon/src/apps/news/blocs/articles.dart';

56
packages/neon/lib/src/apps/news/widgets/articles_view.dart
Unescape View File

@ -45,14 +45,16 @@ class _NewsArticlesViewState extends State<NewsArticlesView> {
) =>
Scaffold(
resizeToAvoidBottomInset: false,
body: RefreshIndicator(
onRefresh: () async {
widget.bloc.refresh();
},
child: Column(
children: <Widget>[
ExceptionWidget(
articlesError ?? feedsError,
body: SortBoxBuilder<ArticlesSortProperty, NewsArticle>(
sortBox: articlesSortBox,
sortPropertyOption: widget.bloc.newsBloc.options.articlesSortPropertyOption,
sortBoxOrderOption: widget.bloc.newsBloc.options.articlesSortBoxOrderOption,
input: articlesData,
builder: (final context, final sorted) => CustomListView<NewsArticle>(
scrollKey: 'news-articles',
items: feedsData == null ? null : sorted,
isLoading: articlesLoading || feedsLoading,
error: articlesError ?? feedsError,
onRetry: () {
if (articlesError != null) {
widget.bloc.refresh();
@ -61,10 +63,16 @@ class _NewsArticlesViewState extends State<NewsArticlesView> {
widget.bloc.refreshNewsBloc();
}
},
onRefresh: () async {
widget.bloc.refresh();
},
builder: (final context, final article) => _buildArticle(
context,
widget.bloc,
article,
feedsData!.singleWhere((final feed) => feed.id == article.feedId),
),
CustomLinearProgressIndicator(
visible: articlesLoading || feedsLoading,
),
topFixedChildren: [
RxBlocBuilder<NewsArticlesBloc, FilterType>(
bloc: widget.bloc,
state: (final bloc) => bloc.filterType,
@ -112,33 +120,7 @@ class _NewsArticlesViewState extends State<NewsArticlesView> {
),
),
),
if (articlesData != null && feedsData != null) ...[
Expanded(
child: SortBoxBuilder<ArticlesSortProperty, NewsArticle>(
sortBox: articlesSortBox,
sortPropertyOption: widget.bloc.newsBloc.options.articlesSortPropertyOption,
sortBoxOrderOption: widget.bloc.newsBloc.options.articlesSortBoxOrderOption,
input: articlesData,
builder: (final context, final sorted) => CustomListView<NewsArticle>(
scrollKey: 'news-articles',
items: sorted,
builder: (final context, final article) => _buildArticle(
context,
widget.bloc,
article,
feedsData.singleWhere((final feed) => feed.id == article.feedId),
),
),
),
),
],
]
.intersperse(
const SizedBox(
height: 10,
),
)
.toList(),
),
),
),

52
packages/neon/lib/src/apps/news/widgets/feeds_view.dart
Unescape View File

@ -48,52 +48,34 @@ class NewsFeedsView extends StatelessWidget {
},
child: const Icon(Icons.add),
),
body: RefreshIndicator(
onRefresh: () async {
bloc.refresh(
mainArticlesToo: true,
);
},
child: Column(
children: <Widget>[
ExceptionWidget(
feedsError ?? foldersError,
onRetry: () {
bloc.refresh(
mainArticlesToo: false,
);
},
),
CustomLinearProgressIndicator(
visible: feedsLoading || foldersLoading,
),
if (feedsData != null && foldersData != null) ...[
Expanded(
child: SortBoxBuilder<FeedsSortProperty, NewsFeed>(
body: SortBoxBuilder<FeedsSortProperty, NewsFeed>(
sortBox: feedsSortBox,
sortPropertyOption: bloc.options.feedsSortPropertyOption,
sortBoxOrderOption: bloc.options.feedsSortBoxOrderOption,
input: feedsData.where((final f) => folderID == null || f.folderId == folderID).toList(),
input: foldersData == null
? null
: feedsData?.where((final f) => folderID == null || f.folderId == folderID).toList(),
builder: (final context, final sorted) => CustomListView<NewsFeed>(
scrollKey: 'news-feeds',
withFloatingActionButton: true,
items: sorted,
isLoading: feedsLoading || foldersLoading,
error: feedsError ?? foldersError,
onRetry: () {
bloc.refresh(
mainArticlesToo: false,
);
},
onRefresh: () async {
bloc.refresh(
mainArticlesToo: true,
);
},
builder: (final context, final feed) => _buildFeed(
context,
feed,
foldersData,
),
),
),
),
],
]
.intersperse(
const SizedBox(
height: 10,
foldersData!,
),
)
.toList(),
),
),
),

52
packages/neon/lib/src/apps/news/widgets/folders_view.dart
Unescape View File

@ -43,33 +43,14 @@ class NewsFoldersView extends StatelessWidget {
final feedsLoading,
final _,
) =>
RefreshIndicator(
onRefresh: () async {
bloc.refresh(
mainArticlesToo: true,
);
},
child: Column(
children: <Widget>[
ExceptionWidget(
feedsError ?? foldersError,
onRetry: () {
bloc.refresh(
mainArticlesToo: false,
);
},
),
CustomLinearProgressIndicator(
visible: feedsLoading || foldersLoading,
),
if (feedsData != null && foldersData != null) ...[
Expanded(
child: SortBoxBuilder<FoldersSortProperty, FolderFeedsWrapper>(
SortBoxBuilder<FoldersSortProperty, FolderFeedsWrapper>(
sortBox: foldersSortBox,
sortPropertyOption: bloc.options.foldersSortPropertyOption,
sortBoxOrderOption: bloc.options.foldersSortBoxOrderOption,
input: foldersData
.map(
input: feedsData == null
? null
: foldersData
?.map(
(final folder) => FolderFeedsWrapper(
folder,
feedsData.where((final feed) => feed.folderId == folder.id).toList(),
@ -80,21 +61,22 @@ class NewsFoldersView extends StatelessWidget {
scrollKey: 'news-folders',
withFloatingActionButton: true,
items: sorted,
isLoading: feedsLoading || foldersLoading,
error: feedsError ?? foldersError,
onRetry: () {
bloc.refresh(
mainArticlesToo: false,
);
},
onRefresh: () async {
bloc.refresh(
mainArticlesToo: true,
);
},
builder: _buildFolder,
),
),
),
],
]
.intersperse(
const SizedBox(
height: 10,
),
)
.toList(),
),
),
),
),
);

1
packages/neon/lib/src/apps/notes/app.dart
Unescape View File

@ -5,7 +5,6 @@ import 'dart:convert';
import 'package:crypto/crypto.dart';
import 'package:flutter/material.dart';
import 'package:flutter_markdown/flutter_markdown.dart';
import 'package:intersperse/intersperse.dart';
import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
import 'package:neon/l10n/localizations.dart';
import 'package:neon/src/apps/notes/blocs/notes.dart';

40
packages/neon/lib/src/apps/notes/widgets/categories_view.dart
Unescape View File

@ -19,29 +19,12 @@ class NotesCategoriesView extends StatelessWidget {
final notesLoading,
final _,
) =>
RefreshIndicator(
onRefresh: () async {
bloc.refresh();
},
child: Column(
children: [
ExceptionWidget(
notesError,
onRetry: () {
bloc.refresh();
},
),
CustomLinearProgressIndicator(
visible: notesLoading,
),
if (notesData != null) ...[
Expanded(
child: SortBoxBuilder<CategoriesSortProperty, NoteCategory>(
SortBoxBuilder<CategoriesSortProperty, NoteCategory>(
sortBox: categoriesSortBox,
sortPropertyOption: bloc.options.categoriesSortPropertyOption,
sortBoxOrderOption: bloc.options.categoriesSortBoxOrderOption,
input: notesData
.map((final note) => note.category!)
?.map((final note) => note.category!)
.toSet()
.map(
(final category) => NoteCategory(
@ -53,20 +36,17 @@ class NotesCategoriesView extends StatelessWidget {
builder: (final context, final sorted) => CustomListView<NoteCategory>(
scrollKey: 'notes-categories',
items: sorted,
isLoading: notesLoading,
error: notesError,
onRetry: () {
bloc.refresh();
},
onRefresh: () async {
bloc.refresh();
},
builder: _buildCategory,
),
),
),
],
]
.intersperse(
const SizedBox(
height: 10,
),
)
.toList(),
),
),
);
Widget _buildCategory(

55
packages/neon/lib/src/apps/notes/widgets/notes_view.dart
Unescape View File

@ -41,54 +41,41 @@ class NotesView extends StatelessWidget {
},
child: const Icon(Icons.add),
),
body: RefreshIndicator(
onRefresh: () async {
bloc.refresh();
},
child: Column(
children: [
ExceptionWidget(
notesError,
onRetry: () {
bloc.refresh();
},
),
CustomLinearProgressIndicator(
visible: notesLoading,
),
if (notesData != null) ...[
Expanded(
child: SortBoxBuilder<NotesSortProperty, NotesNote>(
body: SortBoxBuilder<NotesSortProperty, NotesNote>(
sortBox: notesSortBox,
sortPropertyOption: bloc.options.notesSortPropertyOption,
sortBoxOrderOption: bloc.options.notesSortBoxOrderOption,
input: category != null
? notesData.where((final note) => note.favorite! && note.category == category).toList()
: notesData.where((final note) => note.favorite!).toList(),
? notesData?.where((final note) => note.favorite! && note.category == category).toList()
: notesData?.where((final note) => note.favorite!).toList(),
builder: (final context, final sortedFavorites) => SortBoxBuilder<NotesSortProperty, NotesNote>(
sortBox: notesSortBox,
sortPropertyOption: bloc.options.notesSortPropertyOption,
sortBoxOrderOption: bloc.options.notesSortBoxOrderOption,
input: category != null
? notesData.where((final note) => !note.favorite! && note.category == category).toList()
: notesData.where((final note) => !note.favorite!).toList(),
? notesData?.where((final note) => !note.favorite! && note.category == category).toList()
: notesData?.where((final note) => !note.favorite!).toList(),
builder: (final context, final sortedNonFavorites) => CustomListView<NotesNote>(
scrollKey: 'notes-notes',
withFloatingActionButton: true,
items: [...sortedFavorites, ...sortedNonFavorites],
builder: _buildNote,
),
),
),
),
items: [
if (sortedFavorites != null) ...[
...sortedFavorites,
],
]
.intersperse(
const SizedBox(
height: 10,
if (sortedNonFavorites != null) ...[
...sortedNonFavorites,
],
],
isLoading: notesLoading,
error: notesError,
onRetry: () {
bloc.refresh();
},
onRefresh: () async {
bloc.refresh();
},
builder: _buildNote,
),
)
.toList(),
),
),
),

1
packages/neon/lib/src/apps/notifications/app.dart
Unescape View File

@ -1,7 +1,6 @@
library notifications;
import 'package:flutter/material.dart';
import 'package:intersperse/intersperse.dart';
import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
import 'package:neon/l10n/localizations.dart';
import 'package:neon/src/apps/notifications/blocs/notifications.dart';

36
packages/neon/lib/src/apps/notifications/pages/main.dart
Unescape View File

@ -42,41 +42,21 @@ class _NotificationsMainPageState extends State<NotificationsMainPage> {
},
child: const Icon(MdiIcons.checkAll),
),
body: RefreshIndicator(
onRefresh: () async {
body: CustomListView<NotificationsNotification>(
scrollKey: 'notifications-notifications',
withFloatingActionButton: true,
items: notificationsData,
isLoading: notificationsLoading,
error: notificationsError,
onRetry: () {
widget.bloc.refresh();
},
child: Column(
children: [
ExceptionWidget(
notificationsError,
onRetry: () {
onRefresh: () async {
widget.bloc.refresh();
},
),
CustomLinearProgressIndicator(
visible: notificationsLoading,
),
if (notificationsData != null) ...[
Expanded(
child: CustomListView<NotificationsNotification>(
scrollKey: 'notifications-notifications',
withFloatingActionButton: true,
items: notificationsData,
builder: _buildNotification,
),
),
],
]
.intersperse(
const SizedBox(
height: 10,
),
)
.toList(),
),
),
),
);
Widget _buildNotification(

6
packages/neon/lib/src/utils/sort_box_builder.dart
Unescape View File

@ -13,8 +13,8 @@ class SortBoxBuilder<T extends Enum, R> extends StatelessWidget {
final SortBox<T, R> sortBox;
final SelectOption<T> sortPropertyOption;
final SelectOption<SortBoxOrder> sortBoxOrderOption;
final List<R> input;
final Widget Function(BuildContext, List<R>) builder;
final List<R>? input;
final Widget Function(BuildContext, List<R>?) builder;
@override
Widget build(final BuildContext context) => OptionBuilder<T>(
@ -25,7 +25,7 @@ class SortBoxBuilder<T extends Enum, R> extends StatelessWidget {
? Container()
: builder(
context,
sortBox.sort(input, Box(property, order)),
input == null ? null : sortBox.sort(input!, Box(property, order)),
),
),
);

54
packages/neon/lib/src/widgets/custom_listview.dart
Unescape View File

@ -3,27 +3,67 @@ part of '../neon.dart';
class CustomListView<T> extends StatelessWidget {
const CustomListView({
required this.items,
required this.isLoading,
required this.error,
required this.onRetry,
required this.onRefresh,
required this.builder,
this.scrollKey,
this.withFloatingActionButton = false,
this.topFixedChildren,
this.topScrollingChildren,
super.key,
});
final List<T> items;
final List<T>? items;
final bool isLoading;
final dynamic error;
final Function() onRetry;
final Future Function() onRefresh;
final Widget Function(BuildContext, T data) builder;
final String? scrollKey;
final bool withFloatingActionButton;
final List<Widget>? topFixedChildren;
final List<Widget>? topScrollingChildren;
@override
Widget build(final BuildContext context) => Scrollbar(
child: ListView.separated(
Widget build(final BuildContext context) => RefreshIndicator(
onRefresh: onRefresh,
child: Column(
children: [
if (topFixedChildren != null) ...[
...topFixedChildren!,
],
CustomLinearProgressIndicator(
margin: const EdgeInsets.symmetric(
horizontal: 10,
vertical: 5,
),
visible: isLoading,
),
Expanded(
child: Scrollbar(
child: ListView(
key: scrollKey != null ? PageStorageKey<String>(scrollKey!) : null,
padding: withFloatingActionButton ? const EdgeInsets.only(bottom: 88) : null,
separatorBuilder: (final context, final index) => const SizedBox(
height: 10,
children: [
if (topScrollingChildren != null) ...[
...topScrollingChildren!,
],
ExceptionWidget(
error,
onRetry: onRetry,
),
if (items != null) ...[
for (final item in items!) ...[
builder(context, item),
],
],
],
),
),
),
itemCount: items.length,
itemBuilder: (final context, final index) => builder(context, items[index]),
],
),
);
}

Write Preview
Loading…
Cancel
Save