Merge branch 'haroon_dev' into CR-20974-PDF-Results-In-Lab

lib/core/utils/utils.dart

@@ -808,8 +808,8 @@ class Utils {
     double? border,
     double? borderRadius,
   }) {
-    final iconH = height ?? 24.h;
+    final double? iconW = (width == null && height == null) ? 24.w : width;
-    final iconW = width ?? 24.w;
+    final double? iconH = (width == null && height == null) ? 24.h : height;
     return PreserveImageColors(
       child: Container(
         decoration: BoxDecoration(

lib/presentation/comprehensive_checkup/comprehensive_checkup_page.dart

@@ -282,19 +282,22 @@ class _ComprehensiveCheckupPageState extends State<ComprehensiveCheckupPage> {
           final String imagePath = appStateLocal.isArabic() ? AppAssets.comprehensiveCheckupAr : AppAssets.comprehensiveCheckupEn;
           return Stack(
             children: [
-              Utils.buildImgWithAssets(
+              ClipRRect(
-                icon: imagePath,
+                borderRadius: BorderRadius.circular(16.r),
-                width: double.infinity,
+                child: Utils.buildImgWithAssets(
-                fit: BoxFit.cover,
+                  icon: imagePath,
+                  width: double.infinity,
+                  fit: BoxFit.fitWidth,
+                ),
               ).paddingAll(16.w),
               Align(
                 alignment: Alignment.topRight,
                 child: Container(
                   decoration: BoxDecoration(
-                    color: Color.fromARGB(51, 0, 0, 0),
+                    color: Color.fromARGB(120, 0, 0, 0),
                     borderRadius: BorderRadius.circular(1000.r),
                   ),
-                  margin: EdgeInsets.all(16.h),
+                  margin: EdgeInsets.all(24.w),
                   child: IconButton(
                     icon: Icon(
                       Icons.zoom_in,

lib/widgets/media_viewer/full_screen_image_viewer.dart

@@ -13,17 +13,27 @@ class FullScreenImageViewer extends StatelessWidget {
     return Scaffold(
       appBar: AppBar(
         backgroundColor: Colors.black,
+        elevation: 0,
         leading: IconButton(
           icon: Icon(Icons.close, color: AppColors.whiteColor),
           onPressed: () => Navigator.of(context).pop(),
         ),
       ),
       backgroundColor: Colors.black,
-      body: Center(
+      body: SizedBox.expand(
         child: InteractiveViewer(
-          child: isSvg
+          minScale: 0.5,
-              ? Utils.buildSvgWithAssets(icon: path, width: double.infinity, fit: BoxFit.contain, applyThemeColor: false)
+          maxScale: 6.0,
-              : Utils.buildImgWithAssets(icon: path, width: double.infinity, fit: BoxFit.contain),
+          boundaryMargin: const EdgeInsets.all(20),
+          child: Center(
+            child: isSvg
+                ? Utils.buildSvgWithAssets(icon: path, fit: BoxFit.contain, applyThemeColor: false)
+                : Image.asset(
+                    path,
+                    fit: BoxFit.contain,
+                    errorBuilder: (context, error, stackTrace) => Utils.buildImgWithAssets(icon: path, fit: BoxFit.contain),
+                  ),
+          ),
         ),
       ),
     );