convert to dao calls, prep for migration strategy and first start db seed

analysis_options.yaml

@@ -9,6 +9,10 @@
 # packages, and plugins designed to encourage good coding practices.
 include: package:flutter_lints/flutter.yaml
 
+analyzer:
+  exclude:
+    - "**/*.g.dart"
+
 linter:
   # The lint rules applied to this project can be customized in the
   # section below to disable rules from the `package:flutter_lints/flutter.yaml`

lib/database/database.dart

@@ -2,6 +2,7 @@ import 'package:drift/drift.dart';
 import 'package:drift_flutter/drift_flutter.dart';
 import 'package:sendtrain/database/daos/activities_dao.dart';
 import 'package:sendtrain/database/daos/sessions_dao.dart';
+import 'package:sendtrain/database/seed.dart';
 
 part 'database.g.dart';
 
@@ -125,6 +126,16 @@ class AppDatabase extends _$AppDatabase {
   @override
   int get schemaVersion => 1;
 
+  @override
+  MigrationStrategy get migration {
+    return MigrationStrategy(
+      onCreate: (m) async {
+        await m.createAll(); // create all tables
+        await seedDb(); // seed the tables
+      }
+    );
+  }
+
   static QueryExecutor _openConnection() {
     // `driftDatabase` from `package:drift_flutter` stores the database in
     // `getApplicationDocumentsDirectory()`.

lib/database/seed.dart

@@ -3,7 +3,7 @@ import 'dart:math';
 import 'package:drift/drift.dart';
 import 'package:sendtrain/database/database.dart';
 
-void seedDb() {
+Future<void> seedDb() async {
   final database = AppDatabase();
 
   // seed data setup

lib/main.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
+import 'package:sendtrain/database/database.dart';
 import 'package:sendtrain/models/activity_timer_model.dart';
 import 'package:sendtrain/screens/activities_screen.dart';
 import 'package:sendtrain/screens/sessions_screen.dart';
@@ -11,7 +12,6 @@ class SendTrain extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    // seedDb();
     return MaterialApp(
         title: "Sendtrain",
         theme: ThemeData.dark(useMaterial3: true),
@@ -93,10 +93,13 @@ class _AppState extends State<App> {
 }
 
 void main() {
-  runApp(
+  runApp(MultiProvider(
-    ChangeNotifierProvider(
+    providers: [
-      create: (context) => ActivityTimerModel(),
+      ChangeNotifierProvider(create: (context) => ActivityTimerModel()),
-      child: const SendTrain(),
+      Provider<AppDatabase>(
-    ),
+          create: (context) => AppDatabase(),
-  );
+          dispose: (context, db) => db.close()),
+    ],
+    child: const SendTrain(),
+  ));
 }

lib/models/activity_timer_model.dart

@@ -2,11 +2,13 @@ import 'dart:async';
 
 import 'package:flutter/material.dart';
 import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
+import 'package:sendtrain/database/database.dart';
 import 'package:sendtrain/models/activity_model.dart';
 
 class ActivityTimerModel with ChangeNotifier {
   int _actionCounter = 0;
-  ActivityModel? _activity;
+  ActivityModel? _activityModel;
+  Activity? _activity;
   List _sets = [];
   int _currentActionNum = 0;
   int _currentSetNum = 0;
@@ -20,20 +22,21 @@ class ActivityTimerModel with ChangeNotifier {
   dynamic get currentAction => currentSet[_currentActionNum];
   int get currentSetNum => _currentSetNum;
   dynamic get currentSet => _sets[_currentSetNum];
-  ActivityModel? get activity => _activity;
+  ActivityModel? get activityModel => _activityModel;
+  Activity? get activity => _activity;
   List get sets => _sets;
   Timer? get periodicTimer => _periodicTimer;
   bool get isActive => _isActive();
   double get progress => _progress;
   int get totalTime => _totalTime;
 
-  void setup(ActivityModel activity) {
+  void setup(ActivityModel activityModel) {
-    if (_activity == null || activity.id != _activity?.id) {
+    if (_activityModel == null || activityModel.id != _activityModel?.id) {
       _periodicTimer?.cancel();
       _progress = 0;
       _isc = null;
-      _activity = activity;
+      _activityModel = activityModel;
-      _sets = activity.actions[0].items();
+      _sets = activityModel.actions[0].items();
       _currentActionNum = 0;
       _currentSetNum = 0;
       setActionCount();

lib/screens/sessions_screen.dart

@@ -1,19 +1,18 @@
 import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
 import 'package:sendtrain/database/daos/sessions_dao.dart';
 import 'package:sendtrain/database/database.dart';
 import '../widgets/session_card.dart';
 
 class SessionsScreen extends StatelessWidget {
-  final AppDatabase database = AppDatabase();
+  const SessionsScreen({super.key});
-  SessionsScreen({super.key});
 
   @override
   Widget build(BuildContext context) {
     return FutureBuilder<List<Session>>(
-        future: SessionsDao(database).all(),
+        future: SessionsDao(Provider.of<AppDatabase>(context)).all(),
         builder: (context, snapshot) {
           if (snapshot.hasData) {
-            database.close();
             final sessions = snapshot.data!;
             final pending = sessions.where((session) =>
                 session.status == SessionStatus.completed ||
@@ -28,8 +27,6 @@ class SessionsScreen extends StatelessWidget {
             Widget upcomingSession = SessionCard(session: upcoming);
             Widget currentSession = SessionCard(session: current);
 
-            database.close();
-
             return Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: <Widget>[
@@ -66,7 +63,13 @@ class SessionsScreen extends StatelessWidget {
               ],
             );
           } else {
-            return const CircularProgressIndicator();
+            return Container(
+                alignment: Alignment.center,
+                child: SizedBox(
+                  height: 50.0,
+                  width: 50.0,
+                  child: CircularProgressIndicator(),
+                ));
           }
         });
   }

lib/widgets/activity_action_view.dart

@@ -25,7 +25,7 @@ class ActivityActionViewState extends State<ActivityActionView> {
   Widget build(BuildContext context) {
     ActivityTimerModel atm =
         Provider.of<ActivityTimerModel>(context, listen: true);
-    List<List<Map<String, dynamic>>> sets = atm.activity!.actions[0].items();
+    List<List<Map<String, dynamic>>> sets = atm.activityModel!.actions[0].items();
 
     // we need to set the scroll controller
     // so we can update the selected item position

lib/widgets/activity_card.dart

@@ -36,28 +36,28 @@ class ActivityCardState extends State<ActivityCard> {
           : Theme.of(context).colorScheme.surfaceContainerLow,
       clipBehavior: Clip.hardEdge,
       child: InkWell(
-          // onTap: () => showGeneralDialog(
+          onTap: () => showGeneralDialog(
-          //     barrierColor: Colors.black.withOpacity(0.5),
+              barrierColor: Colors.black.withOpacity(0.5),
-          //     transitionDuration: const Duration(milliseconds: 220),
+              transitionDuration: const Duration(milliseconds: 220),
-          //     transitionBuilder: (BuildContext context,
+              transitionBuilder: (BuildContext context,
-          //         Animation<double> animation,
+                  Animation<double> animation,
-          //         Animation<double> secondaryAnimation,
+                  Animation<double> secondaryAnimation,
-          //         Widget child) {
+                  Widget child) {
-          //       Animation<Offset> custom = Tween<Offset>(
+                Animation<Offset> custom = Tween<Offset>(
-          //               begin: const Offset(0.0, 1.0),
+                        begin: const Offset(0.0, 1.0),
-          //               end: const Offset(0.0, 0.0))
+                        end: const Offset(0.0, 0.0))
-          //           .animate(animation);
+                    .animate(animation);
-          //       return SlideTransition(
+                return SlideTransition(
-          //           position: custom,
+                    position: custom,
-          //           child: Dialog.fullscreen(
+                    child: Dialog.fullscreen(
-          //               child: ActivityView(activity: widget.activity)));
+                        child: ActivityView(activity: widget.activity)));
-          //     },
+              },
-          //     barrierDismissible: true,
+              barrierDismissible: true,
-          //     barrierLabel: '',
+              barrierLabel: '',
-          //     context: context,
+              context: context,
-          //     pageBuilder: (context, animation1, animation2) {
+              pageBuilder: (context, animation1, animation2) {
-          //       return Container();
+                return Container();
-          //     }),
+              }),
           child: Column(
             mainAxisSize: MainAxisSize.min,
             children: <Widget>[
@@ -65,6 +65,7 @@ class ActivityCardState extends State<ActivityCard> {
                   leading: Padding(
                       padding: const EdgeInsets.fromLTRB(0, 0, 0, 0),
                       child: Container(
+                        padding: EdgeInsets.only(top: 5, bottom: 5),
                         width: 60,
                         decoration: BoxDecoration(
                           image: DecorationImage(

lib/widgets/session_view.dart

@@ -1,8 +1,8 @@
-import 'package:drift/drift.dart' hide Column;
 import 'package:flutter/material.dart';
 import 'package:flutter_expandable_fab/flutter_expandable_fab.dart';
 import 'package:intl/intl.dart';
 import 'package:intl/date_symbol_data_local.dart';
+import 'package:provider/provider.dart';
 import 'package:sendtrain/database/daos/activities_dao.dart';
 
 import 'package:sendtrain/database/database.dart';
@@ -12,11 +12,10 @@ import 'package:sendtrain/widgets/session_view_activities.dart';
 import 'package:sendtrain/widgets/session_view_media.dart';
 
 class SessionView extends StatelessWidget {
-  SessionView({super.key, required this.data, required this.session});
+  const SessionView({super.key, required this.data, required this.session});
 
   final SessionModel data;
   final Session session;
-  final AppDatabase database = AppDatabase();
 
   @override
   Widget build(BuildContext context) {
@@ -24,11 +23,10 @@ class SessionView extends StatelessWidget {
     final DateFormat dateFormat = DateFormat('yyyy-MM-dd');
 
     return FutureBuilder<List<Activity>>(
-        future: ActivitiesDao(database).sessionActivities(session.id),
+        future: ActivitiesDao(Provider.of<AppDatabase>(context)).sessionActivities(session.id),
         builder: (context, snapshot) {
           if (snapshot.hasData) {
             final activities = snapshot.data!;
-            database.close();
             return Scaffold(
                 floatingActionButtonLocation: ExpandableFab.location,
                 floatingActionButton: ExpandableFab(
@@ -84,7 +82,7 @@ class SessionView extends StatelessWidget {
                             style: TextStyle(
                                 fontSize: 20, fontWeight: FontWeight.bold),
                             'Media:')),
-                    SessionViewMedia(session: session, media: data.media),
+                    SessionViewMedia(session: session),
                     const Padding(
                         padding: EdgeInsets.fromLTRB(15, 30, 0, 10),
                         child: Text(
@@ -96,7 +94,13 @@ class SessionView extends StatelessWidget {
                   ],
                 ));
           } else {
-            return const CircularProgressIndicator();
+            return Container(
+                alignment: Alignment.center,
+                child: SizedBox(
+                  height: 50.0,
+                  width: 50.0,
+                  child: CircularProgressIndicator(),
+                ));
           }
         });
   }

lib/widgets/session_view_achievements.dart

@@ -1,12 +1,12 @@
 import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
 import 'package:sendtrain/database/daos/session_activities_dao.dart';
 import 'package:sendtrain/database/database.dart';
 
 class SessionViewAchievements extends StatelessWidget {
-  SessionViewAchievements({super.key, required this.session});
+  const SessionViewAchievements({super.key, required this.session});
 
   final Session session;
-  final AppDatabase database = AppDatabase();
 
   List<String> getAchievements(List<SessionActivity> sessionActivities) {
     List<String> achievements = [];
@@ -26,12 +26,12 @@ class SessionViewAchievements extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return FutureBuilder<List<SessionActivity>>(
-        future: SessionActivitiesDao(database).sessionActivitiesBySessionId(session.id),
+        future: SessionActivitiesDao(Provider.of<AppDatabase>(context)).sessionActivitiesBySessionId(session.id),
         builder: (context, snapshot) {
           if (snapshot.hasData) {
             final sessionActivities = snapshot.data!;
             final achievements = getAchievements(sessionActivities);
-            database.close();
+            // database.close();
 
             return Column(
               children: [
@@ -58,7 +58,7 @@ class SessionViewAchievements extends StatelessWidget {
               ],
             );
           } else {
-            return const CircularProgressIndicator();
+            return Padding(padding: EdgeInsets.all(15), child:CircularProgressIndicator());
           }
         });
   }

lib/widgets/session_view_media.dart

@@ -1,24 +1,22 @@
 import 'package:flutter/material.dart';
-import 'package:sendtrain/classes/media.dart';
+import 'package:provider/provider.dart';
 import 'package:sendtrain/database/daos/media_items_dao.dart';
 import 'package:sendtrain/database/database.dart';
 import 'package:sendtrain/widgets/media_card.dart';
 
 class SessionViewMedia extends StatelessWidget {
-  SessionViewMedia({super.key, this.media, required this.session});
+  const SessionViewMedia({super.key, required this.session});
 
-  final List<Media>? media;
   final Session session;
-  final AppDatabase database = AppDatabase();
 
   @override
   Widget build(BuildContext context) {
     return FutureBuilder<List<MediaItem>>(
-        future: MediaItemsDao(database).mediaItemsFromSession(session),
+        future: MediaItemsDao(Provider.of<AppDatabase>(context)).mediaItemsFromSession(session),
         builder: (context, snapshot) {
           if (snapshot.hasData) {
             final mediaItems = snapshot.data!;
-            database.close();
+            // database.close();
             List<Widget> mediaCards = List.generate(
                 mediaItems.length, (i) => MediaCard(media: mediaItems[i]));
 
@@ -37,7 +35,7 @@ class SessionViewMedia extends StatelessWidget {
               ],
             );
           } else {
-            return CircularProgressIndicator();
+            return Padding(padding: EdgeInsets.all(15), child:CircularProgressIndicator());
           }
         });
   }