From 7654acd8879ceb054481e49f6fcf66372cd26a40 Mon Sep 17 00:00:00 2001
From: "Michael W. Aziz" <michael@micazi.dev>
Date: Tue, 4 Mar 2025 18:57:05 +0200
Subject: [PATCH] [0.1.3]

---
 lib/src/Widgets/src/image.widget.dart | 22 +++++++++++-----------
 lib/src/Widgets/widgets.astromic.dart | 12 ++++++------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/lib/src/Widgets/src/image.widget.dart b/lib/src/Widgets/src/image.widget.dart
index 94e55a8..bacf20e 100644
--- a/lib/src/Widgets/src/image.widget.dart
+++ b/lib/src/Widgets/src/image.widget.dart
@@ -57,26 +57,26 @@ class AstromicImage extends StatelessWidget {
     this.assetBytes,
     this.assetFallback,
     //
-    this.sizingMaster = ImageSizingMaster.w,
+    this.sizingMaster ,
     this.widthSizing,
     this.heightSizing,
     this.fixedWidth,
     this.fixedHeight,
     //
-    this.isCircular = false,
+    this.isCircular,
     this.borderWidth,
     this.borderColor,
     this.borderPadding,
-    this.radius = BorderRadius.zero,
+    this.radius,
     this.shadow,
     this.overlayColor,
     this.overlayGradient,
     //
-    this.fit = BoxFit.cover,
-    this.alignment = Alignment.center,
+    this.fit,
+    this.alignment,
     this.blendMode,
-    this.fadeInCurve = Curves.ease,
-    this.fadeInDuration = const Duration(milliseconds: 250),
+    this.fadeInCurve,
+    this.fadeInDuration,
     //
     this.svgColor,
     //
@@ -112,7 +112,7 @@ class AstromicImage extends StatelessWidget {
   /// Used when the height is Master and want to set fixed height OR if width is Master and want to constraint the height
   final double? fixedHeight;
   //S1 -- STYLING
-  final bool isCircular;
+  final bool? isCircular;
   final double? borderWidth;
   final Color? borderColor;
   final EdgeInsetsGeometry? borderPadding;
@@ -223,15 +223,15 @@ class AstromicImage extends StatelessWidget {
                         color: borderColor ?? const Color(0xff000000),
                       )
                     : null,
-                borderRadius: isCircular ? BorderRadius.circular(10000000) : radius,
+                borderRadius: isCircular! ? BorderRadius.circular(10000000) : radius,
                 boxShadow: shadow,
               ),
-              child: isCircular
+              child: isCircular!
                   ? ClipOval(
                       child: isSVG ? finalSVGWidget(size, loadingWidget != null ? loadingWidget!(null, null) : defaultLoadingWidget) : image,
                     )
                   : ClipRRect(
-                      borderRadius: isCircular ? BorderRadius.circular(10000000) : radius!,
+                      borderRadius: isCircular! ? BorderRadius.circular(10000000) : radius!,
                       child: isSVG ? finalSVGWidget(size, loadingWidget != null ? loadingWidget!(null, null) : defaultLoadingWidget) : image,
                     ),
             ),
diff --git a/lib/src/Widgets/widgets.astromic.dart b/lib/src/Widgets/widgets.astromic.dart
index 520ff48..06e7868 100644
--- a/lib/src/Widgets/widgets.astromic.dart
+++ b/lib/src/Widgets/widgets.astromic.dart
@@ -52,7 +52,7 @@ class AstromicWidgets {
         assetURL: assetURL,
         assetBytes: assetBytes,
         assetFallback: assetFallback,
-        sizingMaster: sizingMaster,
+        sizingMaster: sizingMaster ?? ImageSizingMaster.w,
         widthSizing: widthSizing,
 
         /// Used when the width is Master and want to set fixed width OR if height is Master and want to constraint the width
@@ -65,15 +65,15 @@ class AstromicWidgets {
         borderWidth: borderWidth,
         borderColor: borderColor,
         borderPadding: borderPadding,
-        radius: radius,
+        radius: radius ?? BorderRadius.zero,
         shadow: shadow,
         overlayColor: overlayColor,
         overlayGradient: overlayGradient,
-        alignment: alignment,
-        fit: fit,
+        alignment: alignment ?? Alignment.center,
+        fit: fit ?? BoxFit.cover,
         blendMode: blendMode,
-        fadeInCurve: fadeInCurve,
-        fadeInDuration: fadeInDuration,
+        fadeInCurve: fadeInCurve ?? Curves.ease,
+        fadeInDuration: fadeInDuration ?? const Duration(milliseconds: 250),
         svgColor: svgColor,
         loadingWidget: loadingWidget,
         errorWidget: errorWidget,