updated pub

2024-11-24 17:22:27 -05:00 · 2024-11-24 17:22:27 -05:00 · 55a435718d
commit 55a435718d
parent df5f24ef16
8 changed files with 526 additions and 105 deletions
--- a/lib/classes/activity_action.dart
+++ b/lib/classes/activity_action.dart
@ -1,17 +1,43 @@
 class ActivityAction {
-  ActivityAction(
-      {required this.id,
-      required this.title,
-      required this.description,
-      this.repetitions,
-      this.time,
-      this.weight});
+  int id;
+  String title;
+  String description;
+  Set activityActionSet;

-  final int id;
-  final String title;
-  final String description;
-  final int? repetitions;
-  final int? weight;
-  // in milliseconds
-  final int? time;
+  ActivityAction({
+    required this.id,
+    required this.title,
+    required this.description,
+    required this.activityActionSet,
+  });
+}
+
+class Set {
+  String type;
+  int total;
+  int rest;
+  Reps reps;
+
+  Set({
+    required this.type,
+    required this.total,
+    required this.rest,
+    required this.reps,
+  });
+}
+
+class Reps {
+  String type;
+  List<int> tempo;
+  List<int> amounts;
+  List<int> weights;
+  int rest;
+
+  Reps({
+    required this.type,
+    required this.tempo,
+    required this.amounts,
+    required this.weights,
+    required this.rest,
+  });
 }
