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

neon_news: get blocs via context

pull/377/head
Nikolas Rimikis 2 years ago
parent
b003ab9df5
commit
d54fa66e70
No known key found for this signature in database
GPG Key ID: 85ED1DE9786A4FF2
11 changed files with 287 additions and 281 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. 8
      packages/neon/neon_news/lib/dialogs/add_feed.dart
  2. 8
      packages/neon/neon_news/lib/pages/article.dart
  3. 9
      packages/neon/neon_news/lib/pages/feed.dart
  4. 4
      packages/neon/neon_news/lib/pages/folder.dart
  5. 21
      packages/neon/neon_news/lib/pages/main.dart
  6. 50
      packages/neon/neon_news/lib/widgets/articles_view.dart
  7. 9
      packages/neon/neon_news/lib/widgets/feed_floating_action_button.dart
  8. 16
      packages/neon/neon_news/lib/widgets/feeds_view.dart
  9. 9
      packages/neon/neon_news/lib/widgets/folder_floating_action_button.dart
  10. 22
      packages/neon/neon_news/lib/widgets/folder_view.dart
  11. 12
      packages/neon/neon_news/lib/widgets/folders_view.dart

8
packages/neon/neon_news/lib/dialogs/add_feed.dart
Unescape View File

@ -2,12 +2,10 @@ part of '../neon_news.dart';
class NewsAddFeedDialog extends StatefulWidget {
const NewsAddFeedDialog({
required this.bloc,
this.folderID,
super.key,
});
final NewsBloc bloc;
final int? folderID;
@override
@ -17,6 +15,7 @@ class NewsAddFeedDialog extends StatefulWidget {
class _NewsAddFeedDialogState extends State<NewsAddFeedDialog> {
final formKey = GlobalKey<FormState>();
final controller = TextEditingController();
late NewsBloc bloc;
NextcloudNewsFolder? folder;
@ -30,6 +29,7 @@ class _NewsAddFeedDialogState extends State<NewsAddFeedDialog> {
void initState() {
super.initState();
bloc = Provider.of<NewsBloc>(context, listen: false);
unawaited(
Clipboard.getData(Clipboard.kTextPlain).then((final clipboardContent) {
if (clipboardContent != null && clipboardContent.text != null) {
@ -44,7 +44,7 @@ class _NewsAddFeedDialogState extends State<NewsAddFeedDialog> {
@override
Widget build(final BuildContext context) => ResultBuilder<List<NextcloudNewsFolder>>(
stream: widget.bloc.folders,
stream: bloc.folders,
builder: (final context, final folders) => NeonDialog(
title: Text(AppLocalizations.of(context).feedAdd),
children: [
@ -69,7 +69,7 @@ class _NewsAddFeedDialogState extends State<NewsAddFeedDialog> {
Center(
child: NeonException(
folders.error,
onRetry: widget.bloc.refresh,
onRetry: bloc.refresh,
),
),
Center(

8
packages/neon/neon_news/lib/pages/article.dart
Unescape View File

@ -3,7 +3,6 @@ part of '../neon_news.dart';
class NewsArticlePage extends StatefulWidget {
const NewsArticlePage({
required this.bloc,
required this.articlesBloc,
required this.useWebView,
this.bodyData,
this.url,
@ -12,7 +11,6 @@ class NewsArticlePage extends StatefulWidget {
assert(!useWebView || url != null, 'url has to be set when using a WebView');
final NewsArticleBloc bloc;
final NewsArticlesBloc articlesBloc;
final bool useWebView;
final String? bodyData;
final String? url;
@ -22,6 +20,8 @@ class NewsArticlePage extends StatefulWidget {
}
class _NewsArticlePageState extends State<NewsArticlePage> {
late NewsArticlesBloc articlesBloc;
WebViewController? _webviewController;
Timer? _markAsReadTimer;
@ -29,6 +29,8 @@ class _NewsArticlePageState extends State<NewsArticlePage> {
void initState() {
super.initState();
articlesBloc = Provider.of<NewsBloc>(context, listen: false).mainArticlesBloc;
widget.bloc.errors.listen((final error) {
NeonException.showSnackbar(context, error);
});
@ -67,7 +69,7 @@ class _NewsArticlePageState extends State<NewsArticlePage> {
Future _startMarkAsReadTimer() async {
if (await widget.bloc.unread.first) {
if (widget.articlesBloc.options.articleDisableMarkAsReadTimeoutOption.value) {
if (articlesBloc.options.articleDisableMarkAsReadTimeoutOption.value) {
widget.bloc.markArticleAsRead();
} else {
_markAsReadTimer = Timer(const Duration(seconds: 3), () async {

9
packages/neon/neon_news/lib/pages/feed.dart
Unescape View File

@ -2,16 +2,17 @@ part of '../neon_news.dart';
class NewsFeedPage extends StatelessWidget {
const NewsFeedPage({
required this.bloc,
required this.feed,
super.key,
});
final NewsBloc bloc;
final NextcloudNewsFeed feed;
@override
Widget build(final BuildContext context) => Scaffold(
Widget build(final BuildContext context) {
final bloc = Provider.of<NewsBloc>(context, listen: false);
return Scaffold(
resizeToAvoidBottomInset: false,
appBar: AppBar(
title: Text(feed.title),
@ -25,7 +26,7 @@ class NewsFeedPage extends StatelessWidget {
id: feed.id,
listType: ListType.feed,
),
newsBloc: bloc,
),
);
}
}

4
packages/neon/neon_news/lib/pages/folder.dart
Unescape View File

@ -2,12 +2,10 @@ part of '../neon_news.dart';
class NewsFolderPage extends StatelessWidget {
const NewsFolderPage({
required this.bloc,
required this.folder,
super.key,
});
final NewsBloc bloc;
final NextcloudNewsFolder folder;
@override
@ -17,11 +15,9 @@ class NewsFolderPage extends StatelessWidget {
title: Text(folder.name),
),
body: NewsFolderView(
bloc: bloc,
folder: folder,
),
floatingActionButton: NewsFeedFloatingActionButton(
bloc: bloc,
folderID: folder.id,
),
);

21
packages/neon/neon_news/lib/pages/main.dart
Unescape View File

@ -25,23 +25,16 @@ class _NewsMainPageState extends State<NewsMainPage> {
@override
Widget build(final BuildContext context) {
final views = [
NewsArticlesView(
bloc: bloc.mainArticlesBloc,
newsBloc: bloc,
),
NewsFoldersView(
bloc: bloc,
),
NewsFeedsView(
bloc: bloc,
),
const views = [
NewsArticlesView(),
NewsFoldersView(),
NewsFeedsView(),
];
final floatingActionButtons = [
const floatingActionButtons = [
null,
NewsFolderFloatingActionButton(bloc: bloc),
NewsFeedFloatingActionButton(bloc: bloc),
NewsFolderFloatingActionButton(),
NewsFeedFloatingActionButton(),
];
return Scaffold(

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

@ -2,37 +2,41 @@ part of '../neon_news.dart';
class NewsArticlesView extends StatefulWidget {
const NewsArticlesView({
required this.bloc,
required this.newsBloc,
this.bloc,
super.key,
});
final NewsArticlesBloc bloc;
final NewsBloc newsBloc;
final NewsArticlesBloc? bloc;
@override
State<NewsArticlesView> createState() => _NewsArticlesViewState();
}
class _NewsArticlesViewState extends State<NewsArticlesView> {
late NewsBloc newsBloc;
late NewsArticlesBloc bloc;
@override
void initState() {
super.initState();
widget.bloc.errors.listen((final error) {
newsBloc = Provider.of<NewsBloc>(context, listen: false);
bloc = widget.bloc ?? newsBloc.mainArticlesBloc;
bloc.errors.listen((final error) {
NeonException.showSnackbar(context, error);
});
}
@override
Widget build(final BuildContext context) => ResultBuilder<List<NextcloudNewsFeed>>(
stream: widget.newsBloc.feeds,
stream: newsBloc.feeds,
builder: (final context, final feeds) => ResultBuilder<List<NextcloudNewsArticle>>(
stream: widget.bloc.articles,
stream: bloc.articles,
builder: (final context, final articles) => SortBoxBuilder<ArticlesSortProperty, NextcloudNewsArticle>(
sortBox: articlesSortBox,
sortPropertyOption: widget.newsBloc.options.articlesSortPropertyOption,
sortBoxOrderOption: widget.newsBloc.options.articlesSortBoxOrderOption,
sortPropertyOption: newsBloc.options.articlesSortPropertyOption,
sortBoxOrderOption: newsBloc.options.articlesSortBoxOrderOption,
input: articles.data,
builder: (final context, final sorted) => NeonListView<NextcloudNewsArticle>(
scrollKey: 'news-articles',
@ -41,8 +45,8 @@ class _NewsArticlesViewState extends State<NewsArticlesView> {
error: articles.error ?? feeds.error,
onRefresh: () async {
await Future.wait([
widget.bloc.refresh(),
widget.newsBloc.refresh(),
bloc.refresh(),
newsBloc.refresh(),
]);
},
builder: (final context, final article) => _buildArticle(
@ -52,7 +56,7 @@ class _NewsArticlesViewState extends State<NewsArticlesView> {
),
topFixedChildren: [
StreamBuilder<FilterType>(
stream: widget.bloc.filterType,
stream: bloc.filterType,
builder: (final context, final selectedFilterTypeSnapshot) => Container(
margin: const EdgeInsets.symmetric(horizontal: 15),
child: DropdownButton<FilterType>(
@ -61,7 +65,7 @@ class _NewsArticlesViewState extends State<NewsArticlesView> {
items: [
FilterType.all,
FilterType.unread,
if (widget.bloc.listType == null) ...[
if (bloc.listType == null) ...[
FilterType.starred,
],
].map<DropdownMenuItem<FilterType>>(
@ -87,7 +91,7 @@ class _NewsArticlesViewState extends State<NewsArticlesView> {
},
).toList(),
onChanged: (final value) {
widget.bloc.setFilterType(value!);
bloc.setFilterType(value!);
},
),
),
@ -160,9 +164,9 @@ class _NewsArticlesViewState extends State<NewsArticlesView> {
trailing: IconButton(
onPressed: () {
if (article.starred) {
widget.bloc.unstarArticle(article);
bloc.unstarArticle(article);
} else {
widget.bloc.starArticle(article);
bloc.starArticle(article);
}
},
tooltip:
@ -174,13 +178,13 @@ class _NewsArticlesViewState extends State<NewsArticlesView> {
),
onLongPress: () {
if (article.unread) {
widget.bloc.markArticleAsRead(article);
bloc.markArticleAsRead(article);
} else {
widget.bloc.markArticleAsUnread(article);
bloc.markArticleAsUnread(article);
}
},
onTap: () async {
final viewType = widget.newsBloc.options.articleViewTypeOption.value;
final viewType = newsBloc.options.articleViewTypeOption.value;
String? bodyData;
try {
bodyData = _fixArticleBody(article.body);
@ -195,10 +199,9 @@ class _NewsArticlesViewState extends State<NewsArticlesView> {
builder: (final context) => NewsArticlePage(
bloc: NewsArticleBloc(
Provider.of<AccountsBloc>(context, listen: false).activeAccount.value!.client,
widget.bloc,
bloc,
article,
),
articlesBloc: widget.bloc,
useWebView: false,
bodyData: bodyData,
url: article.url,
@ -213,10 +216,9 @@ class _NewsArticlesViewState extends State<NewsArticlesView> {
builder: (final context) => NewsArticlePage(
bloc: NewsArticleBloc(
Provider.of<AccountsBloc>(context, listen: false).activeAccount.value!.client,
widget.bloc,
bloc,
article,
),
articlesBloc: widget.bloc,
useWebView: true,
url: article.url,
),
@ -224,7 +226,7 @@ class _NewsArticlesViewState extends State<NewsArticlesView> {
);
} else {
if (article.unread) {
widget.bloc.markArticleAsRead(article);
bloc.markArticleAsRead(article);
}
if (article.url != null) {
await launchUrlString(

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

@ -2,21 +2,21 @@ part of '../neon_news.dart';
class NewsFeedFloatingActionButton extends StatelessWidget {
const NewsFeedFloatingActionButton({
required this.bloc,
this.folderID,
super.key,
});
final NewsBloc bloc;
final int? folderID;
@override
Widget build(final BuildContext context) => FloatingActionButton(
Widget build(final BuildContext context) {
final bloc = Provider.of<NewsBloc>(context, listen: false);
return FloatingActionButton(
onPressed: () async {
final result = await showDialog<List>(
context: context,
builder: (final context) => NewsAddFeedDialog(
bloc: bloc,
folderID: folderID,
),
);
@ -28,3 +28,4 @@ class NewsFeedFloatingActionButton extends StatelessWidget {
child: const Icon(Icons.add),
);
}
}

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

@ -2,16 +2,17 @@ part of '../neon_news.dart';
class NewsFeedsView extends StatelessWidget {
const NewsFeedsView({
required this.bloc,
this.folderID,
super.key,
});
final NewsBloc bloc;
final int? folderID;
@override
Widget build(final BuildContext context) => ResultBuilder<List<NextcloudNewsFolder>>(
Widget build(final BuildContext context) {
final bloc = Provider.of<NewsBloc>(context, listen: false);
return ResultBuilder<List<NextcloudNewsFolder>>(
stream: bloc.folders,
builder: (final context, final folders) => ResultBuilder<List<NextcloudNewsFeed>>(
stream: bloc.feeds,
@ -38,13 +39,16 @@ class NewsFeedsView extends StatelessWidget {
),
),
);
}
Widget _buildFeed(
final BuildContext context,
final NextcloudNewsFeed feed,
final List<NextcloudNewsFolder> folders,
) =>
ListTile(
) {
final bloc = Provider.of<NewsBloc>(context, listen: false);
return ListTile(
title: Text(
feed.title,
style: feed.unreadCount! == 0
@ -157,7 +161,6 @@ class NewsFeedsView extends StatelessWidget {
await Navigator.of(context).push(
MaterialPageRoute(
builder: (final context) => NewsFeedPage(
bloc: bloc,
feed: feed,
),
),
@ -165,6 +168,7 @@ class NewsFeedsView extends StatelessWidget {
},
);
}
}
enum NewsFeedAction {
showURL,

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

@ -2,14 +2,14 @@ part of '../neon_news.dart';
class NewsFolderFloatingActionButton extends StatelessWidget {
const NewsFolderFloatingActionButton({
required this.bloc,
super.key,
});
final NewsBloc bloc;
@override
Widget build(final BuildContext context) => FloatingActionButton(
Widget build(final BuildContext context) {
final bloc = Provider.of<NewsBloc>(context, listen: false);
return FloatingActionButton(
onPressed: () async {
final result = await showDialog<String>(
context: context,
@ -23,3 +23,4 @@ class NewsFolderFloatingActionButton extends StatelessWidget {
child: const Icon(Icons.add),
);
}
}

22
packages/neon/neon_news/lib/widgets/folder_view.dart
Unescape View File

@ -2,12 +2,10 @@ part of '../neon_news.dart';
class NewsFolderView extends StatefulWidget {
const NewsFolderView({
required this.bloc,
required this.folder,
super.key,
});
final NewsBloc bloc;
final NextcloudNewsFolder folder;
@override
@ -15,9 +13,17 @@ class NewsFolderView extends StatefulWidget {
}
class _NewsFolderViewState extends State<NewsFolderView> {
late final option = widget.bloc.options.defaultFolderViewTypeOption;
late NewsBloc bloc;
late final option = bloc.options.defaultFolderViewTypeOption;
late DefaultFolderViewType _viewType = option.value;
@override
void initState() {
bloc = Provider.of<NewsBloc>(context, listen: false);
super.initState();
}
@override
Widget build(final BuildContext context) => Column(
children: [
@ -45,17 +51,15 @@ class _NewsFolderViewState extends State<NewsFolderView> {
child: _viewType == DefaultFolderViewType.articles
? NewsArticlesView(
bloc: NewsArticlesBloc(
widget.bloc,
widget.bloc.options,
widget.bloc.requestManager,
widget.bloc.client,
bloc,
bloc.options,
bloc.requestManager,
bloc.client,
id: widget.folder.id,
listType: ListType.folder,
),
newsBloc: widget.bloc,
)
: NewsFeedsView(
bloc: widget.bloc,
folderID: widget.folder.id,
),
),

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

@ -2,14 +2,14 @@ part of '../neon_news.dart';
class NewsFoldersView extends StatelessWidget {
const NewsFoldersView({
required this.bloc,
super.key,
});
final NewsBloc bloc;
@override
Widget build(final BuildContext context) => ResultBuilder<List<NextcloudNewsFolder>>(
Widget build(final BuildContext context) {
final bloc = Provider.of<NewsBloc>(context, listen: false);
return ResultBuilder<List<NextcloudNewsFolder>>(
stream: bloc.folders,
builder: (final context, final folders) => ResultBuilder<List<NextcloudNewsFeed>>(
stream: bloc.feeds,
@ -39,12 +39,15 @@ class NewsFoldersView extends StatelessWidget {
),
),
);
}
Widget _buildFolder(
final BuildContext context,
final FolderFeedsWrapper folderFeedsWrapper,
) {
final bloc = Provider.of<NewsBloc>(context, listen: false);
final unreadCount = feedsUnreadCountSum(folderFeedsWrapper.feeds);
return ListTile(
title: Text(
folderFeedsWrapper.folder.name,
@ -122,7 +125,6 @@ class NewsFoldersView extends StatelessWidget {
await Navigator.of(context).push(
MaterialPageRoute(
builder: (final context) => NewsFolderPage(
bloc: bloc,
folder: folderFeedsWrapper.folder,
),
),

Write Preview
Loading…
Cancel
Save