Merge pull request #27 from Iconica-Development/bugfix/feedback_v2

fix: unread notification count, title style, onTap notification
Iconica-Development · Sep 5, 2024 · ddf2a2b · ddf2a2b
2 parents 43a7f44 + 90738db
commit ddf2a2b
Show file tree

Hide file tree

Showing 7 changed files with 84 additions and 45 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## [4.0.0] - 14 August 2024
+
+* Fix overflow issue with long text in notification
+* Fix new notification only sending to the person that triggered the notification
+* Added `onNotificationTap` to a notification
+
 ## [2.0.0] - 6 June 2024
 
 * Rework design for notification center

diff --git a/packages/flutter_notification_center/lib/src/models/notification_config.dart b/packages/flutter_notification_center/lib/src/models/notification_config.dart
@@ -19,6 +19,7 @@ class NotificationConfig {
     this.bellStyle = const AnimatedNotificationBellStyle(),
     this.pinnedIconColor = Colors.black,
     this.emptyNotificationsBuilder,
+    this.onNotificationTap,
   });
 
   /// The notification service to use for delivering notifications.
@@ -46,4 +47,6 @@ class NotificationConfig {
 
   /// A builder function to display when there are no notifications.
   final Widget Function()? emptyNotificationsBuilder;
+
+  final Function(NotificationModel)? onNotificationTap;
 }
