From b5d8829804f470309bd086ad2f7b7afb529a51a9 Mon Sep 17 00:00:00 2001
From: John Wesley <dev@jwr.one>
Date: Fri, 15 Dec 2023 11:17:28 -0500
Subject: [PATCH] Fix EntriesScreen to use EntriesListView

---
 lib/src/screens/entries/entries_screen.dart | 154 ++------------------
 1 file changed, 11 insertions(+), 143 deletions(-)

diff --git a/lib/src/screens/entries/entries_screen.dart b/lib/src/screens/entries/entries_screen.dart
index e0730c9..42e8287 100644
--- a/lib/src/screens/entries/entries_screen.dart
+++ b/lib/src/screens/entries/entries_screen.dart
@@ -1,158 +1,26 @@
 import 'package:flutter/material.dart';
-import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
 import 'package:interstellar/src/api/content_sources.dart';
-import 'package:interstellar/src/api/entries.dart' as api_entries;
-import 'package:interstellar/src/screens/entries/entry_item.dart';
-import 'package:interstellar/src/screens/entries/entry_page.dart';
-import 'package:interstellar/src/screens/settings/settings_controller.dart';
-import 'package:provider/provider.dart';
+import 'package:interstellar/src/screens/entries/entries_list.dart';
 
 class EntriesScreen extends StatefulWidget {
-  const EntriesScreen(
-      {super.key,
-      this.contentSource = const ContentAll(),
-      this.title = 'Feed',
-      this.details});
-
-  final ContentSource contentSource;
-  final String title;
-  final Widget? details;
+  const EntriesScreen({
+    super.key,
+  });
 
   @override
   State<EntriesScreen> createState() => _EntriesScreenState();
 }
 
 class _EntriesScreenState extends State<EntriesScreen> {
-  api_entries.EntriesSort sort = api_entries.EntriesSort.hot;
-
-  final PagingController<int, api_entries.EntryItem> _pagingController =
-      PagingController(firstPageKey: 1);
-
-  @override
-  void initState() {
-    super.initState();
-
-    _pagingController.addPageRequestListener((pageKey) {
-      _fetchPage(pageKey);
-    });
-  }
-
-  Future<void> _fetchPage(int pageKey) async {
-    try {
-      final newPage = await api_entries.fetchEntries(
-        context.read<SettingsController>().instanceHost,
-        widget.contentSource,
-        page: pageKey,
-        sort: sort,
-      );
-
-      final isLastPage =
-          newPage.pagination.currentPage == newPage.pagination.maxPage;
-
-      if (isLastPage) {
-        _pagingController.appendLastPage(newPage.items);
-      } else {
-        final nextPageKey = pageKey + 1;
-        _pagingController.appendPage(newPage.items, nextPageKey);
-      }
-    } catch (error) {
-      _pagingController.error = error;
-    }
-  }
-
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-        appBar: AppBar(
-          title: Text(widget.title),
-        ),
-        body: RefreshIndicator(
-          onRefresh: () => Future.sync(
-            () => _pagingController.refresh(),
-          ),
-          child: CustomScrollView(
-            slivers: [
-              SliverToBoxAdapter(
-                child: Padding(
-                  padding: const EdgeInsets.all(8.0),
-                  child: Row(
-                    children: [
-                      DropdownButton<api_entries.EntriesSort>(
-                        value: sort,
-                        onChanged: (newSort) {
-                          if (newSort != null) {
-                            setState(() {
-                              sort = newSort;
-                              _pagingController.refresh();
-                            });
-                          }
-                        },
-                        items: const [
-                          DropdownMenuItem(
-                            value: api_entries.EntriesSort.hot,
-                            child: Text('Hot'),
-                          ),
-                          DropdownMenuItem(
-                            value: api_entries.EntriesSort.top,
-                            child: Text('Top'),
-                          ),
-                          DropdownMenuItem(
-                            value: api_entries.EntriesSort.newest,
-                            child: Text('Newest'),
-                          ),
-                          DropdownMenuItem(
-                            value: api_entries.EntriesSort.active,
-                            child: Text('Active'),
-                          ),
-                          DropdownMenuItem(
-                            value: api_entries.EntriesSort.commented,
-                            child: Text('Commented'),
-                          ),
-                          DropdownMenuItem(
-                            value: api_entries.EntriesSort.oldest,
-                            child: Text('Oldest'),
-                          ),
-                        ],
-                      ),
-                    ],
-                  ),
-                ),
-              ),
-              PagedSliverList<int, api_entries.EntryItem>(
-                pagingController: _pagingController,
-                builderDelegate:
-                    PagedChildBuilderDelegate<api_entries.EntryItem>(
-                  itemBuilder: (context, item, index) => Padding(
-                    padding: const EdgeInsets.all(8.0),
-                    child: Card(
-                      clipBehavior: Clip.antiAliasWithSaveLayer,
-                      child: InkWell(
-                        onTap: () {
-                          Navigator.of(context).push(
-                            MaterialPageRoute(
-                              builder: (context) => EntryPage(
-                                item: item,
-                              ),
-                            ),
-                          );
-                        },
-                        child: EntryItem(
-                          item,
-                          isPreview: true,
-                        ),
-                      ),
-                    ),
-                  ),
-                ),
-              )
-            ],
-          ),
-        ));
-  }
-
-  @override
-  void dispose() {
-    _pagingController.dispose();
-    super.dispose();
+      appBar: AppBar(
+        title: const Text("Feed"),
+      ),
+      body: const EntriesListView(
+        contentSource: ContentAll(),
+      ),
+    );
   }
 }