updates

lib/presentation/appointments/appointment_details_page.dart

@@ -5,8 +5,6 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_staggered_animations/flutter_staggered_animations.dart';
 import 'package:hmg_patient_app_new/core/app_assets.dart';
-import 'package:hmg_patient_app_new/core/app_state.dart';
-import 'package:hmg_patient_app_new/core/dependencies.dart';
 import 'package:hmg_patient_app_new/core/utils/size_utils.dart';
 import 'package:hmg_patient_app_new/core/utils/utils.dart';
 import 'package:hmg_patient_app_new/extensions/string_extensions.dart';
@@ -20,6 +18,7 @@ import 'package:hmg_patient_app_new/generated/locale_keys.g.dart';
 import 'package:hmg_patient_app_new/presentation/appointments/appointment_payment_page.dart';
 import 'package:hmg_patient_app_new/presentation/appointments/widgets/appointment_checkin_bottom_sheet.dart';
 import 'package:hmg_patient_app_new/presentation/appointments/widgets/appointment_doctor_card.dart';
+import 'package:hmg_patient_app_new/presentation/lab/collapsing_list_view.dart';
 import 'package:hmg_patient_app_new/presentation/prescriptions/prescription_detail_page.dart';
 import 'package:hmg_patient_app_new/presentation/prescriptions/prescriptions_list_page.dart';
 import 'package:hmg_patient_app_new/theme/colors.dart';
