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

Merge pull request #146 from provokateurin/cleanup/blocs 

Cleanup blocs
pull/147/head
Kate 3 years ago committed by GitHub
parent
60d134dee4 00d002e60a
commit
ac453ee2f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 46 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. 7
      packages/neon/lib/src/apps/files/widgets/browser_view.dart
  2. 44
      packages/neon/lib/src/apps/news/blocs/news.dart
  3. 4
      packages/neon/lib/src/apps/news/dialogs/add_feed.dart
  4. 10
      packages/neon/lib/src/apps/news/widgets/articles_view.dart
  5. 7
      packages/neon/lib/src/apps/news/widgets/feeds_view.dart
  6. 7
      packages/neon/lib/src/apps/news/widgets/folders_view.dart
  7. 4
      packages/neon/lib/src/apps/notes/dialogs/create_note.dart
  8. 4
      packages/neon/lib/src/apps/notes/dialogs/select_category.dart
  9. 7
      packages/neon/lib/src/apps/notes/widgets/categories_view.dart
  10. 7
      packages/neon/lib/src/apps/notes/widgets/notes_view.dart
  11. 7
      packages/neon/lib/src/apps/notifications/pages/main.dart
  12. 4
      packages/neon/lib/src/pages/account_settings.dart
  13. 12
      packages/neon/lib/src/pages/home.dart
  14. 14
      packages/neon/lib/src/pages/login.dart
  15. 4
      packages/neon/lib/src/widgets/account_tile.dart
  16. 4
      packages/neon/lib/src/widgets/custom_listview.dart

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

@ -141,12 +141,7 @@ class _FilesBrowserViewState extends State<FilesBrowserView> {
], ],
isLoading: files.loading, isLoading: files.loading,
error: files.error, error: files.error,
onRetry: () async { onRefresh: widget.bloc.refresh,
await widget.bloc.refresh();
},
onRefresh: () async {
await widget.bloc.refresh();
},
builder: (final context, final widget) => widget, builder: (final context, final widget) => widget,
topScrollingChildren: [ topScrollingChildren: [
Align( Align(

44
packages/neon/lib/src/apps/news/blocs/news.dart
Unescape View File

@ -95,27 +95,29 @@ class NewsBloc extends InteractiveBloc implements NewsBlocEvents, NewsBlocStates
@override @override
Future refresh() async { Future refresh() async {
await requestManager.wrapNextcloud<List<NewsFolder>, NewsListFolders>( await Future.wait([
client.id, requestManager.wrapNextcloud<List<NewsFolder>, NewsListFolders>(
'news-folders', client.id,
folders, 'news-folders',
() async => client.news.listFolders(), folders,
(final response) => response.folders, () async => client.news.listFolders(),
); (final response) => response.folders,
await requestManager.wrapNextcloud<List<NewsFeed>, NewsListFeeds>( ),
client.id, requestManager.wrapNextcloud<List<NewsFeed>, NewsListFeeds>(
'news-feeds', client.id,
feeds, 'news-feeds',
() async => client.news.listFeeds(), feeds,
(final response) { () async => client.news.listFeeds(),
// This is a bit ugly, but IDGAF right now (final response) {
if (response.newestItemId != null) { // This is a bit ugly, but IDGAF right now
_newestItemId = response.newestItemId!; if (response.newestItemId != null) {
} _newestItemId = response.newestItemId!;
return response.feeds; }
}, return response.feeds;
); },
await mainArticlesBloc.reload(); ),
mainArticlesBloc.reload(),
]);
} }
@override @override

4
packages/neon/lib/src/apps/news/dialogs/add_feed.dart
Unescape View File

@ -68,9 +68,7 @@ class _NewsAddFeedDialogState extends State<NewsAddFeedDialog> {
Center( Center(
child: ExceptionWidget( child: ExceptionWidget(
folders.error, folders.error,
onRetry: () async { onRetry: widget.bloc.refresh,
await widget.bloc.refresh();
},
), ),
), ),
Center( Center(

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

@ -41,13 +41,11 @@ class _NewsArticlesViewState extends State<NewsArticlesView> {
items: feeds.data == null ? null : sorted, items: feeds.data == null ? null : sorted,
isLoading: articles.loading || feeds.loading, isLoading: articles.loading || feeds.loading,
error: articles.error ?? feeds.error, error: articles.error ?? feeds.error,
onRetry: () async {
await widget.bloc.refresh();
await widget.newsBloc.refresh();
},
onRefresh: () async { onRefresh: () async {
await widget.bloc.refresh(); await Future.wait([
await widget.newsBloc.refresh(); widget.bloc.refresh(),
widget.newsBloc.refresh(),
]);
}, },
builder: (final context, final article) => _buildArticle( builder: (final context, final article) => _buildArticle(
context, context,

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

@ -45,12 +45,7 @@ class NewsFeedsView extends StatelessWidget {
items: sorted, items: sorted,
isLoading: feeds.loading || folders.loading, isLoading: feeds.loading || folders.loading,
error: feeds.error ?? folders.error, error: feeds.error ?? folders.error,
onRetry: () async { onRefresh: bloc.refresh,
await bloc.refresh();
},
onRefresh: () async {
await bloc.refresh();
},
builder: (final context, final feed) => _buildFeed( builder: (final context, final feed) => _buildFeed(
context, context,
feed, feed,

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

@ -47,12 +47,7 @@ class NewsFoldersView extends StatelessWidget {
items: sorted, items: sorted,
isLoading: feeds.loading || folders.loading, isLoading: feeds.loading || folders.loading,
error: feeds.error ?? folders.error, error: feeds.error ?? folders.error,
onRetry: () async { onRefresh: bloc.refresh,
await bloc.refresh();
},
onRefresh: () async {
await bloc.refresh();
},
builder: _buildFolder, builder: _buildFolder,
), ),
), ),

4
packages/neon/lib/src/apps/notes/dialogs/create_note.dart
Unescape View File

@ -51,9 +51,7 @@ class _NotesCreateNoteDialogState extends State<NotesCreateNoteDialog> {
Center( Center(
child: ExceptionWidget( child: ExceptionWidget(
notes.error, notes.error,
onRetry: () async { onRetry: widget.bloc.refresh,
await widget.bloc.refresh();
},
), ),
), ),
Center( Center(

4
packages/neon/lib/src/apps/notes/dialogs/select_category.dart
Unescape View File

@ -39,9 +39,7 @@ class _NotesSelectCategoryDialogState extends State<NotesSelectCategoryDialog> {
Center( Center(
child: ExceptionWidget( child: ExceptionWidget(
notes.error, notes.error,
onRetry: () async { onRetry: widget.bloc.refresh,
await widget.bloc.refresh();
},
), ),
), ),
Center( Center(

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

@ -30,12 +30,7 @@ class NotesCategoriesView extends StatelessWidget {
items: sorted, items: sorted,
isLoading: notes.loading, isLoading: notes.loading,
error: notes.error, error: notes.error,
onRetry: () async { onRefresh: bloc.refresh,
await bloc.refresh();
},
onRefresh: () async {
await bloc.refresh();
},
builder: _buildCategory, builder: _buildCategory,
), ),
), ),

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

@ -60,12 +60,7 @@ class NotesView extends StatelessWidget {
], ],
isLoading: notes.loading, isLoading: notes.loading,
error: notes.error, error: notes.error,
onRetry: () async { onRefresh: bloc.refresh,
await bloc.refresh();
},
onRefresh: () async {
await bloc.refresh();
},
builder: _buildNote, builder: _buildNote,
), ),
), ),

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

@ -39,12 +39,7 @@ class _NotificationsMainPageState extends State<NotificationsMainPage> {
items: notifications.data, items: notifications.data,
isLoading: notifications.loading, isLoading: notifications.loading,
error: notifications.error, error: notifications.error,
onRetry: () async { onRefresh: widget.bloc.refresh,
await widget.bloc.refresh();
},
onRefresh: () async {
await widget.bloc.refresh();
},
builder: _buildNotification, builder: _buildNotification,
), ),
), ),

4
packages/neon/lib/src/pages/account_settings.dart
Unescape View File

@ -74,9 +74,7 @@ class AccountSettingsPage extends StatelessWidget {
], ],
ExceptionWidget( ExceptionWidget(
userDetails.error, userDetails.error,
onRetry: () async { onRetry: _userDetailsBloc.refresh,
await _userDetailsBloc.refresh();
},
), ),
CustomLinearProgressIndicator( CustomLinearProgressIndicator(
visible: userDetails.loading, visible: userDetails.loading,

12
packages/neon/lib/src/pages/home.dart
Unescape View File

@ -254,9 +254,7 @@ class _HomePageState extends State<HomePage> {
] else ...[ ] else ...[
ExceptionWidget( ExceptionWidget(
capabilities.error, capabilities.error,
onRetry: () async { onRetry: _capabilitiesBloc.refresh,
await _capabilitiesBloc.refresh();
},
), ),
CustomLinearProgressIndicator( CustomLinearProgressIndicator(
visible: capabilities.loading, visible: capabilities.loading,
@ -303,9 +301,7 @@ class _HomePageState extends State<HomePage> {
ExceptionWidget( ExceptionWidget(
appImplementations.error, appImplementations.error,
onlyIcon: isQuickBar, onlyIcon: isQuickBar,
onRetry: () async { onRetry: _appsBloc.refresh,
await _appsBloc.refresh();
},
), ),
CustomLinearProgressIndicator( CustomLinearProgressIndicator(
visible: appImplementations.loading, visible: appImplementations.loading,
@ -539,9 +535,7 @@ class _HomePageState extends State<HomePage> {
children: [ children: [
ExceptionWidget( ExceptionWidget(
appImplementations.error, appImplementations.error,
onRetry: () async { onRetry: _appsBloc.refresh,
await _appsBloc.refresh();
},
), ),
if (appImplementations.data != null) ...[ if (appImplementations.data != null) ...[
if (appImplementations.data!.isEmpty) ...[ if (appImplementations.data!.isEmpty) ...[

14
packages/neon/lib/src/pages/login.dart
Unescape View File

@ -66,7 +66,7 @@ class _LoginPageState extends State<LoginPage> {
for (final a in accountsBloc.accounts.value) { for (final a in accountsBloc.accounts.value) {
if (a.id == account.id) { if (a.id == account.id) {
ExceptionWidget.showSnackbar(context, AppLocalizations.of(context).errorAccountAlreadyExists); ExceptionWidget.showSnackbar(context, AppLocalizations.of(context).errorAccountAlreadyExists);
_loginBloc.setServerURL(result.server); await _loginBloc.refresh();
return; return;
} }
} }
@ -168,9 +168,7 @@ class _LoginPageState extends State<LoginPage> {
height: 10, height: 10,
), ),
ElevatedButton( ElevatedButton(
onPressed: () { onPressed: _loginBloc.refresh,
_loginBloc.setServerURL(serverURLSnapshot.data!);
},
child: Text(AppLocalizations.of(context).loginOpenAgain), child: Text(AppLocalizations.of(context).loginOpenAgain),
), ),
], ],
@ -224,17 +222,13 @@ class _LoginPageState extends State<LoginPage> {
if (serverConnectionStateSnapshot.data == ServerConnectionState.unreachable) ...[ if (serverConnectionStateSnapshot.data == ServerConnectionState.unreachable) ...[
ExceptionWidget( ExceptionWidget(
AppLocalizations.of(context).errorUnableToReachServer, AppLocalizations.of(context).errorUnableToReachServer,
onRetry: () { onRetry: _loginBloc.refresh,
_loginBloc.setServerURL(serverURLSnapshot.data);
},
), ),
], ],
if (serverConnectionStateSnapshot.data == ServerConnectionState.maintenanceMode) ...[ if (serverConnectionStateSnapshot.data == ServerConnectionState.maintenanceMode) ...[
ExceptionWidget( ExceptionWidget(
AppLocalizations.of(context).errorServerInMaintenanceMode, AppLocalizations.of(context).errorServerInMaintenanceMode,
onRetry: () { onRetry: _loginBloc.refresh,
_loginBloc.setServerURL(serverURLSnapshot.data);
},
), ),
], ],
], ],

4
packages/neon/lib/src/widgets/account_tile.dart
Unescape View File

@ -71,9 +71,7 @@ class AccountTile extends StatelessWidget {
userDetails.error!, userDetails.error!,
onlyIcon: true, onlyIcon: true,
iconSize: 24, iconSize: 24,
onRetry: () async { onRetry: userDetailsBloc.refresh,
await userDetailsBloc.refresh();
},
), ),
], ],
], ],

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

@ -5,7 +5,6 @@ class CustomListView<T> extends StatelessWidget {
required this.items, required this.items,
required this.isLoading, required this.isLoading,
required this.error, required this.error,
required this.onRetry,
required this.onRefresh, required this.onRefresh,
required this.builder, required this.builder,
this.scrollKey, this.scrollKey,
@ -18,7 +17,6 @@ class CustomListView<T> extends StatelessWidget {
final List<T>? items; final List<T>? items;
final bool isLoading; final bool isLoading;
final dynamic error; final dynamic error;
final Function() onRetry;
final Future Function() onRefresh; final Future Function() onRefresh;
final Widget Function(BuildContext, T data) builder; final Widget Function(BuildContext, T data) builder;
final String? scrollKey; final String? scrollKey;
@ -52,7 +50,7 @@ class CustomListView<T> extends StatelessWidget {
], ],
ExceptionWidget( ExceptionWidget(
error, error,
onRetry: onRetry, onRetry: onRefresh,
), ),
if (items != null) ...[ if (items != null) ...[
for (final item in items!) ...[ for (final item in items!) ...[

Write Preview
Loading…
Cancel
Save