analysis_options.yaml

@@ -3,4 +3,3 @@ include: package:flutter_lints/flutter.yaml
 linter:
   rules:
     curly_braces_in_flow_control_structures: false
-    avoid_print: false

android/build.gradle

@@ -26,6 +26,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-tasks.register("clean", Delete) {
+task clean(type: Delete) {
     delete rootProject.buildDir
 }

gendb.sh

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-dart run build_runner build --delete-conflicting-outputs

lib/database.dart

@@ -17,7 +17,7 @@ class MyDatabase extends _$MyDatabase {
   MyDatabase() : super(_openConnection());
 
   @override
-  int get schemaVersion => 2;
+  int get schemaVersion => 1;
 
   @override
   MigrationStrategy get migration => MigrationStrategy(
@@ -27,28 +27,7 @@ class MyDatabase extends _$MyDatabase {
           if (data.isEmpty) await db.into(db.settings).insert(defaultSettings);
         },
         onUpgrade: (Migrator m, int from, int to) async {
-          if (from == 1) {
+          // no migrations yet
-            await m.addColumn(settings, settings.darkColor);
-            await db.customStatement('''
-              UPDATE settings SET dark_color = darkColor
-            ''');
-            await m.addColumn(settings, settings.lightColor);
-            await db.customStatement('''
-              UPDATE settings SET light_color = lightColor
-            ''');
-            await m.addColumn(settings, settings.showDate);
-            await db.customStatement('''
-              UPDATE settings SET show_date = showDate
-            ''');
-            await m.addColumn(settings, settings.showSets);
-            await db.customStatement('''
-              UPDATE settings SET show_sets = showSets
-            ''');
-            await m.addColumn(settings, settings.showUnit);
-            await db.customStatement('''
-              UPDATE settings SET show_unit = showUnit
-            ''');
-          }
         },
       );
 }

lib/days.dart

@@ -1,53 +0,0 @@
-import 'package:flutter/material.dart';
-
-class Days extends StatefulWidget {
-  final ValueChanged<String> onChanged;
-
-  const Days({required this.onChanged, super.key});
-
-  @override
-  createState() => _DaysState();
-}
-
-class _DaysState extends State<Days> {
-  final List<bool> _selections = List.generate(7, (_) => false);
-  final List<String> _days = [
-    'Monday',
-    'Tuesday',
-    'Wednesday',
-    'Thursday',
-    'Friday',
-    'Saturday',
-    'Sunday'
-  ];
-
-  String _getSelectedDaysString() {
-    List<String> selectedDays = [];
-    for (int i = 0; i < _selections.length; i++) {
-      if (_selections[i]) {
-        selectedDays.add(_days[i]);
-      }
-    }
-    return selectedDays.join(",");
-  }
-
-  void _updateSelections(int index) {
-    setState(() {
-      _selections[index] = !_selections[index];
-      widget.onChanged(_getSelectedDaysString());
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      children: List.generate(7, (index) {
-        return SwitchListTile(
-          title: Text(_days[index]),
-          value: _selections[index],
-          onChanged: (value) => _updateSelections(index),
-        );
-      }),
-    );
-  }
-}

lib/dynamic_color_scheme.dart

@@ -7,8 +7,8 @@ class DynamicColorScheme extends StatefulWidget {
   const DynamicColorScheme({
     required this.data,
     required this.builder,
-    super.key,
+    Key? key,
-  });
+  }) : super(key: key);
 
   @override
   createState() => _DynamicColorSchemeState();

lib/edit_plan.dart

@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/material.dart' as material;
 import 'package:fmassive/database.dart';
-import 'package:fmassive/days.dart';
 import 'package:fmassive/main.dart';
 import 'package:moor_flutter/moor_flutter.dart';
 
@@ -60,11 +59,20 @@ class _EditPlanPageState extends State<EditPlanPage> {
         child: material.Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            Days(onChanged: (days) {
+            TextFormField(
+              controller: _daysController,
+              focusNode: daysNode,
+              decoration: const InputDecoration(labelText: 'Days'),
+              onTap: () {
+                _daysController.selection = TextSelection(
+                    baseOffset: 0, extentOffset: _daysController.text.length);
+              },
+              onChanged: (value) {
                 setState(() {
-                days = days;
+                  plan = plan.copyWith(days: Value(value));
                 });
-            }),
+              },
+            ),
             TextFormField(
               controller: _workoutsController,
               focusNode: workoutsNode,
@@ -92,7 +100,7 @@ class _EditPlanPageState extends State<EditPlanPage> {
             return;
           }
           if (plan.id.present)
-            await db.update(db.plans).replace(plan);
+            await db.update(db.plans).write(plan);
           else
             await db.into(db.plans).insert(plan);
           if (!mounted) return;

lib/edit_set.dart

@@ -27,15 +27,12 @@ class _EditGymSetPageState extends State<EditGymSetPage> {
   void initState() {
     super.initState();
     gymSet = widget.gymSet;
-    print(gymSet);
     _nameController.text = gymSet.name.value;
     _repsController.text = gymSet.reps.value.toString();
     _weightController.text = gymSet.weight.value.toString();
-    if (gymSet.id.present) {
+    if (gymSet.id.present)
       repsNode.requestFocus();
-      _repsController.selection = TextSelection(
+    else
-          baseOffset: 0, extentOffset: _repsController.text.length);
-    } else
       nameNode.requestFocus();
   }
 
@@ -106,8 +103,8 @@ class _EditGymSetPageState extends State<EditGymSetPage> {
               },
               onChanged: (value) {
                 setState(() {
-                  gymSet = gymSet.copyWith(
+                  gymSet =
-                      weight: Value(double.tryParse(value) ?? 0));
+                      gymSet.copyWith(weight: Value(int.tryParse(value) ?? 0));
                 });
               },
             ),
@@ -123,7 +120,7 @@ class _EditGymSetPageState extends State<EditGymSetPage> {
             return;
           }
           if (gymSet.id.present)
-            await db.update(db.gymSets).replace(gymSet);
+            await db.update(db.gymSets).write(gymSet);
           else {
             await Permission.notification.request();
             await db.into(db.gymSets).insert(gymSet);

lib/gym_set.dart

@@ -4,14 +4,13 @@ class GymSets extends Table {
   IntColumn get id => integer().autoIncrement()();
   TextColumn get name => text()();
   IntColumn get reps => integer()();
-  RealColumn get weight => real()();
+  IntColumn get weight => integer()();
   IntColumn get sets => integer().withDefault(const Constant(3))();
   IntColumn get minutes => integer().withDefault(const Constant(3))();
   IntColumn get seconds => integer().withDefault(const Constant(30))();
-  BoolColumn get hidden =>
+  BoolColumn get hidden => boolean().withDefault(const Constant(false))();
-      boolean().nullable().withDefault(const Constant(false))();
   TextColumn get created => text()();
   TextColumn get unit => text().withDefault(const Constant('kg'))();
-  TextColumn get image => text().nullable()();
+  TextColumn get image => text()();
   TextColumn get steps => text().nullable()();
 }

lib/home_page.dart

@@ -57,7 +57,6 @@ class _HomePage extends State<HomePage> {
   Widget build(BuildContext context) {
     return SafeArea(
         child: Scaffold(
-      drawerEdgeDragWidth: 200.0,
       drawer: Drawer(
         child: ListView.builder(
           itemCount: routes.length,

lib/main.dart

@@ -10,7 +10,7 @@ void main() {
 }
 
 class MyApp extends StatelessWidget {
-  MyApp({super.key});
+  MyApp({Key? key}) : super(key: key);
 
   final navigatorKey = GlobalKey<NavigatorState>();
 

lib/plans_page.dart

@@ -20,7 +20,7 @@ class PlansPage extends StatelessWidget {
 }
 
 class _PlansPage extends StatefulWidget {
-  const _PlansPage({super.key, required this.search});
+  const _PlansPage({Key? key, required this.search}) : super(key: key);
 
   final String search;
 
@@ -72,9 +72,8 @@ class _PlansPageState extends State<_PlansPage> {
                 itemCount: plans.length,
                 itemBuilder: (context, index) {
                   return ListTile(
-                      title: Text(plans[index].days.replaceAll(',', ', ')),
+                      title: Text(plans[index].days),
-                      subtitle:
+                      subtitle: Text(plans[index].workouts),
-                          Text(plans[index].workouts.replaceAll(',', ', ')),
                       onTap: () async {
                         await Navigator.push(
                           context,

lib/set_list.dart

@@ -2,14 +2,14 @@ import 'package:flutter/material.dart';
 import 'package:fmassive/database.dart';
 import 'package:fmassive/edit_set.dart';
 import 'package:fmassive/main.dart';
-import 'package:fmassive/set_tile.dart';
 import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
+import 'package:intl/intl.dart';
 import 'package:moor_flutter/moor_flutter.dart';
 
 class SetList extends StatefulWidget {
   final String search;
 
-  const SetList({super.key, required this.search});
+  const SetList({Key? key, required this.search}) : super(key: key);
 
   @override
   createState() => _SetList();
@@ -37,9 +37,6 @@ class _SetList extends State<SetList> {
   Future<void> fetch(int pageKey) async {
     final gymSets = await (db.select(db.gymSets)
           ..where((gymSet) => gymSet.name.contains(widget.search))
-          ..orderBy([
-            (u) => OrderingTerm(expression: u.created, mode: OrderingMode.desc),
-          ])
           ..limit(10, offset: pageKey * 10))
         .get();
 
@@ -65,9 +62,23 @@ class _SetList extends State<SetList> {
       body: PagedListView<int, GymSet>(
         pagingController: pagingController,
         builderDelegate: PagedChildBuilderDelegate<GymSet>(
-          itemBuilder: (context, gymSet, index) => SetTile(
+          itemBuilder: (context, gymSet, index) => ListTile(
-            pagingController: pagingController,
+            title: Text(gymSet.name),
-            gymSet: gymSet,
+            subtitle: Text("${gymSet.reps} x ${gymSet.weight}kg"),
+            trailing: Text(
+              DateFormat("yyyy-MM-dd").format(DateTime.parse(gymSet.created)),
+            ),
+            onTap: () async {
+              await Navigator.push(
+                context,
+                MaterialPageRoute(
+                  builder: (context) => EditGymSetPage(
+                    gymSet: gymSet.toCompanion(false),
+                  ),
+                ),
+              );
+              pagingController.refresh();
+            },
           ),
           firstPageProgressIndicatorBuilder: (_) =>
               const Center(child: CircularProgressIndicator()),

lib/set_tile.dart

@@ -1,67 +0,0 @@
-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/moor.dart';
-
-class SetTile extends StatelessWidget {
-  const SetTile({
-    super.key,
-    required this.pagingController,
-    required this.gymSet,
-  });
-
-  final PagingController<int, GymSet> pagingController;
-  final GymSet gymSet;
-
-  @override
-  Widget build(BuildContext context) {
-    return ListTile(
-      title: Text(gymSet.name),
-      subtitle: Text("${gymSet.reps} x ${gymSet.weight}kg"),
-      trailing: Text(
-        DateFormat("yyyy-MM-dd").format(DateTime.parse(gymSet.created)),
-      ),
-      onTap: () async {
-        await Navigator.push(
-          context,
-          MaterialPageRoute(
-            builder: (context) => EditGymSetPage(
-              gymSet: gymSet.toCompanion(false),
-            ),
-          ),
-        );
-        pagingController.refresh();
-      },
-      onLongPress: () => showDialog(
-        context: context,
-        builder: (BuildContext context) {
-          return AlertDialog(
-            title: const Text('Delete set'),
-            content: Text(
-                'Are you sure you want to delete ${gymSet.name} ${gymSet.reps}x${gymSet.weight}${gymSet.unit}?'),
-            actions: <Widget>[
-              ElevatedButton(
-                child: const Text('Cancel'),
-                onPressed: () {
-                  Navigator.of(context).pop();
-                },
-              ),
-              ElevatedButton(
-                child: const Text('Delete'),
-                onPressed: () async {
-                  final navigator = Navigator.of(context);
-                  await db.gymSets.deleteOne(gymSet);
-                  pagingController.refresh();
-                  navigator.pop();
-                },
-              ),
-            ],
-          );
-        },
-      ),
-    );
-  }
-}

lib/settings.dart

@@ -21,18 +21,18 @@ Setting defaultSettings = Setting(
 
 class Settings extends Table {
   BoolColumn get alarm => boolean()();
-  BoolColumn get backup => boolean().nullable()();
-  TextColumn get darkColor => text().nullable()();
-  TextColumn get date => text().nullable()();
-  BoolColumn get images => boolean().nullable()();
-  TextColumn get lightColor => text().nullable()();
-  BoolColumn get noSound => boolean().nullable()();
-  BoolColumn get notify => boolean().nullable()();
-  BoolColumn get showDate => boolean().nullable()();
-  BoolColumn get showSets => boolean().nullable()();
-  BoolColumn get showUnit => boolean().nullable()();
-  TextColumn get sound => text().nullable()();
-  BoolColumn get steps => boolean().nullable()();
-  TextColumn get theme => text().nullable()();
   BoolColumn get vibrate => boolean()();
+  TextColumn get sound => text().nullable()();
+  BoolColumn get notify => boolean()();
+  BoolColumn get images => boolean()();
+  BoolColumn get showUnit => boolean()();
+  TextColumn get lightColor => text().nullable()();
+  TextColumn get darkColor => text().nullable()();
+  BoolColumn get steps => boolean()();
+  TextColumn get date => text()();
+  BoolColumn get showDate => boolean()();
+  TextColumn get theme => text()();
+  BoolColumn get showSets => boolean()();
+  BoolColumn get noSound => boolean()();
+  BoolColumn get backup => boolean()();
 }

lib/settings_page.dart

@@ -26,7 +26,7 @@ class SettingsPage extends StatelessWidget {
 }
 
 class _SettingsPage extends StatefulWidget {
-  const _SettingsPage({super.key, required this.search});
+  const _SettingsPage({Key? key, required this.search}) : super(key: key);
 
   final String search;
 
@@ -40,7 +40,7 @@ class _SettingsPageState extends State<_SettingsPage> {
   @override
   void initState() {
     super.initState();
-    stream = (db.select(db.settings)..limit(1)).watchSingle();
+    stream = db.select(db.settings).watchSingle();
   }
 
   @override
@@ -50,7 +50,6 @@ class _SettingsPageState extends State<_SettingsPage> {
         stream: stream,
         builder: (context, snapshot) {
           final settings = snapshot.data;
-          print('build: $settings');
 
           if (settings == null)
             return const Center(child: CircularProgressIndicator());
@@ -97,9 +96,6 @@ class _SettingsPageState extends State<_SettingsPage> {
                                 db = MyDatabase();
                                 final migrator = db.createMigrator();
                                 await migrator.createAll();
-                                await db.customInsert('''
-                                  INSERT INTO gym_sets(id, name, reps, weight, created, unit, hidden, image, sets, minutes, seconds, steps) 
-                                    SELECT id, name, reps, weight, created, unit, hidden, image, sets, minutes, seconds, steps FROM sets''');
                                 print('Migrated.');
                               },
                               child: const Text("Import")));
@@ -119,7 +115,7 @@ class _SettingsPageState extends State<_SettingsPage> {
 
                     return SwitchListTile(
                       title: Text(item['title'].toString()),
-                      value: (item['value'] ?? false) as bool,
+                      value: item['value'] as bool,
                       onChanged: (value) {
                         switch (item['title']) {
                           case 'Alarm':

pubspec.lock

@@ -29,74 +29,74 @@ packages:
     dependency: transitive
     description:
       name: args
-      sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596
+      sha256: "4cab82a83ffef80b262ddedf47a0a8e56ee6fbf7fe21e6e768b02792034dd440"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.2"
+    version: "2.4.0"
   async:
     dependency: transitive
     description:
       name: async
-      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
+      sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
       url: "https://pub.dev"
     source: hosted
-    version: "2.11.0"
+    version: "2.10.0"
   audioplayers:
     dependency: "direct main"
     description:
       name: audioplayers
-      sha256: d9f6ca8e9b3e5af5e73d4c814404566f72698ee7ba35487bdf2baa6749e7503f
+      sha256: "6063c05f987596ba7a3dad9bb9a5d8adfa5e7c07b9bae5301b27c11d0b3a239f"
       url: "https://pub.dev"
     source: hosted
-    version: "5.2.0"
+    version: "4.0.1"
   audioplayers_android:
     dependency: transitive
     description:
       name: audioplayers_android
-      sha256: fb01b9481f431fe04ac60f1f97ce8158383f2dc754558820592f795d81ca9d53
+      sha256: fb6bca878ad175d8f6ddc0e0a2d4226d81fa7c10747c12db420e96c7a096b2cc
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.2"
+    version: "3.0.1"
   audioplayers_darwin:
     dependency: transitive
     description:
       name: audioplayers_darwin
-      sha256: "3034e99a6df8d101da0f5082dcca0a2a99db62ab1d4ddb3277bed3f6f81afe08"
+      sha256: c4a56c49347b2e85ac4e1efea218948ca0fba87f04d2a3d3de07ce2410037038
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.2"
+    version: "4.0.1"
   audioplayers_linux:
     dependency: transitive
     description:
       name: audioplayers_linux
-      sha256: "60787e73fefc4d2e0b9c02c69885402177e818e4e27ef087074cf27c02246c9e"
+      sha256: "897e24f190232a3fbb88134b062aa83a9240f55789b5e8d17c114283284ef56b"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.0"
+    version: "2.0.1"
   audioplayers_platform_interface:
     dependency: transitive
     description:
       name: audioplayers_platform_interface
-      sha256: "365c547f1bb9e77d94dd1687903a668d8f7ac3409e48e6e6a3668a1ac2982adb"
+      sha256: "3a90a46198d375fc7d47bc1d3070c8fd8863b6469b7d87ca80f953efb090f976"
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.0"
+    version: "5.0.0"
   audioplayers_web:
     dependency: transitive
     description:
       name: audioplayers_web
-      sha256: "22cd0173e54d92bd9b2c80b1204eb1eb159ece87475ab58c9788a70ec43c2a62"
+      sha256: "4f5dcbfec0bf98ea09e243d5f5b64ea43a4e6710a2f292724bed16cdba3c691e"
       url: "https://pub.dev"
     source: hosted
-    version: "4.1.0"
+    version: "3.0.1"
   audioplayers_windows:
     dependency: transitive
     description:
       name: audioplayers_windows
-      sha256: "9536812c9103563644ada2ef45ae523806b0745f7a78e89d1b5fb1951de90e1a"
+      sha256: "010f575653c01ccbe9756050b18df83d89426740e04b684f6438aa26c775a965"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.0"
+    version: "2.0.1"
   boolean_selector:
     dependency: transitive
     description:
@@ -109,10 +109,10 @@ packages:
     dependency: transitive
     description:
       name: build
-      sha256: "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0"
+      sha256: "3fbda25365741f8251b39f3917fb3c8e286a96fd068a5a242e11c2012d495777"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.1"
+    version: "2.3.1"
   build_config:
     dependency: transitive
     description:
@@ -125,10 +125,10 @@ packages:
     dependency: transitive
     description:
       name: build_daemon
-      sha256: "0343061a33da9c5810b2d6cee51945127d8f4c060b7fbdd9d54917f0a3feaaa1"
+      sha256: "757153e5d9cd88253cb13f28c2fb55a537dc31fefd98137549895b5beb7c6169"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.1"
+    version: "3.1.1"
   build_resolvers:
     dependency: transitive
     description:
@@ -141,18 +141,18 @@ packages:
     dependency: "direct main"
     description:
       name: build_runner
-      sha256: "10c6bcdbf9d049a0b666702cf1cee4ddfdc38f02a19d35ae392863b47519848b"
+      sha256: b0a8a7b8a76c493e85f1b84bffa0588859a06197863dba8c9036b15581fd9727
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.6"
+    version: "2.3.3"
   build_runner_core:
     dependency: transitive
     description:
       name: build_runner_core
-      sha256: "6d6ee4276b1c5f34f21fdf39425202712d2be82019983d52f351c94aafbc2c41"
+      sha256: "14febe0f5bac5ae474117a36099b4de6f1dbc52df6c5e55534b3da9591bf4292"
       url: "https://pub.dev"
     source: hosted
-    version: "7.2.10"
+    version: "7.2.7"
   built_collection:
     dependency: transitive
     description:
@@ -165,18 +165,18 @@ packages:
     dependency: transitive
     description:
       name: built_value
-      sha256: "723b4021e903217dfc445ec4cf5b42e27975aece1fc4ebbc1ca6329c2d9fb54e"
+      sha256: "31b7c748fd4b9adf8d25d72a4c4a59ef119f12876cf414f94f8af5131d5fa2b0"
       url: "https://pub.dev"
     source: hosted
-    version: "8.7.0"
+    version: "8.4.4"
   characters:
     dependency: transitive
     description:
       name: characters
-      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
+      sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.0"
+    version: "1.2.1"
   charcode:
     dependency: transitive
     description:
@@ -189,10 +189,10 @@ packages:
     dependency: transitive
     description:
       name: checked_yaml
-      sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff
+      sha256: "3d1505d91afa809d177efd4eed5bb0eb65805097a1463abdd2add076effae311"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.3"
+    version: "2.0.2"
   cli_util:
     dependency: transitive
     description:
@@ -213,18 +213,18 @@ packages:
     dependency: transitive
     description:
       name: code_builder
-      sha256: "1be9be30396d7e4c0db42c35ea6ccd7cc6a1e19916b5dc64d6ac216b5544d677"
+      sha256: "0d43dd1288fd145de1ecc9a3948ad4a6d5a82f0a14c4fdd0892260787d975cbe"
       url: "https://pub.dev"
     source: hosted
-    version: "4.7.0"
+    version: "4.4.0"
   collection:
     dependency: transitive
     description:
       name: collection
-      sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
+      sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
       url: "https://pub.dev"
     source: hosted
-    version: "1.17.2"
+    version: "1.17.0"
   convert:
     dependency: transitive
     description:
@@ -237,18 +237,18 @@ packages:
     dependency: transitive
     description:
       name: crypto
-      sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab
+      sha256: aa274aa7774f8964e4f4f38cc994db7b6158dd36e9187aaceaddc994b35c6c67
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.3"
+    version: "3.0.2"
   cupertino_icons:
     dependency: "direct main"
     description:
       name: cupertino_icons
-      sha256: d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d
+      sha256: e35129dc44c9118cee2a5603506d823bab99c68393879edb440e0090d07586be
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.6"
+    version: "1.0.5"
   dart_style:
     dependency: transitive
     description:
@@ -285,10 +285,10 @@ packages:
     dependency: transitive
     description:
       name: ffi
-      sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878"
+      sha256: a38574032c5f1dd06c4aee541789906c12ccaab8ba01446e800d9c5b79c4a978
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.0.1"
   file:
     dependency: transitive
     description:
@@ -301,10 +301,10 @@ packages:
     dependency: "direct main"
     description:
       name: file_picker
-      sha256: "4e42aacde3b993c5947467ab640882c56947d9d27342a5b6f2895b23956954a6"
+      sha256: dcde5ad1a0cebcf3715ea3f24d0db1888bf77027a26c77d7779e8ef63b8ade62
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.1"
+    version: "5.2.9"
   fixnum:
     dependency: transitive
     description:
@@ -322,26 +322,18 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      sha256: e2a421b7e59244faef694ba7b30562e489c2b489866e505074eb005cd7060db7
+      sha256: aeb0b80a8b3709709c9cc496cdc027c5b3216796bc0af0ce1007eaf24464fd4c
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.1"
+    version: "2.0.1"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:
       name: flutter_plugin_android_lifecycle
-      sha256: b068ffc46f82a55844acfa4fdbb61fad72fa2aef0905548419d97f0f95c456da
+      sha256: c224ac897bed083dabf11f238dd11a239809b446740be0c2044608c50029ffdf
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.17"
+    version: "2.0.9"
-  flutter_staggered_grid_view:
-    dependency: transitive
-    description:
-      name: flutter_staggered_grid_view
-      sha256: "19e7abb550c96fbfeb546b23f3ff356ee7c59a019a651f8f102a4ba9b7349395"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.7.0"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -364,26 +356,26 @@ packages:
     dependency: transitive
     description:
       name: glob
-      sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63"
+      sha256: "4515b5b6ddb505ebdd242a5f2cc5d22d3d6a80013789debfbda7777f47ea308c"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.1"
   graphs:
     dependency: transitive
     description:
       name: graphs
-      sha256: aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19
+      sha256: f9e130f3259f52d26f0cfc0e964513796dafed572fa52e45d2f8d6ca14db39b2
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.1"
+    version: "2.2.0"
   http:
     dependency: transitive
     description:
       name: http
-      sha256: "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2"
+      sha256: "6aa2946395183537c8b880962d935877325d6a09a2867c3970c05c0fed6ac482"
       url: "https://pub.dev"
     source: hosted
-    version: "0.13.6"
+    version: "0.13.5"
   http_multi_server:
     dependency: transitive
     description:
@@ -404,18 +396,18 @@ packages:
     dependency: "direct main"
     description:
       name: infinite_scroll_pagination
-      sha256: b68bce20752fcf36c7739e60de4175494f74e99e9a69b4dd2fe3a1dd07a7f16a
+      sha256: "9517328f4e373f08f57dbb11c5aac5b05554142024d6b60c903f3b73476d52db"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "3.2.0"
   intl:
     dependency: "direct main"
     description:
       name: intl
-      sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
+      sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6
       url: "https://pub.dev"
     source: hosted
-    version: "0.18.1"
+    version: "0.18.0"
   io:
     dependency: transitive
     description:
@@ -428,58 +420,58 @@ packages:
     dependency: transitive
     description:
       name: js
-      sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
+      sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.7"
+    version: "0.6.5"
   json_annotation:
     dependency: transitive
     description:
       name: json_annotation
-      sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467
+      sha256: c33da08e136c3df0190bd5bbe51ae1df4a7d96e7954d1d7249fea2968a72d317
       url: "https://pub.dev"
     source: hosted
-    version: "4.8.1"
+    version: "4.8.0"
   lints:
     dependency: transitive
     description:
       name: lints
-      sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290
+      sha256: "5e4a9cd06d447758280a8ac2405101e0e2094d2a1dbdd3756aec3fe7775ba593"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.0"
+    version: "2.0.1"
   logging:
     dependency: transitive
     description:
       name: logging
-      sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340"
+      sha256: "04094f2eb032cbb06c6f6e8d3607edcfcb0455e2bb6cbc010cb01171dcb64e6d"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.1.1"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
+      sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.16"
+    version: "0.12.13"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
+      sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.0"
+    version: "0.2.0"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
+      sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.1"
+    version: "1.8.0"
   mime:
     dependency: transitive
     description:
@@ -524,114 +516,114 @@ packages:
     dependency: "direct main"
     description:
       name: path
-      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
+      sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
       url: "https://pub.dev"
     source: hosted
-    version: "1.8.3"
+    version: "1.8.2"
   path_provider:
     dependency: "direct main"
     description:
       name: path_provider
-      sha256: a1aa8aaa2542a6bc57e381f132af822420216c80d4781f7aa085ca3229208aaa
+      sha256: c7edf82217d4b2952b2129a61d3ad60f1075b9299e629e149a8d2e39c2e6aad4
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.0.14"
   path_provider_android:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: e595b98692943b4881b219f0a9e3945118d3c16bd7e2813f98ec6e532d905f72
+      sha256: "019f18c9c10ae370b08dce1f3e3b73bc9f58e7f087bb5e921f06529438ac0ae7"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.1"
+    version: "2.0.24"
   path_provider_foundation:
     dependency: transitive
     description:
       name: path_provider_foundation
-      sha256: "19314d595120f82aca0ba62787d58dde2cc6b5df7d2f0daf72489e38d1b57f2d"
+      sha256: "818b2dc38b0f178e0ea3f7cf3b28146faab11375985d815942a68eee11c2d0f7"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.1"
+    version: "2.2.1"
   path_provider_linux:
     dependency: transitive
     description:
       name: path_provider_linux
-      sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279
+      sha256: "2ae08f2216225427e64ad224a24354221c2c7907e448e6e0e8b57b1eb9f10ad1"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.1"
+    version: "2.1.10"
   path_provider_platform_interface:
     dependency: transitive
     description:
       name: path_provider_platform_interface
-      sha256: "94b1e0dd80970c1ce43d5d4e050a9918fce4f4a775e6142424c30a29a363265c"
+      sha256: "57585299a729335f1298b43245842678cb9f43a6310351b18fb577d6e33165ec"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.0.6"
   path_provider_windows:
     dependency: transitive
     description:
       name: path_provider_windows
-      sha256: "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170"
+      sha256: f53720498d5a543f9607db4b0e997c4b5438884de25b0f73098cc2671a51b130
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.1"
+    version: "2.1.5"
   permission_handler:
     dependency: "direct main"
     description:
       name: permission_handler
-      sha256: "284a66179cabdf942f838543e10413246f06424d960c92ba95c84439154fcac8"
+      sha256: "33c6a1253d1f95fd06fa74b65b7ba907ae9811f9d5c1d3150e51417d04b8d6a8"
       url: "https://pub.dev"
     source: hosted
-    version: "11.0.1"
+    version: "10.2.0"
   permission_handler_android:
     dependency: transitive
     description:
       name: permission_handler_android
-      sha256: f9fddd3b46109bd69ff3f9efa5006d2d309b7aec0f3c1c5637a60a2d5659e76e
+      sha256: "8028362b40c4a45298f1cbfccd227c8dd6caf0e27088a69f2ba2ab15464159e2"
       url: "https://pub.dev"
     source: hosted
-    version: "11.1.0"
+    version: "10.2.0"
   permission_handler_apple:
     dependency: transitive
     description:
       name: permission_handler_apple
-      sha256: "99e220bce3f8877c78e4ace901082fb29fa1b4ebde529ad0932d8d664b34f3f5"
+      sha256: ee96ac32f5a8e6f80756e25b25b9f8e535816c8e6665a96b6d70681f8c4f7e85
       url: "https://pub.dev"
     source: hosted
-    version: "9.1.4"
+    version: "9.0.8"
   permission_handler_platform_interface:
     dependency: transitive
     description:
       name: permission_handler_platform_interface
-      sha256: "6760eb5ef34589224771010805bea6054ad28453906936f843a8cc4d3a55c4a4"
+      sha256: "68abbc472002b5e6dfce47fe9898c6b7d8328d58b5d2524f75e277c07a97eb84"
       url: "https://pub.dev"
     source: hosted
-    version: "3.12.0"
+    version: "3.9.0"
   permission_handler_windows:
     dependency: transitive
     description:
       name: permission_handler_windows
-      sha256: cc074aace208760f1eee6aa4fae766b45d947df85bc831cde77009cdb4720098
+      sha256: f67cab14b4328574938ecea2db3475dad7af7ead6afab6338772c5f88963e38b
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.3"
+    version: "0.1.2"
   platform:
     dependency: transitive
     description:
       name: platform
-      sha256: "0a279f0707af40c890e80b1e9df8bb761694c074ba7e1d4ab1bc4b728e200b59"
+      sha256: "4a451831508d7d6ca779f7ac6e212b4023dd5a7d08a27a63da33756410e32b76"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.3"
+    version: "3.1.0"
   plugin_platform_interface:
     dependency: transitive
     description:
       name: plugin_platform_interface
-      sha256: da3fdfeccc4d4ff2da8f8c556704c08f912542c5fb3cf2233ed75372384a034d
+      sha256: "6a2128648c854906c53fa8e33986fc0247a1116122f9534dd20e3ab9e16a32bc"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.6"
+    version: "2.1.4"
   pool:
     dependency: transitive
     description:
@@ -640,22 +632,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.5.1"
+  process:
+    dependency: transitive
+    description:
+      name: process
+      sha256: "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.2.4"
   pub_semver:
     dependency: transitive
     description:
       name: pub_semver
-      sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c"
+      sha256: "307de764d305289ff24ad257ad5c5793ce56d04947599ad68b3baa124105fc17"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.4"
+    version: "2.1.3"
   pubspec_parse:
     dependency: transitive
     description:
       name: pubspec_parse
-      sha256: c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367
+      sha256: ec85d7d55339d85f44ec2b682a82fea340071e8978257e5a43e69f79e98ef50c
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.3"
+    version: "1.2.2"
   recase:
     dependency: transitive
     description:
@@ -668,18 +668,18 @@ packages:
     dependency: transitive
     description:
       name: shelf
-      sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4
+      sha256: c24a96135a2ccd62c64b69315a14adc5c3419df63b4d7c05832a346fdb73682c
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.1"
+    version: "1.4.0"
   shelf_web_socket:
     dependency: transitive
     description:
       name: shelf_web_socket
-      sha256: "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1"
+      sha256: a988c0e8d8ffbdb8a28aa7ec8e449c260f3deb808781fe1284d22c5bba7156e8
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.4"
+    version: "1.0.3"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -689,10 +689,10 @@ packages:
     dependency: transitive
     description:
       name: sliver_tools
-      sha256: eae28220badfb9d0559207badcbbc9ad5331aac829a88cb0964d330d2a4636a6
+      sha256: ccdc502098a8bfa07b3ec582c282620031481300035584e1bb3aca296a505e8c
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.12"
+    version: "0.2.10"
   source_gen:
     dependency: transitive
     description:
@@ -705,42 +705,42 @@ packages:
     dependency: transitive
     description:
       name: source_span
-      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
+      sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
       url: "https://pub.dev"
     source: hosted
-    version: "1.10.0"
+    version: "1.9.1"
   sqflite:
     dependency: "direct main"
     description:
       name: sqflite
-      sha256: "591f1602816e9c31377d5f008c2d9ef7b8aca8941c3f89cc5fd9d84da0c38a9a"
+      sha256: "500d6fec583d2c021f2d25a056d96654f910662c64f836cd2063167b8f1fa758"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.0"
+    version: "2.2.6"
   sqflite_common:
     dependency: transitive
     description:
       name: sqflite_common
-      sha256: "8ed044102f3135add97be8653662052838859f5400075ef227f8ad72ae320803"
+      sha256: "963dad8c4aa2f814ce7d2d5b1da2f36f31bd1a439d8f27e3dc189bb9d26bc684"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.0+1"
+    version: "2.4.3"
   sqlite3:
     dependency: transitive
     description:
       name: sqlite3
-      sha256: "281b672749af2edf259fc801f0fcba092257425bcd32a0ce1c8237130bc934c7"
+      sha256: "822d321a008e194d7929357e5b58d2e4a04ab670d137182f9759152aa33180ff"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.2"
+    version: "1.10.1"
   sqlite3_flutter_libs:
     dependency: "direct main"
     description:
       name: sqlite3_flutter_libs
-      sha256: "3e3583b77cf888a68eae2e49ee4f025f66b86623ef0d83c297c8d903daa14871"
+      sha256: "02f80aea54a19a36b347dedf6d4181ecd9107f5831ea6139cfd0376a3de197ba"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.18"
+    version: "0.5.13"
   sqlparser:
     dependency: transitive
     description:
@@ -785,10 +785,10 @@ packages:
     dependency: transitive
     description:
       name: synchronized
-      sha256: "5fcbd27688af6082f5abd611af56ee575342c30e87541d0245f7ff99faa02c60"
+      sha256: "33b31b6beb98100bf9add464a36a8dd03eb10c7a8cf15aeec535e9b054aaf04b"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.0"
+    version: "3.0.1"
   term_glyph:
     dependency: transitive
     description:
@@ -801,10 +801,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
+      sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.0"
+    version: "0.4.16"
   timing:
     dependency: transitive
     description:
@@ -817,10 +817,10 @@ packages:
     dependency: transitive
     description:
       name: typed_data
-      sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c
+      sha256: "26f87ade979c47a150c9eaab93ccd2bebe70a27dc0b4b29517f2904f04eb11a5"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.2"
+    version: "1.3.1"
   uuid:
     dependency: transitive
     description:
@@ -841,50 +841,42 @@ packages:
     dependency: transitive
     description:
       name: watcher
-      sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8"
+      sha256: "6a7f46926b01ce81bfc339da6a7f20afbe7733eff9846f6d6a5466aa4c6667c0"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.0.2"
-  web:
-    dependency: transitive
-    description:
-      name: web
-      sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.1.4-beta"
   web_socket_channel:
     dependency: transitive
     description:
       name: web_socket_channel
-      sha256: d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b
+      sha256: ca49c0bc209c687b887f30527fb6a9d80040b072cc2990f34b9bec3e7663101b
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.0"
+    version: "2.3.0"
   win32:
     dependency: transitive
     description:
       name: win32
-      sha256: "350a11abd2d1d97e0cc7a28a81b781c08002aa2864d9e3f192ca0ffa18b06ed3"
+      sha256: a6f0236dbda0f63aa9a25ad1ff9a9d8a4eaaa5012da0dc59d21afdb1dc361ca4
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.9"
+    version: "3.1.4"
   xdg_directories:
     dependency: transitive
     description:
       name: xdg_directories
-      sha256: "589ada45ba9e39405c198fe34eb0f607cddb2108527e658136120892beac46d2"
+      sha256: ee1505df1426458f7f60aac270645098d318a8b4766d85fde75f76f2e21807d1
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.3"
+    version: "1.0.0"
   yaml:
     dependency: transitive
     description:
       name: yaml
-      sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5"
+      sha256: "23812a9b125b48d4007117254bca50abb6c712352927eece9e155207b1db2370"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.2"
+    version: "3.1.1"
 sdks:
-  dart: ">=3.1.0-185.0.dev <4.0.0"
+  dart: ">=2.19.5 <3.0.0"
-  flutter: ">=3.10.0"
+  flutter: ">=3.3.0"

pubspec.yaml

@@ -42,11 +42,11 @@ dependencies:
   path_provider: ^2.0.14
   sqlite3_flutter_libs: ^0.5.13
   moor: ^4.6.1+1
-  file_picker: ^6.1.1
+  file_picker: ^5.2.9
-  audioplayers: ^5.2.0
+  audioplayers: ^4.0.1
   intl: ^0.18.0
-  permission_handler: ^11.0.1
+  permission_handler: ^10.2.0
-  infinite_scroll_pagination: ^4.0.0
+  infinite_scroll_pagination: ^3.2.0
 
 dev_dependencies:
   flutter_test:
@@ -57,7 +57,7 @@ dev_dependencies:
   # activated in the `analysis_options.yaml` file located at the root of your
   # package. See that file for information about deactivating specific lint
   # rules and activating additional ones.
-  flutter_lints: ^3.0.1
+  flutter_lints: ^2.0.0
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec