From c089c65106a3a9a47ba55303dac3c641e7183072 Mon Sep 17 00:00:00 2001 From: micbakos-rdx Date: Fri, 19 May 2023 23:45:13 +0300 Subject: [PATCH 1/3] Fix assets row non-fungibles icon offset --- .../presentation/wallet/AccountAssetsRow.kt | 48 ++++++++++++++----- 1 file changed, 35 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/babylon/wallet/android/presentation/wallet/AccountAssetsRow.kt b/app/src/main/java/com/babylon/wallet/android/presentation/wallet/AccountAssetsRow.kt index f43efd4ee3..61e3fb0ee5 100644 --- a/app/src/main/java/com/babylon/wallet/android/presentation/wallet/AccountAssetsRow.kt +++ b/app/src/main/java/com/babylon/wallet/android/presentation/wallet/AccountAssetsRow.kt @@ -61,7 +61,8 @@ fun AccountAssetsRow( maxVisibleFungibles: Int = 5 ) { AssetsContent( - modifier = modifier.fillMaxWidth() + modifier = modifier + .fillMaxWidth() .height(height = iconSize + bordersSize * 2) .placeholder( visible = isLoading, @@ -139,7 +140,13 @@ private fun AssetsContent( } } - val nonFungibleSectionOffset = iconsOverlap * (sortedFungibles.size - 1) + iconSize + val nonFungibleSectionOffset = if (remainingFungiblesCount > 0) { + iconSize + } else { + 0.dp + } + iconsOverlap * (sortedFungibles.size - 1) + + if (remainingFungiblesCount > 0) { CounterBox( modifier = Modifier @@ -229,6 +236,17 @@ fun AssetsContentRowPreview() { ) { AccountAssetsRow(resources = null, isLoading = true) + val otherFungible = Resource.FungibleResource( + resourceAddress = "resource_address", + amount = BigDecimal.valueOf(237659), + nameMetadataItem = NameMetadataItem("AWE"), + symbolMetadataItem = SymbolMetadataItem("AWE"), + iconUrlMetadataItem = IconUrlMetadataItem( + url = Uri.parse( + "https://c4.wallpaperflare.com/wallpaper/817/534/563/ave-bosque-fantasia-fenix-wallpaper-preview.jpg" + ) + ) + ) AccountAssetsRow( resources = Resources( fungibleResources = listOf( @@ -238,19 +256,23 @@ fun AssetsContentRowPreview() { nameMetadataItem = NameMetadataItem("Radix"), symbolMetadataItem = SymbolMetadataItem("XRD") ), - Resource.FungibleResource( + otherFungible, + otherFungible, + otherFungible, + otherFungible, + otherFungible, + otherFungible, + otherFungible, + otherFungible + ), + nonFungibleResources = listOf( + Resource.NonFungibleResource( resourceAddress = "resource_address", - amount = BigDecimal.valueOf(237659), + amount = 1000, nameMetadataItem = NameMetadataItem("AWE"), - symbolMetadataItem = SymbolMetadataItem("AWE"), - iconUrlMetadataItem = IconUrlMetadataItem( - url = Uri.parse( - "https://c4.wallpaperflare.com/wallpaper/817/534/563/ave-bosque-fantasia-fenix-wallpaper-preview.jpg" - ) - ) - ), - ), - nonFungibleResources = listOf() + items = listOf() + ) + ) ), isLoading = false ) From 9aa71bb3fe49978b73af96a008f249a9b7f13c4b Mon Sep 17 00:00:00 2001 From: micbakos-rdx Date: Sat, 20 May 2023 00:02:25 +0300 Subject: [PATCH 2/3] Fix non-unique key for nft items --- .../presentation/ui/composables/NonFungibleResourcesContent.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/babylon/wallet/android/presentation/ui/composables/NonFungibleResourcesContent.kt b/app/src/main/java/com/babylon/wallet/android/presentation/ui/composables/NonFungibleResourcesContent.kt index 1059f70ced..7886dc6c3b 100644 --- a/app/src/main/java/com/babylon/wallet/android/presentation/ui/composables/NonFungibleResourcesContent.kt +++ b/app/src/main/java/com/babylon/wallet/android/presentation/ui/composables/NonFungibleResourcesContent.kt @@ -42,7 +42,7 @@ fun NonFungibleResourcesContent( } items( nft.items, - key = { item -> item.globalAddress(nftAddress = item.localId) } + key = { item -> item.globalAddress(nftAddress = nft.resourceAddress) } ) { item -> AnimatedVisibility( visible = !collapsed, From 960e88f9f9f4af3c2b14875c2bf27a57e18a09ec Mon Sep 17 00:00:00 2001 From: micbakos-rdx Date: Tue, 23 May 2023 12:34:58 +0300 Subject: [PATCH 3/3] Fix detekt issue --- .../wallet/android/presentation/wallet/AccountAssetsRow.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/com/babylon/wallet/android/presentation/wallet/AccountAssetsRow.kt b/app/src/main/java/com/babylon/wallet/android/presentation/wallet/AccountAssetsRow.kt index 61e3fb0ee5..11553bf725 100644 --- a/app/src/main/java/com/babylon/wallet/android/presentation/wallet/AccountAssetsRow.kt +++ b/app/src/main/java/com/babylon/wallet/android/presentation/wallet/AccountAssetsRow.kt @@ -146,7 +146,6 @@ private fun AssetsContent( 0.dp } + iconsOverlap * (sortedFungibles.size - 1) - if (remainingFungiblesCount > 0) { CounterBox( modifier = Modifier