improving coherence

Author: MonsieurRz

lib/data/workoutsummary.dart

@@ -36,17 +36,17 @@ class Dataplex {
     ...StrokeData2.datapointIdentifiers,
     ...SegmentData1.datapointIdentifiers,
     ...SegmentData2.datapointIdentifiers,
-    ...WorkoutSummaryPacket.datapointIdentifiers,
-    ...WorkoutSummaryPacket2.datapointIdentifiers,
+    ...WorkoutSummary.datapointIdentifiers,
+    ...WorkoutSummary2.datapointIdentifiers,
     ...ForceCurveData.datapointIdentifiers
   };
 
   /// A map of incoming UUID's to the data keys they support.
   Map<String, Set<String>> characteristicToDataKeyMap = {
     Identifiers.C2_ROWING_END_OF_WORKOUT_SUMMARY_CHARACTERISTIC_UUID:
-        WorkoutSummaryPacket.datapointIdentifiers,
+        WorkoutSummary.datapointIdentifiers,
     Identifiers.C2_ROWING_END_OF_WORKOUT_SUMMARY_CHARACTERISTIC2_UUID:
-        WorkoutSummaryPacket2.datapointIdentifiers,
+        WorkoutSummary2.datapointIdentifiers,
   };
 
   Dataplex(

lib/src/dataplex.dart

@@ -24,10 +24,10 @@ final Map<int, PacketParser> _packetParsers = {
   0x36: (data) => StrokeData2.fromBytes(data),
   0x37: (data) => SegmentData1.fromBytes(data),
   0x38: (data) => SegmentData2.fromBytes(data),
-  0x39: (data) => WorkoutSummaryPacket.fromBytes(data),
-  0x3A: (data) => WorkoutSummaryPacket1.fromBytes(data),
-  0x3B: (data) => HeartRateBeltPacket.fromBytes(data),
-  0x3C: (data) => WorkoutSummaryPacket2.fromBytes(data),
+  0x39: (data) => WorkoutSummary.fromBytes(data),
+  0x3A: (data) => WorkoutSummary1.fromBytes(data),
+  0x3B: (data) => HeartRateBelt.fromBytes(data),
+  0x3C: (data) => WorkoutSummary2.fromBytes(data),
   0x3D: (data) => ForceCurveData.fromBytes(data),
   0x3E: (data) => StatusData3.fromBytes(data),
 };

lib/src/helpers.dart

@@ -6,21 +6,21 @@ import './base.dart';
 import 'keys.dart';
 
 /// Represents the heart rate belt packet
-class HeartRateBeltPacket extends Concept2CharacteristicData {
+class HeartRateBelt extends Concept2CharacteristicData {
   int manufacturerID;
   int deviceType;
   int beltID;
 
   static Set<String> get datapointIdentifiers =>
-      HeartRateBeltPacket.zero().asMap().keys.toSet();
+      HeartRateBelt.zero().asMap().keys.toSet();
 
   /// Construct a WorkoutSummary from the bytes returned from the erg
-  HeartRateBeltPacket.fromBytes(Uint8List data)
+  HeartRateBelt.fromBytes(Uint8List data)
       : manufacturerID = data[0],
         deviceType = data[1],
         beltID = CsafeIntExtension.fromBytes(data.sublist(2, 6));
 
-  HeartRateBeltPacket.zero() : this.fromBytes(Uint8List(19));
+  HeartRateBelt.zero() : this.fromBytes(Uint8List(19));
 
   Map<String, dynamic> asMap() => {
         Keys.BELT_MANUFACTURER_ID_KEY: manufacturerID,

lib/src/packets/belt.dart

@@ -10,7 +10,7 @@ import 'keys.dart';
 /// Represents a summary of a completed workout
 ///
 /// This takes care of processesing the raw byte data from workout summary characteristics into easily accessible fields. This class also takes care of things like byte endianness, combining multiple high and low bytes .etc, allowing applications to access things in terms of flutter native types.
-class WorkoutSummaryPacket extends TimestampedData {
+class WorkoutSummary extends TimestampedData {
   Duration elapsedTime;
   double workDistance;
   int avgSPM;
@@ -24,10 +24,10 @@ class WorkoutSummaryPacket extends TimestampedData {
   double avgPace;
 
   static Set<String> get datapointIdentifiers =>
-      WorkoutSummaryPacket.zero().asMap().keys.toSet();
+      WorkoutSummary.zero().asMap().keys.toSet();
 
   /// Construct a WorkoutSummary from the bytes returned from the erg
-  WorkoutSummaryPacket.fromBytes(Uint8List data)
+  WorkoutSummary.fromBytes(Uint8List data)
       : elapsedTime = Concept2DurationExtension.fromBytes(data.sublist(4, 7)),
         workDistance = CsafeIntExtension.fromBytes(data.sublist(7, 10),
                 endian: Endian.little) /
@@ -45,7 +45,7 @@ class WorkoutSummaryPacket extends TimestampedData {
             10,
         super.fromBytes(data);
 
-  WorkoutSummaryPacket.zero() : this.fromBytes(Uint8List(20));
+  WorkoutSummary.zero() : this.fromBytes(Uint8List(20));
 
   Map<String, dynamic> asMap() {
     //     workout.date
@@ -79,7 +79,7 @@ class WorkoutSummaryPacket extends TimestampedData {
   }
 }
 
-class WorkoutSummaryPacket1 extends TimestampedData {
+class WorkoutSummary1 extends TimestampedData {
   int intervalSize;
   int intervalCount;
   int totalCalories;
@@ -89,9 +89,9 @@ class WorkoutSummaryPacket1 extends TimestampedData {
   int avgCalories;
 
   static Set<String> get datapointIdentifiers =>
-      WorkoutSummaryPacket1.zero().asMap().keys.toSet();
+      WorkoutSummary1.zero().asMap().keys.toSet();
 
-  WorkoutSummaryPacket1.fromBytes(Uint8List data)
+  WorkoutSummary1.fromBytes(Uint8List data)
       : intervalSize = CsafeIntExtension.fromBytes(data.sublist(4, 6),
             endian: Endian.little),
         intervalCount = data.elementAt(6),
@@ -107,7 +107,7 @@ class WorkoutSummaryPacket1 extends TimestampedData {
             endian: Endian.little),
         super.fromBytes(data);
 
-  WorkoutSummaryPacket1.zero() : this.fromBytes(Uint8List(18));
+  WorkoutSummary1.zero() : this.fromBytes(Uint8List(18));
 
   Map<String, dynamic> asMap() {
     // workout.heart_rate
@@ -127,19 +127,19 @@ class WorkoutSummaryPacket1 extends TimestampedData {
   }
 }
 
-class WorkoutSummaryPacket2 extends TimestampedData {
+class WorkoutSummary2 extends TimestampedData {
   int avgPace;
   GameId gameID;
   int verifier;
   int gameScore;
   MachineType machineType;
 
   static Set<String> get datapointIdentifiers =>
-      WorkoutSummaryPacket2.zero().asMap().keys.toSet();
+      WorkoutSummary2.zero().asMap().keys.toSet();
 
-  WorkoutSummaryPacket2.zero() : this.fromBytes(Uint8List(10));
+  WorkoutSummary2.zero() : this.fromBytes(Uint8List(10));
 
-  WorkoutSummaryPacket2.fromBytes(Uint8List data)
+  WorkoutSummary2.fromBytes(Uint8List data)
       : avgPace = CsafeIntExtension.fromBytes(data.sublist(4, 6),
             endian: Endian.little),
         gameID = GameIdExtension.fromInt(data.elementAt(6) & 0x0F),

lib/src/packets/workoutsummary.dart

@@ -1,7 +1,7 @@
 import 'dart:typed_data';
 
 import 'package:c2bluetooth/c2bluetooth.dart';
-import 'package:c2bluetooth/data/workoutsummary.dart';
+import 'package:c2bluetooth/src/packets/workoutsummary.dart';
 import 'package:flutter_test/flutter_test.dart';
 
 void main() {