Home screen pop notification pt2

Frontend/patient_manager/lib/mih_components/mih_pop_up_messages/mih_notification_message.dart

@@ -25,6 +25,8 @@ class _MIHNotificationMessageState extends State<MIHNotificationMessage>
   late double popUpBodySize;
   late double popUpIconSize;
   late double popUpPaddingSize;
+  late Color primary;
+  late Color secondary;
   Size? size;
 
   void checkScreenSize() {
@@ -35,39 +37,37 @@ class _MIHNotificationMessageState extends State<MIHNotificationMessage>
         popUpTitleSize = 20.0;
         popUpSubtitleSize = 20.0;
         popUpBodySize = 15;
-        popUpPaddingSize = 5.0;
+        popUpPaddingSize = 25.0;
         popUpIconSize = 100;
       });
     } else {
       setState(() {
-        popUpWidth = size!.width - 20;
+        popUpWidth = size!.width;
         popUpheight = 90;
         popUpTitleSize = 20.0;
         popUpSubtitleSize = 18.0;
         popUpBodySize = 15;
-        popUpPaddingSize = 15.0;
+        popUpPaddingSize = 5.0;
         popUpIconSize = 100;
       });
     }
   }
 
-  Widget NotifyPopUp() {
+  Widget notifyPopUp() {
     //messageTypes["Input Error"] =
-    return Stack(
+    return GestureDetector(
-      children: [
+      onTap: widget.arguments.onTap,
-        Container(
+      child: Container(
-          padding: EdgeInsets.all(popUpPaddingSize),
+        padding:
+            EdgeInsets.symmetric(vertical: 5, horizontal: popUpPaddingSize),
         alignment: Alignment.topLeft,
         width: popUpWidth,
         height: popUpheight,
         decoration: BoxDecoration(
-            color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+          color: primary,
           borderRadius: BorderRadius.circular(25.0),
-            // border: Border.all(
+          border: Border.all(color: secondary, width: 5.0),
-            //     color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
-            //     width: 5.0),
         ),
-          child: SingleChildScrollView(
         child: Column(
           // crossAxisAlignment: CrossAxisAlignment.start,
           // mainAxisAlignment: MainAxisAlignment.start,
@@ -75,21 +75,20 @@ class _MIHNotificationMessageState extends State<MIHNotificationMessage>
           children: [
             //const SizedBox(height: 5),
             Row(
+              mainAxisAlignment: MainAxisAlignment.center,
               children: [
                 Icon(
                   Icons.notifications,
-                      color:
+                  color: secondary,
-                          MzanziInnovationHub.of(context)!.theme.primaryColor(),
                 ),
+                const SizedBox(width: 10),
                 Flexible(
                   child: Text(
                     widget.arguments.title,
-                        textAlign: TextAlign.left,
+                    textAlign: TextAlign.center,
                     overflow: TextOverflow.ellipsis,
                     style: TextStyle(
-                          color: MzanziInnovationHub.of(context)!
+                      color: secondary,
-                              .theme
-                              .primaryColor(),
                       fontSize: popUpTitleSize,
                       fontWeight: FontWeight.bold,
                     ),
@@ -98,42 +97,27 @@ class _MIHNotificationMessageState extends State<MIHNotificationMessage>
               ],
             ),
             const SizedBox(height: 5),
-                Row(
+            Wrap(
+              alignment: WrapAlignment.start,
               children: [
-                    Text(
+                SizedBox(
+                  width: popUpWidth,
+                  child: Text(
                     widget.arguments.body,
                     textAlign: TextAlign.left,
+                    overflow: TextOverflow.ellipsis,
                     style: TextStyle(
-                        color: MzanziInnovationHub.of(context)!
+                      color: secondary,
-                            .theme
-                            .primaryColor(),
                       fontSize: popUpBodySize,
                       fontWeight: FontWeight.bold,
                     ),
                   ),
+                ),
               ],
             ),
           ],
         ),
       ),
-        ),
-        Positioned(
-          top: 5,
-          right: 5,
-          width: 50,
-          height: 50,
-          child: IconButton(
-            onPressed: () {
-              Navigator.pop(context);
-            },
-            icon: Icon(
-              Icons.close,
-              color: MzanziInnovationHub.of(context)!.theme.errorColor(),
-              size: 35,
-            ),
-          ),
-        ),
-      ],
     );
   }
 
@@ -146,11 +130,14 @@ class _MIHNotificationMessageState extends State<MIHNotificationMessage>
   @override
   void initState() {
     super.initState();
-
+    setState(() {
+      primary = MzanziInnovationHub.of(context)!.theme.primaryColor();
+      secondary = MzanziInnovationHub.of(context)!.theme.secondaryColor();
+    });
     _animationController = AnimationController(
       vsync: this,
       duration:
-          const Duration(milliseconds: 200), // Adjust the duration as needed
+          const Duration(milliseconds: 300), // Adjust the duration as needed
     );
 
     _scaleAnimation = Tween<Offset>(
@@ -177,10 +164,9 @@ class _MIHNotificationMessageState extends State<MIHNotificationMessage>
     return SlideTransition(
       position: _scaleAnimation,
       child: Dialog(
-        insetAnimationDuration: const Duration(milliseconds: 1000),
+        shadowColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-        insetAnimationCurve: Curves.bounceIn,
         alignment: Alignment.topCenter,
-        child: NotifyPopUp(),
+        child: notifyPopUp(),
       ),
     );
     // return SlideTransition(

Frontend/patient_manager/lib/mih_objects/arguments.dart

@@ -10,10 +10,12 @@ import 'package:patient_manager/mih_objects/patients.dart';
 class NotificationArguments {
   final String title;
   final String body;
+  final void Function()? onTap;
 
   NotificationArguments(
     this.title,
     this.body,
+    this.onTap,
   );
 }
 

Frontend/patient_manager/lib/mih_packages/mih_home/mih_home.dart

@@ -247,12 +247,18 @@ class _MIHHomeState extends State<MIHHome> {
             barrierColor: const Color(0x01000000),
             context: context,
             builder: (context) {
+              return Builder(builder: (context) {
                 return MIHNotificationMessage(
                   arguments: NotificationArguments(
                     "Testing",
                     "Testing the new MIH Notification",
+                    () {
+                      Navigator.of(context).pop();
+                      //Scaffold.of(context).openEndDrawer();
+                    },
                   ),
                 );
+              });
             },
           );
         },
@@ -733,6 +739,7 @@ class _MIHHomeState extends State<MIHHome> {
     //print(widget.notifications.toString());
     if (notifiList.map((item) => item.notification_read).contains("No")) {
       //print("New Notification Available");
+
       return true;
     } else {
       //print("No New Notification Available");
@@ -760,26 +767,31 @@ class _MIHHomeState extends State<MIHHome> {
     setState(() {
       notifiList = notifi;
     });
-
-    if (hasNewNotifications()) {
-      print("New Notifications");
-      // await MIHNotificationServices.showNotification(
-      //   title: "New Notification waiting",
-      //   body:
-      //       "You have new notification waiting for you in the notification panel",
-      // );
     notificationPopUp();
   }
-  }
 
   void notificationPopUp() {
+    if (hasNewNotifications()) {
       showDialog(
+        barrierColor: const Color(0x01000000),
         context: context,
         builder: (context) {
-        return const MIHErrorMessage(errorType: "Internet Connection");
+          return Builder(builder: (context) {
+            return MIHNotificationMessage(
+              arguments: NotificationArguments(
+                "Unread Notification",
+                "You have unread notifications waiting for you.",
+                () {
+                  Navigator.of(context).pop();
+                  //Scaffold.of(context).openEndDrawer();
+                },
+              ),
+            );
+          });
         },
       );
     }
+  }
 
   @override
   void dispose() {
@@ -790,12 +802,15 @@ class _MIHHomeState extends State<MIHHome> {
 
   @override
   void initState() {
+    super.initState();
     setState(() {
       pbswitch = setApps(persHTList, busHTList);
       businessUserSwitch = false;
       notifiList = widget.notifications;
     });
-    super.initState();
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      notificationPopUp();
+    });
   }
 
   @override