Put search bar into navigation bar

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

View File

@@ -681,11 +681,8 @@ final class ChatMessageInteractiveFileNode: ASDisplayNode {
let streamingStatusForegroundColor: UIColor = incoming ? bubbleTheme.incomingAccentControlColor : bubbleTheme.outgoingAccentControlColor
let streamingStatusBackgroundColor: UIColor = incoming ? bubbleTheme.incomingMediaInactiveControlColor : bubbleTheme.outgoingMediaInactiveControlColor
switch resourceStatus.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)
streamingState = .cloudProgress(color: streamingStatusForegroundColor, strokeBackgroundColor: streamingStatusBackgroundColor, lineWidth: 2.0, value: CGFloat(adjustedProgress))
case .Local:
if let cloudFetchedIconImage = self.cloudFetchedIconImage {
@@ -717,10 +714,7 @@ final class ChatMessageInteractiveFileNode: ASDisplayNode {
self.waveformScrubbingNode?.enableScrubbing = false
switch fetchStatus {
case let .Fetching(isActive, progress):
var adjustedProgress = progress
if isActive {
adjustedProgress = max(adjustedProgress, 0.027)
}
let adjustedProgress = max(progress, 0.027)
state = .progress(color: statusForegroundColor, lineWidth: nil, value: CGFloat(adjustedProgress), cancelEnabled: true)
case .Local:
if isAudio {