--- a/lib/classes/media.dart
+++ b/lib/classes/media.dart
@ -1,4 +1,3 @@
-import 'package:flutter/material.dart';

 class Media {
  Media(
--- a/lib/widgets/activities_header.dart
+++ b/lib/widgets/activities_header.dart
@ -21,12 +21,12 @@ class _ActivitiesHeaderState extends State<ActivitiesHeader> {

  @override
  Widget build(BuildContext context) {
-    return Padding(
-        padding: const EdgeInsets.only(bottom: 10),
+    return const Padding(
+        padding: EdgeInsets.only(bottom: 10),
        child: Row(
            mainAxisSize: MainAxisSize.max,
            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-            children: const <Widget>[
+            children: <Widget>[
              Padding(
                  padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
                  child: Text(
--- a/lib/widgets/activity_card.dart
+++ b/lib/widgets/activity_card.dart
@ -14,11 +14,22 @@ class ActivityCard extends StatelessWidget {
      actions: List.generate(
          10,
          (i) => ActivityAction(
-              id: 1,
-              title: 'exercise',
-              description: 'description',
-              repetitions: 5,
-              time: 5200)));
+                  id: 1,
+                  title: 'test action',
+                  description:'test description',
+                  activityActionSet: Set(
+                    type: 'drop_set',
+                    total: 3,
+                    rest: 3000,
+                    reps: Reps(
+                      type: 'count',
+                      tempo: [2,3,5],
+                      amounts: [5,3,2],
+                      weights: [50,70,80],
+                      rest: 200
+                    )
+                  )
+                ),));

  @override
  Widget build(BuildContext context) {
--- a/lib/widgets/media_card.dart
+++ b/lib/widgets/media_card.dart
@ -9,7 +9,7 @@ class MediaCard extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
-    YoutubePlayerController _controller = YoutubePlayerController(
+    YoutubePlayerController controller = YoutubePlayerController(
        initialVideoId: media.reference,
        flags: const YoutubePlayerFlags(
            autoPlay: false, mute: true, showLiveFullscreenButton: false));
@ -31,7 +31,7 @@ class MediaCard extends StatelessWidget {
        return Image(image: NetworkImage(media.reference));
      } else if (media.type == "youtube") {
        return YoutubePlayer(
-          controller: _controller,
+          controller: controller,
          aspectRatio: 16 / 9,
        );
      }
--- a/lib/widgets/session_card.dart
+++ b/lib/widgets/session_card.dart
@ -19,7 +19,7 @@ class SessionCard extends StatelessWidget {

    Color color = (state == 0)
        ? const Color(0xff3A5FB6)
-        : ThemeData.dark(useMaterial3: true).colorScheme.background;
+        : ThemeData.dark(useMaterial3: true).colorScheme.surface;

    // place holder until we can retrieve real data
    final data = SessionModel(
@ -38,32 +38,22 @@ class SessionCard extends StatelessWidget {
                  "Campus board session, focussing on explosiveness and contact strength.",
              actions: [
                ActivityAction(
-                    id: 1,
-                    title: '1, 3, 5 - left hand start',
-                    description:
-                        'move from rungs 1, 3, and 5, alternating arms on each movement',
-                    repetitions: 1),
-                ActivityAction(
-                    id: 2,
-                    title: 'Rest',
-                    description: 'rest for alotted time',
-                    time: 15000),
-                ActivityAction(
-                    id: 3,
-                    title: '1, 3, 5 - right hand start',
-                    description:
-                        'move from rungs 1, 3, and 5, alternating arms on each movement',
-                    repetitions: 1),
-                ActivityAction(
-                    id: 4,
-                    title: 'Rest',
-                    description: 'rest for alotted time',
-                    time: 300000),
-                ActivityAction(
-                    id: 5,
-                    title: 'Repeat',
-                    description: 'repeat cycle',
-                    repetitions: 5)
+                  id: 1,
+                  title: 'test action',
+                  description:'test description',
+                  activityActionSet: Set(
+                    type: 'drop_set',
+                    total: 3,
+                    rest: 3000,
+                    reps: Reps(
+                      type: 'count',
+                      tempo: [2,3,5],
+                      amounts: [5,3,2],
+                      weights: [50,70,80],
+                      rest: 200
+                    )
+                  )
+                ),
              ],
              resources: ['https://www.youtube.com/watch?v=bLz0xp1PEm4']),
          ActivityModel(
@ -75,20 +65,22 @@ class SessionCard extends StatelessWidget {
                  "Session focussed on attempting a climb at or beyond your perceived limit.",
              actions: [
                ActivityAction(
-                    id: 1,
-                    title: 'attempt boulder',
-                    description: 'attempt boulder project',
-                    repetitions: 1),
-                ActivityAction(
-                    id: 2,
-                    title: 'Rest',
-                    description: 'rest for alotted time',
-                    time: 300000),
-                ActivityAction(
-                    id: 5,
-                    title: 'Repeat',
-                    description: 'repeat cycle',
-                    repetitions: 5)
+                  id: 1,
+                  title: 'test action',
+                  description:'test description',
+                  activityActionSet: Set(
+                    type: 'drop_set',
+                    total: 3,
+                    rest: 3000,
+                    reps: Reps(
+                      type: 'count',
+                      tempo: [2,3,5],
+                      amounts: [5,3,2],
+                      weights: [50,70,80],
+                      rest: 200
+                    )
+                  )
+                ),
              ],
              resources: ['https://www.youtube.com/watch?v=dyAvbUvY_PU']),
          ActivityModel(
@ -100,21 +92,22 @@ class SessionCard extends StatelessWidget {
                  "Weight pullups to increase strength and maximal pulling force.",
              actions: [
                ActivityAction(
-                    id: 1,
-                    title: 'pull ups',
-                    description: 'pull ups',
-                    repetitions: 5,
-                    weight: 100),
-                ActivityAction(
-                    id: 2,
-                    title: 'Rest',
-                    description: 'rest for alotted time',
-                    time: 300000),
-                ActivityAction(
-                    id: 5,
-                    title: 'Repeat',
-                    description: 'repeat cycle',
-                    repetitions: 5)
+                  id: 1,
+                  title: 'test action',
+                  description:'test description',
+                  activityActionSet: Set(
+                    type: 'drop_set',
+                    total: 3,
+                    rest: 3000,
+                    reps: Reps(
+                      type: 'count',
+                      tempo: [2,3,5],
+                      amounts: [5,3,2],
+                      weights: [50,70,80],
+                      rest: 200
+                    )
+                  )
+                ),
              ],
              resources: ['https://www.youtube.com/watch?v=dyAvbUvY_PU']),
        ],
--- a/pubspec.lock
+++ b/pubspec.lock
@ -1,14 +1,43 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
+  _fe_analyzer_shared:
+    dependency: transitive
+    description:
+      name: _fe_analyzer_shared
+      sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834
+      url: "https://pub.dev"
+    source: hosted
+    version: "72.0.0"
+  _macros:
+    dependency: transitive
+    description: dart
+    source: sdk
+    version: "0.3.2"
+  analyzer:
+    dependency: transitive
+    description:
+      name: analyzer
+      sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.7.0"
+  args:
+    dependency: transitive
+    description:
+      name: args
+      sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.6.0"
  async:
    dependency: transitive
    description:
      name: async
-      sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
+      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
      url: "https://pub.dev"
    source: hosted
-    version: "2.10.0"
+    version: "2.11.0"
  boolean_selector:
    dependency: transitive
    description:
@ -17,14 +46,86 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "2.1.1"
+  build:
+    dependency: transitive
+    description:
+      name: build
+      sha256: "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.1"
+  build_config:
+    dependency: transitive
+    description:
+      name: build_config
+      sha256: bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.1"
+  build_daemon:
+    dependency: transitive
+    description:
+      name: build_daemon
+      sha256: "0343061a33da9c5810b2d6cee51945127d8f4c060b7fbdd9d54917f0a3feaaa1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.0.1"
+  build_resolvers:
+    dependency: transitive
+    description:
+      name: build_resolvers
+      sha256: "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.2"
+  build_runner:
+    dependency: "direct dev"
+    description:
+      name: build_runner
+      sha256: "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.13"
+  build_runner_core:
+    dependency: transitive
+    description:
+      name: build_runner_core
+      sha256: "4ae8ffe5ac758da294ecf1802f2aff01558d8b1b00616aa7538ea9a8a5d50799"
+      url: "https://pub.dev"
+    source: hosted
+    version: "7.3.0"
+  built_collection:
+    dependency: transitive
+    description:
+      name: built_collection
+      sha256: "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100"
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.1.1"
+  built_value:
+    dependency: transitive
+    description:
+      name: built_value
+      sha256: c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb
+      url: "https://pub.dev"
+    source: hosted
+    version: "8.9.2"
  characters:
    dependency: transitive
    description:
      name: characters
-      sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
+      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
      url: "https://pub.dev"
    source: hosted
-    version: "1.2.1"
+    version: "1.3.0"
+  checked_yaml:
+    dependency: transitive
+    description:
+      name: checked_yaml
+      sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.3"
  clock:
    dependency: transitive
    description:
@ -33,14 +134,38 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "1.1.1"
+  code_builder:
+    dependency: transitive
+    description:
+      name: code_builder
+      sha256: f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.10.0"
  collection:
    dependency: transitive
    description:
      name: collection
-      sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
+      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
      url: "https://pub.dev"
    source: hosted
-    version: "1.17.0"
+    version: "1.18.0"
+  convert:
+    dependency: transitive
+    description:
+      name: convert
+      sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.1"
+  crypto:
+    dependency: transitive
+    description:
+      name: crypto
+      sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.3"
  cupertino_icons:
    dependency: "direct main"
    description:
@ -49,6 +174,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "1.0.5"
+  dart_style:
+    dependency: transitive
+    description:
+      name: dart_style
+      sha256: "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.6"
  fake_async:
    dependency: transitive
    description:
@ -57,6 +190,22 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "1.3.1"
+  file:
+    dependency: transitive
+    description:
+      name: file
+      sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4
+      url: "https://pub.dev"
+    source: hosted
+    version: "7.0.1"
+  fixnum:
+    dependency: transitive
+    description:
+      name: fixnum
+      sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.1"
  flutter:
    dependency: "direct main"
    description: flutter
@ -83,6 +232,46 @@ packages:
    description: flutter
    source: sdk
    version: "0.0.0"
+  frontend_server_client:
+    dependency: transitive
+    description:
+      name: frontend_server_client
+      sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.0.0"
+  glob:
+    dependency: transitive
+    description:
+      name: glob
+      sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.2"
+  graphs:
+    dependency: transitive
+    description:
+      name: graphs
+      sha256: aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.1"
+  http_multi_server:
+    dependency: transitive
+    description:
+      name: http_multi_server
+      sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.2.1"
+  http_parser:
+    dependency: transitive
+    description:
+      name: http_parser
+      sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.0.2"
  intl:
    dependency: "direct main"
    description:
@ -91,6 +280,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "0.18.0"
+  io:
+    dependency: transitive
+    description:
+      name: io
+      sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.4"
  js:
    dependency: transitive
    description:
@ -99,6 +296,46 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "0.6.5"
+  json_annotation:
+    dependency: "direct main"
+    description:
+      name: json_annotation
+      sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.9.0"
+  json_serializable:
+    dependency: "direct dev"
+    description:
+      name: json_serializable
+      sha256: c2fcb3920cf2b6ae6845954186420fca40bc0a8abcc84903b7801f17d7050d7c
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.9.0"
+  leak_tracker:
+    dependency: transitive
+    description:
+      name: leak_tracker
+      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
+      url: "https://pub.dev"
+    source: hosted
+    version: "10.0.5"
+  leak_tracker_flutter_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_flutter_testing
+      sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.5"
+  leak_tracker_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_testing
+      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.1"
  lints:
    dependency: transitive
    description:
@ -107,38 +344,94 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "2.0.1"
+  logging:
+    dependency: transitive
+    description:
+      name: logging
+      sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.0"
+  macros:
+    dependency: transitive
+    description:
+      name: macros
+      sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.2-main.4"
  matcher:
    dependency: transitive
    description:
      name: matcher
-      sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
+      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
      url: "https://pub.dev"
    source: hosted
-    version: "0.12.13"
+    version: "0.12.16+1"
  material_color_utilities:
    dependency: transitive
    description:
      name: material_color_utilities
-      sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
+      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
      url: "https://pub.dev"
    source: hosted
-    version: "0.2.0"
+    version: "0.11.1"
  meta:
    dependency: transitive
    description:
      name: meta
-      sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
+      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
      url: "https://pub.dev"
    source: hosted
-    version: "1.8.0"
+    version: "1.15.0"
+  mime:
+    dependency: transitive
+    description:
+      name: mime
+      sha256: "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.6"
+  package_config:
+    dependency: transitive
+    description:
+      name: package_config
+      sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.0"
  path:
    dependency: transitive
    description:
      name: path
-      sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
+      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
      url: "https://pub.dev"
    source: hosted
-    version: "1.8.2"
+    version: "1.9.0"
+  pool:
+    dependency: transitive
+    description:
+      name: pool
+      sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.5.1"
+  pub_semver:
+    dependency: transitive
+    description:
+      name: pub_semver
+      sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.4"
+  pubspec_parse:
+    dependency: transitive
+    description:
+      name: pubspec_parse
+      sha256: c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.0"
  scaler:
    dependency: "direct main"
    description:
@ -147,35 +440,75 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "1.1.2+1"
+  shelf:
+    dependency: transitive
+    description:
+      name: shelf
+      sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.4.1"
+  shelf_web_socket:
+    dependency: transitive
+    description:
+      name: shelf_web_socket
+      sha256: "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.4"
  sky_engine:
    dependency: transitive
    description: flutter
    source: sdk
    version: "0.0.99"
+  source_gen:
+    dependency: transitive
+    description:
+      name: source_gen
+      sha256: "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.5.0"
+  source_helper:
+    dependency: transitive
+    description:
+      name: source_helper
+      sha256: "6adebc0006c37dd63fe05bca0a929b99f06402fc95aa35bf36d67f5c06de01fd"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.4"
  source_span:
    dependency: transitive
    description:
      name: source_span
-      sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
+      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
      url: "https://pub.dev"
    source: hosted
-    version: "1.9.1"
+    version: "1.10.0"
  stack_trace:
    dependency: transitive
    description:
      name: stack_trace
-      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
+      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
      url: "https://pub.dev"
    source: hosted
-    version: "1.11.0"
+    version: "1.11.1"
  stream_channel:
    dependency: transitive
    description:
      name: stream_channel
-      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
+      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
+  stream_transform:
+    dependency: transitive
+    description:
+      name: stream_transform
+      sha256: "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.0"
  string_scanner:
    dependency: transitive
    description:
@ -196,10 +529,26 @@ packages:
    dependency: transitive
    description:
      name: test_api
-      sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
+      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
      url: "https://pub.dev"
    source: hosted
-    version: "0.4.16"
+    version: "0.7.2"
+  timing:
+    dependency: transitive
+    description:
+      name: timing
+      sha256: "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.1"
+  typed_data:
+    dependency: transitive
+    description:
+      name: typed_data
+      sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.2"
  vector_math:
    dependency: transitive
    description:
@ -208,6 +557,46 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "2.1.4"
+  vm_service:
+    dependency: transitive
+    description:
+      name: vm_service
+      sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "14.2.5"
+  watcher:
+    dependency: transitive
+    description:
+      name: watcher
+      sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.0"
+  web:
+    dependency: transitive
+    description:
+      name: web
+      sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.5.1"
+  web_socket_channel:
+    dependency: transitive
+    description:
+      name: web_socket_channel
+      sha256: "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.5"
+  yaml:
+    dependency: transitive
+    description:
+      name: yaml
+      sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.2"
  youtube_player_flutter:
    dependency: "direct main"
    description:
@ -217,5 +606,5 @@ packages:
    source: hosted
    version: "8.1.2"
 sdks:
-  dart: ">=2.19.2 <3.0.0"
-  flutter: ">=3.0.0"
+  dart: ">=3.5.0 <4.0.0"
+  flutter: ">=3.18.0-18.0.pre.54"
--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -38,6 +38,7 @@ dependencies:
  scaler: ^1.1.2+1
  intl: ^0.18.0
  youtube_player_flutter: ^8.1.2
+  json_annotation: ^4.9.0

 flutter_launcher_name:
  name: "SendTrain"
@ -52,6 +53,8 @@ dev_dependencies:
  # package. See that file for information about deactivating specific lint
  # rules and activating additional ones.
  flutter_lints: ^2.0.0
+  build_runner: ^2.4.13
+  json_serializable: ^6.9.0

 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec