Various fixes

This commit is contained in:
Ilya Laktyushin 2020-08-21 15:44:41 +03:00
parent 67b2c051d0
commit 5f15fecb75
5 changed files with 62 additions and 54 deletions

View File

@ -927,6 +927,8 @@ public final class ChatListSearchContainerNode: SearchDisplayControllerContentNo
globalExpandType = .none globalExpandType = .none
} }
if let _ = messageTags {
} else {
let lowercasedQuery = finalQuery.lowercased() let lowercasedQuery = finalQuery.lowercased()
if presentationData.strings.DialogList_SavedMessages.lowercased().hasPrefix(lowercasedQuery) || "saved messages".hasPrefix(lowercasedQuery) { if presentationData.strings.DialogList_SavedMessages.lowercased().hasPrefix(lowercasedQuery) || "saved messages".hasPrefix(lowercasedQuery) {
if !existingPeerIds.contains(accountPeer.id), filteredPeer(accountPeer, accountPeer) { if !existingPeerIds.contains(accountPeer.id), filteredPeer(accountPeer, accountPeer) {
@ -983,6 +985,7 @@ public final class ChatListSearchContainerNode: SearchDisplayControllerContentNo
numberOfGlobalPeers += 1 numberOfGlobalPeers += 1
} }
} }
}
if let message = resolvedMessage { if let message = resolvedMessage {
var peer = RenderedPeer(message: message) var peer = RenderedPeer(message: message)

View File

@ -1005,8 +1005,10 @@ final class CallControllerNode: ViewControllerTracingNode, CallControllerNodePro
self.updateButtonsMode() self.updateButtonsMode()
self.updateDimVisibility() self.updateDimVisibility()
if self.incomingVideoViewRequested || self.outgoingVideoViewRequested {
if self.incomingVideoViewRequested && self.outgoingVideoViewRequested { if self.incomingVideoViewRequested && self.outgoingVideoViewRequested {
self.displayedCameraTooltip = true self.displayedCameraTooltip = true
}
self.displayedCameraConfirmation = true self.displayedCameraConfirmation = true
} }
if self.incomingVideoViewRequested && !self.outgoingVideoViewRequested && !self.displayedCameraTooltip && (self.toastContent?.isEmpty ?? true) { if self.incomingVideoViewRequested && !self.outgoingVideoViewRequested && !self.displayedCameraTooltip && (self.toastContent?.isEmpty ?? true) {

View File

@ -308,10 +308,13 @@ public final class PrincipalThemeEssentialGraphics {
self.clockFreeMinImage = emptyImage self.clockFreeMinImage = emptyImage
self.dateAndStatusMediaBackground = emptyImage self.dateAndStatusMediaBackground = emptyImage
self.dateAndStatusFreeBackground = emptyImage self.dateAndStatusFreeBackground = emptyImage
self.incomingDateAndStatusImpressionIcon = emptyImage
self.outgoingDateAndStatusImpressionIcon = emptyImage let impressionCountImage = UIImage(bundleImageName: "Chat/Message/ImpressionCount")!
self.mediaImpressionIcon = emptyImage self.incomingDateAndStatusImpressionIcon = generateTintedImage(image: impressionCountImage, color: theme.message.incoming.secondaryTextColor)!
self.freeImpressionIcon = emptyImage self.outgoingDateAndStatusImpressionIcon = generateTintedImage(image: impressionCountImage, color: theme.message.outgoing.secondaryTextColor)!
self.mediaImpressionIcon = generateTintedImage(image: impressionCountImage, color: .white)!
self.freeImpressionIcon = generateTintedImage(image: impressionCountImage, color: serviceColor.primaryText)!
self.radialIndicatorFileIconIncoming = emptyImage self.radialIndicatorFileIconIncoming = emptyImage
self.radialIndicatorFileIconOutgoing = emptyImage self.radialIndicatorFileIconOutgoing = emptyImage
} else { } else {

View File

@ -1109,7 +1109,7 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView {
|> deliverOnMainQueue |> deliverOnMainQueue
} }
let beatingHearts: [UInt32] = [0x2764, 0x1F90E, 0x1F9E1, 0x1F49A, 0x1F49C, 0x1F49B, 0x1F5A4, 0x1F90D] let beatingHearts: [UInt32] = [0x2764, 0x1F90E, 0x1F9E1, 0x1F499, 0x1F49A, 0x1F49C, 0x1F49B, 0x1F5A4, 0x1F90D]
let peach = 0x1F351 let peach = 0x1F351
if let text = self.item?.message.text, let firstScalar = text.unicodeScalars.first, beatingHearts.contains(firstScalar.value) || firstScalar.value == peach { if let text = self.item?.message.text, let firstScalar = text.unicodeScalars.first, beatingHearts.contains(firstScalar.value) || firstScalar.value == peach {

View File

@ -38,7 +38,7 @@ private final class PrefetchManagerImpl {
|> map { networkType -> MediaAutoDownloadNetworkType in |> map { networkType -> MediaAutoDownloadNetworkType in
switch networkType { switch networkType {
case .none, .cellular: case .none, .cellular:
return.cellular return .cellular
case .wifi: case .wifi:
return .wifi return .wifi
} }