Merge branch 'master' into prod

Author: cybex-dev

README.md

@@ -66,7 +66,7 @@ The Dart Web package is limited in showing notifications, one can only show a ti
 Add the following to your `pubspec.yaml` file:
 ```yaml
 dependencies:
-  js_notifications: ^0.0.1
+  js_notifications: ^0.0.3
 ```
 
 ### Copy service worker
@@ -110,6 +110,10 @@ _jsNotificationsPlugin.showNotification('Title', {
 );
 ```
 
+_Note: the tag is used to identify the notification, if a notification with the same tag is shown, the previous notification is replaced.
+
+For convenient notification access, provide a tag or one will be generated via the [uuid](https://pub.dev/packages/uuid) package, specifically `uuid.v4()`._
+
 ### Creating a notification with actions
 
 Here, we use the `actions` parameter to add actions to the notification. These are filled with `JSNotificationAction` objects.
@@ -167,3 +171,24 @@ _jsNotificationsPlugin.dismissStream.listen((event) {
     print(event);
 });
 ```
+
+
+### Get a list of all notifications
+```dart
+_jsNotificationsPlugin.getAllNotifications().then((notifications) {
+    notifications.forEach((notification) {
+      print(notification);
+    });
+});
+```
+
+### Get a specific notification
+```dart
+_jsNotificationsPlugin.getNotification('my-awesome-notification-tag-here').then((notification) {
+    print(notification);
+});
+```
+
+## Features and bugs
+
+Any and all feedback, PRs are welcome.

example/integration_test/plugin_integration_test.dart

@@ -6,7 +6,6 @@
 // For more information about Flutter integration tests, please see
 // https://docs.flutter.dev/cookbook/testing/integration/introduction
 
-
 import 'package:flutter_test/flutter_test.dart';
 import 'package:integration_test/integration_test.dart';
 

example/lib/main.dart

@@ -1,12 +1,12 @@
-import 'package:flutter/material.dart';
 import 'dart:async';
 //ignore: avoid_web_libraries_in_flutter
 import 'dart:html' as html;
 
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
 import 'package:js_notifications/interop/interop.dart';
 import 'package:js_notifications/js_notifications_web.dart';
 import 'package:js_notifications/platform_interface/js_notifications_platform_interface.dart';
-import 'package:js_notifications/utils/utils.dart';
 import 'package:stop_watch_timer/stop_watch_timer.dart';
 
 void main() {
@@ -61,77 +61,94 @@ class _MyAppState extends State<MyApp> {
           }
         case "confused":
           {
-            _sendBasicNotification("Go watch Star Wars, now!", tag: "star_wars_channel");
+            _sendBasicNotification("Go watch Star Wars, now!",
+                tag: "star_wars_channel");
             break;
           }
         case "kill_him":
           {
-            _sendBasicNotification("Good good, now go watch Star Wars!", tag: "star_wars_channel");
+            _sendBasicNotification("Good good, now go watch Star Wars!",
+                tag: "star_wars_channel");
             break;
           }
         case "watch_star_wars":
           {
-            _sendBasicNotification("Sure, click here to watch it.", tag: "rick_roll");
+            _sendBasicNotification("Sure, click here to watch it.",
+                tag: "rick_roll");
             break;
           }
 
-        case _notificationActionStopwatchStart: {
-          _startTimerNotification();
-          break;
-        }
+        case _notificationActionStopwatchStart:
+          {
+            _startTimerNotification();
+            break;
+          }
 
-        case _notificationActionStopwatchPause: {
-          _pauseTimerNotification();
-          _onSecondTimerTick();
-          break;
-        }
+        case _notificationActionStopwatchPause:
+          {
+            _pauseTimerNotification();
+            _onSecondTimerTick();
+            break;
+          }
 
-        case _notificationActionStopwatchStop: {
-          _stopTimerNotification();
-          _onSecondTimerTick();
-          break;
-        }
+        case _notificationActionStopwatchStop:
+          {
+            _stopTimerNotification();
+            _onSecondTimerTick();
+            break;
+          }
 
-        case _notificationActionStopwatchSilent: {
-          setState(() {
-            _stopwatchSilent = true;
-          });
-          break;
-        }
+        case _notificationActionStopwatchSilent:
+          {
+            setState(() {
+              _stopwatchSilent = true;
+            });
+            break;
+          }
 
-        case _notificationActionStopwatchHeadsUp: {
-          setState(() {
-            _stopwatchSilent = false;
-          });
-          break;
-        }
+        case _notificationActionStopwatchHeadsUp:
+          {
+            setState(() {
+              _stopwatchSilent = false;
+            });
+            break;
+          }
 
-        default: {
-          if(event.tag == "rick_roll") {
-            openNewWindow("https://www.youtube.com/watch?v=dQw4w9WgXcQ");
-          } else if(event.tag == "star_wars_channel") {
-            openNewWindow("https://www.youtube.com/@StarWars");
+        default:
+          {
+            if (event.tag == "rick_roll") {
+              openNewWindow("https://www.youtube.com/watch?v=dQw4w9WgXcQ");
+            } else if (event.tag == "star_wars_channel") {
+              openNewWindow("https://www.youtube.com/@StarWars");
+            }
           }
-        }
       }
     });
     _jsNotificationsPlugin.dismissStream.listen((event) {
-      switch(event.tag) {
-        case "data-notification": {
-          _sendBasicNotification("Dismissed data notification", tag: "");
-          break;
-        }
-        case "grievous": {
-          _sendBasicNotification("My disappointment is immeasurable and my day is ruined.", tag: "ruined");
-          break;
-        }
+      switch (event.tag) {
+        case "data-notification":
+          {
+            _sendBasicNotification("Dismissed data notification", tag: "");
+            break;
+          }
+        case "grievous":
+          {
+            _sendBasicNotification(
+                "My disappointment is immeasurable and my day is ruined.",
+                tag: "ruined");
+            break;
+          }
       }
     });
   }
 
   void _onSecondTimerTick() {
-    final formattedCallTime = StopWatchTimer.getDisplayTime(stopWatchTimer.rawTime.value, milliSecond: false);
-    printDebug("Timer: $formattedCallTime");
+    final formattedCallTime = StopWatchTimer.getDisplayTime(
+        stopWatchTimer.rawTime.value,
+        milliSecond: false);
+    if (kDebugMode) {
+      print("Timer: $formattedCallTime");
+    }
     _jsNotificationsPlugin.showNotification(
       "Timer",
       body: formattedCallTime,
@@ -142,16 +159,22 @@ class _MyAppState extends State<MyApp> {
       silent: _stopwatchSilent,
       actions: [
         if (stopWatchTimer.isRunning) ...[
-          const JSNotificationAction(action: _notificationActionStopwatchPause, title: "Pause"),
-          const JSNotificationAction(action: _notificationActionStopwatchStop, title: "Stop"),
+          const JSNotificationAction(
+              action: _notificationActionStopwatchPause, title: "Pause"),
+          const JSNotificationAction(
+              action: _notificationActionStopwatchStop, title: "Stop"),
         ] else ...[
-          const JSNotificationAction(action: _notificationActionStopwatchStart, title: "Start"),
-          const JSNotificationAction(action: _notificationActionDismiss, title: "Dismiss"),
+          const JSNotificationAction(
+              action: _notificationActionStopwatchStart, title: "Start"),
+          const JSNotificationAction(
+              action: _notificationActionDismiss, title: "Dismiss"),
         ],
         if (_stopwatchSilent)
-          const JSNotificationAction(action: _notificationActionStopwatchHeadsUp, title: "Heads Up")
+          const JSNotificationAction(
+              action: _notificationActionStopwatchHeadsUp, title: "Heads Up")
         else
-          const JSNotificationAction(action: _notificationActionStopwatchSilent, title: "Silence"),
+          const JSNotificationAction(
+              action: _notificationActionStopwatchSilent, title: "Silence"),
       ],
     );
   }
@@ -175,7 +198,8 @@ class _MyAppState extends State<MyApp> {
                   children: [
                     ElevatedButton(
                       onPressed: () {
-                        _sendBasicNotification("Test Notification", tag: "test");
+                        _sendBasicNotification("Test Notification",
+                            tag: "test");
                       },
                       child: const Text("Test Notification"),
                     ),
@@ -285,7 +309,8 @@ class _MyAppState extends State<MyApp> {
     );
   }
 
-  Future<void> _sendDataNotification({String? id, String? title, String? body, Map<String, dynamic>? data}) {
+  Future<void> _sendDataNotification(
+      {String? id, String? title, String? body, Map<String, dynamic>? data}) {
     final id0 = id ?? "data-notification";
     final title0 = title ?? "Data Notification";
     final body0 = body ?? "A notification with some data too";
@@ -297,10 +322,11 @@ class _MyAppState extends State<MyApp> {
       'c': 'c',
       '[]': [],
       '{}': {},
-      if(data != null) ...data,
+      if (data != null) ...data,
     };
 
-    return _jsNotificationsPlugin.showNotification(title0, body: body0, data: data0, tag: id0);
+    return _jsNotificationsPlugin.showNotification(title0,
+        body: body0, data: data0, tag: id0);
   }
 
   Future<void> _sendBasicNotification(String title, {String? tag}) {
@@ -314,12 +340,14 @@ class _MyAppState extends State<MyApp> {
   Future<void> _sendSpanishInquisition() {
     return _jsNotificationsPlugin.showNotification(
       "Oh no!",
-      body: "Subverted expectations result in expected unexpected expectations. Anyway, check the icon...",
+      body:
+          "Subverted expectations result in expected unexpected expectations. Anyway, check the icon...",
       tag: "inquisition",
       icon: "https://pbs.twimg.com/media/CtCG_f4WcAAJY-1.jpg",
       actions: [
         const JSNotificationAction(action: "dismiss", title: "Whatever"),
-        const JSNotificationAction(action: "unexpected", title: "Didn't expect that"),
+        const JSNotificationAction(
+            action: "unexpected", title: "Didn't expect that"),
       ],
       requireInteraction: true,
     );
@@ -333,7 +361,8 @@ class _MyAppState extends State<MyApp> {
       icon:
           "https://www.liveabout.com/thmb/F5lfgFptU9DNTDCT-xNEtot0lQ0=/1500x0/filters:no_upscale():max_bytes(150000):strip_icc()/EP2-IA-60435_R_8x10-56a83bea3df78cf7729d314a.jpg",
       actions: [
-        const JSNotificationAction(action: "general_kenobi", title: "General Kenobi"),
+        const JSNotificationAction(
+            action: "general_kenobi", title: "General Kenobi"),
         const JSNotificationAction(action: "confused", title: "I'm confused"),
       ],
       requireInteraction: true,
@@ -345,10 +374,12 @@ class _MyAppState extends State<MyApp> {
       "Grievous",
       tag: "grievous_2",
       body: "You acknowledge he is a bold one. What do you do?",
-      icon: "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQvS2A_Sb7z7dXcrPVscT0FeCdFO7IM88U2vg&s",
+      icon:
+          "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQvS2A_Sb7z7dXcrPVscT0FeCdFO7IM88U2vg&s",
       actions: [
         const JSNotificationAction(action: "kill_him", title: "Kill Him"),
-        const JSNotificationAction(action: "watch_star_wars", title: "Watch Star Wars"),
+        const JSNotificationAction(
+            action: "watch_star_wars", title: "Watch Star Wars"),
       ],
       requireInteraction: true,
     );
@@ -375,7 +406,8 @@ class _MyAppState extends State<MyApp> {
   }
 
   void _startTimerNotification() {
-    _stopWatchTimerListener ??= stopWatchTimer.secondTime.listen((_) => _onSecondTimerTick());
+    _stopWatchTimerListener ??=
+        stopWatchTimer.secondTime.listen((_) => _onSecondTimerTick());
     _stopwatchSilent = false;
     stopWatchTimer.onStartTimer();
   }