awesome-notifications poc

analysis_options.yaml

@@ -9,10 +9,6 @@
 # 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`

android/app/build.gradle

@@ -24,7 +24,7 @@ android {
         applicationId = "com.example.sendtrain"
         // You can update the following values to match your application needs.
         // For more information, see: https://flutter.dev/to/review-gradle-config.
-        minSdk = flutter.minSdkVersion
+        minSdk = 23
         targetSdk = flutter.targetSdkVersion
         versionCode = flutter.versionCode
         versionName = flutter.versionName

android/app/proguard-rules.pro

@@ -1 +0,0 @@
--keep class androidx.lifecycle.DefaultLifecycleObserver

android/app/src/main/AndroidManifest.xml

@@ -1,20 +1,20 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    <uses-feature android:name="android.hardware.location.network" android:required="false" />
+    <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-feature android:name="android.hardware.location.gps" android:required="false" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.INTERNET"/>
     <application
-        android:label="sendtrain"
+        android:label="SendTrain"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
+        <!-- <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/> -->
         <activity
             android:name=".MainActivity"
             android:exported="true"
             android:launchMode="singleTop"
-            android:taskAffinity=""
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
-            android:windowSoftInputMode="adjustResize">
+            android:windowSoftInputMode="adjustResize"
+            android:enableOnBackInvokedCallback="true">
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
                  while the Flutter UI initializes. After that, this theme continues
@@ -26,6 +26,10 @@
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+                <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
+                <action android:name="android.intent.action.QUICKBOOT_POWERON" />
+                <action android:name="com.htc.intent.action.QUICKBOOT_POWERON" />
             </intent-filter>
         </activity>
         <!-- Don't delete the meta-data below.
@@ -34,18 +38,4 @@
             android:name="flutterEmbedding"
             android:value="2" />
     </application>
-    <meta-data android:name="com.google.android.geo.API_KEY"
-        android:value="AIzaSyBCjMCEAyyNVpsnVYvZj6VL1mmB98Vd6AE" />
-    <!-- Required to query activities that can process text, see:
-         https://developer.android.com/training/package-visibility and
-         https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.
-
-         In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->
-    <queries>
-        <intent>
-            <action android:name="android.intent.action.PROCESS_TEXT" />
-            <data android:mimeType="text/plain" />
-
-        </intent>
-    </queries>
 </manifest>

build.yaml

@@ -1,9 +0,0 @@
-targets:
-  $default:
-    builders:
-      drift_dev:
-        options:
-          schema_dir: lib/database/drift_schemas/
-          databases:
-            # Required: A name for the database and it's path
-            sendtrain: lib/database/database.dart

ios/Runner/AppDelegate.swift

@@ -1,6 +1,5 @@
 import UIKit
 import Flutter
-import GoogleMaps
 
 @UIApplicationMain
 @objc class AppDelegate: FlutterAppDelegate {
@@ -8,7 +7,6 @@ import GoogleMaps
     _ application: UIApplication,
     didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
   ) -> Bool {
-    GMSServices.provideAPIKey("AIzaSyBCjMCEAyyNVpsnVYvZj6VL1mmB98Vd6AE")
     GeneratedPluginRegistrant.register(with: self)
     return super.application(application, didFinishLaunchingWithOptions: launchOptions)
   }

ios/Runner/Info.plist

@@ -2,13 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>UIBackgroundModes</key>
-	<array>
-		<string>fetch</string>
-		<string>remote-notification</string>
-	</array>
-	<key>NSPhotoLibraryUsageDescription</key>
-	<string>The Photo library is used when selecting a photo to upload as media for a Session</string>
 	<key>CADisableMinimumFrameDurationOnPhone</key>
 	<true/>
 	<key>CFBundleDevelopmentRegion</key>

lib/daos/actions_dao.dart

@@ -1,64 +0,0 @@
-import 'package:drift/drift.dart';
-import 'package:sendtrain/database/database.dart';
-
-part 'actions_dao.g.dart';
-
-@DriftAccessor(tables: [Actions])
-class ActionsDao extends DatabaseAccessor<AppDatabase> with _$ActionsDaoMixin {
-  ActionsDao(super.db);
-
-  Future<List<Action>> all() async {
-    return await select(actions).get();
-  }
-
-  Future<Action> find(int id) async {
-    return await (select(actions)..where((action) => action.id.equals(id) )).getSingle();
-  }
-
-  Future<List<Action>> fromActivity(Activity activity, Session session) async {
-    final result = select(db.activityActions).join(
-      [
-        innerJoin(
-          db.actions,
-          db.actions.id.equalsExp(db.activityActions.actionId),
-        ),
-      ],
-    )
-      ..where(db.activityActions.activityId.equals(activity.id))
-      ..where(db.activityActions.sessionId.equals(session.id));
-
-    final actions = (await result.get())
-        .map((e) => e.readTable(db.actions))
-        .toList();
-
-    return actions;
-  }
-
-  Stream<List<Action>> watchActivityActions(Activity activity, Session session) {
-    final result = select(db.activityActions).join(
-      [
-        innerJoin(
-          db.actions,
-          db.actions.id.equalsExp(db.activityActions.actionId),
-        ),
-      ],
-    )
-      ..where(db.activityActions.activityId.equals(activity.id))
-      ..where(db.activityActions.sessionId.equals(session.id));
-
-    // final actions = result.watch().map((rows) {
-    //   return rows.map((row) {
-    //     row.readTable(db.actions);
-    //   }).toList();
-    // });
-
-    final actions = (result.watch()).map((rows) {
-      return rows.map((row) => row.readTable(db.actions)).toList();
-    });
-
-    return actions;
-  }
-
-  Future createOrUpdate(ActionsCompanion action) => into(actions).insertOnConflictUpdate(action);
-  Future replace(Action action) => update(actions).replace(action);
-}

lib/daos/actions_dao.g.dart

@@ -1,8 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'actions_dao.dart';
-
-// ignore_for_file: type=lint
-mixin _$ActionsDaoMixin on DatabaseAccessor<AppDatabase> {
-  $ActionsTable get actions => attachedDatabase.actions;
-}

lib/daos/activities_dao.dart

@@ -1,89 +0,0 @@
-import 'package:drift/drift.dart';
-import 'package:sendtrain/database/database.dart';
-
-part 'activities_dao.g.dart';
-
-@DriftAccessor(tables: [Activities])
-class ActivitiesDao extends DatabaseAccessor<AppDatabase>
-    with _$ActivitiesDaoMixin {
-  ActivitiesDao(super.db);
-
-  Future<List<Activity>> all() async {
-    return await select(activities).get();
-  }
-
-  Future<Activity> find(int id) async {
-    return await (select(activities)
-          ..where((activity) => activity.id.equals(id)))
-        .getSingle();
-  }
-
-  Future remove(Activity activity) => delete(activities).delete(activity);
-
-  Future<List<Activity>> contains(value) async {
-    return (select(activities)
-          ..where((t) =>
-              t.title.contains(value) | t.description.contains(value) | t.category.contains(value)))
-        .get();
-  }
-
-  Future<List<Activity>> activitiesFromSession(int id) async {
-    final result = select(db.sessionActivities).join(
-      [
-        innerJoin(
-          db.activities,
-          db.activities.id.equalsExp(db.sessionActivities.activityId),
-        ),
-      ],
-    )..where(db.sessionActivities.sessionId.equals(id));
-
-    final activities =
-        (await result.get()).map((e) => e.readTable(db.activities)).toList();
-
-    return activities;
-  }
-
-  Stream<List<Activity>> watchSessionActivities(int id) {
-    final query = select(db.sessionActivities).join(
-      [
-        innerJoin(
-          db.activities,
-          db.activities.id.equalsExp(db.sessionActivities.activityId),
-        ),
-      ],
-    )..where(db.sessionActivities.sessionId.equals(id));
-
-    return query.watch().map((rows) {
-      final activities = (rows).map((e) => e.readTable(db.activities)).toList();
-
-      return activities;
-    });
-  }
-
-  // MultiSelectable<SessionActivity> _selectableSessionActivities(int id) {
-  //   // return select(db.sessionActivities)..limit(1, offset: 1);
-  //   // final query = select(db.sessionActivities).join(
-  //   //   [
-  //   //     innerJoin(
-  //   //       db.activities,
-  //   //       db.activities.id.equalsExp(db.sessionActivities.activityId),
-  //   //     ),
-  //   //   ],
-  //   // )..where(db.sessionActivities.sessionId.equals(id));
-
-  //   // return query;
-
-  //   final query = select(db.sessionActivities)..where((row) => row.sessionId.equals(id));
-
-  //   query.join(
-  //     [
-  //       innerJoin(
-  //         db.activities,
-  //         db.activities.id.equalsExp(db.sessionActivities.activityId),
-  //       ),
-  //     ],
-  //   );
-
-  //   return query;
-  // }
-}

lib/daos/activities_dao.g.dart

@@ -1,8 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'activities_dao.dart';
-
-// ignore_for_file: type=lint
-mixin _$ActivitiesDaoMixin on DatabaseAccessor<AppDatabase> {
-  $ActivitiesTable get activities => attachedDatabase.activities;
-}

lib/daos/activity_actions_dao.dart

@@ -1,31 +0,0 @@
-import 'package:drift/drift.dart';
-import 'package:sendtrain/database/database.dart';
-
-part 'activity_actions_dao.g.dart';
-
-@DriftAccessor(tables: [ActivityActions])
-class ActivityActionsDao extends DatabaseAccessor<AppDatabase> with _$ActivityActionsDaoMixin {
-  ActivityActionsDao(super.db);
-
-  Future<List<ActivityAction>> all() => select(activityActions).get();
-  Stream<List<ActivityAction>> watch() => select(activityActions).watch();
-  Future insert(ActivityAction activityAction) => into(activityActions).insert(activityAction);
-  Future replace(ActivityAction activityAction) => update(activityActions).replace(activityAction);
-  Future remove(ActivityAction activityAction) => delete(activityActions).delete(activityAction);
-  Future createOrUpdate(ActivityActionsCompanion activityAction) => into(activityActions).insertOnConflictUpdate(activityAction);
-
-  // Future<List<ActivityAction>> all() async {
-  //   return await select(activityActions).get();
-  // }
-
-  Future<ActivityAction> find(int id) async {
-    return await (select(activityActions)..where((activityAction) => activityAction.id.equals(id) )).getSingle();
-  }
-
-  Future<List<ActivityAction>> fromActivityId(int id) async {
-    final result = db.managers.activityActions
-        .filter((activityAction) => activityAction.activityId.id(id));
-
-    return result.get();
-  }
-}

lib/daos/activity_actions_dao.g.dart

@@ -1,11 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'activity_actions_dao.dart';
-
-// ignore_for_file: type=lint
-mixin _$ActivityActionsDaoMixin on DatabaseAccessor<AppDatabase> {
-  $ActivitiesTable get activities => attachedDatabase.activities;
-  $ActionsTable get actions => attachedDatabase.actions;
-  $SessionsTable get sessions => attachedDatabase.sessions;
-  $ActivityActionsTable get activityActions => attachedDatabase.activityActions;
-}

lib/daos/media_items_dao.dart

@@ -1,84 +0,0 @@
-import 'package:drift/drift.dart';
-import 'package:sendtrain/database/database.dart';
-
-part 'media_items_dao.g.dart';
-
-@DriftAccessor(tables: [MediaItems])
-class MediaItemsDao extends DatabaseAccessor<AppDatabase>
-    with _$MediaItemsDaoMixin {
-  MediaItemsDao(super.db);
-
-  Future createOrUpdate(MediaItemsCompanion mediaItem) =>
-      into(mediaItems).insertOnConflictUpdate(mediaItem);
-
-  Future<List<MediaItem>> all() async {
-    return await select(mediaItems).get();
-  }
-
-  Future<MediaItem> find(int id) async {
-    return await (select(mediaItems)
-          ..where((mediaItem) => mediaItem.id.equals(id)))
-        .getSingle();
-  }
-
-  Future<List<MediaItem>> fromActivity(Activity activity) async {
-    final result = select(db.objectMediaItems).join(
-      [
-        innerJoin(
-          db.mediaItems,
-          db.mediaItems.id.equalsExp(db.objectMediaItems.mediaId),
-        ),
-      ],
-    )
-      ..where(db.objectMediaItems.objectType.equals(ObjectType.activities.name))
-      ..where(db.objectMediaItems.objectId.equals(activity.id));
-
-    final mediaItems =
-        (await result.get()).map((e) => e.readTable(db.mediaItems)).toList();
-
-    return mediaItems;
-  }
-
-  Future<List<MediaItem>> fromSession(int sessionId) async {
-    final result = select(db.objectMediaItems).join(
-      [
-        innerJoin(
-          db.mediaItems,
-          db.mediaItems.id.equalsExp(db.objectMediaItems.mediaId),
-        ),
-      ],
-    )
-      ..where(db.objectMediaItems.objectType.equals(ObjectType.sessions.name))
-      ..where(db.objectMediaItems.objectId.equals(sessionId));
-
-    final mediaItems =
-        (await result.get()).map((e) => e.readTable(db.mediaItems)).toList();
-
-    return mediaItems;
-  }
-
-  Stream<List<MediaItem>> watchSessionMediaItems(int id) {
-    final query = select(db.objectMediaItems).join(
-      [
-        innerJoin(
-          db.mediaItems,
-          db.mediaItems.id.equalsExp(db.objectMediaItems.mediaId),
-        ),
-      ],
-    )
-      ..where(db.objectMediaItems.objectType.equals(ObjectType.sessions.name))
-      ..where(db.objectMediaItems.objectId.equals(id));
-
-    return query.watch().map((rows) {
-      final mediaItems = (rows).map((e) => e.readTable(db.mediaItems)).toList();
-
-      return mediaItems;
-    });
-  }
-
-  Future remove(MediaItem mediaItem) => delete(mediaItems).delete(mediaItem);
-  Future removeAll(Iterable<int> mediaItemIds) {
-    return (delete(mediaItems)..where((table) => table.id.isIn(mediaItemIds)))
-        .go();
-  }
-}

lib/daos/media_items_dao.g.dart

@@ -1,8 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'media_items_dao.dart';
-
-// ignore_for_file: type=lint
-mixin _$MediaItemsDaoMixin on DatabaseAccessor<AppDatabase> {
-  $MediaItemsTable get mediaItems => attachedDatabase.mediaItems;
-}

lib/daos/object_media_items_dao.dart

@@ -1,19 +0,0 @@
-import 'package:drift/drift.dart';
-import 'package:sendtrain/database/database.dart';
-
-part 'object_media_items_dao.g.dart';
-
-@DriftAccessor(tables: [ObjectMediaItems])
-class ObjectMediaItemsDao extends DatabaseAccessor<AppDatabase> with _$ObjectMediaItemsDaoMixin {
-  ObjectMediaItemsDao(super.db);
-
-  Future createOrUpdate(ObjectMediaItemsCompanion objectMediaItem) => into(objectMediaItems).insertOnConflictUpdate(objectMediaItem);
-
-  Future<List<ObjectMediaItem>> all() async {
-    return await select(objectMediaItems).get();
-  }
-
-  Future<ObjectMediaItem> find(int id) async {
-    return await (select(objectMediaItems)..where((objectMediaItem) => objectMediaItem.id.equals(id) )).getSingle();
-  }
-}

lib/daos/object_media_items_dao.g.dart

@@ -1,10 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'object_media_items_dao.dart';
-
-// ignore_for_file: type=lint
-mixin _$ObjectMediaItemsDaoMixin on DatabaseAccessor<AppDatabase> {
-  $MediaItemsTable get mediaItems => attachedDatabase.mediaItems;
-  $ObjectMediaItemsTable get objectMediaItems =>
-      attachedDatabase.objectMediaItems;
-}

lib/daos/session_activities_dao.dart

@@ -1,42 +0,0 @@
-import 'package:drift/drift.dart';
-import 'package:sendtrain/database/database.dart';
-
-part 'session_activities_dao.g.dart';
-
-@DriftAccessor(tables: [SessionActivities])
-class SessionActivitiesDao extends DatabaseAccessor<AppDatabase>
-    with _$SessionActivitiesDaoMixin {
-  SessionActivitiesDao(super.db);
-
-  Future createOrUpdate(SessionActivitiesCompanion sessionActivity) =>
-      into(sessionActivities).insertOnConflictUpdate(sessionActivity);
-
-  Future<List<SessionActivity>> all() async {
-    return await select(sessionActivities).get();
-  }
-
-  Future<SessionActivity> find(int id) async {
-    return await (select(sessionActivities)
-          ..where((sessionActivity) => sessionActivity.id.equals(id)))
-        .getSingle();
-  }
-
-  Future<List<SessionActivity>> fromSessionId(int id) async {
-    final result = db.managers.sessionActivities
-        .filter((sessionActivity) => sessionActivity.sessionId.id(id));
-
-    return result.get();
-  }
-
-  Future remove(SessionActivity sessionActivity) =>
-      delete(sessionActivities).delete(sessionActivity);
-
-  Future removeAssociation(int activityId, int sessionId) {
-    return (delete(sessionActivities)
-          ..where((t) =>
-              t.sessionId.equals(sessionId) & t.activityId.equals(activityId)))
-        .go();
-  }
-}
-
-// return (delete(todos)..where((t) => t.id.isSmallerThanValue(10))).go();

lib/daos/session_activities_dao.g.dart

@@ -1,11 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'session_activities_dao.dart';
-
-// ignore_for_file: type=lint
-mixin _$SessionActivitiesDaoMixin on DatabaseAccessor<AppDatabase> {
-  $SessionsTable get sessions => attachedDatabase.sessions;
-  $ActivitiesTable get activities => attachedDatabase.activities;
-  $SessionActivitiesTable get sessionActivities =>
-      attachedDatabase.sessionActivities;
-}

lib/daos/sessions_dao.dart

@@ -1,17 +0,0 @@
-import 'package:drift/drift.dart';
-import 'package:sendtrain/database/database.dart';
-
-part 'sessions_dao.g.dart';
-
-@DriftAccessor(tables: [Sessions])
-class SessionsDao extends DatabaseAccessor<AppDatabase> with _$SessionsDaoMixin {
-  SessionsDao(super.db);
-
-  Future<Session> find(int id) => (select(sessions)..where((session) => session.id.equals(id) )).getSingle();
-  Stream<Session> watchSession(int id) => (select(sessions)..where((session) => session.id.equals(id) )).watchSingle();
-  Future<List<Session>> all() => select(sessions).get();
-  Stream<List<Session>> watch() => select(sessions).watch();
-  Future createOrUpdate(SessionsCompanion session) => into(sessions).insertOnConflictUpdate(session);
-  Future replace(Session session) => update(sessions).replace(session);
-  Future remove(Session session) => delete(sessions).delete(session);
-}

lib/daos/sessions_dao.g.dart

@@ -1,8 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'sessions_dao.dart';
-
-// ignore_for_file: type=lint
-mixin _$SessionsDaoMixin on DatabaseAccessor<AppDatabase> {
-  $SessionsTable get sessions => attachedDatabase.sessions;
-}

lib/database.dart

@@ -0,0 +1,121 @@
+import 'package:drift/drift.dart';
+import 'package:drift_flutter/drift_flutter.dart';
+
+part 'database.g.dart';
+
+
+enum SessionStatus {
+  pending,
+  started,
+  completed,
+  missed
+}
+
+class Sessions extends Table {
+  IntColumn get id => integer().autoIncrement()();
+  TextColumn get title => text().withLength(min: 3, max: 32)();
+  TextColumn get content => text().named('body')();
+  TextColumn get status => textEnum<SessionStatus>()();
+  DateTimeColumn get date => dateTime().nullable()();
+  DateTimeColumn get createdAt => dateTime().withDefault(Variable(DateTime.now()))();
+}
+
+class SessionActivities extends Table {
+  IntColumn get id => integer().autoIncrement()();
+  IntColumn get sessionId => integer().references(Sessions, #id)();
+  IntColumn get activityId => integer().references(Activities, #id)();
+  TextColumn get results => text().nullable()();
+  TextColumn get achievements => text().nullable()();
+  DateTimeColumn get createdAt => dateTime().withDefault(Variable(DateTime.now()))();
+}
+
+enum ActivityCategories {
+   fundamentals,
+   conditioning,
+   advanced,
+   custom,
+   pro
+}
+
+enum ActivityType {
+  strength,
+  power,
+  conditioning,
+  hypertrophy,
+  endurance,
+  stability,
+  mobility,
+  flexibility,
+  rehabilitation,
+  technical
+}
+
+class Activities extends Table {
+  IntColumn get id => integer().autoIncrement()();
+  TextColumn get title => text().withLength(min: 3, max: 32)();
+  TextColumn get type => textEnum<ActivityType>()();
+  TextColumn get description => text().named('body')();
+  TextColumn get category => textEnum<ActivityCategories>()();
+  DateTimeColumn get createdAt => dateTime().withDefault(Variable(DateTime.now()))();
+}
+
+class ActivityActions extends Table {
+  IntColumn get id => integer().autoIncrement()();
+  IntColumn get activityId => integer().references(Activities, #id)();
+  IntColumn get actionId => integer().references(Actions, #id)();
+  DateTimeColumn get createdAt => dateTime().withDefault(Variable(DateTime.now()))();
+}
+
+class Actions extends Table {
+  IntColumn get id => integer().autoIncrement()();
+  TextColumn get title => text().withLength(min: 3, max: 32)();
+  TextColumn get description => text().named('body')();
+  TextColumn get set => text()();
+  DateTimeColumn get createdAt => dateTime().withDefault(Variable(DateTime.now()))();
+}
+
+class ObjectMediaItems extends Table {
+  IntColumn get id => integer().autoIncrement()();
+  IntColumn get objectId => integer().references(Actions, #id)();
+  IntColumn get mediaId => integer().references(MediaItems, #id)();
+  DateTimeColumn get createdAt => dateTime().withDefault(Variable(DateTime.now()))();
+}
+
+enum MediaType {
+  youtube,
+  image
+}
+class MediaItems extends Table {
+  IntColumn get id => integer().autoIncrement()();
+  TextColumn get title => text().withLength(min: 3, max: 32)();
+  TextColumn get description => text().named('body')();
+  TextColumn get reference => text().withLength(min: 3, max: 32)();
+  TextColumn get type => textEnum<MediaType>()();
+  DateTimeColumn get createdAt => dateTime().withDefault(Variable(DateTime.now()))();
+}
+
+@DriftDatabase(tables: [
+  Sessions,
+  SessionActivities,
+  Activities,
+  ActivityActions,
+  Actions,
+  ObjectMediaItems,
+  MediaItems
+])
+
+class AppDatabase extends _$AppDatabase {
+  // After generating code, this class needs to define a `schemaVersion` getter
+  // and a constructor telling drift where the database should be stored.
+  // These are described in the getting started guide: https://drift.simonbinder.eu/setup/
+  AppDatabase() : super(_openConnection());
+
+  @override
+  int get schemaVersion => 1;
+
+  static QueryExecutor _openConnection() {
+    // `driftDatabase` from `package:drift_flutter` stores the database in
+    // `getApplicationDocumentsDirectory()`.
+    return driftDatabase(name: 'sendtrain');
+  }
+}

lib/database/database.dart

@@ -1,222 +0,0 @@
-import 'package:drift/drift.dart';
-import 'package:drift_flutter/drift_flutter.dart';
-import 'package:sendtrain/daos/actions_dao.dart';
-import 'package:sendtrain/daos/activities_dao.dart';
-import 'package:sendtrain/daos/activity_actions_dao.dart';
-import 'package:sendtrain/daos/media_items_dao.dart';
-import 'package:sendtrain/daos/object_media_items_dao.dart';
-import 'package:sendtrain/daos/session_activities_dao.dart';
-import 'package:sendtrain/daos/sessions_dao.dart';
-import 'package:sendtrain/database/seed.dart';
-
-part 'database.g.dart';
-
-@DriftDatabase(tables: [
-  Sessions,
-  SessionActivities,
-  Activities,
-  ActivityActions,
-  Actions,
-  ObjectMediaItems,
-  MediaItems
-], daos: [
-  SessionsDao,
-  ActivitiesDao,
-  MediaItemsDao,
-  ObjectMediaItemsDao,
-  SessionActivitiesDao,
-  ActivityActionsDao,
-  ActionsDao
-])
-class AppDatabase extends _$AppDatabase {
-  // After generating code, this class needs to define a `schemaVersion` getter
-  // and a constructor telling drift where the database should be stored.
-  // These are described in the getting started guide: https://drift.simonbinder.eu/setup/
-  AppDatabase() : super(_openConnection());
-
-  @override
-  int get schemaVersion => 35;
-
-  @override
-  MigrationStrategy get migration {
-    return MigrationStrategy(
-      onCreate: (m) async {
-        await m.createAll().then((r) async {
-          await seedDb(this);
-        }); // create all tables
-      },
-      beforeOpen: (details) async {
-        /// Enable foreign_keys
-        await customStatement('PRAGMA foreign_keys = ON');
-      },
-    );
-  }
-
-  static QueryExecutor _openConnection() {
-    // `driftDatabase` from `package:drift_flutter` stores the database in
-    // `getApplicationDocumentsDirectory()`.
-    return driftDatabase(name: 'sendtrain');
-  }
-}
-
-enum SessionStatus { pending, started, completed, missed }
-
-class Sessions extends Table {
-  IntColumn get id => integer().autoIncrement()();
-  TextColumn get title => text().withLength(min: 3, max: 32)();
-  TextColumn get content => text().named('body')();
-  TextColumn get status => textEnum<SessionStatus>()();
-  TextColumn get achievements => text().nullable()();
-  TextColumn get address => text().withLength(min: 3, max: 256).nullable()();
-  DateTimeColumn get date => dateTime().nullable()();
-  DateTimeColumn get createdAt =>
-      dateTime().withDefault(Variable(DateTime.now()))();
-}
-
-class SessionActivities extends Table {
-  IntColumn get id => integer().autoIncrement()();
-  IntColumn get sessionId =>
-      integer().references(Sessions, #id, onDelete: KeyAction.cascade)();
-  IntColumn get activityId =>
-      integer().references(Activities, #id, onDelete: KeyAction.cascade)();
-  IntColumn get position => integer()();
-  TextColumn get results => text().nullable()();
-  DateTimeColumn get createdAt =>
-      dateTime().withDefault(Variable(DateTime.now()))();
-}
-
-enum ActivityCategories { fundamentals, conditioning, advanced, custom, pro }
-
-enum ActivityType {
-  strength,
-  stretching,
-  plyometrics,
-  strongman,
-  powerlifting,
-  cardio,
-  olympicWeightlifting
-}
-
-enum ActivityLevel { beginner, intermediate, expert }
-
-enum ActivityMechanic { compound, isolation }
-
-enum ActivityEquipment {
-  bodyOnly,
-  machine,
-  other,
-  foamRoll,
-  kettlebells,
-  dumbbell,
-  cable,
-  barbell,
-  bands,
-  medicineBall,
-  exerciseBall,
-  eZCurlBar
-}
-
-enum ActivityMuscle {
-  abdominals,
-  hamstrings,
-  calves,
-  shoulders,
-  adductors,
-  glutes,
-  quadriceps,
-  biceps,
-  forearms,
-  abductors,
-  triceps,
-  chest,
-  lowerBack,
-  traps,
-  middleBack,
-  lats,
-  neck
-}
-
-class Activities extends Table {
-  IntColumn get id => integer().autoIncrement()();
-  TextColumn get title => text().withLength(min: 3, max: 100)();
-  TextColumn get type => textEnum<ActivityType>().nullable()();
-  TextColumn get description => text().named('body').nullable()();
-  TextColumn get category => textEnum<ActivityCategories>().nullable()();
-  // from exercises.json
-  TextColumn get force => text().nullable()();
-  TextColumn get level => textEnum<ActivityLevel>().nullable()();
-  TextColumn get mechanic => textEnum<ActivityMechanic>().nullable()();
-  TextColumn get equipment => textEnum<ActivityEquipment>().nullable()();
-  TextColumn get primaryMuscles => textEnum<ActivityMuscle>().nullable()();
-  TextColumn get secondaryMuscles => textEnum<ActivityMuscle>().nullable()();
-  DateTimeColumn get createdAt =>
-      dateTime().withDefault(Variable(DateTime.now()))();
-}
-
-class ActivityActions extends Table {
-  IntColumn get id => integer().autoIncrement()();
-  IntColumn get activityId => integer().references(Activities, #id, onDelete: KeyAction.cascade)();
-  IntColumn get actionId =>
-      integer().references(Actions, #id, onDelete: KeyAction.cascade)();
-  IntColumn get sessionId => integer().references(Sessions, #id, onDelete: KeyAction.cascade)();
-  IntColumn get position => integer()();
-  DateTimeColumn get createdAt =>
-      dateTime().withDefault(Variable(DateTime.now()))();
-}
-
-enum RepType { time, count }
-
-enum ActionStatus { pending, started, paused, complete }
-
-class Actions extends Table {
-  IntColumn get id => integer().autoIncrement()();
-  TextColumn get title => text().withLength(min: 3, max: 64)();
-  TextColumn get description => text().named('body')();
-  IntColumn get totalSets => integer()();
-  TextColumn get totalReps => text().withLength(min: 1, max: 32)();
-  IntColumn get restBeforeSets => integer().nullable()();
-  IntColumn get restBetweenSets => integer().nullable()();
-  IntColumn get restBetweenReps => integer().nullable()();
-  IntColumn get restAfterSets => integer().nullable()();
-  TextColumn get repType => textEnum<RepType>()();
-  IntColumn get repLength => integer().nullable()();
-  TextColumn get repWeights => text().nullable()();
-  TextColumn get setWeights => text().nullable()();
-  BoolColumn get isAlternating => boolean().withDefault(Variable(false))();
-  TextColumn get tempo => text().withLength(min: 6, max: 36).nullable()();
-  TextColumn get status =>
-      textEnum<ActionStatus>().withDefault(Variable('pending'))();
-  TextColumn get state => text().withDefault(Variable(
-      "{\"currentSet\": 0, \"currentRep\": 0, \"currentActionType\": 0, \"currentTime\": 0, \"currentAction\": 0}"))();
-  TextColumn get set => text()();
-  DateTimeColumn get createdAt =>
-      dateTime().withDefault(Variable(DateTime.now()))();
-}
-
-enum ObjectType {
-  actions,
-  activities,
-  sessions,
-}
-
-class ObjectMediaItems extends Table {
-  IntColumn get id => integer().autoIncrement()();
-  IntColumn get objectId => integer()();
-  TextColumn get objectType => textEnum<ObjectType>()();
-  IntColumn get mediaId =>
-      integer().references(MediaItems, #id, onDelete: KeyAction.cascade)();
-  DateTimeColumn get createdAt =>
-      dateTime().withDefault(Variable(DateTime.now()))();
-}
-
-enum MediaType { youtube, image, location, localImage, localVideo }
-
-class MediaItems extends Table {
-  IntColumn get id => integer().autoIncrement()();
-  TextColumn get title => text().withLength(min: 3, max: 64)();
-  TextColumn get description => text().named('body')();
-  TextColumn get reference => text()();
-  TextColumn get type => textEnum<MediaType>()();
-  DateTimeColumn get createdAt =>
-      dateTime().withDefault(Variable(DateTime.now()))();
-}

lib/database/seed.dart

@@ -1,270 +0,0 @@
-import 'dart:convert';
-import 'dart:math';
-import 'package:dart_casing/dart_casing.dart';
-import 'package:flutter/services.dart' as root_bundle;
-import 'package:drift/drift.dart';
-import 'package:sendtrain/database/database.dart';
-
-Future<void> seedDb(AppDatabase database) async {
-  // seed data setup
-  final List<List> sessionValues = [
-    [
-      'Projecting',
-      'Beta pully beta beta pinch one arm crimpy. Futuristic pinch, dyno dynamic drop knee climb. Climbing ondra slopey onsight beta ondra power endurance.',
-      'Climbers Rock Inc.'
-    ],
-    [
-      'Moonboard',
-      'Beta pully beta beta pinch one arm crimpy. Futuristic pinch, dyno dynamic drop knee climb. Climbing ondra slopey onsight beta ondra power endurance.',
-      'Beta Bloc'
-    ],
-    [
-      'Off-Wall Training',
-      'Beta pully beta beta pinch one arm crimpy. Futuristic pinch, dyno dynamic drop knee climb. Climbing ondra slopey onsight beta ondra power endurance.',
-      'Climbers Rock Inc.'
-    ],
-    [
-      'Climbing Outdoors',
-      'Beta pully beta beta pinch one arm crimpy. Futuristic pinch, dyno dynamic drop knee climb. Climbing ondra slopey onsight beta ondra power endurance.',
-      'Gravity Hamilton'
-    ],
-    [
-      'Volume Session',
-      'Beta pully beta beta pinch one arm crimpy. Futuristic pinch, dyno dynamic drop knee climb. Climbing ondra slopey onsight beta ondra power endurance.',
-      'Up the Bloc'
-    ],
-  ];
-
-  final List<List> mediaItems = [
-    [
-      'https://www.climbing.com/wp-content/uploads/2022/06/campus-board-e1655470701154.jpeg',
-      MediaType.image
-    ],
-    ['BgheYcxhrsw', MediaType.youtube]
-  ];
-
-  // final List<String> actionTypes = [
-  //   "[[{\"actionID\": 0, \"name\": \"1, 3, 5\", \"type\": \"repititions\", \"amount\": 1, \"weight\": 0}, {\"actionID\": 1, \"name\": \"Rest\", \"type\": \"seconds\", \"amount\": 300}], [{\"actionID\": 2, \"name\": \"1, 3, 5\", \"type\": \"repititions\", \"amount\": 1, \"weight\": 0}, {\"actionID\": 3, \"name\": \"Rest\", \"type\": \"seconds\", \"amount\": 300}], [{\"actionID\": 4, \"name\": \"1, 3, 5\", \"type\": \"repititions\", \"amount\": 1, \"weight\": 0}, {\"actionID\": 5, \"name\": \"Rest\", \"type\": \"seconds\", \"amount\": 300}]]",
-  //   "[[{\"actionID\": 0, \"name\": \"Long Pulls\", \"type\": \"seconds\", \"amount\": 5, \"weight\": 80}, {\"actionID\": 1, \"name\": \"Rest\", \"type\": \"seconds\", \"amount\": 5}, {\"actionID\": 2, \"name\": \"Long Pulls\", \"type\": \"seconds\", \"amount\": 5, \"weights\": 80}, {\"actionID\": 3, \"name\": \"Rest\", \"type\": \"seconds\", \"amount\": 300}], [{\"actionID\": 4, \"name\": \"Long Pulls\", \"type\": \"seconds\", \"amount\": 5, \"weight\": 80}, {\"actionID\": 5, \"name\": \"Rest\", \"type\": \"seconds\", \"amount\": 5}, {\"actionID\": 6, \"name\": \"Long Pulls\", \"type\": \"seconds\", \"amount\": 5, \"weights\": 80}, {\"actionID\": 7, \"name\": \"Rest\", \"type\": \"seconds\", \"amount\": 300}], [{\"actionID\": 8, \"name\": \"Long Pulls\", \"type\": \"seconds\", \"amount\": 5, \"weight\": 80}, {\"actionID\": 9, \"name\": \"Rest\", \"type\": \"seconds\", \"amount\": 5}, {\"actionID\": 10, \"name\": \"Long Pulls\", \"type\": \"seconds\", \"amount\": 5, \"weights\": 80}, {\"actionID\": 11, \"name\": \"Rest\", \"type\": \"seconds\", \"amount\": 300}], [{\"actionID\": 12, \"name\": \"Long Pulls\", \"type\": \"seconds\", \"amount\": 5, \"weight\": 80}, {\"actionID\": 13, \"name\": \"Rest\", \"type\": \"seconds\", \"amount\": 5}, {\"actionID\": 14, \"name\": \"Long Pulls\", \"type\": \"seconds\", \"amount\": 5, \"weights\": 80}, {\"actionID\": 15, \"name\": \"Rest\", \"type\": \"seconds\", \"amount\": 300}], [{\"actionID\": 16, \"name\": \"Long Pulls\", \"type\": \"seconds\", \"amount\": 5, \"weight\": 80}, {\"actionID\": 17, \"name\": \"Rest\", \"type\": \"seconds\", \"amount\": 5}, {\"actionID\": 18, \"name\": \"Long Pulls\", \"type\": \"seconds\", \"amount\": 5, \"weights\": 80}, {\"actionID\": 19, \"name\": \"Rest\", \"type\": \"seconds\", \"amount\": 300}]]"
-  // ];
-
-  final int totalSessions = 15;
-  final int totalActivities = 6;
-  // final int totalActions = 5;
-  final int totalMedia = 5;
-  final random = Random();
-  final whitespaceRE = RegExp(r"(?! )\s+| \s+");
-  // we gotta build all the activities!
-  final jsondata =
-      await root_bundle.rootBundle.loadString('assets/exercises.json');
-  final exercises = json.decode(jsondata);
-  List<int> activityIds = [];
-
-  for (int i = 0; i < exercises.length; i++) {
-    var exercise = exercises[i];
-    var images = [];
-    if (exercise['images'] != null) {
-      for (int j = 0; j < exercise['images'].length; j++) {
-        var image = exercise['images'][j];
-        images.add(
-            "https://raw.githubusercontent.com/yuhonas/free-exercise-db/main/exercises/$image");
-      }
-    }
-
-    Map<Symbol, Value> payload = {
-      Symbol('title'): Value<String>(
-          exercise['name'].toString().trim().replaceAll(whitespaceRE, " ")),
-      Symbol('description'): Value<String>(json.encode(exercise['instructions']
-          .toString()
-          .trim()
-          .replaceAll(whitespaceRE, " "))),
-      Symbol('force'): Value<String>(exercise['force'] ?? "")
-    };
-
-    // well this fucking sucks
-    if (exercise['category'] != null) {
-      payload[Symbol('type')] = Value<ActivityType>(ActivityType.values
-          .firstWhere((e) =>
-              e.toString() ==
-              "ActivityType.${Casing.camelCase(exercise['category'])}"));
-    }
-    if (exercise['level'] != null) {
-      payload[Symbol('level')] = Value<ActivityLevel>(ActivityLevel.values
-          .firstWhere((e) =>
-              e.toString() ==
-              "ActivityLevel.${Casing.camelCase(exercise['level'])}"));
-    }
-    if (exercise['mechanic'] != null) {
-      payload[Symbol('mechanic')] = Value<ActivityMechanic>(
-          ActivityMechanic.values.firstWhere((e) =>
-              e.toString() ==
-              "ActivityMechanic.${Casing.camelCase(exercise['mechanic'])}"));
-    }
-    if (exercise['equipment'] != null) {
-      payload[Symbol('equipment')] = Value<ActivityEquipment>(
-          ActivityEquipment.values.firstWhere((e) =>
-              e.toString() ==
-              "ActivityEquipment.${Casing.camelCase(exercise['equipment'])}"));
-    }
-    if (exercise['primaryMuscles'].isNotEmpty) {
-      payload[Symbol('primaryMuscles')] = Value<ActivityMuscle>(
-          ActivityMuscle.values.firstWhere((e) =>
-              e.toString() ==
-              "ActivityMuscle.${Casing.camelCase(exercise['primaryMuscles'].first)}"));
-    }
-    if (exercise['secondaryMuscles'].isNotEmpty) {
-      payload[Symbol('secondaryMuscles')] = Value<ActivityMuscle>(
-          ActivityMuscle.values.firstWhere((e) =>
-              e.toString() ==
-              "ActivityMuscle.${Casing.camelCase(exercise['secondaryMuscles'].first)}"));
-    }
-
-    activityIds.add(await database
-        .into(database.activities)
-        .insert(Function.apply(ActivitiesCompanion.new, [], payload))
-        .then((activityId) async {
-      for (int m = 0; m < images.length; m++) {
-        final mediaItem = images[m];
-        await database
-            .into(database.mediaItems)
-            .insert(MediaItemsCompanion.insert(
-                title: exercise['name'],
-                description: exercise['name'],
-                reference: mediaItem,
-                type: MediaType.image))
-            .then((mediaId) async {
-          await database.into(database.objectMediaItems).insert(
-              ObjectMediaItemsCompanion.insert(
-                  objectId: activityId,
-                  mediaId: mediaId,
-                  objectType: ObjectType.activities));
-        });
-      }
-      return activityId;
-    }));
-  }
-
-  // seed loop
-  for (int i = 0; i < totalSessions; i++) {
-    // session things
-    var status = SessionStatus.completed;
-    if (i == 0) status = SessionStatus.started;
-    if (i == 1) status = SessionStatus.pending;
-
-    final sessionValue = sessionValues[random.nextInt(sessionValues.length)];
-    await database
-        .into(database.sessions)
-        .insert(SessionsCompanion.insert(
-            title: sessionValue[0],
-            content: sessionValue[1],
-            status: status,
-            address: Value(sessionValue[2]),
-            achievements: Value(
-                "[\"achievement 1\", \"achievement 2\", \"achievement 3\"]"),
-            date: Value(DateTime.now())))
-        .then((sessionId) async {
-      // activities things
-      for (int j = 0; j <= random.nextInt(totalActivities); j++) {
-        int activityId = random.nextInt(activityIds.length);
-        activityIds.removeAt(activityId);
-
-        await database
-            .into(database.sessionActivities)
-            .insert(SessionActivitiesCompanion.insert(
-              sessionId: sessionId,
-              activityId: activityId,
-              position: j,
-              results: Value("results json, will need to test"),
-            ));
-
-        // actions
-        // await database
-        //     .into(database.actions)
-        //     .insert(ActionsCompanion.insert(
-        //         title: 'Test action',
-        //         description:
-        //             'Beta pully beta beta pinch one arm crimpy. Futuristic pinch, dyno dynamic drop knee climb. Climbing ondra slopey onsight beta ondra power endurance.',
-        //         totalSets: 5,
-        //         totalReps: "[1]",
-        //         restBeforeSets: Value(30000),
-        //         restBetweenSets: Value(300000),
-        //         restBetweenReps: Value(15000),
-        //         restAfterSets: Value(300000),
-        //         repType: RepType.time,
-        //         repLength: Value(10000),
-        //         repWeights: Value("[110]"),
-        //         setWeights: Value("[1]"),
-        //         isAlternating: Value(true),
-        //         set: actionTypes[random.nextInt(actionTypes.length)]))
-        //     .then((actionId) async {
-        //   // add activity action association
-        //   await database.into(database.activityActions).insert(
-        //       ActivityActionsCompanion.insert(
-        //           activityId: activityId, actionId: actionId, sessionId: sessionId, position: 0));
-        // });
-        // for (int k = 0; k <= random.nextInt(totalActions); k++) {
-        //   await database
-        //       .into(database.actions)
-        //       .insert(ActionsCompanion.insert(
-        //           title: 'Test action $k',
-        //           description:
-        //               '$k Beta pully beta beta pinch one arm crimpy. Futuristic pinch, dyno dynamic drop knee climb. Climbing ondra slopey onsight beta ondra power endurance.',
-        //           totalSets: 5,
-        //           totalReps: "[1]",
-        //           restBeforeSets: Value(30000),
-        //           restBetweenSets: Value(300000),
-        //           restBetweenReps: Value(15000),
-        //           restAfterSets: Value(300000),
-        //           repType: RepType.time,
-        //           repLength: Value(10000),
-        //           repWeights: Value("[110]"),
-        //           setWeights: Value("[1]"),
-        //           isAlternating: Value(true),
-        //           set: actionTypes[random.nextInt(actionTypes.length)]))
-        //       .then((actionId) async {
-        //     // add activity action association
-        //     await database.into(database.activityActions).insert(
-        //         ActivityActionsCompanion.insert(
-        //             activityId: activityId, actionId: actionId, position: k));
-        //   });
-        // }
-      }
-
-      for (int n = 0; n <= random.nextInt(totalMedia); n++) {
-        final mediaItem = mediaItems[random.nextInt(mediaItems.length)];
-        await database
-            .into(database.mediaItems)
-            .insert(MediaItemsCompanion.insert(
-                title: 'Media title $n',
-                description:
-                    'Media description $n Beta pully beta beta pinch one arm crimpy. Futuristic pinch, dyno dynamic drop knee climb. Climbing ondra slopey onsight beta ondra power endurance.',
-                reference: mediaItem[0],
-                type: mediaItem[1]))
-            .then((mediaId) async {
-          await database.into(database.objectMediaItems).insert(
-              ObjectMediaItemsCompanion.insert(
-                  objectId: sessionId,
-                  mediaId: mediaId,
-                  objectType: ObjectType.sessions));
-        });
-      }
-
-      await database
-          .into(database.mediaItems)
-          .insert(MediaItemsCompanion.insert(
-              title: 'Locations details',
-              description:
-                  '5155 Harvester Rd #1, Burlington, ON L7L 6V2, Canada',
-              reference:
-                  'https://lh3.googleusercontent.com/places/ANXAkqHwtb5oRMGG3haJkaHeTxdTI1lQ17RgvkCXwzA1dGV53BXPbHrdXIs1mLC_-4exyRW8dbYhMOeiOCHJqGeVBx-dNtABZAl9tQA=s4800-w800',
-              type: MediaType.location))
-          .then((mediaId) async {
-        await database.into(database.objectMediaItems).insert(
-            ObjectMediaItemsCompanion.insert(
-                objectId: sessionId,
-                mediaId: mediaId,
-                objectType: ObjectType.sessions));
-      });
-    });
-  }
-}

lib/extensions/string_extensions.dart

@@ -1,84 +0,0 @@
-List<String> exceptions = [
-  'a',
-  'abaft',
-  'about',
-  'above',
-  'afore',
-  'after',
-  'along',
-  'amid',
-  'among',
-  'an',
-  'apud',
-  'as',
-  'aside',
-  'at',
-  'atop',
-  'below',
-  'but',
-  'by',
-  'circa',
-  'down',
-  'for',
-  'from',
-  'given',
-  'in',
-  'into',
-  'lest',
-  'like',
-  'mid',
-  'midst',
-  'minus',
-  'near',
-  'next',
-  'of',
-  'off',
-  'on',
-  'onto',
-  'out',
-  'over',
-  'pace',
-  'past',
-  'per',
-  'plus',
-  'pro',
-  'qua',
-  'round',
-  'sans',
-  'save',
-  'since',
-  'than',
-  'thru',
-  'till',
-  'times',
-  'to',
-  'under',
-  'until',
-  'unto',
-  'up',
-  'upon',
-  'via',
-  'vice',
-  'with',
-  'worth',
-  'the","and',
-  'nor',
-  'or',
-  'yet',
-  'so'
-];
-
-extension TitleCase on String {
-  String toTitleCase() {
-    return toLowerCase().replaceAllMapped(
-        RegExp(
-            r'[A-Z]{2,}(?=[A-Z][a-z]+[0-9]*|\b)|[A-Z]?[a-z]+[0-9]*|[A-Z]|[0-9]+'),
-        (Match match) {
-
-      // if (exceptions.contains(match[0])) {
-      //   return match[0]!;
-      // }
-      return "${match[0]![0].toUpperCase()}${match[0]!.substring(1).toLowerCase()}";
-    }).replaceAll(RegExp(r'(_|-)+'), ' ');
-  }
-}

lib/helpers/date_time_helpers.dart

@@ -1,16 +0,0 @@
-import 'package:intl/intl.dart';
-
-final DateFormat dateFormat = DateFormat('yyyy-MM-dd');
-
-String formattedTime(int timeInSecond) {
-  int sec = timeInSecond % 60;
-  int min = (timeInSecond / 60).floor();
-  String minute = min.toString().length <= 1 ? "0$min" : "$min";
-  String second = sec.toString().length <= 1 ? "0$sec" : "$sec";
-  return "$minute:$second";
-}
-
-int toSeconds(int milliseconds) {
-  int sec = (milliseconds / 1000).floor();
-  return sec;
-}

lib/helpers/media_helpers.dart

@@ -1,16 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:sendtrain/database/database.dart';
-
-ImageProvider findMediaByType(List<MediaItem> media, MediaType type) {
-  Iterable<MediaItem>? found = media.where((m) => m.type == type);
-  Image image;
-
-  if (found.isNotEmpty) {
-    image = Image.network(found.first.reference);
-  } else {
-    // Element is not found
-    image = Image.asset('assets/images/placeholder.jpg');
-  }
-
-  return image.image;
-}

lib/helpers/widget_helpers.dart

@@ -1,62 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:sendtrain/database/database.dart';
-import 'package:sendtrain/widgets/media/media_details.dart';
-
-showMediaDetailWidget(BuildContext context, MediaItem media) {
-  showEditorSheet(context, MediaDetails(media: media));
-}
-
-showGenericSheet(BuildContext context, Widget widget,
-    [Color? backgroundColor]) {
-  backgroundColor ??= Theme.of(context).colorScheme.surfaceBright;
-
-  showModalBottomSheet<void>(
-      backgroundColor: backgroundColor,
-      shape: RoundedRectangleBorder(
-        borderRadius: BorderRadius.only(
-            topLeft: Radius.circular(10.0), topRight: Radius.circular(10.0)),
-      ),
-      context: context,
-      showDragHandle: true,
-      isScrollControlled: true,
-      useSafeArea: true,
-      builder: (BuildContext context) {
-        return widget;
-      });
-}
-
-showEditorSheet(BuildContext context, Widget widget) {
-  showGenericSheet(context, widget);
-}
-
-String jsonToDescription(List text) {
-  String content = '';
-
-  for (int i = 0; i < text.length; i++) {
-    if (content.isEmpty) {
-      content = text[i];
-    } else {
-      content = "$content\n\n${text[i]}";
-    }
-  }
-
-  return content;
-}
-
-Widget formItemWrapper(Widget content,
-    [EdgeInsets padding = const EdgeInsets.fromLTRB(0, 0, 0, 0)]) {
-  return Expanded(child: Padding(padding: padding, child: content));
-}
-
-List<DropdownMenuEntry> numericDropDownItems(String type, int itemLimit) {
-  final List<DropdownMenuEntry> items = [];
-
-  // String entryName = type;
-
-  for (int i = 0; i < itemLimit; i++) {
-    // if (i != 0) entryName = "${type}s";
-    items.add(DropdownMenuEntry(value: i + 1, label: "${i + 1}"));
-  }
-
-  return items;
-}

lib/main.dart

@@ -1,38 +1,18 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
-import 'package:sendtrain/database/database.dart';
-import 'package:sendtrain/helpers/widget_helpers.dart';
 import 'package:sendtrain/models/activity_timer_model.dart';
-import 'package:sendtrain/providers/action_timer.dart';
+import 'package:sendtrain/screens/activities_screen.dart';
-import 'package:sendtrain/widgets/screens/activities_screen.dart';
+import 'package:sendtrain/screens/sessions_screen.dart';
-import 'package:sendtrain/widgets/screens/sessions_screen.dart';
+import 'package:awesome_notifications/awesome_notifications.dart';
-// ignore: unused_import
-import 'package:sendtrain/database/seed.dart';
-import 'package:sendtrain/widgets/sessions/session_editor.dart';
 
 class SendTrain extends StatelessWidget {
   const SendTrain({super.key});
 
   @override
   Widget build(BuildContext context) {
-    final ThemeData themeData = ThemeData.dark(useMaterial3: true);
     return MaterialApp(
         title: "Sendtrain",
-        theme: themeData.copyWith(
+        theme: ThemeData.dark(useMaterial3: true),
-          filledButtonTheme: FilledButtonThemeData(
-            style: FilledButton.styleFrom(
-              shape: RoundedRectangleBorder(
-                borderRadius: BorderRadius.circular(12),
-              ),
-            ),
-          ),
-          floatingActionButtonTheme: FloatingActionButtonThemeData(
-              shape: RoundedRectangleBorder(
-                  borderRadius: BorderRadius.circular(12))),
-          inputDecorationTheme: InputDecorationTheme(
-            fillColor: themeData.colorScheme.surface,
-          ),
-        ),
         home: const App());
   }
 }
@@ -40,6 +20,10 @@ class SendTrain extends StatelessWidget {
 class App extends StatefulWidget {
   const App({super.key});
 
+  static final GlobalKey<NavigatorState> navigatorKey = GlobalKey<NavigatorState>();
+  static const String name = 'Awesome Notifications - Example App';
+  static const Color mainColor = Colors.deepPurple;
+
   @override
   State<App> createState() => _AppState();
 }
@@ -79,10 +63,6 @@ class _AppState extends State<App> {
                 alignment: Alignment.center,
                 child: const Text('In Progress...'),
               ),
-              Container(
-                alignment: Alignment.center,
-                child: const Text('Profile in Progress...'),
-              ),
             ][currentPageIndex]),
         bottomNavigationBar: NavigationBar(
             onDestinationSelected: (int index) {
@@ -95,37 +75,128 @@ class _AppState extends State<App> {
               NavigationDestination(
                   icon: Icon(Icons.sports), label: "Sessions"),
               NavigationDestination(
-                  icon: Icon(Icons.sports_gymnastics_rounded),
+                  icon: Icon(Icons.landscape), label: "Activities"),
-                  label: "Activities"),
               NavigationDestination(
                   icon: Icon(Icons.calendar_month_rounded), label: "Plan"),
               NavigationDestination(
                   icon: Icon(Icons.group), label: "Team Send"),
               NavigationDestination(
-                  icon: Icon(Icons.analytics), label: "Progress"),
+                  icon: Icon(Icons.analytics), label: "Progress")
-              NavigationDestination(
-                  icon: Icon(Icons.account_circle_rounded), label: "Profile"),
             ]),
         floatingActionButton: FloatingActionButton.extended(
           onPressed: () {
-            showEditorSheet(context, SessionEditor());
+            // Add your onPressed code here!
           },
           label: const Text('New Session'),
           icon: const Icon(Icons.add_chart),
-          // backgroundColor: Colors.deepPurple,
+          backgroundColor: Colors.deepPurple,
         ));
   }
 }
 
 void main() {
-  var db = AppDatabase();
+  // final database = AppDatabase();
-  runApp(MultiProvider(
+
-    providers: [
+  // database.into(database.sessions).insert(SessionsCompanion.insert(
-      Provider<AppDatabase>(
+  //     title: 'Projecting @ Climbers Rock',
-          create: (context) => db, dispose: (context, db) => db.close()),
+  //     content: 'Beta pully beta beta pinch one arm crimpy. Futuristic pinch, dyno dynamic drop knee climb. Climbing ondra slopey onsight beta ondra power endurance.',
-      ChangeNotifierProvider(create: (context) => ActivityTimerModel()),
+  //     status: SessionStatus.started,
-      ChangeNotifierProvider(create: (context) => ActionTimer()),
+  //     date: Value(DateTime.now())));
+
+  // database.into(database.sessions).insert(SessionsCompanion.insert(
+  //     title: 'Moonboard @ Boardroom',
+  //     content: 'Beta pully beta beta pinch one arm crimpy. Futuristic pinch, dyno dynamic drop knee climb. Climbing ondra slopey onsight beta ondra power endurance.',
+  //     status: SessionStatus.pending,
+  //     date: Value(DateTime.now())));
+
+  // database.into(database.sessions).insert(SessionsCompanion.insert(
+  //     title: 'Moonboard @ Boardroom',
+  //     content: 'Beta pully beta beta pinch one arm crimpy. Futuristic pinch, dyno dynamic drop knee climb. Climbing ondra slopey onsight beta ondra power endurance.',
+  //     status: SessionStatus.completed,
+  //     date: Value(DateTime.now())));
+
+  // database.into(database.sessions).insert(SessionsCompanion.insert(
+  //     title: 'Projecting @ Climbers Rock',
+  //     content: 'Beta pully beta beta pinch one arm crimpy. Futuristic pinch, dyno dynamic drop knee climb. Climbing ondra slopey onsight beta ondra power endurance.',
+  //     status: SessionStatus.completed,
+  //     date: Value(DateTime.now())));
+
+  // database.into(database.sessions).insert(SessionsCompanion.insert(
+  //     title: 'Off-Wall Training',
+  //     content: 'Beta pully beta beta pinch one arm crimpy. Futuristic pinch, dyno dynamic drop knee climb. Climbing ondra slopey onsight beta ondra power endurance.',
+  //     status: SessionStatus.missed,
+  //     date: Value(DateTime.now())));
+
+  // database.into(database.sessions).insert(SessionsCompanion.insert(
+  //     title: 'Off-Wall Training',
+  //     content: 'Beta pully beta beta pinch one arm crimpy. Futuristic pinch, dyno dynamic drop knee climb. Climbing ondra slopey onsight beta ondra power endurance.',
+  //     status: SessionStatus.completed,
+  //     date: Value(DateTime.now())));
+
+  // database.into(database.activities).insert(ActivitiesCompanion.insert(
+  //     title: "test activity",
+  //     type: ActivityType.technical,
+  //     description: "test training activity",
+  //     category: ActivityCategories.fundamentals));
+
+  // database
+  //     .into(database.sessionActivities)
+  //     .insert(SessionActivitiesCompanion.insert(
+  //       sessionId: 1,
+  //       activityId: 1,
+  //       results: Value("results json, will need to test"),
+  //       achievements: Value("comma, seperated, items"),
+  //     ));
+
+  // database.into(database.actions).insert(ActionsCompanion.insert(
+  //       title: "test action title",
+  //       description: "teste action description",
+  //       set: "not sure how the json will work yet",
+  //     ));
+
+  // database
+  //     .into(database.activityActions)
+  //     .insert(ActivityActionsCompanion.insert(
+  //       activityId: 1,
+  //       actionId: 1,
+  //     ));
+
+  // database.into(database.mediaItems).insert(MediaItemsCompanion.insert(
+  //     title: "test youtube media item",
+  //     description: "this is a test youtube item",
+  //     reference: "sZVAEy9UmoY",
+  //     type: MediaType.youtube));
+
+  // database
+  //     .into(database.objectMediaItems)
+  //     .insert(ObjectMediaItemsCompanion.insert(objectId: 1, mediaId: 1));
+  WidgetsFlutterBinding.ensureInitialized();
+  AwesomeNotifications().initialize(
+      // set the icon to null if you want to use the default app icon
+      null,
+      [
+        NotificationChannel(
+            channelGroupKey: 'activity_progress_group',
+            channelKey: 'activity_progress',
+            channelName: 'Activity Progress notifications',
+            channelDescription: 'Notification channel for Activity progression',
+            defaultColor: Color(0xFF9D50DD),
+            ledColor: Colors.white,
+            importance: NotificationImportance.Max,
+            )
       ],
+      // Channel groups are only visual and are not required
+      channelGroups: [
+        NotificationChannelGroup(
+            channelGroupKey: 'activity_progress_group',
+            channelGroupName: 'Activity Progress group')
+      ],
+      debug: true);
+
+  runApp(
+    ChangeNotifierProvider(
+      create: (context) => ActivityTimerModel(),
       child: const SendTrain(),
-  ));
+    ),
+  );
 }

lib/models/action_model.dart

@@ -1,260 +0,0 @@
-import 'dart:convert';
-
-import 'package:sendtrain/daos/actions_dao.dart';
-import 'package:sendtrain/database/database.dart';
-import 'package:sendtrain/helpers/date_time_helpers.dart';
-
-class ActionModel {
-  final ActionsDao dao;
-  List<Item> items;
-  Action action;
-
-  ActionModel({required this.action, required AppDatabase db})
-      : dao = ActionsDao(db),
-        items = _generateItems(action);
-
-  int get id => action.id;
-  ActionStatus get status => action.status;
-  Map get state => json.decode(action.state);
-  List<Set> get sets => items.whereType<Set>().toList();
-  List<Item> get allItems => _flattenedItems();
-  int get totalTime {
-    int time = 0;
-    for (int i = 0; i < allItems.length; i++) {
-      Item item = allItems[i];
-      time += item.time ?? 0;
-    }
-
-    return toSeconds(time);
-  }
-
-  List<Item> _flattenedItems() {
-    List<Item> items = [];
-
-    for (int i = 0; i < this.items.length; i++) {
-      Item item = this.items[i];
-      if (item.runtimeType == Set) {
-        Set setItem = item as Set;
-        for (int j = 0; j < setItem.items.length; j++) {
-          items.add(setItem.items[j]);
-        }
-      } else {
-        items.add(item);
-      }
-    }
-
-    return items;
-  }
-
-  static List<Item> _generateItems(Action action) {
-    int totalItems = 0;
-    int setItems = 0;
-    List<Item> items = [];
-    final List setReps = json.decode(action.totalReps);
-
-    if (action.restBeforeSets != null) {
-      items.add(Rest(
-          id: totalItems,
-          position: totalItems,
-          action: action,
-          time: action.restBeforeSets!,
-          name: 'prepare'));
-    }
-
-    for (int i = 0; i < action.totalSets; i++) {
-      final int totalReps;
-
-      if (setReps.length == 1) {
-        totalReps = setReps.first;
-      } else {
-        totalReps = setReps[i];
-      }
-
-      totalItems += 1;
-      items.add(Set(
-          id: totalItems,
-          setOrder: setItems++,
-          position: totalItems,
-          action: action,
-          totalReps: totalReps));
-
-      if (action.restBetweenSets != null && i < action.totalSets - 1) {
-        totalItems += 1;
-        items.add(Rest(
-            id: totalItems,
-            position: totalItems,
-            action: action,
-            time: action.restBetweenSets!,
-            name: 'rest'));
-      }
-    }
-
-    if (action.restAfterSets != null && totalItems != items.length) {
-      totalItems += 1;
-      items.add(Rest(
-          id: totalItems,
-          position: totalItems,
-          action: action,
-          time: action.restAfterSets!,
-          name: 'cooldown'));
-    }
-
-    return items;
-  }
-
-  Future<Action> updateStatus(ActionStatus status) async {
-    Action newAction = action.copyWith(id: action.id, status: status);
-    await dao.createOrUpdate(newAction.toCompanion(true));
-    action = newAction;
-    return newAction;
-  }
-
-  Future<Action> updateState(String state) async {
-    Action newAction = action.copyWith(id: action.id, state: state);
-    await dao.createOrUpdate(newAction.toCompanion(true));
-    action = newAction;
-    return newAction;
-  }
-}
-
-class Item {
-  final int id;
-  final Action action;
-  int position;
-  List<Item> items = [];
-  dynamic value;
-  final String name;
-  int? parentId;
-  int? time;
-
-  Item(
-      {required this.id,
-      required this.position,
-      required this.action,
-      this.parentId,
-      this.time})
-      : name = action.title;
-
-  RepType get valueType => action.repType;
-  String get humanValueType => valueType == RepType.time ? 'seconds' : 'reps';
-}
-
-class Set extends Item {
-  final int totalReps;
-  int? setOrder;
-
-  Set(
-      {required super.id,
-      required super.action,
-      required super.position,
-      required this.totalReps,
-      this.setOrder}) {
-    items = _generateItems(action, id, totalReps);
-  }
-
-  int? get weightMultiplyer =>
-      action.setWeights != null ? json.decode(action.setWeights!)[id] : null;
-  List<Reps> get reps => items.whereType<Reps>().toList();
-
-  static List<Item> _generateItems(action, id, totalReps) {
-    List<Item> items = [];
-    // add item for exercise
-    int position = 0;
-
-    if (action.repType == RepType.time) {
-      for (int i = 0; i < totalReps; i++) {
-        position = position > 0 ? position + 1 : position;
-
-        // don't show a rest before first rep
-        if (i > 0) {
-          items.add(Rest(
-              id: position,
-              position: position,
-              parentId: id,
-              action: action,
-              time: action.restBetweenReps,
-              name: 'rest'));
-        }
-
-        items.add(Reps(
-            id: ++position, position: position, parentId: id, action: action));
-
-        if (action.isAlternating) {
-          items.add(Rest(
-              id: ++position,
-              position: position,
-              parentId: id,
-              action: action,
-              time: action.restBetweenReps,
-              name: 'alternate'));
-          items.add(Reps(
-              id: ++position,
-              position: position,
-              parentId: id,
-              action: action));
-        }
-      }
-    } else {
-      items.add(Reps(id: id, position: position, action: action));
-
-      if (action.isAlternating) {
-        items.add(Rest(
-            id: ++position,
-            position: position,
-            parentId: id,
-            action: action,
-            time: action.restBetweenReps,
-            name: 'alternate'));
-        items.add(Reps(id: id, position: ++position, action: action));
-      }
-    }
-
-    return items;
-  }
-}
-
-class Reps extends Item {
-  Reps(
-      {required super.id,
-      required super.position,
-      required super.action,
-      super.parentId});
-
-  @override
-  dynamic get value => type == RepType.time ? time : count;
-
-  RepType get type => action.repType;
-  @override
-  int? get time => toSeconds(action.repLength!);
-  int? get count => getReps(id, json.decode(action.totalReps));
-  int? get weight =>
-      action.repWeights != null ? json.decode(action.repWeights!)[id] : null;
-
-  static int getReps(setId, reps) {
-    if (reps.length > 1) {
-      return reps[setId];
-    } else {
-      return reps.first;
-    }
-  }
-}
-
-class Rest extends Item {
-  @override
-  String name;
-
-  Rest(
-      {required super.id,
-      required super.position,
-      required super.action,
-      super.parentId,
-      required super.time,
-      required this.name});
-
-  // @override
-  // String get name => 'Rest';
-  @override
-  int get value => toSeconds(time ?? 0);
-  @override
-  RepType get valueType => RepType.time;
-}

lib/models/activity_timer_model.dart

@@ -1,15 +1,14 @@
 import 'dart:async';
-import 'dart:convert';
 
+import 'package:awesome_notifications/awesome_notifications.dart';
 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;
-  Activity? _activity;
+  ActivityModel? _activity;
   List _sets = [];
-  // List _actions = [];
   int _currentActionNum = 0;
   int _currentSetNum = 0;
   Timer? _periodicTimer;
@@ -19,29 +18,63 @@ class ActivityTimerModel with ChangeNotifier {
 
   int get actionCount => _actionCounter;
   int get currentActionNum => _currentActionNum;
-  dynamic get currentAction => currentSet.isNotEmpty ? currentSet[_currentActionNum] : {};
+  dynamic get currentAction => currentSet[_currentActionNum];
   int get currentSetNum => _currentSetNum;
-  dynamic get currentSet => _sets.isNotEmpty ? _sets[_currentSetNum] : {};
+  dynamic get currentSet => _sets[_currentSetNum];
-  Activity? get activity => _activity;
+  ActivityModel? 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(Activity activity, List actions) {
+  void createNotification() {
+    AwesomeNotifications().isNotificationAllowed().then((isAllowed) {
+      if (!isAllowed) {
+        // This is just a basic example. For real apps, you must show some
+        // friendly dialog box before call the request method.
+        // This is very important to not harm the user experience
+        AwesomeNotifications().requestPermissionToSendNotifications();
+      }
+    });
+
+    AwesomeNotifications().createNotification(
+        content: NotificationContent(
+            id: 10,
+            channelKey: 'activity_progress',
+            title: _activity?.title,
+            body: _activity?.description,
+            category: NotificationCategory.Workout,
+            // payload: {
+            //   'file': 'filename.txt',
+            //   'path': '-rmdir c://ruwindows/system32/huehuehue'
+            // },
+            notificationLayout: NotificationLayout.ProgressBar,
+            progress: _progress,
+            locked: true));
+    // AwesomeNotifications().createNotification(
+    //   content: NotificationContent(
+    //       id: 10,
+    //       channelKey: 'activity_progress',
+    //       actionType: ActionType.Default,
+    //       title: _activity?.title,
+    //       body: _activity?.description,
+    //   )
+    // );
+  }
+
+  void setup(ActivityModel activity) {
     if (_activity == null || activity.id != _activity?.id) {
       _periodicTimer?.cancel();
       _progress = 0;
       _isc = null;
       _activity = activity;
-      // only one action for now
+      _sets = activity.actions[0].items();
-      _sets = actions.isNotEmpty ? json.decode(actions[0].set) : [];
-      // _actions = actions;
       _currentActionNum = 0;
       _currentSetNum = 0;
       setActionCount();
       getTotalTime();
+      createNotification();
     }
 
     moveToIndex(_currentSetNum);
@@ -49,8 +82,10 @@ class ActivityTimerModel with ChangeNotifier {
 
   void getTotalTime() {
     int time = 0;
-    for(int setIndex = 0; _sets.length > setIndex; setIndex++) {
+    for (int setIndex = 0; _sets.length > setIndex; setIndex++) {
-      for (int actionIndex = 0; _sets[setIndex].length > actionIndex; actionIndex++) {
+      for (int actionIndex = 0;
+          _sets[setIndex].length > actionIndex;
+          actionIndex++) {
         var action = _sets[setIndex][actionIndex];
         if (action['type'] == 'seconds') {
           time = time + action['amount'] as int;
@@ -92,7 +127,7 @@ class ActivityTimerModel with ChangeNotifier {
   }
 
   void setActionCount() {
-    _actionCounter = currentAction.isNotEmpty ? currentAction['amount'] : 0;
+    _actionCounter = currentAction['amount'];
   }
 
   void pause() {
@@ -116,6 +151,7 @@ class ActivityTimerModel with ChangeNotifier {
             setActionCount();
           }
           updateProgress();
+          createNotification();
       }
 
       notifyListeners();

lib/models/google_place_model.dart

@@ -1,12 +0,0 @@
-class GooglePlaceModel {
-  final String placeId;
-  final String description;
-  final String address;
-  final List<dynamic>? imageReferences;
-
-  GooglePlaceModel(
-      {required this.placeId,
-      required this.description,
-      required this.address,
-      this.imageReferences});
-}

lib/providers/action_timer.dart

@@ -1,223 +0,0 @@
-import 'dart:async';
-import 'dart:convert';
-
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:flutter_sound/flutter_sound.dart';
-import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
-import 'package:sendtrain/database/database.dart';
-import 'package:sendtrain/models/action_model.dart';
-import 'package:vibration/vibration.dart';
-
-class ActionTimer with ChangeNotifier {
-  ActionModel? actionModel;
-  double _progress = 0;
-  int _currentTime = 0;
-  final List<ItemScrollController> _scrollControllers = [];
-  final FlutterSoundPlayer _mPlayer = FlutterSoundPlayer();
-
-  ActionTimer();
-
-  Map get state => actionModel?.state ?? _stateConstructor();
-  ActionStatus get status => actionModel?.status ?? ActionStatus.pending;
-  bool get started => status == ActionStatus.started;
-  bool get paused => status == ActionStatus.paused;
-  bool get pending => status == ActionStatus.pending;
-  bool get complete => status == ActionStatus.complete;
-  bool get available => paused | pending;
-  List<Set> get sets => actionModel!.sets;
-  List<Item> get items => actionModel!.items;
-  Set get currentSet => sets[state['currentSet']];
-  Reps get currentRep => currentSet.reps[state['currentRep']];
-  Item get currentAction => allActions[state['currentAction']];
-  int get currentTime => _currentTime;
-  dynamic get currentValue => currentAction.valueType == RepType.time
-      ? currentTime
-      : currentAction.value;
-  List<Item> get allActions => actionModel?.allItems ?? [];
-  String get repType =>
-      actionModel!.action.repType == RepType.time ? 'Seconds' : 'Reps';
-  int? get repLength => currentRep.value;
-  int? get repCount => currentRep.count;
-  dynamic get repValue =>
-      actionModel!.action.repType == RepType.time ? repLength : repCount;
-  double get progress => _progress;
-  int get totalTime => actionModel!.totalTime;
-  Timer? _periodicTimer;
-
-  Map _stateConstructor() {
-    return {
-      'currentSet': 0,
-      'currentRep': 0,
-      'currentTime': 0,
-      'currentAction': 0
-    };
-  }
-
-  void setup(ActionModel actionModel, ItemScrollController scrollController,
-      [bool resetOnLoad = true]) async {
-    _scrollControllers.clear();
-    _scrollControllers.add(scrollController);
-
-    if (resetOnLoad) {
-      if (this.actionModel == actionModel) {
-        reset();
-        _scrollControllers.add(scrollController);
-      }
-
-      this.actionModel = actionModel;
-      setAction(currentAction.id);
-    }
-  }
-
-  Future pause() async =>
-      await actionModel?.updateStatus(ActionStatus.paused).whenComplete(() {
-        _periodicTimer?.cancel();
-        notifyListeners();
-
-        // _mPlayer.stopPlayer();
-        // Be careful : you must `close` the audio session when you have finished with it.
-      });
-
-  Future start() async {
-    await actionModel!.updateStatus(ActionStatus.started);
-    await _mPlayer.openPlayer();
-
-    Uint8List? countTone;
-    Uint8List? finishTone;
-    await rootBundle
-        .load('assets/audio/count_tone.mp3')
-        .then((data) => countTone = data.buffer.asUint8List());
-    await rootBundle
-        .load('assets/audio/count_finish.mp3')
-        .then((data) => finishTone = data.buffer.asUint8List());
-
-    // start timer
-    if (_periodicTimer == null || _periodicTimer!.isActive == false) {
-      _periodicTimer =
-          Timer.periodic(const Duration(seconds: 1), (Timer timer) async {
-        switch (currentAction.valueType) {
-          case RepType.count:
-            break;
-          case RepType.time:
-            _currentTime--;
-
-            if (_currentTime <= 3 && _currentTime != 0) {
-              await _mPlayer
-                  .startPlayer(fromDataBuffer: countTone, codec: Codec.mp3)
-                  .then((duration) async {
-                if (await Vibration.hasVibrator()) {
-                  Vibration.vibrate(duration: 250);
-                }
-              });
-            }
-
-            if (_currentTime == 0) {
-              // move to next action
-              await _mPlayer
-                  .startPlayer(fromDataBuffer: finishTone, codec: Codec.mp3)
-                  .then((duration) async {
-                if (await Vibration.hasVibrator()) {
-                  Vibration.vibrate(duration: 250);
-                }
-              });
-
-              await setAction(state['currentAction'] + 1);
-            }
-
-            await updateProgress();
-            notifyListeners();
-        }
-      });
-    }
-
-    notifyListeners();
-  }
-
-  Future close() async => await actionModel!
-          .updateStatus(ActionStatus.complete)
-          .whenComplete(() async {
-        _periodicTimer!.cancel();
-        _mPlayer.closePlayer();
-        notifyListeners();
-      });
-
-  Future reset() async {
-    await actionModel?.updateStatus(ActionStatus.pending);
-    await actionModel?.updateState(json.encode(_stateConstructor()));
-    _periodicTimer?.cancel();
-    _progress = 0;
-    _scrollControllers.clear();
-    _mPlayer.closePlayer();
-    notifyListeners();
-  }
-
-  Future clear() async {
-    await reset();
-  }
-
-  double timeUsed() {
-    Iterable<Item> usedItems = allActions.getRange(0, state['currentAction']);
-    return usedItems.fold(0.0, (p, c) => p + c.value!);
-  }
-
-  double totalComplete() {
-    Iterable<Item> usedItems = allActions.getRange(0, state['currentAction']);
-    return usedItems.length / allActions.length;
-  }
-
-  updateProgress() {
-    double repUsed = (currentAction.value - currentTime) / currentAction.value;
-    _progress =
-        totalComplete() + ((repUsed < 0 ? 0 : repUsed) / allActions.length);
-    notifyListeners();
-  }
-
-  setAction(int actionNum, [bool isManual = false]) async {
-    if (actionNum < allActions.length) {
-      Item item = allActions[actionNum];
-      Map newState = state;
-
-      newState['currentAction'] = actionNum;
-      newState['currentSet'] = item.parentId;
-      newState['currentRep'] = item.id;
-      newState['currentTime'] = _currentTime = item.value!;
-
-      await actionModel!
-          .updateState(json.encode(newState))
-          .whenComplete(() async {
-        // if manual select, pause next action
-        if (isManual) {
-          await pause();
-          await updateProgress();
-        }
-
-        int index = currentAction.parentId != null
-            ? currentAction.parentId!
-            : currentAction.id;
-
-        if (_scrollControllers.isNotEmpty) {
-          for (int i = 0; i < _scrollControllers.length; i++) {
-            ItemScrollController sc = _scrollControllers[i];
-
-            sc.scrollTo(
-                index: index,
-                duration: Duration(milliseconds: 500),
-                curve: Curves.easeInOutCubic);
-          }
-        }
-        // _scrollController?.scrollTo(
-        //     index: index,
-        //     duration: Duration(milliseconds: 500),
-        //     curve: Curves.easeInOutCubic);
-      });
-    } else {
-      await actionModel?.updateStatus(ActionStatus.complete).whenComplete(() {
-        _periodicTimer?.cancel();
-        notifyListeners();
-      });
-    }
-
-    notifyListeners();
-  }
-}

lib/screens/activities_screen.dart

@@ -1,10 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:sendtrain/classes/activity_action.dart';
-import 'package:sendtrain/database/database.dart' hide ActivityAction;
 import 'package:sendtrain/models/activity_model.dart';
 
-// import '../widgets/activities/activities_header.dart';
+import '../widgets/activities_header.dart';
-// import '../widgets/activities/activity_card.dart';
+import '../widgets/activity_card.dart';
 
 class ActivitiesScreen extends StatefulWidget {
   const ActivitiesScreen({super.key});
@@ -14,7 +13,6 @@ class ActivitiesScreen extends StatefulWidget {
 }
 
 class _ActivitiesScreenState extends State<ActivitiesScreen> {
-  final Activity? activity = null;
 
   final data = ActivityModel(
       id: 1,
@@ -42,24 +40,23 @@ class _ActivitiesScreenState extends State<ActivitiesScreen> {
 
   @override
   Widget build(BuildContext context) {
-    return Text("N/A");
+    List<Widget> activities = List.generate(10, (i) => ActivityCard(activity: data));
-    // List<Widget> activities = List.generate(10, (i) => ActivityCard(activity: data, data: activity));
 
-    // return Padding(
+    return Padding(
-    //     padding: const EdgeInsets.fromLTRB(10, 15, 10, 0),
+        padding: const EdgeInsets.fromLTRB(10, 15, 10, 0),
-    //     child: Column(
+        child: Column(
-    //         crossAxisAlignment: CrossAxisAlignment.start,
+            crossAxisAlignment: CrossAxisAlignment.start,
-    //         children: <Widget>[
+            children: <Widget>[
-    //           const ActivitiesHeader(),
+              const ActivitiesHeader(),
-    //           Expanded(
+              Expanded(
-    //               child: GridView.count(
+                  child: GridView.count(
-    //             primary: false,
+                primary: false,
-    //             padding: const EdgeInsets.fromLTRB(0, 0, 0, 0),
+                padding: const EdgeInsets.fromLTRB(0, 0, 0, 0),
-    //             crossAxisSpacing: 10,
+                crossAxisSpacing: 10,
-    //             mainAxisSpacing: 10,
+                mainAxisSpacing: 10,
-    //             crossAxisCount: 2,
+                crossAxisCount: 2,
-    //             children: activities,
+                children: activities,
-    //           ))
+              ))
-    //         ]));
+            ]));
   }
 }

lib/screens/sessions_screen.dart

@@ -0,0 +1,113 @@
+import 'package:drift/drift.dart' hide Column;
+import 'package:flutter/material.dart';
+import 'package:sendtrain/database.dart';
+import '../widgets/session_card.dart';
+
+class SessionsScreen extends StatelessWidget {
+  final AppDatabase database = AppDatabase();
+  SessionsScreen({super.key});
+
+  Future<List<Session>> getSessions() async {
+    // database.managers.sessions.filter((session) => session.status(SessionStatus.pending));
+    return await database.managers.sessions.get();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return FutureBuilder<List<Session>>(
+        future: getSessions(),
+        builder: (context, snapshot) {
+          if (snapshot.hasData) {
+            final sessions = snapshot.data!;
+            final pending = sessions.where((session) => session.status == SessionStatus.completed || session.status == SessionStatus.missed);
+            final upcoming = sessions.firstWhere((session) => session.status == SessionStatus.pending);
+            final current = sessions.firstWhere((session) => session.status == SessionStatus.started);
+
+            List<Widget> previousSessions = List.generate(pending.length, (i) => SessionCard(type: 1, session: pending.elementAt(i)));
+            Widget upcomingSession =
+                SessionCard(session: upcoming);
+            Widget currentSession = SessionCard(session: current);
+
+            database.close();
+
+            return Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: <Widget>[
+                const Padding(
+                    padding: EdgeInsets.fromLTRB(15, 5, 0, 0),
+                    child: Text(
+                        style: TextStyle(fontSize: 25, fontWeight: FontWeight.bold),
+                        'Current:')),
+                currentSession,
+                const Padding(
+                    padding: EdgeInsets.fromLTRB(15, 30, 0, 0),
+                    child: Text(
+                        style: TextStyle(fontSize: 25, fontWeight: FontWeight.bold),
+                        'Upcoming:')),
+                upcomingSession,
+                const Padding(
+                    padding: EdgeInsets.fromLTRB(15, 30, 0, 0),
+                    child: Text(
+                        style: TextStyle(fontSize: 25, fontWeight: FontWeight.bold),
+                        'Previous:')),
+                SizedBox(
+                    width: double.infinity,
+                    height: 160,
+                    child: GridView.count(
+                        padding: const EdgeInsets.fromLTRB(15, 10, 0, 0),
+                        scrollDirection: Axis.horizontal,
+                        crossAxisSpacing: 5,
+                        mainAxisSpacing: 5,
+                        crossAxisCount: 1,
+                        children: previousSessions))
+              ],
+            );
+          } else {
+            return const CircularProgressIndicator();
+          }
+        });
+
+    // List<Widget> previousSessions = List.generate(
+    //     10, (i) => SessionCard(state: 1, type: 1, session: _sessions.first));
+    // Widget upcomingSession = SessionCard(state: 2, session: _sessions.first);
+    // Widget currentSession = SessionCard(session: _sessions.first);
+
+    // return Column(
+    //   crossAxisAlignment: CrossAxisAlignment.start,
+    //   children: <Widget>[
+    //     const Padding(
+    //         padding: EdgeInsets.fromLTRB(15, 5, 0, 0),
+    //         child: Text(
+    //             style: TextStyle(fontSize: 25, fontWeight: FontWeight.bold),
+    //             'Current:')),
+    //     currentSession,
+    //     const Padding(
+    //         padding: EdgeInsets.fromLTRB(15, 30, 0, 0),
+    //         child: Text(
+    //             style: TextStyle(fontSize: 25, fontWeight: FontWeight.bold),
+    //             'Upcoming:')),
+    //     upcomingSession,
+    //     const Padding(
+    //         padding: EdgeInsets.fromLTRB(15, 30, 0, 0),
+    //         child: Text(
+    //             style: TextStyle(fontSize: 25, fontWeight: FontWeight.bold),
+    //             'Previous:')),
+    //     SizedBox(
+    //         width: double.infinity,
+    //         height: 160,
+    //         child: GridView.count(
+    //             padding: const EdgeInsets.fromLTRB(15, 10, 0, 0),
+    //             scrollDirection: Axis.horizontal,
+    //             crossAxisSpacing: 5,
+    //             mainAxisSpacing: 5,
+    //             crossAxisCount: 1,
+    //             children: previousSessions))
+    //     // Flexible(
+    //     //     child: ListView(
+    //     //   scrollDirection: Axis.vertical,
+    //     //   children: previousSessions,
+    //     // )),
+    //   ],
+    // );
+  }
+}

lib/services/functional/debouncer.dart

@@ -1,68 +0,0 @@
-import 'dart:async';
-
-typedef _Debounceable<S, T> = Future<S?> Function(T parameter);
-
-class Debouncer {
-  Debouncer(this._duration, this._callback);
-
-  final Duration _duration;
-  final dynamic _callback;
-  late final _Debounceable<dynamic, String> _debouncedSearch = _debounce<dynamic, String>(_callback);
-
-  /// Returns a new function that is a debounced version of the given function.
-  ///
-  /// This means that the original function will be called only after no calls
-  /// have been made for the given Duration.
-  _Debounceable<S, T> _debounce<S, T>(_Debounceable<S?, T> function) {
-    _DebounceTimer? debounceTimer;
-
-    return (T parameter) async {
-      if (debounceTimer != null && !debounceTimer!.isCompleted) {
-        debounceTimer!.cancel();
-      }
-      debounceTimer = _DebounceTimer(_duration);
-      try {
-        await debounceTimer!.future;
-      } on _CancelException {
-        return null;
-      }
-      return function(parameter);
-    };
-  }
-
-  process(data) {
-    return _debouncedSearch(data);
-  }
-}
-
-// A wrapper around Timer used for debouncing.
-class _DebounceTimer {
-  final Duration debounceDuration;
-
-  _DebounceTimer(
-    this.debounceDuration
-  ) {
-    _timer = Timer(debounceDuration, _onComplete);
-  }
-
-  late final Timer _timer;
-  final Completer<void> _completer = Completer<void>();
-
-  void _onComplete() {
-    _completer.complete();
-  }
-
-  Future<void> get future => _completer.future;
-
-  bool get isCompleted => _completer.isCompleted;
-
-  void cancel() {
-    _timer.cancel();
-    _completer.completeError(const _CancelException());
-  }
-}
-
-// An exception indicating that the timer was canceled.
-class _CancelException implements Exception {
-  const _CancelException();
-}

lib/services/search/activity_finder_service.dart

@@ -1,43 +0,0 @@
-import 'dart:convert';
-
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-import 'package:sendtrain/daos/activities_dao.dart';
-import 'package:sendtrain/database/database.dart';
-import 'package:sendtrain/helpers/widget_helpers.dart';
-import 'package:sendtrain/widgets/generic/elements/form_search_input.dart';
-
-class ActivityFinderService {
-  final BuildContext context;
-  final ActivitiesDao dao;
-
-  ActivityFinderService(this.context)
-      : dao = ActivitiesDao(Provider.of<AppDatabase>(context, listen: false));
-
-  void finish() {}
-
-  Future<List<Suggestion>?> fetchSuggestions(String input) async {
-    List<Activity> activities = await dao.contains(input);
-
-    if (activities.isNotEmpty) {
-      return activities
-          .map<Suggestion>((activity) => Suggestion<Activity>(activity))
-          .toList();
-    } else {
-      return null;
-    }
-  }
-
-  Widget resultWidget(Activity activity, Function? callback) {
-    return ListTile(
-      title: Text(activity.title),
-      subtitle: Text(jsonToDescription(json.decode(activity.description ?? "")),
-          maxLines: 2, softWrap: true, overflow: TextOverflow.ellipsis),
-      onTap: () {
-        if (callback != null) {
-          callback();
-        }
-      },
-    );
-  }
-}

lib/services/search/google_places_service.dart

@@ -1,90 +0,0 @@
-import 'dart:async';
-import 'dart:convert';
-
-import 'package:flutter/material.dart';
-import 'package:http/http.dart';
-import 'package:sendtrain/models/google_place_model.dart';
-import 'package:sendtrain/widgets/generic/elements/form_search_input.dart';
-import 'package:uuid/uuid.dart';
-
-class GooglePlacesService {
-  final sessionToken = Uuid().v4();
-  final apiKey = "AIzaSyBCjMCEAyyNVpsnVYvZj6VL1mmB98Vd6AE";
-  final client = Client();
-
-  void finish() {
-    client.close();
-  }
-
-  Future<List<Suggestion>?> fetchSuggestions(String input) async {
-    var headers = {
-      'Content-Type': 'application/json',
-      'X-Goog-Api-Key': apiKey,
-      "Access-Control-Allow-Origin": "*",
-      'X-Goog-FieldMask':
-          'places.displayName,places.id,places.formattedAddress,places.photos'
-    };
-    var request = Request('POST',
-        Uri.parse('https://places.googleapis.com/v1/places:searchText'));
-    request.body = json.encode({"textQuery": input});
-    request.headers.addAll(headers);
-
-    StreamedResponse response = await request.send();
-
-    if (response.statusCode == 200) {
-      final result = json.decode(await response.stream.bytesToString());
-
-      if (result.isNotEmpty) {
-        return result['places']
-            .map<Suggestion>((p) => Suggestion<GooglePlaceModel>(
-                GooglePlaceModel(
-                    placeId: p['id'],
-                    description: p['displayName']['text'],
-                    address: p['formattedAddress'],
-                    imageReferences: p['photos'])))
-            .toList();
-      } else {
-        return null;
-      }
-    } else {
-      throw Exception(response.reasonPhrase);
-    }
-  }
-
-  Future fetchPhoto(String name) async {
-    var headers = {
-      "Access-Control-Allow-Origin": "*",
-    };
-
-    var request = Request(
-        'GET',
-        Uri.parse(
-            'https://places.googleapis.com/v1/$name/media?key=$apiKey&maxWidthPx=800&skipHttpRedirect=true'));
-    request.headers.addAll(headers);
-
-    StreamedResponse response = await request.send();
-
-    if (response.statusCode == 200) {
-      final result = json.decode(await response.stream.bytesToString());
-
-      if (result.isNotEmpty) {
-        return result;
-      } else {
-        return null;
-      }
-    } else {
-      throw Exception(response.reasonPhrase);
-    }
-  }
-
-  Widget resultWidget(GooglePlaceModel place, Function? callback) {
-    return ListTile(
-      title: Text(place.description),
-      onTap: () async {
-        if (callback != null) {
-          callback();
-        }
-      },
-    );
-  }
-}

lib/widgets/achievements/achievement_editor.dart

@@ -1,63 +0,0 @@
-import 'dart:convert';
-
-import 'package:drift/drift.dart' hide Column;
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-import 'package:sendtrain/daos/sessions_dao.dart';
-import 'package:sendtrain/database/database.dart';
-import 'package:sendtrain/widgets/generic/elements/form_text_input.dart';
-
-class AchievementEditor extends StatelessWidget {
-  AchievementEditor({super.key, required this.session, this.callback});
-
-  final GlobalKey<FormState> _formKey = GlobalKey<FormState>();
-  final TextEditingController tec = TextEditingController();
-  final Session session;
-  final Function? callback;
-
-  @override
-  Widget build(
-    BuildContext context,
-  ) {
-    return Padding(
-        padding: EdgeInsets.fromLTRB(15, 0, 15, 15),
-        child: Form(
-            key: _formKey,
-            child: Column(
-                mainAxisSize: MainAxisSize.min,
-                crossAxisAlignment: CrossAxisAlignment.center,
-                children: <Widget>[
-                  Padding(
-                      padding: EdgeInsets.only(top: 10, bottom: 10),
-                      child: Text('Create Achievement',
-                          textAlign: TextAlign.center,
-                          style: Theme.of(context).textTheme.titleLarge)),
-                  FormTextInput(controller: tec, title: 'Achievement', icon: Icon(Icons.military_tech_rounded)),
-                  Row(mainAxisAlignment: MainAxisAlignment.end, children: [
-                    Padding(
-                        padding: EdgeInsets.only(top: 10),
-                        child: FilledButton(
-                            child: Text('Submit'),
-                            onPressed: () async {
-                              session.achievements;
-                              List achievements =
-                                  json.decode(session.achievements ?? "[]");
-                              achievements.add(tec.text);
-                              Session updatedSession = session.copyWith(
-                                  achievements:
-                                      Value<String>(json.encode(achievements)));
-
-                              SessionsDao(Provider.of<AppDatabase>(context,
-                                      listen: false))
-                                  .replace(updatedSession);
-
-                              Navigator.pop(_formKey.currentContext!, 'Submit');
-
-                              if (callback != null) {
-                                await callback!();
-                              }
-                            }))
-                  ])
-                ])));
-  }
-}

lib/widgets/activities/activity_action_editor.dart

@@ -1,305 +0,0 @@
-import 'dart:convert';
-
-import 'package:drift/drift.dart' hide Column;
-import 'package:flutter/material.dart' hide Action;
-import 'package:provider/provider.dart';
-import 'package:sendtrain/daos/actions_dao.dart';
-import 'package:sendtrain/daos/activity_actions_dao.dart';
-import 'package:sendtrain/database/database.dart';
-import 'package:sendtrain/helpers/widget_helpers.dart';
-import 'package:sendtrain/widgets/generic/elements/form_drop_down.dart';
-import 'package:sendtrain/widgets/generic/elements/form_text_input.dart';
-
-class ActivityActionEditor extends StatefulWidget {
-  const ActivityActionEditor(
-      {super.key,
-      required this.session,
-      required this.activity,
-      this.action,
-      this.callback});
-
-  final Session session;
-  final Activity activity;
-  final Action? action;
-  final Function? callback;
-
-  @override
-  State<ActivityActionEditor> createState() => _ActivityActionEditorState();
-}
-
-class _ActivityActionEditorState extends State<ActivityActionEditor> {
-  final GlobalKey<FormState> _formKey = GlobalKey<FormState>();
-
-  final Map<String, TextEditingController> actionEditController = {
-    'sets': TextEditingController(),
-    'reps': TextEditingController(),
-    'weight': TextEditingController(),
-    'repLength': TextEditingController(),
-    'preparation': TextEditingController(),
-    'setRest': TextEditingController(),
-    'repRest': TextEditingController(),
-    'cooldown': TextEditingController(),
-    'type': TextEditingController(),
-    'alternating': TextEditingController(),
-  };
-
-  late final AppDatabase db;
-
-  bool isAlternating = false;
-  bool isTimed = false;
-  String editorType = 'Create';
-
-  @override
-  void initState() {
-    super.initState();
-    db = Provider.of<AppDatabase>(context, listen: false);
-
-    // if we're editing a session, we'll want to populate it with the appropriate values
-    if (widget.action != null) {
-      final Action action = widget.action!;
-      editorType = 'Edit';
-      isAlternating = action.isAlternating;
-      isTimed = action.repType == RepType.time ? true : false;
-
-      actionEditController['sets']?.text = action.totalSets.toString();
-      actionEditController['reps']?.text =
-          json.decode(action.totalReps)[0].toString();
-      actionEditController['weight']?.text =
-          json.decode(action.repWeights ?? "")[0].toString();
-      actionEditController['repLength']?.text =
-          ((action.repLength ?? 0) ~/ 1000).toString();
-      actionEditController['preparation']?.text =
-          ((action.restBeforeSets ?? 0) ~/ 1000).toString();
-      actionEditController['setRest']?.text =
-          ((action.restBetweenSets ?? 0) ~/ 1000).toString();
-      actionEditController['repRest']?.text =
-          ((action.restBetweenReps ?? 0) ~/ 1000).toString();
-      actionEditController['cooldown']?.text =
-          ((action.restAfterSets ?? 0) ~/ 1000).toString();
-      actionEditController['isTimed']?.text = isTimed.toString();
-      actionEditController['alternating']?.text = isAlternating.toString();
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    if (widget.action != null) {
-      editorType = 'Edit';
-    }
-
-    return Padding(
-        padding: EdgeInsets.fromLTRB(15, 0, 15, 15),
-        child: Form(
-            key: _formKey,
-            child: Column(
-                mainAxisSize: MainAxisSize.min,
-                crossAxisAlignment: CrossAxisAlignment.center,
-                children: <Widget>[
-                  Padding(
-                      padding: EdgeInsets.only(top: 10, bottom: 10),
-                      child: Text('$editorType Action',
-                          textAlign: TextAlign.center,
-                          style: Theme.of(context).textTheme.titleLarge)),
-                  Row(children: [
-                    formItemWrapper(
-                        CheckboxListTile(
-                          title: Text("Reps alternate? (eg. Left/Right Hand)"),
-                          value: isAlternating,
-                          shape: RoundedRectangleBorder(
-                            borderRadius:
-                                BorderRadius.all(Radius.circular(10.0)),
-                          ),
-                          onChanged: (bool? value) {
-                            setState(() {
-                              isAlternating = value!;
-                            });
-                          },
-                        ),
-                        EdgeInsets.fromLTRB(10, 10, 10, 10)),
-                  ]),
-                  Row(children: [
-                    formItemWrapper(
-                        CheckboxListTile(
-                          title: Text("Are reps timed?"),
-                          value: isTimed,
-                          shape: RoundedRectangleBorder(
-                            borderRadius:
-                                BorderRadius.all(Radius.circular(10.0)),
-                          ),
-                          onChanged: (bool? value) {
-                            setState(() {
-                              isTimed = value!;
-                            });
-                          },
-                        ),
-                        EdgeInsets.fromLTRB(10, 10, 10, 15))
-                  ]),
-                  Row(children: [
-                    FormDropDown(
-                        title: 'Sets',
-                        entries: numericDropDownItems('Set', 50),
-                        controller: actionEditController['sets']!),
-                    FormDropDown(
-                      title: 'Reps',
-                      entries: numericDropDownItems('Rep', 100),
-                      controller: actionEditController['reps']!,
-                    )
-                  ]),
-                  Row(children: [
-                    formItemWrapper(
-                        FormTextInput(
-                            type: InputTypes.number,
-                            controller: actionEditController['preparation']!,
-                            title: 'Preparation (sec)',
-                            hint: 'time before start',
-                            requiresValidation: false),
-                        EdgeInsets.fromLTRB(10, 5, 10, 0)),
-                    formItemWrapper(
-                        FormTextInput(
-                            type: InputTypes.number,
-                            controller: actionEditController['cooldown']!,
-                            title: 'Cooldown (sec)',
-                            hint: 'rest after completion',
-                            requiresValidation: false),
-                        EdgeInsets.fromLTRB(10, 5, 10, 0)),
-                  ]),
-                  Row(children: [
-                    formItemWrapper(
-                        FormTextInput(
-                            type: InputTypes.number,
-                            controller: actionEditController['setRest']!,
-                            title: 'Set Rest (sec)',
-                            hint: 'Rest between sets',
-                            requiresValidation: false),
-                        EdgeInsets.only(left: 10, right: 10)),
-                    formItemWrapper(
-                        FormTextInput(
-                            type: InputTypes.number,
-                            controller: actionEditController['repRest']!,
-                            title: 'Rep Rest (sec)',
-                            hint: 'Rest between reps',
-                            requiresValidation: false),
-                        EdgeInsets.only(left: 10, right: 10)),
-                  ]),
-                  Row(children: [
-                    formItemWrapper(
-                        FormTextInput(
-                            type: InputTypes.number,
-                            controller: actionEditController['repLength']!,
-                            title: 'Rep Length (sec)',
-                            hint: 'Total rep time (not required)',
-                            requiresValidation: false),
-                        EdgeInsets.only(left: 10, right: 10)),
-                    formItemWrapper(
-                        FormTextInput(
-                            type: InputTypes.number,
-                            controller: actionEditController['weight']!,
-                            title: 'Weight',
-                            hint: 'Weight for reps',
-                            requiresValidation: false),
-                        EdgeInsets.only(left: 10, right: 10)),
-                  ]),
-                  Row(mainAxisAlignment: MainAxisAlignment.end, children: [
-                    Padding(
-                        padding: EdgeInsets.only(top: 10, right: 10),
-                        child: FilledButton(
-                            onPressed: () async {
-                              if (_formKey.currentState!.validate()) {
-                                if (widget.action != null) {
-                                  Action newAction = widget.action!.copyWith(
-                                    totalSets: int.parse(
-                                        actionEditController['sets']!.text),
-                                    totalReps: json.encode([
-                                      int.parse(
-                                          actionEditController['reps']!.text)
-                                    ]),
-                                    repLength: Value<int>(int.parse(
-                                            actionEditController['repLength']!
-                                                .text) *
-                                        1000),
-                                    restBeforeSets: Value<int>(int.parse(
-                                            actionEditController['preparation']!
-                                                .text) *
-                                        1000),
-                                    restBetweenSets: Value<int>(int.parse(
-                                            actionEditController['setRest']!
-                                                .text) *
-                                        1000),
-                                    restBetweenReps: Value<int>(int.parse(
-                                            actionEditController['repRest']!
-                                                .text) *
-                                        1000),
-                                    restAfterSets: Value<int>(int.parse(
-                                            actionEditController['cooldown']!
-                                                .text) *
-                                        1000),
-                                    repType: int.parse(actionEditController[
-                                                    'repLength']!
-                                                .text) >
-                                            0
-                                        ? RepType.time
-                                        : RepType.count,
-                                    repWeights: Value<String>(json.encode([
-                                      int.parse(
-                                          actionEditController['weight']!.text)
-                                    ])),
-                                    // setWeights: Value<String>(json.encode([actionEditController['setWeights']!.text])),
-                                    isAlternating: isAlternating,
-                                  );
-
-                                  // var result = await ActionsDao(db).createOrUpdate(
-                                  //     newAction.toCompanion(true));
-                                  await ActionsDao(db).replace(newAction);
-                                } else {
-                                  // create action
-                                  await ActionsDao(db)
-                                      .createOrUpdate(ActionsCompanion(
-                                          title: Value('rep'),
-                                          description: Value('exercise action'),
-                                          totalSets: Value(int.parse(
-                                              actionEditController['sets']!
-                                                  .text)),
-                                          totalReps: Value(json.encode(
-                                              [int.parse(actionEditController['reps']!.text)])),
-                                          repLength: Value<int>(
-                                              int.parse(actionEditController['repLength']!.text) *
-                                                  1000),
-                                          restBeforeSets: Value<int>(
-                                              int.parse(actionEditController['preparation']!.text) *
-                                                  1000),
-                                          restBetweenSets: Value<int>(
-                                              int.parse(actionEditController['setRest']!.text) *
-                                                  1000),
-                                          restBetweenReps:
-                                              Value<int>(int.parse(actionEditController['repRest']!.text) * 1000),
-                                          restAfterSets: Value<int>(int.parse(actionEditController['cooldown']!.text) * 1000),
-                                          repType: Value(int.parse(actionEditController['repLength']!.text) > 0 ? RepType.time : RepType.count),
-                                          repWeights: Value<String>(json.encode([int.parse(actionEditController['weight']!.text)])),
-                                          // setWeights: Value<String>(json.encode([actionEditController['setWeights']!.text])),
-                                          isAlternating: Value<bool>(isAlternating),
-                                          // repType: RepType.values.firstWhere((e) => e.toString() == "RepType.${actionEditController['repType']!.text}"),
-                                          set: Value("")))
-                                      .then((actionId) {
-                                    ActivityActionsDao(db).createOrUpdate(
-                                        ActivityActionsCompanion(
-                                            activityId:
-                                                Value(widget.activity.id),
-                                            sessionId: Value(widget.session.id),
-                                            actionId: Value(actionId),
-                                            position: Value(0)));
-                                  });
-                                }
-
-                                Navigator.pop(
-                                    _formKey.currentContext!, 'Submit');
-
-                                if (widget.callback != null) {
-                                  await widget.callback!();
-                                }
-                              }
-                            },
-                            child: Text('Submit')))
-                  ])
-                ])));
-  }
-}

lib/widgets/activities/activity_action_view.dart

@@ -1,250 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
-import 'package:sendtrain/database/database.dart';
-import 'package:sendtrain/extensions/string_extensions.dart';
-import 'package:sendtrain/helpers/widget_helpers.dart';
-import 'package:sendtrain/models/action_model.dart';
-import 'package:sendtrain/providers/action_timer.dart';
-import 'package:sendtrain/widgets/activities/activity_action_editor.dart';
-import 'package:sendtrain/widgets/generic/elements/add_card_generic.dart';
-
-// class ActivityActionView extends StatefulWidget {
-class ActivityActionView extends StatelessWidget {
-  ActivityActionView(
-      {super.key,
-      required this.session,
-      required this.activity,
-      required this.actions,
-      this.callback,
-      this.resetOnLoad = true});
-  final Session session;
-  final Activity activity;
-  final List actions;
-  final Function? callback;
-  final bool resetOnLoad;
-
-  // @override
-  // State<ActivityActionView> createState() => ActivityActionViewState();
-// }
-
-// class ActivityActionViewState extends State<ActivityActionView> {
-// class ActivityActionView extends StatelessWidget {
-  //  ActivityActionView({super.key, required this.actions});
-
-  // final List actions;
-  final ItemScrollController itemScrollController = ItemScrollController();
-  final ScrollOffsetController scrollOffsetController =
-      ScrollOffsetController();
-  final ItemPositionsListener itemPositionsListener =
-      ItemPositionsListener.create();
-  final ScrollOffsetListener scrollOffsetListener =
-      ScrollOffsetListener.create();
-
-  late final ActionTimer at;
-  // int actionCount = 0;
-
-  GestureDetector gtBuild(
-      ActionTimer at, Item item, int actionNum, int selectedIndex,
-      {int? order}) {
-    // default, for rests
-    String setItemRef = '-';
-
-    // non rests decimal reference to item
-    if (order != null) {
-      setItemRef = '${order + 1}.${item.position + 1}';
-    }
-
-    return GestureDetector(onTap: () {
-      at.setAction(actionNum, true);
-    }, child: Consumer<ActionTimer>(builder: (context, at, child) {
-      return Row(children: [
-        Ink(
-            width: 70,
-            padding: const EdgeInsets.all(15),
-            color: item == at.currentAction
-                ? Theme.of(context).colorScheme.primaryContainer
-                : Theme.of(context).colorScheme.onPrimary,
-            child: Text(textAlign: TextAlign.center, setItemRef)),
-        Expanded(
-            child: Ink(
-                padding: const EdgeInsets.all(15),
-                color: item == at.currentAction
-                    ? Theme.of(context).colorScheme.surfaceBright
-                    : Theme.of(context).colorScheme.surfaceContainerLow,
-                child: Text(
-                    textAlign: TextAlign.center,
-                    '${item.name}: ${item.value} ${item.humanValueType}'
-                        .toTitleCase())))
-      ]);
-    }));
-  }
-
-  // @override
-  // void initState() {
-  //   super.initState();
-  //   at = Provider.of<ActionTimer>(context, listen: false);
-  // }
-
-  @override
-  Widget build(BuildContext context) {
-    at = Provider.of<ActionTimer>(context, listen: false);
-    int actionCount = 0;
-    if (actions.isNotEmpty) {
-      at.setup(
-          ActionModel(
-              action: actions.first,
-              db: Provider.of<AppDatabase>(context)),
-          itemScrollController,
-          resetOnLoad);
-
-      // WidgetsBinding.instance.addPostFrameCallback((_) {
-      //   if (itemScrollController.isAttached) {
-      //     itemScrollController.scrollTo(
-      //         index: at.currentAction.parentId != null
-      //             ? at.currentAction.parentId!
-      //             : at.currentAction.id,
-      //         duration: Duration(milliseconds: 500),
-      //         curve: Curves.easeInOutCubic);
-      //   }
-      // });
-
-      return Expanded(
-          child: Column(children: [
-        Padding(
-            padding: const EdgeInsets.only(left: 10, right: 10),
-            child: Card(
-                clipBehavior: Clip.antiAlias,
-                shape: const RoundedRectangleBorder(
-                  borderRadius: BorderRadius.only(
-                      topLeft: Radius.circular(10),
-                      topRight: Radius.circular(10)),
-                ),
-                color: Theme.of(context).colorScheme.onPrimary,
-                child: Row(children: [
-                  Ink(
-                      width: 70,
-                      color: Theme.of(context).colorScheme.primaryContainer,
-                      child: Consumer<ActionTimer>(
-                        builder: (context, at, child) {
-                          return IconButton(
-                              alignment: AlignmentDirectional.center,
-                              icon: at.available
-                                  ? const Icon(Icons.play_arrow_rounded)
-                                  : const Icon(Icons.pause_rounded),
-                              onPressed: () => {
-                                    if (at.started)
-                                      {at.pause()}
-                                    else if (at.available || at.complete)
-                                      {at.start()}
-                                  });
-                        },
-                      )),
-                  Expanded(
-                      flex: 1,
-                      child: Stack(alignment: Alignment.center, children: [
-                        Container(
-                          alignment: Alignment.center,
-                          child: Consumer<ActionTimer>(
-                            builder: (context, at, child) {
-                              return Text(
-                                  style: const TextStyle(fontSize: 20),
-                                  textAlign: TextAlign.center,
-                                  '${at.currentValue} ${at.currentAction.humanValueType}'
-                                      .toTitleCase());
-                            },
-                          ),
-                        ),
-                        Container(
-                            alignment: Alignment.centerRight,
-                            padding: EdgeInsets.only(right: 15),
-                            child: Consumer<ActionTimer>(
-                                builder: (context, at, child) {
-                              return Text(
-                                  style: const TextStyle(fontSize: 12),
-                                  textAlign: TextAlign.right,
-                                  '${at.state['currentAction'] + 1} of ${at.allActions.length}');
-                            })),
-                      ])),
-                ]))),
-        Padding(
-            padding: EdgeInsets.only(left: 14, right: 14),
-            child: Consumer<ActionTimer>(builder: (context, at, child) {
-              return LinearProgressIndicator(
-                value: at.progress,
-                semanticsLabel: 'Activity Progress',
-              );
-            })),
-        Expanded(
-            child: ScrollablePositionedList.builder(
-                padding: const EdgeInsets.fromLTRB(10, 0, 10, 20),
-                itemCount: at.items.length,
-                // initialScrollIndex: at.currentAction.parentId != null
-                //   ? at.currentAction.parentId!
-                //   : at.currentAction.id,
-                itemScrollController: itemScrollController,
-                scrollOffsetController: scrollOffsetController,
-                itemPositionsListener: itemPositionsListener,
-                scrollOffsetListener: scrollOffsetListener,
-                itemBuilder: (BuildContext context, int itemNum) {
-                  if (itemNum == 0) {
-                    actionCount = 0;
-                  }
-
-                  List<GestureDetector> content = [];
-                  Item item = at.items[itemNum];
-                  if (item.runtimeType == Rest) {
-                    content.add(gtBuild(at, item, actionCount++, itemNum));
-                  } else if (item.runtimeType == Set) {
-                    List<Item> setItems = item.items;
-
-                    for (int setItemNum = 0;
-                        setItemNum < setItems.length;
-                        setItemNum++) {
-                      Item setItem = setItems[setItemNum];
-                      content.add(gtBuild(at, setItem, actionCount++, itemNum,
-                          order: (item as Set).setOrder));
-                    }
-                  }
-
-                  if (itemNum == 0) {
-                    return Card(
-                        shape: const RoundedRectangleBorder(
-                          borderRadius: BorderRadius.only(
-                              topLeft: Radius.circular(0),
-                              topRight: Radius.circular(0),
-                              bottomLeft: Radius.circular(10),
-                              bottomRight: Radius.circular(10)),
-                        ),
-                        clipBehavior: Clip.antiAlias,
-                        child: Column(children: content));
-                  } else {
-                    return Card(
-                        shape: const RoundedRectangleBorder(
-                          borderRadius: BorderRadius.only(
-                              topLeft: Radius.circular(10),
-                              topRight: Radius.circular(10),
-                              bottomLeft: Radius.circular(10),
-                              bottomRight: Radius.circular(10)),
-                        ),
-                        clipBehavior: Clip.antiAlias,
-                        child: Column(children: content));
-                  }
-                }))
-      ]));
-    } else {
-      return AddCardGeneric(
-          title: 'Add an Action!',
-          description:
-              'Click here to create an exercise template (sets and reps, etc) for your activity!',
-          action: () {
-            showEditorSheet(
-                context,
-                ActivityActionEditor(
-                    session: session,
-                    activity: activity,
-                    callback: callback));
-          });
-    }
-  }
-}

lib/widgets/activities/activity_card.dart

@@ -1,115 +0,0 @@
-import 'dart:convert';
-
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-import 'package:sendtrain/daos/media_items_dao.dart';
-import 'package:sendtrain/daos/session_activities_dao.dart';
-import 'package:sendtrain/database/database.dart';
-import 'package:sendtrain/extensions/string_extensions.dart';
-import 'package:sendtrain/helpers/date_time_helpers.dart';
-import 'package:sendtrain/helpers/media_helpers.dart';
-import 'package:sendtrain/helpers/widget_helpers.dart';
-import 'package:sendtrain/models/activity_timer_model.dart';
-import 'package:sendtrain/widgets/activities/activity_view.dart';
-import 'package:sendtrain/widgets/builders/dialogs.dart';
-import 'package:sendtrain/widgets/generic/elements/card_image.dart';
-import 'package:sendtrain/widgets/generic/elements/generic_progress_indicator.dart';
-
-class ActivityCard extends StatefulWidget {
-  final Activity activity;
-  final Session session;
-  final Function? callback;
-
-  const ActivityCard(
-      {super.key,
-      required this.activity,
-      required this.session,
-      this.callback});
-
-  @override
-  State<ActivityCard> createState() => ActivityCardState();
-}
-
-class ActivityCardState extends State<ActivityCard> {
-  @override
-  Widget build(BuildContext context) {
-    final ActivityTimerModel atm = Provider.of<ActivityTimerModel>(context);
-
-    return FutureBuilder<List<MediaItem>>(
-        future: MediaItemsDao(Provider.of<AppDatabase>(context))
-            .fromActivity(widget.activity),
-        builder: (context, snapshot) {
-          if (snapshot.hasData) {
-            List<MediaItem> mediaItems = snapshot.data!;
-
-            return Card.outlined(
-              color: atm.activity?.id == widget.activity.id
-                  ? Theme.of(context).colorScheme.primaryContainer
-                  : Theme.of(context).colorScheme.surfaceContainerLow,
-              clipBehavior: Clip.hardEdge,
-              child: InkWell(
-                  onTap: () => showGenericDialog(
-                      ActivityView(session: widget.session, activity: widget.activity), context),
-                  child: Column(
-                    mainAxisSize: MainAxisSize.min,
-                    children: <Widget>[
-                      ListTile(
-                          leading: CardImage(
-                              image:
-                                  findMediaByType(mediaItems, MediaType.image)),
-                          title: Consumer<ActivityTimerModel>(
-                            builder: (context, atm, child) {
-                              if (atm.activity?.id == widget.activity.id) {
-                                return Text(
-                                    maxLines: 1,
-                                    overflow: TextOverflow.ellipsis,
-                                    "${widget.activity.title.toTitleCase()} (${formattedTime(atm.totalTime)})");
-                              } else {
-                                return Text(
-                                    maxLines: 1,
-                                    overflow: TextOverflow.ellipsis,
-                                    widget.activity.title.toTitleCase());
-                              }
-                            },
-                          ),
-                          subtitle: Text(
-                              overflow: TextOverflow.ellipsis,
-                              maxLines: 2,
-                              softWrap: true,
-                              jsonToDescription(json
-                                  .decode(widget.activity.description ?? ""))),
-                          contentPadding: EdgeInsets.only(left: 13),
-                          trailing: Flex(
-                              direction: Axis.vertical,
-                              mainAxisSize: MainAxisSize.max,
-                              children: [
-                                IconButton(
-                                  padding: EdgeInsets.all(0),
-                                  alignment: Alignment.topCenter,
-                                  visualDensity: VisualDensity.compact,
-                                  icon: Icon(Icons.close_rounded),
-                                  onPressed: () {
-                                    showRemovalDialog(
-                                        'Activity Removal',
-                                        'Would you like to permanently remove this activity from the current session?',
-                                        context, () {
-                                      SessionActivitiesDao(
-                                              Provider.of<AppDatabase>(context,
-                                                  listen: false))
-                                          .removeAssociation(widget.activity.id,
-                                              widget.session.id);
-                                    }).then((result) {
-                                      setState(() {});
-                                    });
-                                  },
-                                )
-                              ])),
-                    ],
-                  )),
-            );
-          } else {
-            return GenericProgressIndicator();
-          }
-        });
-  }
-}

lib/widgets/activities/activity_view.dart

@@ -1,287 +0,0 @@
-import 'dart:convert';
-
-import 'package:flutter/material.dart' hide Action;
-import 'package:flutter_expandable_fab/flutter_expandable_fab.dart';
-import 'package:provider/provider.dart';
-import 'package:sendtrain/daos/actions_dao.dart';
-import 'package:sendtrain/database/database.dart';
-import 'package:sendtrain/extensions/string_extensions.dart';
-import 'package:sendtrain/helpers/widget_helpers.dart';
-import 'package:sendtrain/providers/action_timer.dart';
-import 'package:sendtrain/widgets/activities/activity_action_editor.dart';
-import 'package:sendtrain/widgets/activities/activity_action_view.dart';
-import 'package:sendtrain/widgets/activities/activity_view_categories.dart';
-import 'package:sendtrain/widgets/activities/activity_view_media.dart';
-import 'package:sendtrain/widgets/builders/dialogs.dart';
-
-class ActivityView extends StatefulWidget {
-  const ActivityView(
-      {super.key, required this.session, required this.activity});
-  final Session session;
-  final Activity activity;
-
-  @override
-  State<ActivityView> createState() => _ActivityViewState();
-}
-
-class _ActivityViewState extends State<ActivityView> {
-  final _fabKey = GlobalKey<ExpandableFabState>();
-
-  void resetState() async {
-    final state = _fabKey.currentState;
-    if (state != null && state.isOpen) {
-      state.toggle();
-    }
-
-    setState(() {});
-  }
-
-  List<ActivityMuscle> activityMuscle(Activity activity) {
-    List<ActivityMuscle> muscles = [];
-
-    if (activity.primaryMuscles != null) {
-      muscles.add(activity.primaryMuscles!);
-    }
-
-    if (activity.secondaryMuscles != null) {
-      muscles.add(activity.secondaryMuscles!);
-    }
-
-    return muscles;
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final Activity activity = widget.activity;
-    final Session session = widget.session;
-
-    return FutureBuilder<List>(
-        future: ActionsDao(Provider.of<AppDatabase>(context))
-            .fromActivity(activity, session),
-        builder: (context, snapshot) {
-          if (snapshot.hasData) {
-            List<Action> actions = snapshot.data! as List<Action>;
-
-            return PopScope(
-                canPop: false,
-                onPopInvokedWithResult: (didPop, result) async {
-                  if (didPop) {
-                    return;
-                  }
-                  final bool shouldPop = await showBackDialog(context) ?? false;
-                  if (context.mounted && shouldPop) {
-                    Navigator.pop(context);
-                  }
-                },
-                child: Scaffold(
-                    floatingActionButtonLocation: ExpandableFab.location,
-                    floatingActionButton: ExpandableFab(
-                        key: _fabKey,
-                        distance: 70,
-                        type: ExpandableFabType.up,
-                        overlayStyle: ExpandableFabOverlayStyle(
-                          color: Colors.black.withValues(alpha: 0.5),
-                          blur: 10,
-                        ),
-                        onOpen: () {
-                          // pause the activity on open
-                          ActionTimer at =
-                              Provider.of<ActionTimer>(context, listen: false);
-                          if (at.started) at.pause();
-                        },
-                        children: [
-                          // FloatingActionButton.extended(
-                          //   icon: const Icon(Icons.upload_outlined),
-                          //   label: Text('Upload Media'),
-                          //   onPressed: () {},
-                          // ),
-                          FloatingActionButton.extended(
-                            icon: const Icon(Icons.done_all_outlined),
-                            label: Text('Edit Action'),
-                            onPressed: () {
-                              showEditorSheet(
-                                  context,
-                                  ActivityActionEditor(
-                                      session: session,
-                                      activity: activity,
-                                      action: actions.first,
-                                      callback: resetState));
-                            },
-                          ),
-                          FloatingActionButton.extended(
-                            icon: const Icon(Icons.note_add_outlined),
-                            label: Text('Add Note'),
-                            onPressed: () {},
-                          ),
-                          FloatingActionButton.extended(
-                            icon: const Icon(Icons.history_outlined),
-                            label: Text('Restart'),
-                            onPressed: () {},
-                          ),
-                          FloatingActionButton.extended(
-                            icon: const Icon(Icons.done_all_outlined),
-                            label: Text('Done'),
-                            onPressed: () {},
-                          ),
-                        ]),
-                    body: Column(
-                        crossAxisAlignment: CrossAxisAlignment.start,
-                        children: [
-                          AppBar(
-                            titleSpacing: 0,
-                            centerTitle: true,
-                            title: const Text('Activity',
-                                style: TextStyle(fontSize: 15)),
-                          ),
-                          Padding(
-                              padding: const EdgeInsets.only(
-                                  left: 15, right: 20, top: 15, bottom: 10),
-                              child: Text(
-                                  maxLines: 1,
-                                  style: const TextStyle(
-                                      fontSize: 25,
-                                      fontWeight: FontWeight.bold),
-                                  activity.title.toTitleCase())),
-                          SizedBox(
-                              height: 40,
-                              child: ListView(
-                                  scrollDirection: Axis.horizontal,
-                                  padding:
-                                      const EdgeInsets.fromLTRB(10, 0, 10, 0),
-                                  shrinkWrap: true,
-                                  children: [
-                                    ActivityViewCategories<List<ActivityLevel>>(
-                                        icon: Icon(Icons.stairs_rounded),
-                                        text: "Activity Level",
-                                        object: activity.level != null
-                                            ? [activity.level!]
-                                            : []),
-                                    // ActivityViewCategories<List<ActivityMechanic>>(
-                                    //     icon: Icon(Icons.),
-                                    //     text: 'Activity Mechanic',
-                                    //     object: activity.mechanic != null
-                                    //         ? [activity.mechanic!]
-                                    //         : []),
-                                    ActivityViewCategories<
-                                            List<ActivityEquipment>>(
-                                        icon:
-                                            Icon(Icons.fitness_center_rounded),
-                                        text: 'Equipment Used',
-                                        object: activity.equipment != null
-                                            ? [activity.equipment!]
-                                            : []),
-                                    ActivityViewCategories<List<ActivityType>>(
-                                        icon: Icon(Icons.type_specimen_rounded),
-                                        text: 'Activity Type',
-                                        object: activity.type != null
-                                            ? [activity.type!]
-                                            : []),
-                                    ActivityViewCategories<
-                                            List<ActivityMuscle>>(
-                                        icon: Icon(Icons.person),
-                                        text: 'Muscles used',
-                                        object: activityMuscle(activity))
-                                  ])),
-                          Padding(
-                              padding: const EdgeInsets.only(
-                                  top: 10, bottom: 0, left: 15, right: 15),
-                              child: Text(
-                                  maxLines: 4,
-                                  overflow: TextOverflow.ellipsis,
-                                  // softWrap: true,
-                                  textAlign: TextAlign.left,
-                                  style: const TextStyle(fontSize: 15),
-                                  jsonToDescription([
-                                    json.decode(activity.description ?? "")[0]
-                                  ]))),
-                          Padding(
-                              padding: EdgeInsets.only(right: 15),
-                              child: Align(
-                                  alignment: Alignment.topRight,
-                                  child: TextButton(
-                                    style: ButtonStyle(
-                                        textStyle:
-                                            WidgetStateProperty.all<TextStyle>(
-                                                TextStyle(
-                                                    fontWeight:
-                                                        FontWeight.normal)),
-                                        shape: WidgetStateProperty.all<
-                                                RoundedRectangleBorder>(
-                                            RoundedRectangleBorder(
-                                          borderRadius:
-                                              BorderRadius.circular(10.0),
-                                        ))),
-                                    onPressed: () {
-                                      showGenericSheet(
-                                          context,
-                                          Padding(
-                                              padding: EdgeInsets.all(15),
-                                              child: Text(
-                                                  style:
-                                                      TextStyle(fontSize: 18),
-                                                  jsonToDescription(json.decode(
-                                                      activity.description ??
-                                                          "")))));
-                                    },
-                                    child: Text(
-                                      "read more",
-                                      textAlign: TextAlign.right,
-                                      style: TextStyle(fontSize: 12),
-                                    ),
-                                  ))),
-                          const Padding(
-                              padding: EdgeInsets.fromLTRB(15, 10, 0, 10),
-                              child: Text(
-                                  style: TextStyle(
-                                      fontSize: 20,
-                                      fontWeight: FontWeight.bold),
-                                  'Media:')),
-                          ActivityViewMedia(activity: activity),
-                          Padding(
-                              padding: const EdgeInsets.fromLTRB(15, 20, 5, 0),
-                              child: Row(children: [
-                                Expanded(
-                                    child: const Text(
-                                        textAlign: TextAlign.left,
-                                        style: TextStyle(
-                                            fontSize: 20,
-                                            fontWeight: FontWeight.bold),
-                                        'Actions')),
-                                IconButton(
-                                  onPressed: () {
-                                    showGenericSheet(
-                                        context,
-                                        Column(children: [
-                                          ActivityActionView(
-                                              session: session,
-                                              activity: activity,
-                                              actions: actions,
-                                              callback: resetState,
-                                              resetOnLoad: false)
-                                        ]),
-                                        Theme.of(context).colorScheme.surface);
-                                  },
-                                  icon: Icon(Icons.expand),
-                                  alignment: Alignment.bottomCenter,
-                                )
-                              ])),
-                          ActivityActionView(
-                              session: session,
-                              activity: activity,
-                              actions: actions,
-                              callback: resetState)
-                        ])));
-            // ] +
-            // action(actions, context)));
-          } else {
-            return Container(
-                alignment: Alignment.center,
-                child: SizedBox(
-                  height: 50.0,
-                  width: 50.0,
-                  child: CircularProgressIndicator(),
-                ));
-          }
-        });
-  }
-}

lib/widgets/activities/activity_view_categories.dart

@@ -1,35 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:sendtrain/extensions/string_extensions.dart';
-
-class ActivityViewCategories<T extends List<Enum>> extends StatelessWidget {
-  const ActivityViewCategories(
-      {super.key,
-      required this.object,
-      required this.icon,
-      required this.text});
-
-  final T object;
-  final Icon icon;
-  final String text;
-
-  @override
-  Widget build(BuildContext context) {
-    return ListView.builder(
-      shrinkWrap: true,
-      scrollDirection: Axis.horizontal,
-      // padding: const EdgeInsets.only(right: 10, left: 10),
-      itemCount: object.length,
-      itemBuilder: (BuildContext context, int index) {
-        return Padding(
-            padding: EdgeInsets.only(right: 5),
-            child: ActionChip(
-              visualDensity: VisualDensity.compact,
-              avatar: icon,
-              label: Text(maxLines: 1, object[index].name.toTitleCase()),
-              tooltip: text,
-              onPressed: () {},
-            ));
-      },
-    );
-  }
-}

lib/widgets/activities/activity_view_media.dart

@@ -1,51 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-import 'package:sendtrain/daos/media_items_dao.dart';
-import 'package:sendtrain/database/database.dart';
-import 'package:sendtrain/widgets/media/media_card.dart';
-
-class ActivityViewMedia extends StatelessWidget {
-  const ActivityViewMedia({super.key, required this.activity});
-
-  final Activity activity;
-
-  @override
-  Widget build(BuildContext context) {
-    return FutureBuilder<List<MediaItem>>(
-      future: MediaItemsDao(Provider.of<AppDatabase>(context)).fromActivity(activity),
-      builder: (context, snapshot) {
-        if (snapshot.hasData) {
-          List<MediaItem> mediaItems = snapshot.data!;
-          List<MediaCard> mediaCards = [];
-
-          for (int i = 0; i < mediaItems.length; i++) {
-            mediaCards.add(MediaCard(media: mediaItems[i]));
-          }
-
-          return Column(
-            children: [
-              SizedBox(
-                  width: double.infinity,
-                  height: 100,
-                  child: GridView.count(
-                      padding: const EdgeInsets.fromLTRB(15, 0, 0, 0),
-                      scrollDirection: Axis.horizontal,
-                      crossAxisSpacing: 5,
-                      mainAxisSpacing: 5,
-                      crossAxisCount: 1,
-                      children: mediaCards))
-            ],
-          );
-        } else {
-          return Container(
-                alignment: Alignment.center,
-                child: SizedBox(
-                  height: 50.0,
-                  width: 50.0,
-                  child: CircularProgressIndicator(),
-                ));
-        }
-      }
-    );
-  }
-}

lib/widgets/activities/activity_view_types.dart

@@ -1,30 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:sendtrain/database/database.dart';
-import 'package:sendtrain/extensions/string_extensions.dart';
-
-class ActivityViewTypes extends StatelessWidget {
-  const ActivityViewTypes({super.key, required this.types});
-
-  final List<ActivityType> types;
-
-  @override
-  Widget build(BuildContext context) {
-    return SizedBox(
-        height: 40,
-        child: ListView.builder(
-          shrinkWrap: true,
-          scrollDirection: Axis.horizontal,
-          padding: const EdgeInsets.only(right: 10),
-          itemCount: types.length,
-          itemBuilder: (BuildContext context, int index) {
-            return ActionChip(
-              visualDensity: VisualDensity.compact,
-              avatar: const Icon(Icons.fitness_center_rounded),
-              label: Text(maxLines: 1, types[index].name.toTitleCase()),
-              tooltip: "Activity Type",
-              onPressed: () {},
-            );
-          },
-        ));
-  }
-}

lib/widgets/activities_header.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'activity_type_filter.dart';
+import '../widgets/activity_type_filter.dart';
 
 class ActivitiesHeader extends StatefulWidget {
   const ActivitiesHeader({super.key});

lib/widgets/activity_action_view.dart

@@ -0,0 +1,108 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
+import 'package:sendtrain/classes/activity_action.dart';
+import 'package:sendtrain/models/activity_timer_model.dart';
+
+class ActivityActionView extends StatefulWidget {
+  const ActivityActionView({super.key, required this.action});
+  final ActivityAction action;
+
+  @override
+  State<ActivityActionView> createState() => ActivityActionViewState();
+}
+
+class ActivityActionViewState extends State<ActivityActionView> {
+  final ItemScrollController itemScrollController = ItemScrollController();
+  final ScrollOffsetController scrollOffsetController =
+      ScrollOffsetController();
+  final ItemPositionsListener itemPositionsListener =
+      ItemPositionsListener.create();
+  final ScrollOffsetListener scrollOffsetListener =
+      ScrollOffsetListener.create();
+
+  @override
+  Widget build(BuildContext context) {
+    ActivityTimerModel atm =
+        Provider.of<ActivityTimerModel>(context, listen: true);
+    List<List<Map<String, dynamic>>> sets = atm.activity!.actions[0].items();
+
+    // we need to set the scroll controller
+    // so we can update the selected item position
+    atm.setScrollController(itemScrollController);
+
+    return Expanded(
+        child: ScrollablePositionedList.builder(
+      padding: const EdgeInsets.fromLTRB(10, 0, 10, 20),
+      itemCount: widget.action.activityActionSet.total,
+      itemScrollController: itemScrollController,
+      scrollOffsetController: scrollOffsetController,
+      itemPositionsListener: itemPositionsListener,
+      scrollOffsetListener: scrollOffsetListener,
+      itemBuilder: (BuildContext context, int setNum) {
+        List<GestureDetector> content = [];
+        List<Map<String, dynamic>> set = sets[setNum];
+
+        for (int actionNum = 0; actionNum < set.length; actionNum++) {
+          Map<String, dynamic> setItem = set[actionNum];
+
+          content.add(GestureDetector(
+              onTap: () {
+                atm.setAction(setNum, actionNum, 'manual');
+                atm.setActionCount();
+
+                itemScrollController.scrollTo(
+                    index: setNum,
+                    duration: Duration(milliseconds: 500),
+                    curve: Curves.easeInOutCubic);
+              },
+              child: Row(children: [
+                Ink(
+                    width: 70,
+                    padding: const EdgeInsets.all(15),
+                    color: atm.isCurrentItem(setNum, actionNum)
+                        ? Theme.of(context).colorScheme.primaryContainer
+                        : Theme.of(context).colorScheme.onPrimary,
+                    child: Text(
+                        textAlign: TextAlign.center,
+                        '${setNum + 1}.${actionNum + 1} ')),
+                Expanded(
+                    child: Ink(
+                        padding: const EdgeInsets.all(15),
+                        color: atm.isCurrentItem(setNum, actionNum)
+                            ? Theme.of(context).colorScheme.surfaceBright
+                            : Theme.of(context).colorScheme.surfaceContainerLow,
+                        child: Text(
+                            textAlign: TextAlign.center,
+                            '${setItem['name']}: ${setItem['amount']} ${setItem['type']}')))
+              ])));
+        }
+
+        if (setNum == 0) {
+          return Card(
+              shape: const RoundedRectangleBorder(
+                borderRadius: BorderRadius.only(
+                    topLeft: Radius.circular(0),
+                    topRight: Radius.circular(0),
+                    bottomLeft: Radius.circular(10),
+                    bottomRight: Radius.circular(10)),
+              ),
+              clipBehavior: Clip.antiAlias,
+              child: Column(children: content));
+        } else {
+          return Card(
+              shape: const RoundedRectangleBorder(
+                borderRadius: BorderRadius.only(
+                    topLeft: Radius.circular(10),
+                    topRight: Radius.circular(10),
+                    bottomLeft: Radius.circular(10),
+                    bottomRight: Radius.circular(10)),
+              ),
+              clipBehavior: Clip.antiAlias,
+              child: Column(children: content));
+        }
+        // return Column(children: contents);
+      },
+    ));
+  }
+}

lib/widgets/activity_card.dart

@@ -0,0 +1,127 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+import 'package:sendtrain/classes/media.dart';
+import 'package:sendtrain/models/activity_model.dart';
+import 'package:sendtrain/models/activity_timer_model.dart';
+import 'package:sendtrain/widgets/activity_view.dart';
+
+class ActivityCard extends StatefulWidget {
+  final ActivityModel activity;
+
+  const ActivityCard({super.key, required this.activity});
+
+  @override
+  State<ActivityCard> createState() => ActivityCardState();
+}
+
+class ActivityCardState extends State<ActivityCard> {
+  String formattedTime(int timeInSecond) {
+    int sec = timeInSecond % 60;
+    int min = (timeInSecond / 60).floor();
+    String minute = min.toString().length <= 1 ? "0$min" : "$min";
+    String second = sec.toString().length <= 1 ? "0$sec" : "$sec";
+    return "$minute:$second";
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final ActivityTimerModel atm =
+        Provider.of<ActivityTimerModel>(context, listen: false);
+
+    return Card(
+      color: atm.activity?.id == widget.activity.id
+          ? Theme.of(context).colorScheme.primaryContainer
+          : Theme.of(context).colorScheme.surfaceContainerLow,
+      clipBehavior: Clip.hardEdge,
+      child: InkWell(
+          onTap: () => showGeneralDialog(
+              barrierColor: Colors.black.withOpacity(0.5),
+              transitionDuration: const Duration(milliseconds: 220),
+              transitionBuilder: (BuildContext context,
+                  Animation<double> animation,
+                  Animation<double> secondaryAnimation,
+                  Widget child) {
+                Animation<Offset> custom = Tween<Offset>(
+                        begin: const Offset(0.0, 1.0),
+                        end: const Offset(0.0, 0.0))
+                    .animate(animation);
+                return SlideTransition(
+                    position: custom,
+                    child: Dialog.fullscreen(
+                        child: ActivityView(activity: widget.activity)));
+              },
+              barrierDismissible: true,
+              barrierLabel: '',
+              context: context,
+              pageBuilder: (context, animation1, animation2) {
+                return Container();
+              }),
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: <Widget>[
+              ListTile(
+                  leading: Padding(
+                      padding: const EdgeInsets.fromLTRB(0, 0, 0, 0),
+                      child: Container(
+                        width: 60,
+                        decoration: BoxDecoration(
+                          image: DecorationImage(
+                              fit: BoxFit.cover,
+                              image: findMediaByType(
+                                  widget.activity.actions[0].media, 'image')),
+                          // color: Colors.blue,
+                          borderRadius:
+                              const BorderRadius.all(Radius.elliptical(10, 10)),
+                        ),
+                      )),
+                  title: Consumer<ActivityTimerModel>(
+                    builder: (context, atm, child) {
+                      if (atm.activity?.id == widget.activity.id) {
+                        return Text(
+                            maxLines: 1,
+                            "${widget.activity.title} (${formattedTime(atm.totalTime)})");
+                      } else {
+                        return Text(maxLines: 1, widget.activity.title);
+                      }
+                    },
+                  ),
+                  subtitle: Text(maxLines: 2, widget.activity.description),
+                  trailing: IconButton(
+                    visualDensity: VisualDensity.compact,
+                    icon: Icon(Icons.close_rounded),
+                    onPressed: () {
+                      showAdaptiveDialog(
+                        context: context,
+                        builder: (BuildContext context) => AlertDialog(
+                          title: const Text('Activity Removal'),
+                          content: const Text('Would you like to permanently remove this activity from the current session?'),
+                          actions: <Widget>[
+                            TextButton(
+                              onPressed: () => Navigator.pop(context, 'Cancel'),
+                              child: const Text('Cancel'),
+                            ),
+                            TextButton(
+                              onPressed: () => Navigator.pop(context, 'OK'),
+                              child: const Text('OK'),
+                            ),
+                          ],
+                        ),
+                      );
+                    },
+                  )),
+            ],
+          )),
+    );
+  }
+
+  ImageProvider findMediaByType(List<Media>? media, String type) {
+    var found = media?.where((m) => m.type == 'image');
+
+    if (found != null) {
+      return NetworkImage(found.first.reference);
+    } else {
+      // Element is not found
+      return const AssetImage('assets/images/placeholder.jpg');
+    }
+  }
+}

lib/widgets/activity_view.dart

@@ -0,0 +1,214 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_expandable_fab/flutter_expandable_fab.dart';
+import 'package:provider/provider.dart';
+import 'package:sendtrain/classes/activity_action.dart';
+import 'package:sendtrain/classes/media.dart';
+import 'package:sendtrain/models/activity_model.dart';
+import 'package:sendtrain/models/activity_timer_model.dart';
+import 'package:sendtrain/widgets/activity_action_view.dart';
+import 'package:sendtrain/widgets/media_card.dart';
+
+class ActivityView extends StatefulWidget {
+  const ActivityView({super.key, required this.activity});
+  final ActivityModel activity;
+
+  @override
+  State<ActivityView> createState() => _ActivityViewState();
+}
+
+class _ActivityViewState extends State<ActivityView> {
+  @override
+  Widget build(BuildContext context) {
+    ActivityModel activity = widget.activity;
+    ActivityTimerModel atm =
+        Provider.of<ActivityTimerModel>(context, listen: false);
+
+    atm.setup(activity);
+
+    return Scaffold(
+        floatingActionButtonLocation: ExpandableFab.location,
+        floatingActionButton: ExpandableFab(
+            distance: 70,
+            type: ExpandableFabType.up,
+            overlayStyle: ExpandableFabOverlayStyle(
+              color: Colors.black.withOpacity(0.5),
+              blur: 10,
+            ),
+            children: [
+              FloatingActionButton.extended(
+                icon: const Icon(Icons.history_outlined),
+                label: Text('Restart'),
+                onPressed: () {},
+              ),
+              FloatingActionButton.extended(
+                icon: const Icon(Icons.done_all_outlined),
+                label: Text('Done'),
+                onPressed: () {},
+              ),
+              FloatingActionButton.extended(
+                icon: const Icon(Icons.edit_outlined),
+                label: Text('Edit'),
+                onPressed: () {},
+              ),
+            ]),
+        body: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
+          AppBar(
+            centerTitle: true,
+            title: const Text('Activity', style: TextStyle(fontSize: 15)),
+          ),
+          Padding(
+              padding: const EdgeInsets.only(
+                  left: 15, right: 20, top: 15, bottom: 10),
+              child: Text(
+                  maxLines: 1,
+                  style: const TextStyle(
+                      fontSize: 25, fontWeight: FontWeight.bold),
+                  activity.title)),
+          ActivityViewCategories(categories: activity.categories),
+          Padding(
+              padding: const EdgeInsets.only(
+                  top: 0, bottom: 20, left: 15, right: 15),
+              child: Text(
+                  textAlign: TextAlign.left,
+                  style: const TextStyle(fontSize: 15),
+                  activity.description)),
+          ActivityViewMedia(activity: activity),
+          const Padding(
+              padding: EdgeInsets.fromLTRB(15, 30, 0, 10),
+              child: Text(
+                  textAlign: TextAlign.left,
+                  style: TextStyle(fontSize: 20, fontWeight: FontWeight.bold),
+                  'Actions')),
+          Padding(
+              padding: const EdgeInsets.only(left: 10, right: 10),
+              child: Card(
+                  clipBehavior: Clip.antiAlias,
+                  shape: const RoundedRectangleBorder(
+                    borderRadius: BorderRadius.only(
+                        topLeft: Radius.circular(10),
+                        topRight: Radius.circular(10)),
+                  ),
+                  color: Theme.of(context).colorScheme.onPrimary,
+                  child: Row(children: [
+                    Ink(
+                        width: 70,
+                        color: Theme.of(context).colorScheme.primaryContainer,
+                        child: Consumer<ActivityTimerModel>(
+                          builder: (context, atm, child) {
+                            return IconButton(
+                                alignment: AlignmentDirectional.center,
+                                icon: atm.isActive
+                                    ? const Icon(Icons.pause_rounded)
+                                    : const Icon(Icons.play_arrow_rounded),
+                                onPressed: () =>
+                                    {atm.isActive ? atm.pause() : atm.start()});
+                          },
+                        )),
+                    Expanded(
+                        flex: 1,
+                        child: Stack(alignment: Alignment.center, children: [
+                          Container(
+                            alignment: Alignment.center,
+                            child: Consumer<ActivityTimerModel>(
+                              builder: (context, atm, child) {
+                                return Text(
+                                    style: const TextStyle(fontSize: 20),
+                                    textAlign: TextAlign.center,
+                                    '${atm.actionCount} ${atm.currentAction['type']}');
+                              },
+                            ),
+                          ),
+                          Container(
+                              alignment: Alignment.centerRight,
+                              padding: EdgeInsets.only(right: 15),
+                              child: Consumer<ActivityTimerModel>(
+                                  builder: (context, atm, child) {
+                                return Text(
+                                    style: const TextStyle(fontSize: 12),
+                                    textAlign: TextAlign.right,
+                                    '${atm.currentAction['actionID'] + 1} of ${atm.totalActions()}');
+                              })),
+                        ])),
+                  ]))),
+          Padding(
+              padding: EdgeInsets.only(left: 14, right: 14),
+              child:
+                  Consumer<ActivityTimerModel>(builder: (context, atm, child) {
+                return LinearProgressIndicator(
+                  value: atm.progress,
+                  semanticsLabel: 'Activity Progress',
+                );
+              })),
+          ActivityActionView(action: activity.actions[0]),
+        ]));
+  }
+}
+
+class ActivityViewCategories extends StatelessWidget {
+  const ActivityViewCategories({super.key, this.categories});
+
+  final List<String>? categories;
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      children: [
+        Padding(
+            padding: const EdgeInsets.only(bottom: 10),
+            child: SizedBox(
+                height: 40,
+                child: ListView.builder(
+                  shrinkWrap: true,
+                  scrollDirection: Axis.horizontal,
+                  padding: const EdgeInsets.fromLTRB(10, 0, 10, 0),
+                  itemCount: categories?.length,
+                  itemBuilder: (BuildContext context, int index) {
+                    return Padding(
+                        padding: const EdgeInsets.only(right: 5),
+                        child: ActionChip(
+                          visualDensity: VisualDensity.compact,
+                          avatar: const Icon(Icons.check_circle_outline),
+                          label: Text(maxLines: 1, '${categories?[index]}'),
+                          onPressed: () {},
+                        ));
+                  },
+                ))),
+      ],
+    );
+  }
+}
+
+class ActivityViewMedia extends StatelessWidget {
+  const ActivityViewMedia({super.key, this.activity});
+
+  final ActivityModel? activity;
+
+  @override
+  Widget build(BuildContext context) {
+    List<Media> media = [];
+
+    for (ActivityAction action in activity!.actions) {
+      if (action.media!.isNotEmpty) {
+        media.addAll(action.media as Iterable<Media>);
+      }
+    }
+
+    List<Widget> mediaCards =
+        List.generate(media.length, (i) => MediaCard(media: media[i]));
+
+    return Column(
+      children: [
+        SizedBox(
+            width: double.infinity,
+            height: 100,
+            child: GridView.count(
+                padding: const EdgeInsets.fromLTRB(15, 0, 0, 0),
+                scrollDirection: Axis.horizontal,
+                crossAxisSpacing: 5,
+                mainAxisSpacing: 5,
+                crossAxisCount: 1,
+                children: mediaCards))
+      ],
+    );
+  }
+}

lib/widgets/builders/dialogs.dart

@@ -1,107 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-import 'package:sendtrain/providers/action_timer.dart';
-
-Future showGenericDialog(dynamic object, BuildContext parentContext) {
-  return showGeneralDialog(
-      barrierColor: Colors.black.withValues(alpha: 0.5),
-      transitionDuration: const Duration(milliseconds: 220),
-      transitionBuilder: (BuildContext context, Animation<double> animation,
-          Animation<double> secondaryAnimation, Widget child) {
-        Animation<Offset> custom = Tween<Offset>(
-                begin: const Offset(0.0, 1.0), end: const Offset(0.0, 0.0))
-            .animate(animation);
-        return SlideTransition(
-            position: custom, child: Dialog.fullscreen(child: object));
-      },
-      barrierDismissible: true,
-      barrierLabel: '',
-      context: parentContext,
-      pageBuilder: (context, animation1, animation2) {
-        return Container();
-      });
-}
-
-Future showCrudDialog(String title, String content, BuildContext context,
-    [Function? callback]) {
-  return showAdaptiveDialog(
-    context: context,
-    builder: (BuildContext context) => AlertDialog(
-      title: Text(title),
-      content: Text(content),
-      actions: <Widget>[
-        TextButton(
-          onPressed: () => {
-            Navigator.pop(context, 'Cancel'),
-          },
-          child: const Text('Cancel'),
-        ),
-        TextButton(
-          onPressed: () => {
-            if (callback != null) {callback()},
-            Navigator.pop(context, 'OK')
-          },
-          child: const Text('OK'),
-        ),
-      ],
-    ),
-  );
-}
-
-Future showRemovalDialog(String title, String content, BuildContext context,
-    [Function? callback]) {
-  return showCrudDialog(title, content, context, callback);
-}
-
-Future showUpdateDialog(String title, String content, BuildContext context,
-    [Function? callback]) {
-  return showCrudDialog(title, content, context, callback);
-}
-
-// TODO - factor out, this should be more generic
-Future<bool?> showBackDialog(BuildContext context) async {
-  ActionTimer at = Provider.of<ActionTimer>(context, listen: false);
-
-  if (at.pending || at.complete) {
-    await at.clear();
-    return true;
-  } else {
-    return await showDialog<bool>(
-      context: context,
-      builder: (BuildContext context) {
-        return AlertDialog(
-          title: const Text('Are you sure?'),
-          content: const Text(
-            'Leaving will stop the current activity. Are you sure you want to leave?',
-          ),
-          actions: <Widget>[
-            TextButton(
-              style: TextButton.styleFrom(
-                textStyle: Theme.of(context).textTheme.labelLarge,
-              ),
-              child: const Text('Nevermind'),
-              onPressed: () async {
-                Navigator.pop(context, false);
-              },
-            ),
-            TextButton(
-              style: TextButton.styleFrom(
-                textStyle: Theme.of(context).textTheme.labelLarge,
-              ),
-              child: const Text('Leave'),
-              onPressed: () async {
-                ActionTimer at =
-                    Provider.of<ActionTimer>(context, listen: false);
-                await at.clear();
-
-                if (context.mounted) {
-                  Navigator.pop(context, true);
-                }
-              },
-            ),
-          ],
-        );
-      },
-    );
-  }
-}

lib/widgets/generic/elements/add_card_generic.dart

@@ -1,37 +0,0 @@
-import 'package:flutter/material.dart';
-
-class AddCardGeneric extends StatelessWidget {
-  const AddCardGeneric(
-      {super.key, required this.title, required this.description, this.action});
-
-  final String title;
-  final String description;
-  final Function? action;
-
-  @override
-  Widget build(BuildContext context) {
-    return Expanded(
-        child: ListView(
-            padding: const EdgeInsets.fromLTRB(10, 0, 10, 0),
-            children: [
-          Card.outlined(
-              child: InkWell(
-                  customBorder: RoundedRectangleBorder(
-                    borderRadius: BorderRadius.circular(10),
-                  ),
-                  onTap: () {
-                    if (action != null) {
-                      action!();
-                    }
-                  },
-                  child: ListTile(
-                    contentPadding:
-                        EdgeInsets.only(top: 5, left: 15, right: 5, bottom: 5),
-                    autofocus: true,
-                    leading: Icon(Icons.add_box_rounded),
-                    title: Text(title),
-                    subtitle: Text(description),
-                  )))
-        ]));
-  }
-}

lib/widgets/generic/elements/card_content.dart

@@ -1,19 +0,0 @@
-import 'package:flutter/material.dart';
-
-class CardContent extends StatelessWidget {
-  const CardContent({super.key, required this.content});
-
-  final String content;
-
-  @override
-  Widget build(BuildContext context) {
-    return ListTile(
-      contentPadding: const EdgeInsets.fromLTRB(15, 0, 15, 15),
-      title: Text(
-          maxLines: 2,
-          overflow: TextOverflow.ellipsis,
-          style: const TextStyle(fontWeight: FontWeight.w300),
-          content),
-    );
-  }
-}

lib/widgets/generic/elements/card_image.dart

@@ -1,31 +0,0 @@
-import 'package:flutter/material.dart';
-
-enum SizeAxis { width, height }
-
-class CardImage extends StatelessWidget {
-  const CardImage({super.key, required this.image, this.padding, this.size});
-
-  final ImageProvider<Object> image;
-  final EdgeInsets? padding;
-
-  final Map<SizeAxis, double>? size;
-
-  @override
-  Widget build(BuildContext context) {
-    return Padding(
-        padding: padding ?? const EdgeInsets.fromLTRB(0, 0, 0, 0),
-        child: Container(
-          width: size?[SizeAxis.width] ?? 60,
-          height: size?[SizeAxis.height] ?? 60,
-          decoration: BoxDecoration(
-            image: DecorationImage(
-              fit: BoxFit.cover,
-              image: image,
-              onError: (error, stackTrace) => AssetImage('assets/images/placeholder.jpg')
-              // color: Colors.blue,
-            ),
-            borderRadius: BorderRadius.all(Radius.elliptical(8, 8)),
-          ),
-        ));
-  }
-}

lib/widgets/generic/elements/form_drop_down.dart

@@ -1,32 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:sendtrain/helpers/widget_helpers.dart';
-
-class FormDropDown extends StatelessWidget {
-  const FormDropDown(
-      {super.key,
-      required this.title,
-      required this.entries,
-      required this.controller});
-
-  final List<DropdownMenuEntry> entries;
-  final String title;
-  final TextEditingController controller;
-
-  @override
-  Widget build(BuildContext context) {
-    return formItemWrapper(
-        DropdownMenu(
-            leadingIcon: Icon(Icons.select_all_rounded),
-            initialSelection: controller.text,
-            controller: controller,
-            expandedInsets: EdgeInsets.zero,
-            inputDecorationTheme: InputDecorationTheme(
-                filled: true,
-                border: OutlineInputBorder(
-                    borderSide: BorderSide.none,
-                    borderRadius: BorderRadius.circular(12))),
-            label: Text(title),
-            dropdownMenuEntries: entries),
-        EdgeInsets.fromLTRB(10, 5, 10, 5));
-  }
-}

lib/widgets/generic/elements/form_search_input.dart

@@ -1,116 +0,0 @@
-import 'dart:async';
-
-import 'package:flutter/material.dart';
-import 'package:sendtrain/services/functional/debouncer.dart';
-import 'package:sendtrain/widgets/generic/elements/form_text_input.dart';
-
-class Suggestion<T> {
-  T content;
-
-  Suggestion(this.content);
-
-  Widget resultWidget() {
-    return ListTile(
-      title: Text('test'),
-    );
-  }
-}
-
-// controller: manages the selected content
-// service: manages the requests for the specific data to search against
-// title: the title of the text input
-// callback: the fuction called when a selection is made
-class FormSearchInput extends StatefulWidget {
-  const FormSearchInput(
-      {super.key,
-      required this.controller,
-      required this.service,
-      required this.resultHandler,
-      this.title});
-
-  final String? title;
-  final TextEditingController controller;
-  final dynamic service;
-  final Function resultHandler;
-
-  @override
-  State<FormSearchInput> createState() => _FormSearchInputState();
-}
-
-class _FormSearchInputState extends State<FormSearchInput> {
-  String? _currentQuery;
-
-  late final service = widget.service;
-  late final resultHandler = widget.resultHandler;
-  // The most recent suggestions received from the API.
-  late Iterable<Widget> _lastOptions = <Widget>[];
-  late final Debouncer debouncer;
-
-  // @override
-  // initState() {
-  //   service = widget.service;
-  // }
-
-  // Calls the "remote" API to search with the given query. Returns null when
-  // the call has been made obsolete.
-  Future<Iterable<Suggestion>?> _search(String query) async {
-    _currentQuery = query;
-
-    // In a real application, there should be some error handling here.
-    if (query.isNotEmpty && query.length > 3) {
-      final List<Suggestion>? suggestions =
-          await service.fetchSuggestions(_currentQuery!);
-
-      // If another search happened after this one, throw away these options.
-      if (_currentQuery != query) {
-        return null;
-      }
-      _currentQuery = null;
-
-      return suggestions?.map((suggestion) => suggestion);
-    } else {
-      return null;
-    }
-  }
-
-  @override
-  void initState() {
-    super.initState();
-    debouncer = Debouncer(Duration(milliseconds: 50), _search);
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return SearchAnchor(
-        isFullScreen: false,
-        builder: (BuildContext context, SearchController controller) {
-          return FormTextInput(
-              controller: widget.controller,
-              title: widget.title ?? "",
-              icon: Icon(Icons.search_rounded),
-              maxLines: 2,
-              requiresValidation: false,
-              onTap: () {
-                controller.openView();
-              });
-        },
-        suggestionsBuilder:
-            (BuildContext context, SearchController controller) async {
-          final List<Suggestion>? options =
-              (await debouncer.process(controller.text))?.toList();
-          if (options == null) {
-            return _lastOptions;
-          }
-          _lastOptions = List<ListTile>.generate(options.length, (int index) {
-            final Suggestion item = options[index];
-            final dynamic content = item.content;
-            return service.resultWidget(content, () {
-              resultHandler(content, service);
-              controller.closeView(null);
-            });
-          });
-
-          return _lastOptions;
-        });
-  }
-}

lib/widgets/generic/elements/form_text_input.dart

@@ -1,78 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-
-enum InputTypes { text, number }
-
-class FormTextInput extends StatelessWidget {
-  const FormTextInput(
-      {super.key,
-      required this.controller,
-      required this.title,
-      this.icon,
-      this.maxLines,
-      this.minLines,
-      this.onTap,
-      this.requiresValidation = true,
-      this.type = InputTypes.text,
-      this.hint,
-      this.validations});
-
-  final TextEditingController controller;
-  final String title;
-  final int? maxLines;
-  final int? minLines;
-  final Icon? icon;
-  final dynamic onTap;
-  final bool requiresValidation;
-  final InputTypes type;
-  final String? hint;
-  final Function? validations;
-
-  @override
-  Widget build(BuildContext context) {
-    final Map params = {};
-    if (type == InputTypes.number) {
-      params['keyboardType'] = TextInputType.number;
-      params['inputFormatters'] = <TextInputFormatter>[
-        FilteringTextInputFormatter.digitsOnly
-      ];
-    }
-
-    return Padding(
-        padding: EdgeInsets.only(top: 10, bottom: 10),
-        child: TextFormField(
-            keyboardType: params['keyboardType'] ?? TextInputType.text,
-            inputFormatters: params['inputFormatters'] ?? [],
-            minLines: minLines ?? 1,
-            maxLines: maxLines ?? 1,
-            controller: controller,
-            decoration: InputDecoration(
-              filled: true,
-              prefixIcon: icon ?? Icon(Icons.draw_rounded),
-              border: OutlineInputBorder(
-                  borderSide: BorderSide.none,
-                  borderRadius: BorderRadius.circular(12)),
-              labelText: title,
-              hintText: hint ?? '',
-            ),
-            validator: (String? value) {
-              if (requiresValidation == true) {
-                if (value == null || value.isEmpty) {
-                  return 'Please enter some text';
-                }
-
-                if (validations != null) validations!(value);
-
-                // if (value.length < 3) {
-                //   return 'Please enter a minimum of 3 characters';
-                // }
-              }
-              return null;
-            },
-            onTap: () {
-              if (onTap != null) {
-                onTap();
-              }
-            }));
-  }
-}

lib/widgets/generic/elements/generic_progress_indicator.dart

@@ -1,16 +0,0 @@
-import 'package:flutter/material.dart';
-
-class GenericProgressIndicator extends StatelessWidget {
-  const GenericProgressIndicator({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-        alignment: Alignment.center,
-        child: SizedBox(
-          height: 50.0,
-          width: 50.0,
-          child: CircularProgressIndicator(),
-        ));
-  }
-}