ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-06-16 05:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove debugging

Browse Source
This commit is contained in:
Ali 2023-06-20 09:36:50 +03:00
parent caaf905f66
commit d5acba215b
2 changed files with 51 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
submodules/SparseItemGrid/Sources/SparseItemGrid.swift
View File

@ -951,63 +951,65 @@ public final class SparseItemGrid: ASDisplayNode {
var updateLayers: [SparseItemGridDisplayItem] = [] var updateLayers: [SparseItemGridDisplayItem] = []
let visibleRange = layout.visibleItemRange(for: visibleBounds, count: items.count) let visibleRange = layout.visibleItemRange(for: visibleBounds, count: items.count)
for index in visibleRange.minIndex ... visibleRange.maxIndex { if visibleRange.maxIndex >= visibleRange.minIndex {
if let item = items.item(at: index) { for index in visibleRange.minIndex ... visibleRange.maxIndex {
let itemFrame = layout.frame(at: index) if let item = items.item(at: index) {
let itemFrame = layout.frame(at: index)
let itemLayer: VisibleItem
if let current = self.visibleItems[item.id] { let itemLayer: VisibleItem
itemLayer = current if let current = self.visibleItems[item.id] {
updateLayers.append(itemLayer) itemLayer = current
} else { updateLayers.append(itemLayer)
itemLayer = VisibleItem(layer: items.itemBinding.createLayer(), view: items.itemBinding.createView()) } else {
self.visibleItems[item.id] = itemLayer itemLayer = VisibleItem(layer: items.itemBinding.createLayer(), view: items.itemBinding.createView())
self.visibleItems[item.id] = itemLayer
bindItems.append(item)
bindLayers.append(itemLayer) bindItems.append(item)
bindLayers.append(itemLayer)
if let layer = itemLayer.layer {
self.scrollView.layer.addSublayer(layer) if let layer = itemLayer.layer {
} else if let view = itemLayer.view { self.scrollView.layer.addSublayer(layer)
self.scrollView.addSubview(view) } else if let view = itemLayer.view {
self.scrollView.addSubview(view)
}
} }
}
if itemLayer.needsShimmer {
if itemLayer.needsShimmer { let placeholderLayer: SparseItemGridShimmerLayer
if let current = itemLayer.shimmerLayer {
placeholderLayer = current
} else {
placeholderLayer = items.itemBinding.createShimmerLayer() ?? Shimmer.Layer()
self.scrollView.layer.insertSublayer(placeholderLayer, at: 0)
itemLayer.shimmerLayer = placeholderLayer
}
placeholderLayer.frame = itemFrame
self.shimmer.update(colors: shimmerColors, layer: placeholderLayer, containerSize: layout.containerLayout.size, frame: itemFrame.offsetBy(dx: 0.0, dy: -visibleBounds.minY))
placeholderLayer.update(size: itemFrame.size)
} else if let placeholderLayer = itemLayer.shimmerLayer {
itemLayer.shimmerLayer = nil
placeholderLayer.removeFromSuperlayer()
}
validIds.insert(item.id)
itemLayer.frame = itemFrame
} else {
let placeholderLayer: SparseItemGridShimmerLayer let placeholderLayer: SparseItemGridShimmerLayer
if let current = itemLayer.shimmerLayer { if self.visiblePlaceholders.count > usedPlaceholderCount {
placeholderLayer = current placeholderLayer = self.visiblePlaceholders[usedPlaceholderCount]
} else { } else {
placeholderLayer = items.itemBinding.createShimmerLayer() ?? Shimmer.Layer() placeholderLayer = items.itemBinding.createShimmerLayer() ?? Shimmer.Layer()
self.scrollView.layer.insertSublayer(placeholderLayer, at: 0) self.scrollView.layer.addSublayer(placeholderLayer)
itemLayer.shimmerLayer = placeholderLayer self.visiblePlaceholders.append(placeholderLayer)
} }
let itemFrame = layout.frame(at: index)
placeholderLayer.frame = itemFrame placeholderLayer.frame = itemFrame
self.shimmer.update(colors: shimmerColors, layer: placeholderLayer, containerSize: layout.containerLayout.size, frame: itemFrame.offsetBy(dx: 0.0, dy: -visibleBounds.minY)) self.shimmer.update(colors: shimmerColors, layer: placeholderLayer, containerSize: layout.containerLayout.size, frame: itemFrame.offsetBy(dx: 0.0, dy: -visibleBounds.minY))
placeholderLayer.update(size: itemFrame.size) placeholderLayer.update(size: itemFrame.size)
} else if let placeholderLayer = itemLayer.shimmerLayer { usedPlaceholderCount += 1
itemLayer.shimmerLayer = nil
placeholderLayer.removeFromSuperlayer()
} }
validIds.insert(item.id)
itemLayer.frame = itemFrame
} else {
let placeholderLayer: SparseItemGridShimmerLayer
if self.visiblePlaceholders.count > usedPlaceholderCount {
placeholderLayer = self.visiblePlaceholders[usedPlaceholderCount]
} else {
placeholderLayer = items.itemBinding.createShimmerLayer() ?? Shimmer.Layer()
self.scrollView.layer.addSublayer(placeholderLayer)
self.visiblePlaceholders.append(placeholderLayer)
}
let itemFrame = layout.frame(at: index)
placeholderLayer.frame = itemFrame
self.shimmer.update(colors: shimmerColors, layer: placeholderLayer, containerSize: layout.containerLayout.size, frame: itemFrame.offsetBy(dx: 0.0, dy: -visibleBounds.minY))
placeholderLayer.update(size: itemFrame.size)
usedPlaceholderCount += 1
} }
} }

2
submodules/TelegramUI/Components/Stories/StoryContentComponent/Sources/StoryItemContentComponent.swift
View File

@ -148,7 +148,7 @@ final class StoryItemContentComponent: Component {
return return
} }
if case let .file(file) = currentMessageMedia, let peerReference = PeerReference(component.peer._asPeer()), !"".isEmpty { if case let .file(file) = currentMessageMedia, let peerReference = PeerReference(component.peer._asPeer()) {
if self.videoNode == nil { if self.videoNode == nil {
let videoNode = UniversalVideoNode( let videoNode = UniversalVideoNode(
postbox: component.context.account.postbox, postbox: component.context.account.postbox,