lib/database.dart

@@ -23,7 +23,7 @@ class MyDatabase extends _$MyDatabase {
   MigrationStrategy get migration => MigrationStrategy(
         onCreate: (Migrator m) async {
           await m.createAll();
-          var data = await (db.select(db.settings)..limit(1)).get();
+          var data = await db.select(db.settings).get();
           if (data.isEmpty) await db.into(db.settings).insert(defaultSettings);
         },
         onUpgrade: (Migrator m, int from, int to) async {

lib/home_page.dart

@@ -1,19 +1,19 @@
 import 'package:flutter/material.dart';
 import 'package:fmassive/best_page.dart';
 import 'package:fmassive/plans_page.dart';
-import 'package:fmassive/set_list.dart';
 import 'package:fmassive/settings_page.dart';
 import 'package:fmassive/timer_page.dart';
 import 'package:fmassive/workouts_page.dart';
+import 'package:fmassive/set_list.dart';
 
 class HomePage extends StatefulWidget {
   const HomePage({super.key});
 
   @override
-  createState() => _HomePage();
+  createState() => RootPage();
 }
 
-class _HomePage extends State<HomePage> {
+class RootPage extends State<HomePage> {
   bool showSearch = false;
   int selected = 0;
   String search = '';

lib/set_list.dart

@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:fmassive/database.dart';
 import 'package:fmassive/edit_set.dart';
 import 'package:fmassive/main.dart';
-import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
 import 'package:intl/intl.dart';
 import 'package:moor_flutter/moor_flutter.dart';
 
@@ -17,37 +16,25 @@ class SetList extends StatefulWidget {
 
 class _SetList extends State<SetList> {
   bool showSearch = false;
-  final PagingController<int, GymSet> pagingController =
+  late Stream<List<GymSet>> stream;
-      PagingController(firstPageKey: 0);
 
   @override
   initState() {
     super.initState();
-    pagingController.addPageRequestListener((pageKey) {
+    setStream();
-      fetch(pageKey);
+  }
-    });
+
+  void setStream() {
+    stream = (db.select(db.gymSets)
+          ..where((gymSet) => gymSet.name.contains(widget.search))
+          ..limit(10, offset: 0))
+        .watch();
   }
 
   @override
   didUpdateWidget(covariant SetList oldWidget) {
     super.didUpdateWidget(oldWidget);
-    pagingController.refresh();
+    setStream();
-  }
-
-  Future<void> fetch(int pageKey) async {
-    final gymSets = await (db.select(db.gymSets)
-          ..where((gymSet) => gymSet.name.contains(widget.search))
-          ..limit(10, offset: pageKey * 10))
-        .get();
-
-    final isLastPage = gymSets.length < 10;
-
-    if (isLastPage) {
-      pagingController.appendLastPage(gymSets);
-    } else {
-      final nextPageKey = pageKey + 1;
-      pagingController.appendPage(gymSets, nextPageKey);
-    }
   }
 
   void toggleSearch() {
@@ -59,53 +46,50 @@ class _SetList extends State<SetList> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      body: PagedListView<int, GymSet>(
+        body: StreamBuilder<List<GymSet>>(
-        pagingController: pagingController,
+            stream: stream,
-        builderDelegate: PagedChildBuilderDelegate<GymSet>(
+            builder: (context, snapshot) {
-          itemBuilder: (context, gymSet, index) => ListTile(
+              final gymSets = snapshot.data;
-            title: Text(gymSet.name),
+
-            subtitle: Text("${gymSet.reps} x ${gymSet.weight}kg"),
+              if (gymSets == null)
-            trailing: Text(
+                return const Center(child: CircularProgressIndicator());
-              DateFormat("yyyy-MM-dd").format(DateTime.parse(gymSet.created)),
+
-            ),
+              return ListView.builder(
-            onTap: () async {
+                itemCount: gymSets.length,
+                itemBuilder: (context, index) {
+                  return ListTile(
+                      title: Text(gymSets[index].name),
+                      subtitle: Text(
+                          "${gymSets[index].reps} x ${gymSets[index].weight}kg"),
+                      trailing: Text(DateFormat("yyyy-MM-dd")
+                          .format(DateTime.parse(gymSets[index].created))),
+                      onTap: () async {
+                        await Navigator.push(
+                          context,
+                          MaterialPageRoute(
+                            builder: (context) => EditGymSetPage(
+                                gymSet: gymSets[index].toCompanion(false)),
+                          ),
+                        );
+                      });
+                },
+              );
+            }),
+        floatingActionButton: FloatingActionButton(
+            onPressed: () async {
               await Navigator.push(
                 context,
                 MaterialPageRoute(
                   builder: (context) => EditGymSetPage(
-                    gymSet: gymSet.toCompanion(false),
+                      gymSet: GymSetsCompanion(
-                  ),
+                          name: const Value(''),
+                          reps: const Value(0),
+                          weight: const Value(0),
+                          image: const Value(''),
+                          created: Value(DateTime.now().toString()))),
                 ),
               );
-              pagingController.refresh();
             },
-          ),
+            child: const Icon(Icons.add)));
-          firstPageProgressIndicatorBuilder: (_) =>
-              const Center(child: CircularProgressIndicator()),
-          newPageProgressIndicatorBuilder: (_) =>
-              const Center(child: CircularProgressIndicator()),
-        ),
-      ),
-      floatingActionButton: FloatingActionButton(
-        onPressed: () async {
-          await Navigator.push(
-            context,
-            MaterialPageRoute(
-              builder: (context) => EditGymSetPage(
-                gymSet: GymSetsCompanion(
-                  name: const Value(''),
-                  reps: const Value(0),
-                  weight: const Value(0),
-                  image: const Value(''),
-                  created: Value(DateTime.now().toString()),
-                ),
-              ),
-            ),
-          );
-          pagingController.refresh();
-        },
-        child: const Icon(Icons.add),
-      ),
-    );
   }
 }

lib/settings_page.dart

@@ -1,14 +1,9 @@
-import 'dart:io';
-
-import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/material.dart' as material;
 import 'package:fmassive/database.dart';
 import 'package:fmassive/main.dart';
 import 'package:fmassive/sound_picker.dart';
 import 'package:moor/moor.dart';
-import 'package:path/path.dart';
-import 'package:sqflite/sqflite.dart';
 
 class SettingsPage extends StatelessWidget {
   const SettingsPage({super.key, required this.search});
@@ -62,7 +57,6 @@ class _SettingsPageState extends State<_SettingsPage> {
             {'title': 'Show Unit', 'value': settings.showUnit},
             {'title': 'Steps', 'value': settings.steps},
             {'title': 'Sound', 'value': settings.sound},
-            {'title': 'Import', 'value': settings.sound},
           ]
               .where((item) => (item['title'] as String)
                   .toLowerCase()
@@ -77,29 +71,6 @@ class _SettingsPageState extends State<_SettingsPage> {
                   itemBuilder: (context, index) {
                     final item = filteredItems[index];
 
-                    if (item['title'] == 'Import')
-                      return Center(
-                          child: ElevatedButton(
-                              onPressed: () async {
-                                final result =
-                                    await FilePicker.platform.pickFiles(
-                                  type: FileType.any,
-                                );
-                                if (result == null) return;
-
-                                final file = File(result.files.single.path!);
-                                final path = await getDatabasesPath();
-                                final to = join(path, 'massive.db');
-                                await db.close();
-                                await file.copy(to);
-                                print('Migrating...');
-                                db = MyDatabase();
-                                final migrator = db.createMigrator();
-                                await migrator.createAll();
-                                print('Migrated.');
-                              },
-                              child: const Text("Import")));
-
                     if (item['title'] == 'Sound') {
                       return Center(
                         child: SoundPicker(

pubspec.lock

@@ -392,14 +392,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.0.2"
-  infinite_scroll_pagination:
-    dependency: "direct main"
-    description:
-      name: infinite_scroll_pagination
-      sha256: "9517328f4e373f08f57dbb11c5aac5b05554142024d6b60c903f3b73476d52db"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.2.0"
   intl:
     dependency: "direct main"
     description:
@@ -685,14 +677,6 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.99"
-  sliver_tools:
-    dependency: transitive
-    description:
-      name: sliver_tools
-      sha256: ccdc502098a8bfa07b3ec582c282620031481300035584e1bb3aca296a505e8c
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.2.10"
   source_gen:
     dependency: transitive
     description:

pubspec.yaml

@@ -46,7 +46,6 @@ dependencies:
   audioplayers: ^4.0.1
   intl: ^0.18.0
   permission_handler: ^10.2.0
-  infinite_scroll_pagination: ^3.2.0
 
 dev_dependencies:
   flutter_test: