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

Put search bar into navigation bar

Browse Source
This commit is contained in:
Ilya Laktyushin
2019-01-03 21:44:27 +04:00
parent eaaf1aa787
commit 603145971c
68 changed files with 2658 additions and 2188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
TelegramUI/ChatMessageInteractiveMediaNode.swift
View File

@@ -379,11 +379,8 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode {
updatedStatusSignal = combineLatest(chatMessagePhotoStatus(account: account, messageId: message.id, photoReference: .message(message: MessageReference(message), media: image)), account.pendingMessageManager.pendingMessageStatus(message.id))
|> map { resourceStatus, pendingStatus -> MediaResourceStatus in
if let pendingStatus = pendingStatus {
var progress = pendingStatus.progress
if pendingStatus.isRunning {
progress = max(progress, 0.027)
}
return .Fetching(isActive: pendingStatus.isRunning, progress: progress)
let adjustedProgress = max(pendingStatus.progress, 0.027)
return .Fetching(isActive: pendingStatus.isRunning, progress: adjustedProgress)
} else {
return resourceStatus
}
@@ -395,11 +392,8 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode {
updatedStatusSignal = combineLatest(messageMediaFileStatus(account: account, messageId: message.id, file: file), account.pendingMessageManager.pendingMessageStatus(message.id))
|> map { resourceStatus, pendingStatus -> MediaResourceStatus in
if let pendingStatus = pendingStatus {
var progress = pendingStatus.progress
if pendingStatus.isRunning {
progress = max(progress, 0.027)
}
return .Fetching(isActive: pendingStatus.isRunning, progress: progress)
let adjustedProgress = max(pendingStatus.progress, 0.027)
return .Fetching(isActive: pendingStatus.isRunning, progress: adjustedProgress)
} else {
return resourceStatus
}
@@ -631,11 +625,8 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode {
}
if let fetchStatus = self.fetchStatus {
switch fetchStatus {
case let .Fetching(isActive, progress):
var adjustedProgress = progress
if isActive {
adjustedProgress = max(adjustedProgress, 0.027)
}
case let .Fetching(_, progress):
let adjustedProgress = max(progress, 0.027)
var wasCheck = false
if let statusNode = self.statusNode, case .check = statusNode.state {
wasCheck = true