Fixed Restrr#on (and similar methods)

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.6.2
+- Fixed `Restrr#on` (and similar methods)
+
 ## 0.6.1
 - Fixed `RestrrEventHandler#fire`
 

lib/src/events/event_handler.dart

@@ -5,11 +5,13 @@ class RestrrEventHandler {
 
   const RestrrEventHandler(this.eventMap);
 
-  void on<T extends RestrrEvent>(Function(T) callback) {
-    eventMap[T.runtimeType] = callback;
+  void on<T extends RestrrEvent>(Type type, Function(T) callback) {
+    eventMap[type] = callback;
   }
 
   void fire<T extends RestrrEvent>(T event) {
+    print(eventMap);
+    print(event.runtimeType);
     eventMap[event.runtimeType]?.call(event);
   }
 }

lib/src/restrr_base.dart

@@ -41,8 +41,8 @@ class RestrrBuilder {
 
   RestrrBuilder.savedSession({required this.uri}) : initType = RestrrInitType.savedSession;
 
-  RestrrBuilder on<T extends RestrrEvent>(void Function(T) func) {
-    _eventMap[T.runtimeType] = func;
+  RestrrBuilder on<T extends RestrrEvent>(Type type, void Function(T) func) {
+    _eventMap[type] = func;
     return this;
   }
 
@@ -115,7 +115,7 @@ abstract class Restrr {
         routeOptions: RouteOptions(hostUri: uri));
   }
 
-  void on<T extends RestrrEvent>(void Function(T) func);
+  void on<T extends RestrrEvent>(Type type, void Function(T) func);
 
   /// Retrieves the currently authenticated user.
   Future<User?> retrieveSelf({bool forceRetrieve = false});
@@ -166,7 +166,7 @@ class RestrrImpl implements Restrr {
   late final User selfUser;
 
   @override
-  void on<T extends RestrrEvent>(void Function(T) func) => eventHandler.on(func);
+  void on<T extends RestrrEvent>(Type type, void Function(T) func) => eventHandler.on(type, func);
 
   @override
   Future<User?> retrieveSelf({bool forceRetrieve = false}) async {

pubspec.yaml

@@ -1,6 +1,6 @@
 name: restrr
 description: Dart package which allows to communicate with the financrr REST API.
-version: 0.6.1
+version: 0.6.2
 repository: https://github.com/financrr/restrr
 
 environment: