From 143ee0bc347d8d977a10e3389e6b72a6294355f6 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 29 Oct 2024 10:38:20 -0500 Subject: [PATCH] fix(mobile): Revert thumbnail image ui improvements (#13655) (#13806) Revert "chore(mobile): thumbnail image ui improvements (#13655)" This reverts commit 16f2364e932c8ae5ef539f949225dbb961834161. --- .../widgets/asset_grid/thumbnail_image.dart | 86 +++++++------------ 1 file changed, 32 insertions(+), 54 deletions(-) diff --git a/mobile/lib/widgets/asset_grid/thumbnail_image.dart b/mobile/lib/widgets/asset_grid/thumbnail_image.dart index 40c6f219b7..6cadef763d 100644 --- a/mobile/lib/widgets/asset_grid/thumbnail_image.dart +++ b/mobile/lib/widgets/asset_grid/thumbnail_image.dart @@ -138,31 +138,10 @@ class ThumbnailImage extends ConsumerWidget { tag: isFromDto ? '${asset.remoteId}-$heroOffset' : asset.id + heroOffset, - child: Stack( - children: [ - ImmichThumbnail( - asset: asset, - height: 250, - width: 250, - ), - Container( - height: 250, - width: 250, - decoration: const BoxDecoration( - gradient: LinearGradient( - colors: [ - Color.fromRGBO(0, 0, 0, 0.1), - Colors.transparent, - Colors.transparent, - Color.fromRGBO(0, 0, 0, 0.1), - ], - begin: Alignment.topCenter, - end: Alignment.bottomCenter, - stops: [0, 0.3, 0.6, 1], - ), - ), - ), - ], + child: ImmichThumbnail( + asset: asset, + height: 250, + width: 250, ), ), ); @@ -174,8 +153,11 @@ class ThumbnailImage extends ConsumerWidget { color: canDeselect ? assetContainerColor : Colors.grey, ), child: ClipRRect( - borderRadius: const BorderRadius.all( - Radius.circular(15.0), + borderRadius: const BorderRadius.only( + topRight: Radius.circular(15.0), + bottomRight: Radius.circular(15.0), + bottomLeft: Radius.circular(15.0), + topLeft: Radius.zero, ), child: image, ), @@ -195,33 +177,7 @@ class ThumbnailImage extends ConsumerWidget { ) : const Border(), ), - child: Stack( - children: [ - buildImage(), - if (showStorageIndicator) - Positioned( - right: 8, - bottom: 5, - child: Icon( - storageIcon(asset), - color: Colors.white.withOpacity(.8), - size: 16, - ), - ), - if (asset.isFavorite) - const Positioned( - left: 8, - bottom: 5, - child: Icon( - Icons.favorite, - color: Colors.white, - size: 16, - ), - ), - if (!asset.isImage) buildVideoIcon(), - if (asset.stackCount > 0) buildStackIcon(), - ], - ), + child: buildImage(), ), if (multiselectEnabled) Padding( @@ -231,6 +187,28 @@ class ThumbnailImage extends ConsumerWidget { child: buildSelectionIcon(asset), ), ), + if (showStorageIndicator) + Positioned( + right: 8, + bottom: 5, + child: Icon( + storageIcon(asset), + color: Colors.white.withOpacity(.8), + size: 16, + ), + ), + if (asset.isFavorite) + const Positioned( + left: 8, + bottom: 5, + child: Icon( + Icons.favorite, + color: Colors.white, + size: 18, + ), + ), + if (!asset.isImage) buildVideoIcon(), + if (asset.stackCount > 0) buildStackIcon(), ], ); }