Merge branch 'master' into haroon_dev

# Conflicts:
#	lib/core/app_assets.dart
#	lib/features/authentication/authentication_view_model.dart

assets/images/svg/logout.svg

@@ -0,0 +1,4 @@
+<svg width="24" height="25" viewBox="0 0 24 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15.7494 6.84523C15.6598 4.59011 13.7806 2.69067 11.2973 2.75142C10.7204 2.76553 10.0421 2.95699 8.97809 3.25735L8.84753 3.2942C5.92379 4.11888 3.05604 5.59448 2.37359 9.07412C2.24987 9.70491 2.24992 10.4012 2.25 11.5693L2.25 13.4307C2.24992 14.5988 2.24987 15.2951 2.37359 15.9259C3.05604 19.4055 5.92379 20.8811 8.84752 21.7058L8.97806 21.7427C10.0421 22.043 10.7204 22.2345 11.2973 22.2486C13.7806 22.3093 15.6598 20.4099 15.7494 18.1548C15.7659 17.7409 15.4437 17.392 15.0298 17.3756C14.6159 17.3591 14.267 17.6813 14.2506 18.0952C14.193 19.544 12.9856 20.7894 11.334 20.749C10.9722 20.7402 10.493 20.6114 9.25473 20.2621C6.45545 19.4726 4.35508 18.2352 3.84554 15.6372C3.75341 15.1675 3.75001 14.6267 3.75001 13.3373L3.75001 11.6628C3.75001 10.3733 3.75341 9.83255 3.84554 9.36281C4.35508 6.76484 6.45545 5.52745 9.25474 4.73787C10.493 4.38859 10.9722 4.25982 11.334 4.25097C12.9856 4.21057 14.193 5.45605 14.2506 6.9048C14.267 7.31868 14.6159 7.64087 15.0298 7.62442C15.4437 7.60797 15.7659 7.25912 15.7494 6.84523Z" fill="#ED1C2B"/>
+<path d="M19.0227 9.46219C18.7257 9.17349 18.2509 9.18023 17.9622 9.47726C17.6735 9.77428 17.6802 10.2491 17.9773 10.5378C18.1388 10.6949 18.396 10.8971 18.6407 11.0893L18.6976 11.134C18.9434 11.327 19.2061 11.5333 19.4548 11.7439L19.4619 11.75L10 11.75C9.58579 11.75 9.25 12.0858 9.25 12.5C9.25 12.9142 9.58579 13.25 10 13.25L19.4619 13.25L19.4548 13.2561C19.2061 13.4668 18.9434 13.673 18.6976 13.866L18.6407 13.9107C18.396 14.1029 18.1388 14.3051 17.9773 14.4622C17.6802 14.7509 17.6735 15.2257 17.9622 15.5227C18.2509 15.8198 18.7257 15.8265 19.0227 15.5378C19.114 15.4491 19.2958 15.3035 19.5672 15.0903L19.6272 15.0432C19.8693 14.8532 20.1534 14.6302 20.4245 14.4005C20.715 14.1543 21.0168 13.8787 21.2515 13.6032C21.369 13.4652 21.485 13.3096 21.5746 13.1422C21.661 12.9807 21.75 12.7583 21.75 12.5C21.75 12.2417 21.661 12.0193 21.5746 11.8578C21.485 11.6904 21.369 11.5348 21.2515 11.3968C21.0168 11.1213 20.715 10.8457 20.4245 10.5995C20.1534 10.3698 19.8693 10.1469 19.6272 9.95679L19.5672 9.90971C19.2958 9.69651 19.114 9.55089 19.0227 9.46219Z" fill="#ED1C2B"/>
+</svg>

lib/core/app_assets.dart

@@ -98,6 +98,7 @@ class AppAssets {
   static const String email_icon = '$svgBasePath/email_icon.svg';
   static const String notes_icon = '$svgBasePath/notes_icon.svg';
   static const String forward_chevron_icon = '$svgBasePath/forward_chevron_icon.svg';
+  static const String logout = '$svgBasePath/logout.svg';
 
   //bottom navigation//
   static const String homeBottom = '$svgBasePath/home_bottom.svg';

lib/features/authentication/authentication_view_model.dart

@@ -80,7 +80,7 @@ class AuthenticationViewModel extends ChangeNotifier {
   String errorMsg = '';
   final FocusNode myFocusNode = FocusNode();
   var healthId;
-  int getDeviceLastLogin = 1;
+  int getDeviceLastLogin =1;
 
   Future<void> onLoginPressed() async {
     try {
@@ -191,7 +191,7 @@ class AuthenticationViewModel extends ChangeNotifier {
       (failure) async {
         // LoadingUtils.hideFullScreenLoader();
         // await _errorHandlerService.handleError(failure: failure);
-        LoadingUtils.hideFullScreenLoader();
+        LoaderBottomSheet.hideLoader();
         _navigationService.pushPage(page: LoginScreen());
       },
       (apiResponse) {
@@ -238,6 +238,7 @@ class AuthenticationViewModel extends ChangeNotifier {
           _navigationService.pushPage(page: SavedLogin());
           // _navigationService.pushPage(page: LoginScreen());
         } else {
+          print("print login........");
           LoaderBottomSheet.hideLoader();
           _navigationService.pushPage(page: LoginScreen());
         }
@@ -292,11 +293,12 @@ class AuthenticationViewModel extends ChangeNotifier {
         } else if (apiResponse.messageStatus == 1) {
           if (apiResponse.data['isSMSSent']) {
             _appState.setAppAuthToken = apiResponse.data['LogInTokenID'];
-            await sendActivationCode(
+          await  sendActivationCode(
               otpTypeEnum: otpTypeEnum,
               phoneNumber: phoneNumberController.text,
               nationalIdOrFileNumber: nationalIdController.text,
             );
+
           } else {
             if (apiResponse.data['IsAuthenticated']) {
               await checkActivationCode(
@@ -304,6 +306,7 @@ class AuthenticationViewModel extends ChangeNotifier {
                 onWrongActivationCode: (String? message) {},
                 activationCode: null, //todo silent login case halded on the repo itself..
               );
+
             }
           }
         }
@@ -450,7 +453,6 @@ class AuthenticationViewModel extends ChangeNotifier {
           if (_appState.getSelectDeviceByImeiRespModelElement != null) {
             _appState.getSelectDeviceByImeiRespModelElement!.logInType = loginTypeEnum.toInt;
           }
-
           LoaderBottomSheet.hideLoader();
           insertPatientIMEIData(loginTypeEnum.toInt);
           clearDefaultInputValues();
@@ -736,6 +738,7 @@ class AuthenticationViewModel extends ChangeNotifier {
       deviceTypeId: _appState.getDeviceTypeID(),
       patientId: _appState.getAuthenticatedUser()!.patientId!,
       patientIdentificationNo: _appState.getAuthenticatedUser()!.patientIdentificationNo!,
+      identificationNo: _appState.getAuthenticatedUser()!.patientIdentificationNo!,
       firstName: _appState.getAuthenticatedUser()!.firstName!,
       lastName: _appState.getAuthenticatedUser()!.lastName!,
       patientTypeId: _appState.getAuthenticatedUser()!.patientType,

lib/presentation/lab/collapsing_list_view.dart

@@ -2,6 +2,7 @@ import 'dart:ui';
 
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:hmg_patient_app_new/core/app_assets.dart';
 import 'package:hmg_patient_app_new/core/app_export.dart';
 import 'package:hmg_patient_app_new/core/utils/utils.dart';
@@ -17,10 +18,11 @@ class CollapsingListView extends StatelessWidget {
   VoidCallback? search;
   VoidCallback? report;
   VoidCallback? logout;
+  VoidCallback? history;
   Widget? bottomChild;
   bool isClose;
 
-  CollapsingListView({required this.title, this.child, this.search, this.isClose = false, this.bottomChild, this.report, this.logout});
+  CollapsingListView({required this.title, this.child, this.search, this.isClose = false, this.bottomChild, this.report, this.logout, this.history});
 
   @override
   Widget build(BuildContext context) {
@@ -34,6 +36,7 @@ class CollapsingListView extends StatelessWidget {
                 pinned: true,
                 expandedHeight: 100,
                 stretch: true,
+                systemOverlayStyle: SystemUiOverlayStyle(statusBarBrightness: Brightness.light),
                 surfaceTintColor: Colors.transparent,
                 backgroundColor: AppColors.bgScaffoldColor,
                 leading: IconButton(
@@ -49,7 +52,6 @@ class CollapsingListView extends StatelessWidget {
                     t = t - 1;
                     if (t < 0.7) t = 0.7;
                     t = t.clamp(0.0, 1.0);
-                    print("t:$t");
 
                     final double fontSize = lerpDouble(14, 18, t)!;
                     final double bottomPadding = lerpDouble(0, 0, t)!;
@@ -81,8 +83,9 @@ class CollapsingListView extends StatelessWidget {
                                         color: AppColors.blackColor,
                                         letterSpacing: -0.5),
                                   ).expanded,
-                                  if (logout != null) actionButton(context, t, title: "Logout".needTranslation, icon: AppAssets.report_icon).onPress(logout!),
+                                  if (logout != null) actionButton(context, t, title: "Logout".needTranslation, icon: AppAssets.logout).onPress(logout!),
                                   if (report != null) actionButton(context, t, title: "Report".needTranslation, icon: AppAssets.report_icon).onPress(report!),
+                                  if (history != null) actionButton(context, t, title: "History".needTranslation, icon: AppAssets.insurance_history_icon).onPress(history!),
                                   if (search != null) Utils.buildSvgWithAssets(icon: AppAssets.search_icon).onPress(search!).paddingOnly(right: 24)
                                 ],
                               )),

lib/presentation/lab/search_lab_report.dart

@@ -143,10 +143,6 @@ class SuggestionChip extends StatelessWidget {
         decoration: BoxDecoration(
           color: isSelected ? AppColors.primaryRedColor : AppColors.whiteColor,
           borderRadius: BorderRadius.circular(8),
-          border: Border.all(
-            color: AppColors.greyColor,
-            width: 1,
-          ),
         ),
         child: label.toText12(
           color: isSelected ? Colors.white : Colors.black87,

lib/theme/app_theme.dart

@@ -47,6 +47,7 @@ class AppTheme {
             color: Colors.grey[800],
           ),
           systemOverlayStyle: SystemUiOverlayStyle.light,
+          surfaceTintColor: Colors.transparent,
         ),
       );
 }