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

Update indicator positioning

Browse Source
This commit is contained in:
Ali 2022-06-07 14:30:11 +04:00
parent 654e8851bb
commit f72ab6bd3d
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
submodules/TelegramUI/Components/AudioTranscriptionPendingIndicatorComponent/Sources/AudioTranscriptionPendingIndicatorComponent.swift
View File

@ -6,13 +6,18 @@ import Display
public final class AudioTranscriptionPendingIndicatorComponent: Component { public final class AudioTranscriptionPendingIndicatorComponent: Component {
public let color: UIColor public let color: UIColor
public let font: UIFont
public init(color: UIColor) { public init(color: UIColor, font: UIFont) {
self.color = color self.color = color
self.font = font
} }
public static func ==(lhs: AudioTranscriptionPendingIndicatorComponent, rhs: AudioTranscriptionPendingIndicatorComponent) -> Bool { public static func ==(lhs: AudioTranscriptionPendingIndicatorComponent, rhs: AudioTranscriptionPendingIndicatorComponent) -> Bool {
if lhs.color !== rhs.color { if lhs.color != rhs.color {
return false
}
if lhs.font != rhs.font {
return false return false
} }
return true return true
@ -61,6 +66,10 @@ public final class AudioTranscriptionPendingIndicatorComponent: Component {
let dotSize: CGFloat = 2.0 let dotSize: CGFloat = 2.0
let spacing: CGFloat = 3.0 let spacing: CGFloat = 3.0
var stringSize = NSAttributedString(string: "...", font: component.font, textColor: .black).boundingRect(with: CGSize(width: 100.0, height: 100.0), options: .usesLineFragmentOrigin, context: nil).size
stringSize.width = ceil(stringSize.width)
stringSize.height = ceil(stringSize.height)
if self.component?.color != component.color { if self.component?.color != component.color {
if let dotImage = generateFilledCircleImage(diameter: dotSize, color: component.color) { if let dotImage = generateFilledCircleImage(diameter: dotSize, color: component.color) {
for dotLayer in self.dotLayers { for dotLayer in self.dotLayers {
@ -77,7 +86,7 @@ public final class AudioTranscriptionPendingIndicatorComponent: Component {
self.dotLayers[i].frame = CGRect(origin: CGPoint(x: CGFloat(i) * (dotSize + spacing), y: 0.0), size: CGSize(width: dotSize, height: dotSize)) self.dotLayers[i].frame = CGRect(origin: CGPoint(x: CGFloat(i) * (dotSize + spacing), y: 0.0), size: CGSize(width: dotSize, height: dotSize))
} }
return CGSize(width: min(availableSize.width, size.width), height: min(availableSize.height, size.height)) return CGSize(width: min(availableSize.width, stringSize.width), height: min(availableSize.height, size.height))
} }
} }

18
submodules/TelegramUI/Sources/ChatMessageInteractiveFileNode.swift
View File

@ -654,16 +654,18 @@ final class ChatMessageInteractiveFileNode: ASDisplayNode {
var displayTrailingAnimatedDots = false var displayTrailingAnimatedDots = false
/*#if DEBUG
if "".isEmpty {
displayTrailingAnimatedDots = true
}
#endif*/
if let transcribedText = transcribedText, case .expanded = effectiveAudioTranscriptionState { if let transcribedText = transcribedText, case .expanded = effectiveAudioTranscriptionState {
switch transcribedText { switch transcribedText {
case let .success(text, isPending): case let .success(text, isPending):
textString = NSAttributedString(string: text, font: textFont, textColor: messageTheme.primaryTextColor) textString = NSAttributedString(string: text, font: textFont, textColor: messageTheme.primaryTextColor)
/*#if DEBUG
var isPending = isPending
if "".isEmpty {
isPending = true
}
#endif*/
if isPending { if isPending {
let modifiedString = NSMutableAttributedString(attributedString: textString!) let modifiedString = NSMutableAttributedString(attributedString: textString!)
modifiedString.append(NSAttributedString(string: "...", font: textFont, textColor: .clear)) modifiedString.append(NSAttributedString(string: "...", font: textFont, textColor: .clear))
@ -1027,12 +1029,12 @@ final class ChatMessageInteractiveFileNode: ASDisplayNode {
} }
let indicatorSize = transcriptionPendingIndicator.update( let indicatorSize = transcriptionPendingIndicator.update(
transition: .immediate, transition: .immediate,
component: AnyComponent(AudioTranscriptionPendingIndicatorComponent(color: messageTheme.primaryTextColor)), component: AnyComponent(AudioTranscriptionPendingIndicatorComponent(color: messageTheme.primaryTextColor, font: textFont)),
environment: {}, environment: {},
containerSize: CGSize(width: 100.0, height: 100.0) containerSize: CGSize(width: 100.0, height: 100.0)
) )
transcriptionPendingIndicator.frame = CGRect(origin: CGPoint(x: strongSelf.textNode.frame.minX + textLayout.trailingLineWidth + 2.0, y: strongSelf.textNode.frame.maxY - indicatorSize.height - 6.0), size: indicatorSize) transcriptionPendingIndicator.frame = CGRect(origin: CGPoint(x: strongSelf.textNode.frame.minX + textLayout.trailingLineWidth - indicatorSize.width + 1.0, y: strongSelf.textNode.frame.maxY - indicatorSize.height - 6.0), size: indicatorSize)
} else { } else {
if let transcriptionPendingIndicator = strongSelf.transcriptionPendingIndicator { if let transcriptionPendingIndicator = strongSelf.transcriptionPendingIndicator {
strongSelf.transcriptionPendingIndicator = nil strongSelf.transcriptionPendingIndicator = nil