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

Various improvements

Browse Source
This commit is contained in:
Ilya Laktyushin
2024-12-22 17:16:14 +04:00
parent 26ff9da7d1
commit 5451053195
133 changed files with 5419 additions and 1692 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
submodules/AnimatedCountLabelNode/Sources/AnimatedCountLabelNode.swift
View File

@@ -85,7 +85,7 @@ public class AnimatedCountLabelNode: ASDisplayNode {
super.init()
}
public func asyncLayout() -> (CGSize, [Segment]) -> (Layout, (Bool) -> Void) {
public func asyncLayout() -> (CGSize, UIEdgeInsets, [Segment]) -> (Layout, (Bool) -> Void) {
var segmentLayouts: [ResolvedSegment.Key: (TextNodeLayoutArguments) -> (TextNodeLayout, () -> TextNode)] = [:]
let wasEmpty = self.resolvedSegments.isEmpty
for (segmentKey, segmentAndTextNode) in self.resolvedSegments {
@@ -94,7 +94,7 @@ public class AnimatedCountLabelNode: ASDisplayNode {
let reverseAnimationDirection = self.reverseAnimationDirection
let alwaysOneDirection = self.alwaysOneDirection
return { [weak self] size, initialSegments in
return { [weak self] size, insets, initialSegments in
var segments: [ResolvedSegment] = []
loop: for segment in initialSegments {
switch segment {
@@ -165,7 +165,7 @@ public class AnimatedCountLabelNode: ASDisplayNode {
transition = .immediate
}
var currentOffset = CGPoint()
var currentOffset = CGPoint(x: insets.left, y: 0.0)
for segment in segments {
var animation: (CGFloat, Double)?
if let (currentSegment, currentTextNode) = strongSelf.resolvedSegments[segment.key] {
@@ -254,12 +254,14 @@ public final class ImmediateAnimatedCountLabelNode: AnimatedCountLabelNode {
public var segments: [AnimatedCountLabelNode.Segment] = []
private var constrainedSize: CGSize?
private var insets: UIEdgeInsets?
public func updateLayout(size: CGSize, animated: Bool) -> CGSize {
public func updateLayout(size: CGSize, insets: UIEdgeInsets = .zero, animated: Bool) -> CGSize {
self.constrainedSize = size
self.insets = insets
let makeLayout = self.asyncLayout()
let (layout, apply) = makeLayout(size, self.segments)
let (layout, apply) = makeLayout(size, insets, self.segments)
let _ = apply(animated)
return layout.size
}
@@ -282,8 +284,8 @@ public final class ImmediateAnimatedCountLabelNode: AnimatedCountLabelNode {
}
}
}
if let constrainedSize = self.constrainedSize {
let _ = node.updateLayout(size: constrainedSize, animated: false)
if let constrainedSize = self.constrainedSize, let insets = self.insets {
let _ = node.updateLayout(size: constrainedSize, insets: insets, animated: false)
}
return node
}