ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-07 14:53:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Various fixes

Browse Source
This commit is contained in:
Ilya Laktyushin 2023-01-28 17:10:58 +04:00
parent 1b723cd2a7
commit 19d984dc8f
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
submodules/PremiumUI/Sources/PremiumIntroScreen.swift
View File

@ -2094,11 +2094,7 @@ private final class PremiumIntroScreenComponent: CombinedComponent {
strongSelf.otherPeerName = otherPeerName strongSelf.otherPeerName = otherPeerName
if !hadProducts { if !hadProducts {
if let _ = products.first(where: { $0.isCurrent }) { strongSelf.selectedProductId = strongSelf.products?.first?.id
strongSelf.selectedProductId = strongSelf.products?.first?.id
} else {
strongSelf.selectedProductId = strongSelf.products?.last?.id
}
for (_, video) in promoConfiguration.videos { for (_, video) in promoConfiguration.videos {
strongSelf.preloadDisposableSet.add(preloadVideoResource(postbox: context.account.postbox, userLocation: .other, userContentType: .video, resourceReference: .standalone(resource: video.resource), duration: 3.0).start()) strongSelf.preloadDisposableSet.add(preloadVideoResource(postbox: context.account.postbox, userLocation: .other, userContentType: .video, resourceReference: .standalone(resource: video.resource), duration: 3.0).start())

23
submodules/TelegramUI/Sources/ChatHistoryListNode.swift
View File

@ -1397,14 +1397,29 @@ public final class ChatHistoryListNode: ListView, ChatHistoryNode {
scrollAnimationCurve = .Spring(duration: 0.4) scrollAnimationCurve = .Spring(duration: 0.4)
} else { } else {
let wasPlaying = strongSelf.appliedPlayingMessageId != nil let wasPlaying = strongSelf.appliedPlayingMessageId != nil
if strongSelf.appliedPlayingMessageId != currentlyPlayingMessageId, let (currentlyPlayingMessageId, currentlyPlayingVideo) = currentlyPlayingMessageIdAndType { if strongSelf.appliedPlayingMessageId != currentlyPlayingMessageId, let (currentlyPlayingMessageId, currentlyPlayingVideo) = currentlyPlayingMessageIdAndType {
if isFirstTime { if isFirstTime {
} else if case let .peer(peerId) = chatLocation, currentlyPlayingMessageId.id.peerId != peerId { } else if case let .peer(peerId) = chatLocation, currentlyPlayingMessageId.id.peerId != peerId {
} else { } else {
if wasPlaying || currentlyPlayingVideo { var isChat = false
updatedScrollPosition = .index(index: .message(currentlyPlayingMessageId), position: .center(.bottom), directionHint: .Up, animated: true, highlight: true, displayLink: true) if case .peer = chatLocation {
scrollAnimationCurve = .Spring(duration: 0.4) isChat = true
}
if (isChat && (wasPlaying || currentlyPlayingVideo)) || (!isChat && !wasPlaying && currentlyPlayingVideo) {
var currentIsVisible = true
if let appliedPlayingMessageId = strongSelf.appliedPlayingMessageId {
currentIsVisible = false
strongSelf.forEachVisibleMessageItemNode({ view in
if view.item?.message.id == appliedPlayingMessageId.id {
currentIsVisible = true
}
})
}
if currentIsVisible {
updatedScrollPosition = .index(index: .message(currentlyPlayingMessageId), position: .center(.bottom), directionHint: .Up, animated: true, highlight: true, displayLink: true)
scrollAnimationCurve = .Spring(duration: 0.4)
}
} }
} }
} }