@@ -62,13 +61,11 @@ class _AppointmentDetailsPageState extends State<AppointmentDetailsPage> {
     prescriptionsViewModel = Provider.of<PrescriptionsViewModel>(context);
     return Scaffold(
       backgroundColor: AppColors.bgScaffoldColor,
-      appBar: AppBar(
-        title: "Appointment Details".needTranslation.toText18(),
-        backgroundColor: AppColors.bgScaffoldColor,
-      ),
       body: Column(
         children: [
           Expanded(
+            child: CollapsingListView(
+              title: "Appointment Details".needTranslation,
               child: SingleChildScrollView(
                 child: Column(
                   crossAxisAlignment: CrossAxisAlignment.start,
@@ -392,6 +389,7 @@ class _AppointmentDetailsPageState extends State<AppointmentDetailsPage> {
                 ).paddingSymmetrical(24.h, 24.h),
               ),
             ),
+          ),
           Container(
             decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
               color: AppColors.whiteColor,

lib/presentation/appointments/appointment_payment_page.dart

@@ -9,7 +9,6 @@ import 'package:hmg_patient_app_new/core/app_state.dart';
 import 'package:hmg_patient_app_new/core/cache_consts.dart';
 import 'package:hmg_patient_app_new/core/dependencies.dart';
 import 'package:hmg_patient_app_new/core/enums.dart';
-import 'package:hmg_patient_app_new/features/authentication/models/resp_models/authenticated_user_resp_model.dart';
 import 'package:hmg_patient_app_new/features/payfort/models/apple_pay_request_insert_model.dart';
 import 'package:hmg_patient_app_new/core/utils/size_utils.dart';
 import 'package:hmg_patient_app_new/core/utils/utils.dart';
@@ -22,6 +21,7 @@ import 'package:hmg_patient_app_new/generated/locale_keys.g.dart';
 import 'package:hmg_patient_app_new/presentation/appointments/my_appointments_page.dart';
 import 'package:hmg_patient_app_new/presentation/home/navigation_screen.dart';
 import 'package:hmg_patient_app_new/presentation/insurance/insurance_home_page.dart';
+import 'package:hmg_patient_app_new/presentation/lab/collapsing_list_view.dart';
 import 'package:hmg_patient_app_new/services/cache_service.dart';
 import 'package:hmg_patient_app_new/theme/colors.dart';
 import 'package:hmg_patient_app_new/widgets/buttons/custom_button.dart';
@@ -72,21 +72,18 @@ class _AppointmentPaymentPageState extends State<AppointmentPaymentPage> {
     payfortViewModel = Provider.of<PayfortViewModel>(context);
     return Scaffold(
       backgroundColor: AppColors.bgScaffoldColor,
-      appBar: AppBar(
-        title: "Appointment Payment".needTranslation.toText18(),
-        backgroundColor: AppColors.bgScaffoldColor,
-      ),
       body: Consumer<MyAppointmentsViewModel>(builder: (context, myAppointmentsVM, child) {
-        return myAppointmentsVM.isAppointmentPatientShareLoading
+        return Column(
-            ? const MoviesShimmerWidget().paddingAll(24.h)
-            : Column(
           children: [
             Expanded(
+              child: CollapsingListView(
+                title: "Appointment Payment".needTranslation,
                 child: SingleChildScrollView(
-                      child: Column(
+                  child: myAppointmentsVM.isAppointmentPatientShareLoading
+                      ? const MoviesShimmerWidget().paddingAll(24.h)
+                      : Column(
                           crossAxisAlignment: CrossAxisAlignment.start,
                           children: [
-                          "Appointment Payment".needTranslation.toText24(isBold: true).paddingSymmetrical(24.h, 0.h),
                             SizedBox(height: 24.h),
                             Container(
                               decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
@@ -196,7 +193,10 @@ class _AppointmentPaymentPageState extends State<AppointmentPaymentPage> {
                         ),
                 ),
               ),
-                  Container(
+            ),
+            myAppointmentsVM.isAppointmentPatientShareLoading
+                ? SizedBox.shrink()
+                : Container(
                     decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
                       color: AppColors.whiteColor,
                       borderRadius: 24.h,

lib/presentation/appointments/my_appointments_page.dart

@@ -1,17 +1,14 @@
 import 'dart:async';
 
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_staggered_animations/flutter_staggered_animations.dart';
-import 'package:hmg_patient_app_new/core/app_state.dart';
-import 'package:hmg_patient_app_new/core/dependencies.dart';
 import 'package:hmg_patient_app_new/core/utils/size_utils.dart';
 import 'package:hmg_patient_app_new/core/utils/utils.dart';
 import 'package:hmg_patient_app_new/extensions/string_extensions.dart';
 import 'package:hmg_patient_app_new/extensions/widget_extensions.dart';
 import 'package:hmg_patient_app_new/features/my_appointments/my_appointments_view_model.dart';
-import 'package:hmg_patient_app_new/generated/locale_keys.g.dart';
 import 'package:hmg_patient_app_new/presentation/appointments/widgets/appointment_card.dart';
+import 'package:hmg_patient_app_new/presentation/lab/collapsing_list_view.dart';
 import 'package:hmg_patient_app_new/theme/colors.dart';
 import 'package:hmg_patient_app_new/widgets/custom_tab_bar.dart';
 import 'package:hmg_patient_app_new/widgets/shimmer/movies_shimmer_widget.dart';
@@ -41,19 +38,12 @@ class _MyAppointmentsPageState extends State<MyAppointmentsPage> {
     myAppointmentsViewModel = Provider.of<MyAppointmentsViewModel>(context);
     return Scaffold(
       backgroundColor: AppColors.bgScaffoldColor,
-      appBar: AppBar(
+      body: CollapsingListView(
-        title: "Appointments List".needTranslation.toText18(),
+        title: "Appointments List".needTranslation,
-        backgroundColor: AppColors.bgScaffoldColor,
+        child: SingleChildScrollView(
-      ),
-      body: SingleChildScrollView(
           child: Column(
             children: [
-            Row(
+              SizedBox(height: 16.h),
-              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-              children: [
-                "Appointments List".needTranslation.toText24(isBold: true),
-              ],
-            ).paddingSymmetrical(24.h, 24.h),
               CustomTabBar(
                 activeTextColor: Color(0xffED1C2B),
                 activeBackgroundColor: Color(0xffED1C2B).withValues(alpha: .1),
@@ -73,6 +63,7 @@ class _MyAppointmentsPageState extends State<MyAppointmentsPage> {
             ],
           ),
         ),
+      ),
     );
   }
 
@@ -83,7 +74,6 @@ class _MyAppointmentsPageState extends State<MyAppointmentsPage> {
         return Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            SizedBox(height: 24.h),
             // Expandable list
             ListView.separated(
               shrinkWrap: true,
@@ -127,7 +117,6 @@ class _MyAppointmentsPageState extends State<MyAppointmentsPage> {
         return Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            SizedBox(height: 24.h),
             // Expandable list
             ListView.separated(
               shrinkWrap: true,
@@ -171,7 +160,6 @@ class _MyAppointmentsPageState extends State<MyAppointmentsPage> {
         return Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            SizedBox(height: 24.h),
             // Expandable list
             ListView.separated(
               shrinkWrap: true,

lib/presentation/appointments/widgets/appointment_card.dart

@@ -142,7 +142,7 @@ class _AppointmentCardState extends State<AppointmentCard> {
                       Wrap(
                         direction: Axis.horizontal,
                         spacing: 3.h,
-                        runSpacing: -8.h,
+                        runSpacing: 4.h,
                         children: [
                           AppCustomChipWidget(labelText: widget.patientAppointmentHistoryResponseModel.clinicName!),
                           AppCustomChipWidget(labelText: widget.patientAppointmentHistoryResponseModel.projectName!),

lib/presentation/appointments/widgets/appointment_doctor_card.dart

@@ -51,7 +51,7 @@ class AppointmentDoctorCard extends StatelessWidget {
                       Wrap(
                         direction: Axis.horizontal,
                         spacing: 3.h,
-                        runSpacing: -8.h,
+                        runSpacing: 4.h,
                         children: [
                           AppCustomChipWidget(labelText: patientAppointmentHistoryResponseModel.clinicName!),
                           AppCustomChipWidget(labelText: patientAppointmentHistoryResponseModel.projectName!),

lib/presentation/habib_wallet/habib_wallet_page.dart

@@ -10,6 +10,7 @@ import 'package:hmg_patient_app_new/extensions/widget_extensions.dart';
 import 'package:hmg_patient_app_new/features/habib_wallet/models/habib_wallet_view_model.dart';
 import 'package:hmg_patient_app_new/generated/locale_keys.g.dart';
 import 'package:hmg_patient_app_new/presentation/habib_wallet/recharge_wallet_page.dart';
+import 'package:hmg_patient_app_new/presentation/lab/collapsing_list_view.dart';
 import 'package:hmg_patient_app_new/theme/colors.dart';
 import 'package:hmg_patient_app_new/widgets/buttons/custom_button.dart';
 import 'package:hmg_patient_app_new/widgets/transitions/fade_page.dart';
@@ -28,18 +29,14 @@ class _HabibWalletState extends State<HabibWalletPage> {
     AppState _appState = getIt.get<AppState>();
     return Scaffold(
       backgroundColor: AppColors.bgScaffoldColor,
-      appBar: AppBar(
+      body: CollapsingListView(
-        title: LocaleKeys.myWallet.tr(context: context).toText18(),
+        title: LocaleKeys.myWallet.tr(),
-        backgroundColor: AppColors.bgScaffoldColor,
+        child: Padding(
-      ),
-      body: Padding(
           padding: EdgeInsets.all(24.h),
           child: SingleChildScrollView(
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
-              LocaleKeys.myWallet.tr(context: context).toText24(isBold: true),
-              SizedBox(height: 24.h),
                 Container(
                   width: double.infinity,
                   height: 180.h,
@@ -70,7 +67,7 @@ class _HabibWalletState extends State<HabibWalletPage> {
                         Consumer<HabibWalletViewModel>(builder: (context, habibWalletVM, child) {
                           return Utils.getPaymentAmountWithSymbol(habibWalletVM.habibWalletAmount.toString().toText32(isBold: true, color: AppColors.whiteColor), AppColors.whiteColor, 13.h,
                                   isExpanded: false)
-                            .toShimmer2(isShow: habibWalletVM.isWalletAmountLoading, radius: 12.h);
+                              .toShimmer2(isShow: habibWalletVM.isWalletAmountLoading, radius: 12.h, width: 80.h, height: 40.h);
                         }),
                       ],
                     ),
@@ -106,6 +103,7 @@ class _HabibWalletState extends State<HabibWalletPage> {
             ),
           ),
         ),
+      ),
     );
   }
 }

lib/presentation/habib_wallet/recharge_wallet_page.dart

@@ -8,6 +8,7 @@ import 'package:hmg_patient_app_new/core/utils/utils.dart';
 import 'package:hmg_patient_app_new/extensions/string_extensions.dart';
 import 'package:hmg_patient_app_new/extensions/widget_extensions.dart';
 import 'package:hmg_patient_app_new/generated/locale_keys.g.dart';
+import 'package:hmg_patient_app_new/presentation/lab/collapsing_list_view.dart';
 import 'package:hmg_patient_app_new/theme/colors.dart';
 import 'package:hmg_patient_app_new/widgets/buttons/custom_button.dart';
 import 'package:hmg_patient_app_new/widgets/common_bottom_sheet.dart';
@@ -30,22 +31,18 @@ class _RechargeWalletPageState extends State<RechargeWalletPage> {
     AppState appState = getIt.get<AppState>();
     return Scaffold(
       backgroundColor: AppColors.bgScaffoldColor,
-      appBar: AppBar(
-        title: LocaleKeys.createAdvancedPayment.tr(context: context).toText18(),
-        backgroundColor: AppColors.bgScaffoldColor,
-      ),
       body: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
           Expanded(
+              child: CollapsingListView(
+            title: LocaleKeys.createAdvancedPayment.tr(context: context),
             child: SingleChildScrollView(
               child: Padding(
                 padding: EdgeInsets.all(24.h),
                 child: Column(
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
-                  LocaleKeys.createAdvancedPayment.tr(context: context).toText20(isBold: true),
-                  SizedBox(height: 24.h),
                     Container(
                       height: 135.h,
                       decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
@@ -117,7 +114,8 @@ class _RechargeWalletPageState extends State<RechargeWalletPage> {
                                       crossAxisAlignment: CrossAxisAlignment.start,
                                       children: [
                                         LocaleKeys.myAccount.tr(context: context).toText16(color: AppColors.textColor, weight: FontWeight.w500),
-                                      "${LocaleKeys.medicalFile.tr(context: context)}: ${appState.getAuthenticatedUser()!.patientId}".toText14(color: AppColors.greyTextColor, weight: FontWeight.w500),
+                                        "${LocaleKeys.medicalFile.tr(context: context)}: ${appState.getAuthenticatedUser()!.patientId}"
+                                            .toText14(color: AppColors.greyTextColor, weight: FontWeight.w500),
                                       ],
                                     ),
                                   ],
@@ -200,6 +198,7 @@ class _RechargeWalletPageState extends State<RechargeWalletPage> {
                   ],
                 ),
               ),
+            ),
           )),
           Container(
             decoration: RoundedRectangleBorder().toSmoothCornerDecoration(

lib/presentation/habib_wallet/widgets/select-medical_file.dart

@@ -136,8 +136,8 @@ class _MultiPageBottomSheetState extends State<MultiPageBottomSheet> {
               Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
-                  LocaleKeys.myMedicalFile.tr(context: context).toText16(color: AppColors.textColor, weight: FontWeight.w500),
+                  LocaleKeys.familyTitle.tr(context: context).toText16(color: AppColors.textColor, weight: FontWeight.w500),
-                  "${LocaleKeys.fileno.tr(context: context)}: ${appState.getAuthenticatedUser()!.patientId}".toText14(color: AppColors.greyTextColor, weight: FontWeight.w500),
+                  "Select a medical file from your family".needTranslation.toText14(color: AppColors.greyTextColor, weight: FontWeight.w500),
                 ],
               ),
               Utils.buildSvgWithAssets(icon: AppAssets.forward_chevron_icon, iconColor: AppColors.textColor, width: 15.h, height: 15.h),
@@ -157,14 +157,20 @@ class _MultiPageBottomSheetState extends State<MultiPageBottomSheet> {
               Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
-                  LocaleKeys.myMedicalFile.tr(context: context).toText16(color: AppColors.textColor, weight: FontWeight.w500),
+                  LocaleKeys.otherAccount.tr(context: context).toText16(color: AppColors.textColor, weight: FontWeight.w500),
-                  "${LocaleKeys.fileno.tr(context: context)}: ${appState.getAuthenticatedUser()!.patientId}".toText14(color: AppColors.greyTextColor, weight: FontWeight.w500),
+                  "Any active medical file from HMG".toText14(color: AppColors.greyTextColor, weight: FontWeight.w500),
                 ],
               ),
               Utils.buildSvgWithAssets(icon: AppAssets.forward_chevron_icon, iconColor: AppColors.textColor, width: 15.h, height: 15.h),
             ],
           ).paddingAll(16.h),
-        ),
+        ).onPress(() {
+          _pageController.animateToPage(
+            2,
+            duration: const Duration(milliseconds: 300),
+            curve: Curves.easeInOut,
+          );
+        }),
       ],
     );
   }

lib/presentation/home/widgets/habib_wallet_card.dart

@@ -84,7 +84,7 @@ class HabibWalletCard extends StatelessWidget {
                           fit: BoxFit.contain,
                         ),
                         SizedBox(width: 8.h),
-                        habibWalletVM.habibWalletAmount.toString().toText32(isBold: true).toShimmer2(isShow: habibWalletVM.isWalletAmountLoading, radius: 12.h),
+                        habibWalletVM.habibWalletAmount.toString().toText32(isBold: true).toShimmer2(isShow: habibWalletVM.isWalletAmountLoading, radius: 12.h, width: 80.h, height: 40.h),
                       ],
                     );
                   }),

lib/presentation/insurance/insurance_home_page.dart

@@ -9,6 +9,7 @@ import 'package:hmg_patient_app_new/extensions/string_extensions.dart';
 import 'package:hmg_patient_app_new/features/insurance/insurance_view_model.dart';
 import 'package:hmg_patient_app_new/generated/locale_keys.g.dart';
 import 'package:hmg_patient_app_new/presentation/insurance/widgets/patient_insurance_card.dart';
+import 'package:hmg_patient_app_new/presentation/lab/collapsing_list_view.dart';
 import 'package:hmg_patient_app_new/presentation/lab/search_lab_report.dart';
 import 'package:hmg_patient_app_new/theme/colors.dart';
 import 'package:hmg_patient_app_new/extensions/widget_extensions.dart';
@@ -42,11 +43,9 @@ class _InsuranceHomePageState extends State<InsuranceHomePage> {
     insuranceViewModel = Provider.of<InsuranceViewModel>(context);
     return Scaffold(
       backgroundColor: AppColors.bgScaffoldColor,
-      appBar: AppBar(
+      body: CollapsingListView(
-        title: LocaleKeys.insurance.tr(context: context).toText18(),
+        title: "${LocaleKeys.insurance.tr(context: context)} ${LocaleKeys.updateInsurance.tr(context: context)}",
-        backgroundColor: AppColors.bgScaffoldColor,
+        child: SingleChildScrollView(
-      ),
-      body: SingleChildScrollView(
           child: Consumer<InsuranceViewModel>(builder: (context, insuranceVM, child) {
             return Column(
               crossAxisAlignment: CrossAxisAlignment.start,
@@ -64,7 +63,7 @@ class _InsuranceHomePageState extends State<InsuranceHomePage> {
                         insuranceVM.setIsInsuranceHistoryLoading(true);
                         insuranceVM.getPatientInsuranceCardHistory();
                         showCommonBottomSheet(context,
-                          child: InsuranceHistory(), callBackFunc: (str){}, title: "", height: ResponsiveExtension.screenHeight * 0.65, isCloseButtonVisible: false, isFullScreen: false);
+                            child: InsuranceHistory(), callBackFunc: (str) {}, title: "", height: ResponsiveExtension.screenHeight * 0.65, isCloseButtonVisible: false, isFullScreen: false);
                       },
                       backgroundColor: AppColors.primaryRedColor.withOpacity(0.1),
                       borderColor: AppColors.primaryRedColor.withOpacity(0.0),
@@ -86,6 +85,7 @@ class _InsuranceHomePageState extends State<InsuranceHomePage> {
             );
           }),
         ),
+      ),
     );
   }
 }

lib/presentation/insurance/widgets/insurance_update_details_card.dart

@@ -69,7 +69,7 @@ class PatientInsuranceCardUpdateCard extends StatelessWidget {
                         Wrap(
                           direction: Axis.horizontal,
                           spacing: 4.h,
-                          runSpacing: -8.h,
+                          runSpacing: 4.h,
                           children: [
                             AppCustomChipWidget(
                               icon: AppAssets.doctor_calendar_icon,

lib/presentation/insurance/widgets/patient_insurance_card.dart

@@ -75,7 +75,7 @@ class PatientInsuranceCard extends StatelessWidget {
             Wrap(
               direction: Axis.horizontal,
               spacing: 4.h,
-              runSpacing: -8.h,
+              runSpacing: 4.h,
               children: [
                 AppCustomChipWidget(
                     icon: AppAssets.doctor_calendar_icon,

lib/presentation/lab/lab_orders_page.dart

@@ -4,26 +4,15 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_staggered_animations/flutter_staggered_animations.dart';
-import 'package:hmg_patient_app_new/core/app_assets.dart';
 import 'package:hmg_patient_app_new/core/enums.dart';
-import 'package:hmg_patient_app_new/core/utils/date_util.dart';
-import 'package:hmg_patient_app_new/core/utils/size_utils.dart';
-import 'package:hmg_patient_app_new/core/utils/utils.dart';
-import 'package:hmg_patient_app_new/extensions/string_extensions.dart';
-import 'package:hmg_patient_app_new/extensions/widget_extensions.dart';
 import 'package:hmg_patient_app_new/features/lab/models/resp_models/patient_lab_orders_response_model.dart';
 import 'package:hmg_patient_app_new/generated/locale_keys.g.dart';
 import 'package:hmg_patient_app_new/features/lab/lab_view_model.dart';
 
-// import 'package:hmg_patient_app_new/presentation/lab/collapse_example.dart';
 import 'package:hmg_patient_app_new/presentation/lab/lab_result_item_view.dart';
 import 'package:hmg_patient_app_new/presentation/lab/search_lab_report.dart';
 import 'package:hmg_patient_app_new/theme/colors.dart';
-import 'package:hmg_patient_app_new/widgets/buttons/custom_button.dart';
-import 'package:hmg_patient_app_new/widgets/chip/app_custom_chip_widget.dart';
 import 'package:hmg_patient_app_new/widgets/chip/custom_chip_widget.dart';
-import 'package:hmg_patient_app_new/widgets/common_bottom_sheet.dart';
-import 'package:hmg_patient_app_new/widgets/shimmer/movies_shimmer_widget.dart';
 import 'package:provider/provider.dart';
 
 import 'collapsing_list_view.dart';

lib/presentation/prescriptions/prescription_detail_page.dart

@@ -13,6 +13,7 @@ import 'package:hmg_patient_app_new/extensions/widget_extensions.dart';
 import 'package:hmg_patient_app_new/features/prescriptions/models/resp_models/patient_prescriptions_response_model.dart';
 import 'package:hmg_patient_app_new/features/prescriptions/prescriptions_view_model.dart';
 import 'package:hmg_patient_app_new/generated/locale_keys.g.dart';
+import 'package:hmg_patient_app_new/presentation/lab/collapsing_list_view.dart';
 import 'package:hmg_patient_app_new/presentation/prescriptions/prescription_item_view.dart';
 import 'package:hmg_patient_app_new/presentation/prescriptions/prescription_reminder_view.dart';
 import 'package:hmg_patient_app_new/theme/colors.dart';
@@ -53,19 +54,16 @@ class _PrescriptionDetailPageState extends State<PrescriptionDetailPage> {
     prescriptionsViewModel = Provider.of<PrescriptionsViewModel>(context, listen: false);
     return Scaffold(
       backgroundColor: AppColors.bgScaffoldColor,
-      appBar: AppBar(
-        title: LocaleKeys.prescriptions.tr(context: context).toText18(),
-        backgroundColor: AppColors.bgScaffoldColor,
-      ),
       body: Column(
         children: [
           Expanded(
+            child: CollapsingListView(
+              title: LocaleKeys.prescriptions.tr(context: context),
               child: SingleChildScrollView(
                 child: Consumer<PrescriptionsViewModel>(builder: (context, prescriptionVM, child) {
                   return Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
-                    LocaleKeys.prescriptions.tr(context: context).toText24(isBold: true).paddingSymmetrical(24.h, 0.h),
                       SizedBox(height: 24.h),
                       Container(
                         decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
@@ -95,7 +93,7 @@ class _PrescriptionDetailPageState extends State<PrescriptionDetailPage> {
                               Wrap(
                                 direction: Axis.horizontal,
                                 spacing: 4.h,
-                              runSpacing: -8.h,
+                                runSpacing: 4.h,
                                 children: [
                                   AppCustomChipWidget(
                                     icon: AppAssets.doctor_calendar_icon,
@@ -118,7 +116,6 @@ class _PrescriptionDetailPageState extends State<PrescriptionDetailPage> {
                           ),
                         ),
                       ).paddingSymmetrical(24.h, 0.h),
-                    SizedBox(height: 16.h),
                       ListView.builder(
                         shrinkWrap: true,
                         physics: NeverScrollableScrollPhysics(),
@@ -143,6 +140,7 @@ class _PrescriptionDetailPageState extends State<PrescriptionDetailPage> {
                 }),
               ),
             ),
+          ),
           Container(
             decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
               color: AppColors.whiteColor,

lib/presentation/prescriptions/prescriptions_list_page.dart

@@ -11,6 +11,7 @@ import 'package:hmg_patient_app_new/extensions/string_extensions.dart';
 import 'package:hmg_patient_app_new/extensions/widget_extensions.dart';
 import 'package:hmg_patient_app_new/features/prescriptions/prescriptions_view_model.dart';
 import 'package:hmg_patient_app_new/generated/locale_keys.g.dart';
+import 'package:hmg_patient_app_new/presentation/lab/collapsing_list_view.dart';
 import 'package:hmg_patient_app_new/presentation/prescriptions/prescription_detail_page.dart';
 import 'package:hmg_patient_app_new/theme/colors.dart';
 import 'package:hmg_patient_app_new/widgets/buttons/custom_button.dart';
@@ -43,18 +44,13 @@ class _PrescriptionsListPageState extends State<PrescriptionsListPage> {
     prescriptionsViewModel = Provider.of<PrescriptionsViewModel>(context, listen: false);
     return Scaffold(
       backgroundColor: AppColors.bgScaffoldColor,
-      appBar: AppBar(
+      body: CollapsingListView(
-        title: LocaleKeys.prescriptions.tr(context: context).toText18(),
+        title: LocaleKeys.prescriptions.tr(context: context),
-        backgroundColor: AppColors.bgScaffoldColor,
+        child: SingleChildScrollView(
-      ),
-      body: SingleChildScrollView(
           child: Consumer<PrescriptionsViewModel>(builder: (context, model, child) {
             return Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
-              LocaleKeys.prescriptions.tr(context: context).toText24(isBold: true).paddingSymmetrical(24.h, 0.h),
-              SizedBox(height: 16.h),
-              // Build Tab Bar
                 SizedBox(height: 16.h),
                 // Clinic & Hospital Sort
                 Row(
@@ -294,6 +290,7 @@ class _PrescriptionsListPageState extends State<PrescriptionsListPage> {
             );
           }),
         ),
+      ),
     );
   }
 }

lib/presentation/radiology/radiology_orders_page.dart

@@ -11,6 +11,7 @@ import 'package:hmg_patient_app_new/extensions/string_extensions.dart';
 import 'package:hmg_patient_app_new/extensions/widget_extensions.dart';
 import 'package:hmg_patient_app_new/generated/locale_keys.g.dart';
 import 'package:hmg_patient_app_new/features/lab/lab_view_model.dart';
+import 'package:hmg_patient_app_new/presentation/lab/collapsing_list_view.dart';
 import 'package:hmg_patient_app_new/theme/colors.dart';
 import 'package:hmg_patient_app_new/widgets/buttons/custom_button.dart';
 import 'package:hmg_patient_app_new/widgets/shimmer/movies_shimmer_widget.dart';
@@ -43,27 +44,14 @@ class _RadiologyOrdersPageState extends State<RadiologyOrdersPage> {
     radiologyViewModel = Provider.of<RadiologyViewModel>(context);
     return Scaffold(
       backgroundColor: AppColors.bgScaffoldColor,
-      appBar: AppBar(
+      body: CollapsingListView(
-        title: LocaleKeys.radiology.tr(context: context).toText18(),
+        title: LocaleKeys.radiology.tr(context: context),
-        backgroundColor: AppColors.bgScaffoldColor,
-      ),
-      body: Padding(
-        padding: EdgeInsets.all(24.h),
         child: SingleChildScrollView(
           child: Consumer<RadiologyViewModel>(
             builder: (context, model, child) {
               return Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
-                  Row(
-                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                    children: [
-                      LocaleKeys.radiology.tr(context: context).toText24(isBold: true),
-                      Utils.buildSvgWithAssets(icon: AppAssets.search_icon),
-                    ],
-                  ),
-                  SizedBox(height: 16.h),
-                  // Build Tab Bar
                   SizedBox(height: 16.h),
                   // Expandable list
                   ListView.builder(