From b7f84a97b5be994c48121520e462a685df1ea95f Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Tue, 6 May 2025 04:14:21 +0400 Subject: [PATCH] Various fixes --- .../Sources/GiftOptionsScreen.swift | 3 +++ .../Sources/PeerInfoGiftsCoverComponent.swift | 16 +++++++++++++--- .../Wallet/QrIcon.imageset/Contents.json | 12 ------------ .../Wallet/QrIcon.imageset/ic_qrcode.pdf | Bin 4962 -> 0 bytes 4 files changed, 16 insertions(+), 15 deletions(-) delete mode 100644 submodules/TelegramUI/Images.xcassets/Wallet/QrIcon.imageset/Contents.json delete mode 100644 submodules/TelegramUI/Images.xcassets/Wallet/QrIcon.imageset/ic_qrcode.pdf diff --git a/submodules/TelegramUI/Components/Gifts/GiftOptionsScreen/Sources/GiftOptionsScreen.swift b/submodules/TelegramUI/Components/Gifts/GiftOptionsScreen/Sources/GiftOptionsScreen.swift index 08eac311a9..643d1f7131 100644 --- a/submodules/TelegramUI/Components/Gifts/GiftOptionsScreen/Sources/GiftOptionsScreen.swift +++ b/submodules/TelegramUI/Components/Gifts/GiftOptionsScreen/Sources/GiftOptionsScreen.swift @@ -1567,6 +1567,9 @@ final class GiftOptionsScreenComponent: Component { } } } + if disallowedGifts.contains(.unique) && gift.availability?.remains == 0 { + return false + } } return true } diff --git a/submodules/TelegramUI/Components/PeerInfo/PeerInfoCoverComponent/Sources/PeerInfoGiftsCoverComponent.swift b/submodules/TelegramUI/Components/PeerInfo/PeerInfoCoverComponent/Sources/PeerInfoGiftsCoverComponent.swift index 81ba25209d..4f32eca5a3 100644 --- a/submodules/TelegramUI/Components/PeerInfo/PeerInfoCoverComponent/Sources/PeerInfoGiftsCoverComponent.swift +++ b/submodules/TelegramUI/Components/PeerInfo/PeerInfoCoverComponent/Sources/PeerInfoGiftsCoverComponent.swift @@ -184,7 +184,9 @@ public final class PeerInfoGiftsCoverComponent: Component { } } + private var scheduledAnimateIn = false public func willAnimateIn() { + self.scheduledAnimateIn = true for (_, layer) in self.iconLayers { layer.opacity = 0.0 } @@ -194,6 +196,7 @@ public final class PeerInfoGiftsCoverComponent: Component { guard let _ = self.currentSize, let component = self.component else { return } + self.scheduledAnimateIn = false for (_, layer) in self.iconLayers { layer.opacity = 1.0 @@ -319,8 +322,12 @@ public final class PeerInfoGiftsCoverComponent: Component { self.iconLayers[id] = iconLayer self.layer.addSublayer(iconLayer) - iconLayer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2) - iconLayer.animateScale(from: 0.01, to: 1.0, duration: 0.2) + if self.scheduledAnimateIn { + iconLayer.opacity = 0.0 + } else { + iconLayer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2) + iconLayer.animateScale(from: 0.01, to: 1.0, duration: 0.2) + } iconLayer.startAnimations(index: index) } @@ -349,7 +356,10 @@ public final class PeerInfoGiftsCoverComponent: Component { iconTransition.setPosition(layer: iconLayer, position: absolutePosition) iconLayer.updateRotation(effectiveAngle, transition: iconTransition) iconTransition.setScale(layer: iconLayer, scale: iconPosition.scale * (1.0 - itemScaleFraction)) - iconTransition.setAlpha(layer: iconLayer, alpha: 1.0 - itemScaleFraction) + + if !self.scheduledAnimateIn { + iconTransition.setAlpha(layer: iconLayer, alpha: 1.0 - itemScaleFraction) + } index += 1 } diff --git a/submodules/TelegramUI/Images.xcassets/Wallet/QrIcon.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Wallet/QrIcon.imageset/Contents.json deleted file mode 100644 index f8015db3bc..0000000000 --- a/submodules/TelegramUI/Images.xcassets/Wallet/QrIcon.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "filename" : "ic_qrcode.pdf", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/submodules/TelegramUI/Images.xcassets/Wallet/QrIcon.imageset/ic_qrcode.pdf b/submodules/TelegramUI/Images.xcassets/Wallet/QrIcon.imageset/ic_qrcode.pdf deleted file mode 100644 index cf234b82239e82c027356a047d742e9c99dadf49..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4962 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 g1BEKk|L>5$ixBHhDvck12