From 06057a439ed48811b19a7bb7353eb38549433732 Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 5 Jun 2025 16:01:08 +0500 Subject: [PATCH] Updated on 2026-08-14 --- .../local/nft/converter/NFTSdkAssetConverter.kt | 8 ++++---- .../main/kotlin/com/tangem/domain/nft/models/NFTAsset.kt | 4 ++-- .../entity/transformer/UpdateDataStateTransformer.kt | 2 +- .../nft/details/block/DefaultNFTDetailsBlockComponent.kt | 2 +- .../com/tangem/features/nft/details/entity/NFTAssetUM.kt | 1 - .../nft/details/entity/factory/NFTDetailsUMFactory.kt | 5 ++--- .../com/tangem/features/nft/details/ui/NFTDetailsAsset.kt | 1 - .../com/tangem/features/nft/details/ui/NFTDetailsLogo.kt | 1 - gradle/tangem_dependencies.toml | 2 +- 9 files changed, 11 insertions(+), 15 deletions(-) diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/nft/converter/NFTSdkAssetConverter.kt b/core/datasource/src/main/java/com/tangem/datasource/local/nft/converter/NFTSdkAssetConverter.kt index f3cc4fe9d5..8ebb7bd198 100644 --- a/core/datasource/src/main/java/com/tangem/datasource/local/nft/converter/NFTSdkAssetConverter.kt +++ b/core/datasource/src/main/java/com/tangem/datasource/local/nft/converter/NFTSdkAssetConverter.kt @@ -34,8 +34,8 @@ object NFTSdkAssetConverter : TwoWayConverter, NFTAss }, media = asset.media?.let { NFTAsset.Media( - url = it.url, - mimetype = it.mimetype, + animationUrl = it.animationUrl, + imageUrl = it.imageUrl, ) }, traits = asset.traits.map { @@ -73,8 +73,8 @@ object NFTSdkAssetConverter : TwoWayConverter, NFTAss }, media = value.media?.let { SdkNFTAsset.Media( - url = it.url, - mimetype = it.mimetype, + animationUrl = it.animationUrl, + imageUrl = it.imageUrl, ) }, traits = value.traits.map { diff --git a/domain/nft/models/src/main/kotlin/com/tangem/domain/nft/models/NFTAsset.kt b/domain/nft/models/src/main/kotlin/com/tangem/domain/nft/models/NFTAsset.kt index d096902c49..f30b865df7 100644 --- a/domain/nft/models/src/main/kotlin/com/tangem/domain/nft/models/NFTAsset.kt +++ b/domain/nft/models/src/main/kotlin/com/tangem/domain/nft/models/NFTAsset.kt @@ -25,8 +25,8 @@ data class NFTAsset( @Serializable data class Media( - val mimetype: String?, - val url: String, + val animationUrl: String?, + val imageUrl: String?, ) @Serializable diff --git a/features/nft/impl/src/main/kotlin/com/tangem/features/nft/collections/entity/transformer/UpdateDataStateTransformer.kt b/features/nft/impl/src/main/kotlin/com/tangem/features/nft/collections/entity/transformer/UpdateDataStateTransformer.kt index a1696325a7..1a0bfc2607 100644 --- a/features/nft/impl/src/main/kotlin/com/tangem/features/nft/collections/entity/transformer/UpdateDataStateTransformer.kt +++ b/features/nft/impl/src/main/kotlin/com/tangem/features/nft/collections/entity/transformer/UpdateDataStateTransformer.kt @@ -127,7 +127,7 @@ internal class UpdateDataStateTransformer( return NFTCollectionAssetUM( id = id.toString(), name = name ?: DASH_SIGN, - imageUrl = media?.url, + imageUrl = media?.imageUrl, price = when (val salePrice = salePrice) { is NFTSalePrice.Empty -> NFTSalePriceUM.Failed is NFTSalePrice.Loading -> NFTSalePriceUM.Loading diff --git a/features/nft/impl/src/main/kotlin/com/tangem/features/nft/details/block/DefaultNFTDetailsBlockComponent.kt b/features/nft/impl/src/main/kotlin/com/tangem/features/nft/details/block/DefaultNFTDetailsBlockComponent.kt index 9bf227ce83..234cb0adfb 100644 --- a/features/nft/impl/src/main/kotlin/com/tangem/features/nft/details/block/DefaultNFTDetailsBlockComponent.kt +++ b/features/nft/impl/src/main/kotlin/com/tangem/features/nft/details/block/DefaultNFTDetailsBlockComponent.kt @@ -21,7 +21,7 @@ class DefaultNFTDetailsBlockComponent @AssistedInject constructor( NFTDetailsBlock( assetName = stringReference(params.nftAsset.name.orEmpty()), collectionName = stringReference(params.nftCollectionName), - assetImage = params.nftAsset.media?.url, + assetImage = params.nftAsset.media?.imageUrl, networkIconRes = getActiveIconRes(params.nftAsset.network.rawId), ) } diff --git a/features/nft/impl/src/main/kotlin/com/tangem/features/nft/details/entity/NFTAssetUM.kt b/features/nft/impl/src/main/kotlin/com/tangem/features/nft/details/entity/NFTAssetUM.kt index 66d1c85e54..4b2b63d11a 100644 --- a/features/nft/impl/src/main/kotlin/com/tangem/features/nft/details/entity/NFTAssetUM.kt +++ b/features/nft/impl/src/main/kotlin/com/tangem/features/nft/details/entity/NFTAssetUM.kt @@ -29,7 +29,6 @@ data class NFTAssetUM( sealed class Media { data object Empty : Media() data class Content( - val mimetype: String?, val url: String, ) : Media() } diff --git a/features/nft/impl/src/main/kotlin/com/tangem/features/nft/details/entity/factory/NFTDetailsUMFactory.kt b/features/nft/impl/src/main/kotlin/com/tangem/features/nft/details/entity/factory/NFTDetailsUMFactory.kt index 5b72f4f8af..5fbb553580 100644 --- a/features/nft/impl/src/main/kotlin/com/tangem/features/nft/details/entity/factory/NFTDetailsUMFactory.kt +++ b/features/nft/impl/src/main/kotlin/com/tangem/features/nft/details/entity/factory/NFTDetailsUMFactory.kt @@ -44,10 +44,9 @@ internal class NFTDetailsUMFactory( private fun NFTAsset.transform(): NFTAssetUM = NFTAssetUM( name = name.orEmpty(), - media = media?.let { + media = media?.imageUrl?.let { NFTAssetUM.Media.Content( - mimetype = it.mimetype, - url = it.url, + url = it, ) } ?: NFTAssetUM.Media.Empty, topInfo = when { diff --git a/features/nft/impl/src/main/kotlin/com/tangem/features/nft/details/ui/NFTDetailsAsset.kt b/features/nft/impl/src/main/kotlin/com/tangem/features/nft/details/ui/NFTDetailsAsset.kt index 377935d368..145ac5aa49 100644 --- a/features/nft/impl/src/main/kotlin/com/tangem/features/nft/details/ui/NFTDetailsAsset.kt +++ b/features/nft/impl/src/main/kotlin/com/tangem/features/nft/details/ui/NFTDetailsAsset.kt @@ -120,7 +120,6 @@ private class NFTAssetProvider : CollectionPreviewParameterProvider( name = "Nethers #9744", media = NFTAssetUM.Media.Content( url = "img1", - mimetype = "image/jpeg", ), topInfo = NFTAssetUM.TopInfo.Content( title = resourceReference(R.string.nft_details_last_sale_price), diff --git a/features/nft/impl/src/main/kotlin/com/tangem/features/nft/details/ui/NFTDetailsLogo.kt b/features/nft/impl/src/main/kotlin/com/tangem/features/nft/details/ui/NFTDetailsLogo.kt index 8331048382..2d7851550f 100644 --- a/features/nft/impl/src/main/kotlin/com/tangem/features/nft/details/ui/NFTDetailsLogo.kt +++ b/features/nft/impl/src/main/kotlin/com/tangem/features/nft/details/ui/NFTDetailsLogo.kt @@ -88,7 +88,6 @@ private class NFTAssetMediaProvider : CollectionPreviewParameterProvider