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

Various UI fixes

Browse Source
This commit is contained in:
Ilya Laktyushin
2018-11-17 18:24:30 +04:00
parent b7030dd3ad
commit b7225b8bbc
12 changed files with 103 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
TelegramUI/ChatMessageInteractiveMediaNode.swift
View File

@@ -595,7 +595,7 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode {
if let size = file.size {
if let duration = file.duration, !message.flags.contains(.Unsent) {
if isMediaStreamable(message: message, media: file) {
let durationString = String(format: "%d:%02d", duration / 60, duration % 60)
let durationString = stringForDuration(duration)
let sizeString = "\(dataSizeString(Int(Float(size) * progress), forceDecimal: true)) / \(dataSizeString(size, forceDecimal: true))"
badgeContent = .mediaDownload(backgroundColor: bubbleTheme.mediaDateAndStatusFillColor, foregroundColor: bubbleTheme.mediaDateAndStatusTextColor, duration: durationString, size: sizeString)
mediaDownloadState = .fetching(progress: progress)
@@ -618,7 +618,7 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode {
}
} else {
if let duration = file.duration, !file.isAnimated {
let durationString = String(format: "%d:%02d", duration / 60, duration % 60)
let durationString = stringForDuration(duration)
badgeContent = .text(inset: 0.0, backgroundColor: bubbleTheme.mediaDateAndStatusFillColor, foregroundColor: bubbleTheme.mediaDateAndStatusTextColor, shape: .round, text: NSAttributedString(string: durationString))
}
}
@@ -649,7 +649,7 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode {
}
if case .constrained = sizeCalculation {
if let file = media as? TelegramMediaFile, let duration = file.duration, !file.isAnimated {
let durationString = String(format: "%d:%02d", duration / 60, duration % 60)
let durationString = stringForDuration(duration)
badgeContent = .text(inset: 0.0, backgroundColor: bubbleTheme.mediaDateAndStatusFillColor, foregroundColor: bubbleTheme.mediaDateAndStatusTextColor, shape: .round, text: NSAttributedString(string: durationString))
}
}
@@ -660,16 +660,15 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode {
if isMediaStreamable(message: message, media: file) {
state = .play(bubbleTheme.mediaOverlayControlForegroundColor)
let durationString = String(format: "%d:%02d", duration / 60, duration % 60)
let durationString = stringForDuration(duration)
badgeContent = .mediaDownload(backgroundColor: bubbleTheme.mediaDateAndStatusFillColor, foregroundColor: bubbleTheme.mediaDateAndStatusTextColor, duration: durationString, size: dataSizeString(file.size ?? 0))
mediaDownloadState = .remote
} else {
let durationString = String(format: "%d:%02d", duration / 60, duration % 60)
let durationString = stringForDuration(duration)
badgeContent = .text(inset: 0.0, backgroundColor: bubbleTheme.mediaDateAndStatusFillColor, foregroundColor: bubbleTheme.mediaDateAndStatusTextColor, shape: .round, text: NSAttributedString(string: durationString))
}
} else {
let durationString = String(format: "%d:%02d", duration / 60, duration % 60)
let durationString = stringForDuration(duration)
if isMediaStreamable(message: message, media: file) {
state = .play(bubbleTheme.mediaOverlayControlForegroundColor)
badgeContent = .text(inset: 16.0, backgroundColor: bubbleTheme.mediaDateAndStatusFillColor, foregroundColor: bubbleTheme.mediaDateAndStatusTextColor, shape: .round, text: NSAttributedString(string: durationString))