diff --git a/packages/flutter_notification_center/lib/src/notification_center.dart b/packages/flutter_notification_center/lib/src/notification_center.dart
@@ -94,12 +94,18 @@ class NotificationCenterState extends State<NotificationCenter> {
                 var notification = snapshot.data![index];
                 return notification.isPinned
                     ? GestureDetector(
-                        onTap: () async => _navigateToNotificationDetail(
-                          context,
-                          notification,
-                          widget.config.service,
-                          widget.config.translations,
-                        ),
+                        onTap: () async {
+                          if (widget.config.onNotificationTap != null) {
+                            widget.config.onNotificationTap!.call(notification);
+                          } else {
+                            await _navigateToNotificationDetail(
+                              context,
+                              notification,
+                              widget.config.service,
+                              widget.config.translations,
+                            );
+                          }
+                        },
                         child: Dismissible(
                           key: Key("${notification.id}_pinned"),
                           onDismissed: (direction) async {
@@ -170,12 +176,18 @@ class NotificationCenterState extends State<NotificationCenter> {
                         ),
                       )
                     : GestureDetector(
-                        onTap: () async => _navigateToNotificationDetail(
-                          context,
-                          notification,
-                          widget.config.service,
-                          widget.config.translations,
-                        ),
+                        onTap: () async {
+                          if (widget.config.onNotificationTap != null) {
+                            widget.config.onNotificationTap!.call(notification);
+                          } else {
+                            await _navigateToNotificationDetail(
+                              context,
+                              notification,
+                              widget.config.service,
+                              widget.config.translations,
+                            );
+                          }
+                        },
                         child: Dismissible(
                           key: Key(notification.id),
                           onDismissed: (direction) async {
@@ -274,16 +286,20 @@ Widget _notificationItem(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
             Row(
+              crossAxisAlignment: CrossAxisAlignment.start,
               children: [
                 if (!notification.isPinned) ...[
                   if (!notification.isRead) ...[
                     const SizedBox(
                       width: 8,
                     ),
-                    const Icon(
-                      Icons.circle_rounded,
-                      color: Colors.black,
-                      size: 8,
+                    const Padding(
+                      padding: EdgeInsets.only(top: 8),
+                      child: Icon(
+                        Icons.circle_rounded,
+                        color: Colors.black,
+                        size: 8,
+                      ),
                     ),
                     const SizedBox(
                       width: 8,
@@ -305,11 +321,13 @@ Widget _notificationItem(
                     width: 8,
                   ),
                 ],
-                Text(
-                  notification.title,
-                  style: notification.isRead && !notification.isPinned
-                      ? theme.textTheme.bodyMedium
-                      : theme.textTheme.titleMedium,
+                Flexible(
+                  child: Text(
+                    notification.title,
+                    style: notification.isRead && !notification.isPinned
+                        ? theme.textTheme.bodyMedium
+                        : theme.textTheme.titleMedium,
+                  ),
                 ),
               ],
             ),

diff --git a/packages/flutter_notification_center/lib/src/services/notification_service.dart b/packages/flutter_notification_center/lib/src/services/notification_service.dart
@@ -27,7 +27,8 @@ abstract class NotificationService with ChangeNotifier {
 
   /// Pushes a notification to the service.
   Future pushNotification(
-    NotificationModel notification, [
+    NotificationModel notification,
+    List<String> recipientIds, [
     Function(NotificationModel model)? onNewNotification,
   ]);
 

diff --git a/packages/flutter_notification_center/pubspec.yaml b/packages/flutter_notification_center/pubspec.yaml
@@ -1,7 +1,7 @@
 name: flutter_notification_center
 description: "A Flutter package for displaying notifications in a notification center."
 publish_to: "none"
-version: 3.0.1
+version: 4.0.0
 
 environment:
   sdk: ">=3.3.2 <4.0.0"

diff --git a/.../flutter_notification_center_firebase/lib/src/services/firebase_notification_service.dart b/.../flutter_notification_center_firebase/lib/src/services/firebase_notification_service.dart
@@ -42,7 +42,8 @@ class FirebaseNotificationService
 
   @override
   Future<void> pushNotification(
-    NotificationModel notification, [
+    NotificationModel notification,
+    List<String> recipientIds, [
     Function(NotificationModel model)? onNewNotification,
   ]) async {
     try {
@@ -53,24 +54,30 @@ class FirebaseNotificationService
         return;
       }
 
-      CollectionReference notifications =
-          FirebaseFirestore.instanceFor(app: _firebaseApp)
-              .collection(activeNotificationsCollection)
-              .doc(userId)
-              .collection(activeNotificationsCollection);
-
-      var currentDateTime = DateTime.now();
-      notification.dateTimePushed = currentDateTime;
-      var notificationMap = notification.toMap();
-      await notifications.doc(notification.id).set(notificationMap);
-
-      listOfActiveNotifications = [...listOfActiveNotifications, notification];
-
-      //Show popup with notification conte
-      if (onNewNotification != null) {
-        onNewNotification(notification);
-      } else {
-        newNotificationCallback(notification);
+      for (var recipientId in recipientIds) {
+        CollectionReference notifications =
+            FirebaseFirestore.instanceFor(app: _firebaseApp)
+                .collection(activeNotificationsCollection)
+                .doc(recipientId)
+                .collection(activeNotificationsCollection);
+
+        var currentDateTime = DateTime.now();
+        notification.dateTimePushed = currentDateTime;
+        var notificationMap = notification.toMap();
+        await notifications.doc(notification.id).set(notificationMap);
+      }
+      if (recipientIds.contains(userId)) {
+        listOfActiveNotifications = [
+          ...listOfActiveNotifications,
+          notification,
+        ];
+
+        //Show popup with notification conte
+        if (onNewNotification != null) {
+          onNewNotification(notification);
+        } else {
+          newNotificationCallback(notification);
+        }
       }
 
       notifyListeners();
@@ -364,7 +371,11 @@ class FirebaseNotificationService
       for (var notification in plannedNotifications) {
         if (notification.scheduledFor!.isBefore(currentTime) ||
             notification.scheduledFor!.isAtSameMomentAs(currentTime)) {
-          await pushNotification(notification, newNotificationCallback);
+          await pushNotification(
+            notification,
+            [userId],
+            newNotificationCallback,
+          );
 
           await deletePlannedNotification(notification);
 

diff --git a/packages/flutter_notification_center_firebase/pubspec.yaml b/packages/flutter_notification_center_firebase/pubspec.yaml
@@ -1,7 +1,7 @@
 name: flutter_notification_center_firebase
 description: "A new Flutter project."
 publish_to: "none"
-version: 3.0.0
+version: 4.0.0
 
 environment:
   sdk: ">=2.18.0 <3.0.0"
@@ -21,7 +21,7 @@ dependencies:
   flutter_notification_center:
     git:
       url: https://github.com/Iconica-Development/flutter_notification_center
-      ref: 3.0.1
+      ref: 4.0.0
       path: packages/flutter_notification_center
 
 dev_dependencies: