Use functions instead of classes for notif click listeners

Author: emawby

example/lib/main.dart

@@ -11,7 +11,7 @@ class MyApp extends StatefulWidget {
   _MyAppState createState() => new _MyAppState();
 }
 
-class _MyAppState extends State<MyApp> with OneSignalNotificationClickListener {
+class _MyAppState extends State<MyApp> {
   String _debugLabelString = "";
   String? _emailAddress;
   String? _smsNumber;
@@ -57,7 +57,13 @@ class _MyAppState extends State<MyApp> with OneSignalNotificationClickListener {
       print("Has permission " + state.toString());
     });
 
-    OneSignal.Notifications.addClickListener(this);
+    OneSignal.Notifications.addClickListener((event) {
+      print('NOTIFICATION CLICK LISTENER CALLED WITH EVENT: $event');
+      this.setState(() {
+        _debugLabelString =
+            "Clicked notification: \n${event.notification.jsonRepresentation().replaceAll("\\n", "\n")}";
+      });
+    });
 
     OneSignal.Notifications.addForegroundWillDisplayListener((event) {
       print(
@@ -112,14 +118,6 @@ class _MyAppState extends State<MyApp> with OneSignalNotificationClickListener {
     OneSignal.InAppMessages.paused(true);
   }
 
-  void onClickNotification(OSNotificationClickEvent event) {
-    print('NOTIFICATION CLICK LISTENER CALLED WITH EVENT: $event');
-    this.setState(() {
-      _debugLabelString =
-          "Clicked notification: \n${event.notification.jsonRepresentation().replaceAll("\\n", "\n")}";
-    });
-  }
-
   void _handleSendTags() {
     print("Sending tags");
     OneSignal.User.addTagWithKey("test2", "val2");

lib/src/notifications.dart

@@ -10,14 +10,12 @@ typedef void OnNotificationPermissionChangeObserver(bool permission);
 typedef void OnNotificationWillDisplayListener(
     OSNotificationWillDisplayEvent event);
 
-class OneSignalNotificationClickListener {
-  void onClickNotification(OSNotificationClickEvent event) {}
-}
+typedef void OnNotificationClickListener(OSNotificationClickEvent event);
 
 class OneSignalNotifications {
   // event listeners
-  List<OneSignalNotificationClickListener> _clickListeners =
-      <OneSignalNotificationClickListener>[];
+  List<OnNotificationClickListener> _clickListeners =
+      <OnNotificationClickListener>[];
   List<OnNotificationWillDisplayListener> _willDisplayListeners =
       <OnNotificationWillDisplayListener>[];
 
@@ -127,7 +125,7 @@ class OneSignalNotifications {
   Future<Null> _handleMethod(MethodCall call) async {
     if (call.method == 'OneSignal#onClickNotification') {
       for (var listener in _clickListeners) {
-        listener.onClickNotification(
+        listener(
             OSNotificationClickEvent(call.arguments.cast<String, dynamic>()));
       }
     } else if (call.method == 'OneSignal#onWillDisplayNotification') {
@@ -175,11 +173,11 @@ class OneSignalNotifications {
 
   /// The notification click listener is called whenever the user opens a
   /// OneSignal push notification, or taps an action button on a notification.
-  void addClickListener(OneSignalNotificationClickListener listener) {
+  void addClickListener(OnNotificationClickListener listener) {
     _clickListeners.add(listener);
   }
 
-  void removeClickListener(OneSignalNotificationClickListener listener) {
+  void removeClickListener(OnNotificationClickListener listener) {
     _clickListeners.remove(listener);
   }
 }