Merge branch 'dev_v3.13.6' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6

lib/pages/DrawerPages/family/my-family.dart

@@ -218,7 +218,7 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
                                 child: Row(
                                   mainAxisAlignment: MainAxisAlignment.center,
                                   children: [
-                                    SvgPicture.asset("assets/images/new-design/delete.svg", height: 16, color: isFemale ? Color(0Xff5A282E) : Colors.white),
+                                    SvgPicture.asset("assets/images/new-design/delete.svg", height: 22, color: isFemale ? Color(0Xff5A282E) : Colors.white),
                                     SizedBox(width: 4),
                                     Texts(TranslationBase.of(context).delete, color: isFemale ? Color(0Xff5A282E) : Colors.white, fontSize: 12, fontWeight: FontWeight.w600),
                                   ],
@@ -404,7 +404,7 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
               child: Icon(
                 Icons.delete,
                 color: Colors.red,
-                size: 12,
+                size: 22,
               ),
               onTap: () {
                 acceptRemoveRequest(result.iD, 4, context);
@@ -533,7 +533,7 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
     request["Status"] = status;
     this.familyFileProvider.acceptRejectFamily(request).then((value) async {
       await refreshFamily(context);
-      GifLoaderDialogUtils.hideDialog(context);
+     await GifLoaderDialogUtils.hideDialog(context);
     });
   }
 
@@ -553,7 +553,7 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
   List<GetAllSharedRecordsByStatusList> sentRecordsList = [];
 
   Future getFamilyFiles() async {
-    late GetAllSharedRecordsByStatusResponse familySharedRecords;
+    GetAllSharedRecordsByStatusResponse? familySharedRecords;
     if (await sharedPref.getObject(FAMILY_FILE) != null) {
       familySharedRecords = GetAllSharedRecordsByStatusResponse.fromJson(await sharedPref.getObject(FAMILY_FILE));
     }
@@ -585,6 +585,7 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
       GifLoaderDialogUtils.hideDialog(context);
     } catch (ex) {
       familySharedRecords = GetAllSharedRecordsByStatusResponse(getAllSharedRecordsByStatusList: []);
+      GifLoaderDialogUtils.hideDialog(context);
     }
   }
 

lib/pages/DrawerPages/notifications/notification_details_page.dart

@@ -21,7 +21,7 @@ class _NotificationsDetailsPageState extends State<NotificationsDetailsPage> {
   @override
   void initState() {
     _controller = YoutubePlayerController(
-      initialVideoId: getVideoURL()!,
+      initialVideoId: getVideoURL(),
       flags: YoutubePlayerFlags(
         autoPlay: true,
         mute: false,
@@ -47,12 +47,14 @@ class _NotificationsDetailsPageState extends State<NotificationsDetailsPage> {
     return monthName + ',${d.day},${d.year}, $hour';
   }
 
-  String? getVideoURL() {
+  String getVideoURL() {
     if (widget.notification.videoURL != null && widget.notification.notificationType == "2") {
       String videoId;
       videoId = YoutubePlayer.convertUrlToId(widget.notification.videoURL)!;
       print(videoId); // BBAyRBTfsOU
       return videoId;
+    }else{
+      return "";
     }
   }
 

lib/pages/login/confirm-login.dart

@@ -288,9 +288,15 @@ class _ConfirmLogin extends State<ConfirmLogin> {
   }
 
   Future<void> _getAvailableBiometrics() async {
+
+    final bool canAuthenticateWithBiometrics = await auth.canCheckBiometrics;
+    final bool canAuthenticate =
+        canAuthenticateWithBiometrics || await auth.isDeviceSupported();
+
     var availableBiometrics;
     try {
       availableBiometrics = await auth.getAvailableBiometrics();
+      print(availableBiometrics);
     } on PlatformException catch (e) {
       AppToast.showErrorToast(message: e.message!);
       print(e);

lib/pages/medical/my_invoices/invoice_detail_page.dart

@@ -59,12 +59,12 @@ class _InvoiceDetailState extends State<InvoiceDetail> {
                       widget.doctor.name!,
                       widget.doctor.doctorID!,
                       widget.doctor.doctorImageURL!,
-                      widget.doctor.speciality!,
+                      widget.doctor.speciality??[""],
                       widget.doctor.clinicName!,
                       widget.doctor.projectName!,
                       DateUtil.convertStringToDate(widget.doctor.date),
                       null,
-                      widget.doctor.nationalityFlagURL!,
+                      widget.doctor.nationalityFlagURL != null ? widget.doctor.nationalityFlagURL! : "" ,
                       widget.doctor.doctorRate,
                       widget.doctor.actualDoctorRate,
                       widget.doctor.noOfPatientsRate ?? 0,

lib/uitl/location_util.dart

@@ -128,8 +128,10 @@ class LocationUtils {
                   heading: 0.0,
                   speed: 0.0,
                   speedAccuracy: 1,
-                    altitudeAccuracy: 0,
-                   headingAccuracy: 0,
+                  altitudeAccuracy: 0.0,
+                  headingAccuracy: 0.0,
+                  //  altitudeAccuracy: 0,
+                  // headingAccuracy: 0,
                   // Added by Aamir
                 ),
               );