From 1fc6afd80c7f78d2218846a62a44a6371bbd5b32 Mon Sep 17 00:00:00 2001 From: Tyrone Date: Tue, 4 Jul 2023 12:17:33 +0800 Subject: [PATCH 1/3] feat: add alignment to CldImageWidget --- lib/image/cld_image.dart | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/image/cld_image.dart b/lib/image/cld_image.dart index 05a094c..589c0c9 100644 --- a/lib/image/cld_image.dart +++ b/lib/image/cld_image.dart @@ -45,7 +45,8 @@ class CldImageWidget extends CachedNetworkImage { BoxFit? fit, ImageRepeat repeat = ImageRepeat.noRepeat, FilterQuality filterQuality = FilterQuality.low, - bool matchTextDirection = false}) + bool matchTextDirection = false, + Alignment alignment = Alignment.center}) : super( imageUrl: '', httpHeaders: httpHeaders, @@ -112,6 +113,7 @@ class CldImageWidget extends CachedNetworkImage { maxHeightDiskCache: super.maxHeightDiskCache, fit: super.fit, repeat: super.repeat, - matchTextDirection: super.matchTextDirection); + matchTextDirection: super.matchTextDirection, + alignment: super.alignment); } } From 79b0d0bba3e38060530fb87d492f0cc9c34f1bf3 Mon Sep 17 00:00:00 2001 From: Tyrone Date: Tue, 4 Jul 2023 12:18:35 +0800 Subject: [PATCH 2/3] styles: add trailing comma --- lib/image/cld_image.dart | 103 ++++++++++++++++++++------------------- 1 file changed, 52 insertions(+), 51 deletions(-) diff --git a/lib/image/cld_image.dart b/lib/image/cld_image.dart index 589c0c9..0cd1f1e 100644 --- a/lib/image/cld_image.dart +++ b/lib/image/cld_image.dart @@ -18,36 +18,36 @@ class CldImageWidget extends CachedNetworkImage { late final CldImage cldImage; final CldImageWidgetConfiguration? configuration; - CldImageWidget( - {required String publicId, - super.key, - this.configuration, - String? version, - String? extension, - String? urlSuffix, - String? assetType, - String? deliveryType, - Transformation? transformation, - Map? httpHeaders, - ImageWidgetBuilder? imageBuilder, - PlaceholderWidgetBuilder? placeholder, - LoadingErrorWidgetBuilder? errorBuilder, - Duration? placeholderFadeInDuration, - int? memCacheWidth, - int? memCacheHeight, - String? cacheKey, - int? maxWidthDiskCache, - int? maxHeightDiskCache, - double? width, - double? height, - Color? color, - BlendMode? colorBlendMode, - BoxFit? fit, - ImageRepeat repeat = ImageRepeat.noRepeat, - FilterQuality filterQuality = FilterQuality.low, - bool matchTextDirection = false, - Alignment alignment = Alignment.center}) - : super( + CldImageWidget({ + required String publicId, + super.key, + this.configuration, + String? version, + String? extension, + String? urlSuffix, + String? assetType, + String? deliveryType, + Transformation? transformation, + Map? httpHeaders, + ImageWidgetBuilder? imageBuilder, + PlaceholderWidgetBuilder? placeholder, + LoadingErrorWidgetBuilder? errorBuilder, + Duration? placeholderFadeInDuration, + int? memCacheWidth, + int? memCacheHeight, + String? cacheKey, + int? maxWidthDiskCache, + int? maxHeightDiskCache, + double? width, + double? height, + Color? color, + BlendMode? colorBlendMode, + BoxFit? fit, + ImageRepeat repeat = ImageRepeat.noRepeat, + FilterQuality filterQuality = FilterQuality.low, + bool matchTextDirection = false, + Alignment alignment = Alignment.center, + }) : super( imageUrl: '', httpHeaders: httpHeaders, imageBuilder: imageBuilder, @@ -94,26 +94,27 @@ class CldImageWidget extends CachedNetworkImage { ? NoDiskCacheManager.instance : DefaultCacheManager(); return CachedNetworkImage( - imageUrl: cldImage.toString(), - cacheManager: cacheManager, - httpHeaders: super.httpHeaders, - imageBuilder: super.imageBuilder, - placeholder: super.placeholder, - errorWidget: super.errorWidget, - width: super.width, - height: super.height, - color: super.color, - filterQuality: super.filterQuality, - colorBlendMode: super.colorBlendMode, - placeholderFadeInDuration: super.placeholderFadeInDuration, - memCacheWidth: super.memCacheWidth, - memCacheHeight: super.memCacheHeight, - cacheKey: super.cacheKey, - maxWidthDiskCache: super.maxWidthDiskCache, - maxHeightDiskCache: super.maxHeightDiskCache, - fit: super.fit, - repeat: super.repeat, - matchTextDirection: super.matchTextDirection, - alignment: super.alignment); + imageUrl: cldImage.toString(), + cacheManager: cacheManager, + httpHeaders: super.httpHeaders, + imageBuilder: super.imageBuilder, + placeholder: super.placeholder, + errorWidget: super.errorWidget, + width: super.width, + height: super.height, + color: super.color, + filterQuality: super.filterQuality, + colorBlendMode: super.colorBlendMode, + placeholderFadeInDuration: super.placeholderFadeInDuration, + memCacheWidth: super.memCacheWidth, + memCacheHeight: super.memCacheHeight, + cacheKey: super.cacheKey, + maxWidthDiskCache: super.maxWidthDiskCache, + maxHeightDiskCache: super.maxHeightDiskCache, + fit: super.fit, + repeat: super.repeat, + matchTextDirection: super.matchTextDirection, + alignment: super.alignment, + ); } } From ff1952725041d27a7625b5db83125ff920495059 Mon Sep 17 00:00:00 2001 From: Tyrone Date: Tue, 4 Jul 2023 12:19:43 +0800 Subject: [PATCH 3/3] refactor: add Type and use final to improve memory usage --- lib/image/cld_image.dart | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/image/cld_image.dart b/lib/image/cld_image.dart index 0cd1f1e..92804b9 100644 --- a/lib/image/cld_image.dart +++ b/lib/image/cld_image.dart @@ -90,9 +90,10 @@ class CldImageWidget extends CachedNetworkImage { @override Widget build(BuildContext context) { - var cacheManager = (configuration != null && !configuration!.cache) - ? NoDiskCacheManager.instance - : DefaultCacheManager(); + final CacheManager cacheManager = + (configuration != null && !configuration!.cache) + ? NoDiskCacheManager.instance + : DefaultCacheManager(); return CachedNetworkImage( imageUrl: cldImage.toString(), cacheManager: cacheManager,