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

Fix string

Browse Source
This commit is contained in:
Ali 2023-09-27 23:18:16 +04:00
parent 993db8cc1d
commit 5ca7082fbb
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -375,7 +375,7 @@ public class AnimatedCountLabelView: UIView {
fatalError("init(coder:) has not been implemented")
}
public func update(size: CGSize, segments initialSegments: [Segment], transition: ContainedViewLayoutTransition) -> Layout {
public func update(size: CGSize, segments initialSegments: [Segment], reducedLetterSpacing: Bool = false, transition: ContainedViewLayoutTransition) -> Layout {
var segmentLayouts: [ResolvedSegment.Key: (TextNodeLayoutArguments) -> (TextNodeLayout, () -> TextNode)] = [:]
let wasEmpty = self.resolvedSegments.isEmpty
for (segmentKey, segmentAndTextNode) in self.resolvedSegments {
@ -393,7 +393,15 @@ public class AnimatedCountLabelView: UIView {
}
let attributes = string.attributes(at: 0, longestEffectiveRange: nil, in: NSRange(location: 0, length: 1))
var remainingValue = value
for character in string.string {
if let _ = Int(String(character)) {
segments.append(.number(id: 1000 + segments.count, value: value, string: NSAttributedString(string: String(character), attributes: attributes)))
} else {
segments.append(.text(id: 1000 + segments.count, string: NSAttributedString(string: String(character), attributes: attributes)))
}
}
/*var remainingValue = value
let insertPosition = segments.count
@ -405,7 +413,7 @@ public class AnimatedCountLabelView: UIView {
if remainingValue == 0 {
break
}
}
}*/
case let .text(id, string):
segments.append(.text(id: id, string: string))
}
@ -489,7 +497,11 @@ public class AnimatedCountLabelView: UIView {
} else if textNode.frame != textFrame {
transition.updateFrameAdditive(node: textNode, frame: textFrame)
}
currentOffset.x += effectiveSegmentWidth
if reducedLetterSpacing {
currentOffset.x += effectiveSegmentWidth * 0.9
} else {
currentOffset.x += effectiveSegmentWidth
}
if let (_, currentTextNode) = self.resolvedSegments[segment.key] {
if currentTextNode !== textNode {
currentTextNode.removeFromSupernode()

5
submodules/TelegramUI/Components/Stories/StoryFooterPanelComponent/Sources/StoryFooterPanelComponent.swift
View File

@ -537,7 +537,7 @@ public final class StoryFooterPanelComponent: Component {
var regularSegments: [AnimatedCountLabelView.Segment] = []
if viewCount != 0 {
regularSegments.append(.number(viewCount, NSAttributedString(string: "\(viewCount)", font: Font.with(size: 15.0, traits: .monospacedNumbers), textColor: .white)))
regularSegments.append(.number(viewCount, NSAttributedString(string: countString(Int64(viewCount)), font: Font.with(size: 15.0, traits: .monospacedNumbers), textColor: .white)))
}
let viewPart: String
@ -555,7 +555,7 @@ public final class StoryFooterPanelComponent: Component {
viewPart = string
}
let viewStatsTextLayout = self.viewStatsCountText.update(size: CGSize(width: availableSize.width, height: size.height), segments: regularSegments, transition: isFirstTime ? .immediate : ContainedViewLayoutTransition.animated(duration: 0.25, curve: .easeInOut))
let viewStatsTextLayout = self.viewStatsCountText.update(size: CGSize(width: availableSize.width, height: size.height), segments: regularSegments, reducedLetterSpacing: true, transition: isFirstTime ? .immediate : ContainedViewLayoutTransition.animated(duration: 0.25, curve: .easeInOut))
if self.viewStatsCountText.superview == nil {
self.viewStatsCountText.isUserInteractionEnabled = false
self.externalContainerView.addSubview(self.viewStatsCountText)
@ -602,6 +602,7 @@ public final class StoryFooterPanelComponent: Component {
segments: [
.number(reactionCount, NSAttributedString(string: "\(reactionCount)", font: Font.with(size: 15.0, traits: .monospacedNumbers), textColor: .white))
],
reducedLetterSpacing: true,
transition: (isFirstTime || reactionsTransition.animation.isImmediate) ? .immediate : ContainedViewLayoutTransition.animated(duration: 0.25, curve: .easeInOut)
)
reactionsTextSize = reactionStatsLayout.size