Refactor SpinifyImpl to update JSON codec support in SpinifySubscript…

…ionMixin
PlugFox · Jun 13, 2024 · d15c375 · d15c375
1 parent e5b1593
commit d15c375
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/lib/src/model/state.dart b/lib/src/model/state.dart
@@ -117,7 +117,7 @@ sealed class SpinifyState extends _$SpinifyStateBase {
       };
 
   @override
-  String toString() => 'SpinifyState\$$type{}';
+  String toString() => type;
 }
 
 /// Disconnected
@@ -137,7 +137,7 @@ final class SpinifyState$Disconnected extends SpinifyState {
   }) : super(timestamp ?? DateTime.now());
 
   @override
-  String get type => 'Disconnected';
+  String get type => 'disconnected';
 
   @override
   String? get url => null;
@@ -191,7 +191,7 @@ final class SpinifyState$Connecting extends SpinifyState {
       : super(timestamp ?? DateTime.now());
 
   @override
-  String get type => 'Connecting';
+  String get type => 'connecting';
 
   @override
   final String url;
@@ -251,7 +251,7 @@ final class SpinifyState$Connected extends SpinifyState {
   }) : super(timestamp ?? DateTime.now());
 
   @override
-  String get type => 'Connected';
+  String get type => 'connected';
 
   @override
   final String url;
@@ -344,7 +344,7 @@ final class SpinifyState$Closed extends SpinifyState {
       : super(timestamp ?? DateTime.now());
 
   @override
-  String get type => 'Closed';
+  String get type => 'closed';
 
   @override
   String? get url => null;

diff --git a/lib/src/model/subscription_state.dart b/lib/src/model/subscription_state.dart
@@ -34,6 +34,9 @@ sealed class SpinifySubscriptionState extends _$SpinifySubscriptionStateBase {
     required List<int>? data,
     DateTime? timestamp,
   }) = SpinifySubscriptionState$Subscribed;
+
+  @override
+  String toString() => type;
 }
 
 /// Unsubscribed state
@@ -79,10 +82,9 @@ final class SpinifySubscriptionState$Unsubscribed
 
   @override
   bool operator ==(Object other) =>
-      identical(this, other) || other is SpinifySubscriptionState$Unsubscribed;
-
-  @override
-  String toString() => r'SpinifySubscriptionState$Unsubscribed{}';
+      identical(this, other) ||
+      other is SpinifySubscriptionState$Unsubscribed &&
+          other.timestamp.isAtSameMomentAs(timestamp);
 }
 
 /// Subscribing state
@@ -128,10 +130,9 @@ final class SpinifySubscriptionState$Subscribing
 
   @override
   bool operator ==(Object other) =>
-      identical(this, other) || other is SpinifySubscriptionState$Subscribing;
-
-  @override
-  String toString() => r'SpinifySubscriptionState$Subscribing{}';
+      identical(this, other) ||
+      other is SpinifySubscriptionState$Subscribing &&
+          other.timestamp.isAtSameMomentAs(timestamp);
 }
 
 /// Subscribed state
@@ -147,7 +148,7 @@ final class SpinifySubscriptionState$Subscribed
     DateTime? timestamp,
   }) : super(timestamp: timestamp ?? DateTime.now());
 
-  /// Data
+  /// Data attached to current subscription.
   final List<int>? data;
 
   @override
@@ -181,10 +182,9 @@ final class SpinifySubscriptionState$Subscribed
 
   @override
   bool operator ==(Object other) =>
-      identical(this, other) || other is SpinifySubscriptionState$Subscribed;
-
-  @override
-  String toString() => r'SpinifySubscriptionState$Subscribed{}';
+      identical(this, other) ||
+      other is SpinifySubscriptionState$Subscribed &&
+          other.timestamp.isAtSameMomentAs(timestamp);
 }
 
 /// Pattern matching for [SpinifySubscriptionState].