From 686c70e3db0c1f0b9ae8e8fc1f7e32f3dc3cd615 Mon Sep 17 00:00:00 2001
From: Sikander Saleem <sikandersaleem.cloudsolutions@gmail.com>
Date: Wed, 15 Nov 2023 16:25:36 +0300
Subject: [PATCH] profile image improvement & notificaiton

---
 .../providers/api/notifications_provider.dart          |  6 +++---
 lib/new_views/common_widgets/app_drawer.dart           |  8 ++++----
 lib/new_views/pages/land_page/dashboard_page.dart      | 10 ++++++----
 lib/views/pages/user/profile_page.dart                 |  8 ++++----
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/lib/controllers/providers/api/notifications_provider.dart b/lib/controllers/providers/api/notifications_provider.dart
index f7970e3a..0d27022d 100644
--- a/lib/controllers/providers/api/notifications_provider.dart
+++ b/lib/controllers/providers/api/notifications_provider.dart
@@ -40,9 +40,9 @@ class NotificationsProvider extends ChangeNotifier {
   /// for more details check http state manager
   /// lib\controllers\http_status_manger\http_status_manger.dart
   Future<int> getSystemNotifications({
-    @required String host,
-    @required User user,
-    @required int hospitalId,
+    String host,
+    User user,
+    int hospitalId,
   }) async {
     if (isLoading == true) return -2;
     isLoading = true;
diff --git a/lib/new_views/common_widgets/app_drawer.dart b/lib/new_views/common_widgets/app_drawer.dart
index 57ee0c21..0e7e8a21 100644
--- a/lib/new_views/common_widgets/app_drawer.dart
+++ b/lib/new_views/common_widgets/app_drawer.dart
@@ -40,11 +40,11 @@ class AppDrawer extends StatelessWidget {
                   child: Padding(
                     padding: const EdgeInsets.all(1), // Border radius
                     child: ClipOval(
-                      child: (snapshot.user.profilePhotoName?.isNotEmpty ?? false)
-                          ? Image.network(snapshot.user.profilePhotoName)
-                          : snapshot.profileImage != null
+                      child: snapshot.profileImage != null
                               ? Image.file(snapshot.profileImage)
-                              : const Icon(
+                              : (snapshot.user.profilePhotoName?.isNotEmpty ?? false)
+                          ? Image.network(snapshot.user.profilePhotoName)
+                          : const Icon(
                                   Icons.person,
                                   size: 50,
                                   color: Colors.white,
diff --git a/lib/new_views/pages/land_page/dashboard_page.dart b/lib/new_views/pages/land_page/dashboard_page.dart
index efa27cce..80d10a2e 100644
--- a/lib/new_views/pages/land_page/dashboard_page.dart
+++ b/lib/new_views/pages/land_page/dashboard_page.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:test_sa/controllers/providers/api/all_requests_provider.dart';
+import 'package:test_sa/controllers/providers/api/notifications_provider.dart';
 import 'package:test_sa/controllers/providers/api/user_provider.dart';
 import 'package:test_sa/extensions/context_extension.dart';
 import 'package:test_sa/extensions/int_extensions.dart';
@@ -28,6 +29,7 @@ class _DashboardPageState extends State<DashboardPage> {
   void initState() {
     super.initState();
     Provider.of<AllRequestsProvider>(context, listen: false).getRequests();
+    Provider.of<NotificationsProvider>(context, listen: false).getSystemNotifications();
   }
 
   @override
@@ -54,10 +56,10 @@ class _DashboardPageState extends State<DashboardPage> {
                 child: Padding(
                   padding: const EdgeInsets.all(1), // Border radius
                   child: ClipOval(
-                    child: (snapshot.user.profilePhotoName?.isNotEmpty ?? false)
-                        ? Image.network(snapshot.user.profilePhotoName)
-                        : snapshot.profileImage != null
-                            ? Image.file(snapshot.profileImage)
+                    child: snapshot.profileImage != null
+                        ? Image.file(snapshot.profileImage)
+                        : (snapshot.user.profilePhotoName?.isNotEmpty ?? false)
+                            ? Image.network(snapshot.user.profilePhotoName)
                             : const Icon(
                                 Icons.person,
                                 size: 24,
diff --git a/lib/views/pages/user/profile_page.dart b/lib/views/pages/user/profile_page.dart
index fb466f96..dcc51e86 100644
--- a/lib/views/pages/user/profile_page.dart
+++ b/lib/views/pages/user/profile_page.dart
@@ -71,11 +71,11 @@ class _ProfilePageState extends State<ProfilePage> {
                           child: Padding(
                             padding: const EdgeInsets.all(1), // Border radius
                             child: ClipOval(
-                              child: (snapshot.user.profilePhotoName?.isNotEmpty ?? false)
-                                  ? Image.network(snapshot.user.profilePhotoName)
-                                  : snapshot.profileImage != null
+                              child:  snapshot.profileImage != null
                                       ? Image.file(snapshot.profileImage)
-                                      : const Icon(
+                                      : (snapshot.user.profilePhotoName?.isNotEmpty ?? false)
+                                  ? Image.network(snapshot.user.profilePhotoName)
+                                  : const Icon(
                                           Icons.person,
                                           size: 50,
                                           color: Colors.white,