diff --git a/submodules/TelegramCore/Sources/State/PendingMessageManager.swift b/submodules/TelegramCore/Sources/State/PendingMessageManager.swift index b97190d5bd..1b4de7dd3c 100644 --- a/submodules/TelegramCore/Sources/State/PendingMessageManager.swift +++ b/submodules/TelegramCore/Sources/State/PendingMessageManager.swift @@ -494,7 +494,7 @@ public final class PendingMessageManager { stateManager: strongSelf.stateManager, accountPeerId: strongSelf.accountPeerId, peerId: message.id.peerId, - title: "Topic #\(message.stableId)", + title: "New Thread", iconColor: 0, iconFileId: nil ).startStrict(next: { [weak strongSelf] topicId in diff --git a/submodules/TelegramPresentationData/Sources/DefaultDayPresentationTheme.swift b/submodules/TelegramPresentationData/Sources/DefaultDayPresentationTheme.swift index b6c4fb74db..aacb1f0111 100644 --- a/submodules/TelegramPresentationData/Sources/DefaultDayPresentationTheme.swift +++ b/submodules/TelegramPresentationData/Sources/DefaultDayPresentationTheme.swift @@ -964,7 +964,7 @@ public func makeDefaultDayPresentationTheme(extendingThemeReference: Presentatio panelIconColor: UIColor(rgb: 0x858e99), panelHighlightedIconBackgroundColor: UIColor(rgb: 0x858e99, alpha: 0.2), panelHighlightedIconColor: UIColor(rgb: 0x4D5561), - panelContentVibrantOverlayColor: UIColor(white: 0.7, alpha: 0.65), + panelContentVibrantOverlayColor: UIColor(white: 0.6, alpha: 0.65), panelContentControlVibrantOverlayColor: UIColor(white: 0.85, alpha: 0.65), panelContentControlVibrantSelectionColor: UIColor(white: 0.85, alpha: 0.1), panelContentControlOpaqueOverlayColor: UIColor(white: 0.0, alpha: 0.2), diff --git a/submodules/TelegramUI/Components/GlassBackgroundComponent/Sources/GlassBackgroundComponent.swift b/submodules/TelegramUI/Components/GlassBackgroundComponent/Sources/GlassBackgroundComponent.swift index 82d63582b1..1410cd9da9 100644 --- a/submodules/TelegramUI/Components/GlassBackgroundComponent/Sources/GlassBackgroundComponent.swift +++ b/submodules/TelegramUI/Components/GlassBackgroundComponent/Sources/GlassBackgroundComponent.swift @@ -711,7 +711,8 @@ public extension GlassBackgroundView { } else if s <= 0.3 && !isDark { image.draw(in: CGRect(origin: CGPoint(), size: size).insetBy(dx: inset - imageInset, dy: inset - imageInset), blendMode: .normal, alpha: 0.7) } else if b >= 0.2 { - image.draw(in: CGRect(origin: CGPoint(), size: size).insetBy(dx: inset - imageInset, dy: inset - imageInset), blendMode: .overlay, alpha: max(0.5, min(1.0, 0.9 * s))) + let maxAlpha: CGFloat = isDark ? 0.7 : 0.8 + image.draw(in: CGRect(origin: CGPoint(), size: size).insetBy(dx: inset - imageInset, dy: inset - imageInset), blendMode: .overlay, alpha: max(0.5, min(1.0, maxAlpha * s))) } else { image.draw(in: CGRect(origin: CGPoint(), size: size).insetBy(dx: inset - imageInset, dy: inset - imageInset), blendMode: .normal, alpha: 0.5) } diff --git a/submodules/TelegramUI/Sources/ChatControllerNode.swift b/submodules/TelegramUI/Sources/ChatControllerNode.swift index a5b7eefda2..1419fdcd8d 100644 --- a/submodules/TelegramUI/Sources/ChatControllerNode.swift +++ b/submodules/TelegramUI/Sources/ChatControllerNode.swift @@ -5173,7 +5173,7 @@ class ChatControllerNode: ASDisplayNode, ASScrollViewDelegate { } func prepareSwitchToChatLocation(chatLocation: ChatLocation, historyNode: ChatHistoryListNodeImpl, animationDirection: ChatControllerAnimateInnerChatSwitchDirection?) { - self.chatLocation = historyNode.chatLocation + self.chatLocation = chatLocation if historyNode === self.historyNode { historyNode.updateChatLocation(chatLocation: chatLocation) } else { diff --git a/submodules/TelegramUI/Sources/ChatHistoryListNode.swift b/submodules/TelegramUI/Sources/ChatHistoryListNode.swift index 88c4bb2aad..b2b08bdccb 100644 --- a/submodules/TelegramUI/Sources/ChatHistoryListNode.swift +++ b/submodules/TelegramUI/Sources/ChatHistoryListNode.swift @@ -1092,6 +1092,17 @@ public final class ChatHistoryListNodeImpl: ListView, ChatHistoryNode, ChatHisto } } + if matches { + for (message, _) in item.content { + if strongSelf.chatLocation.threadId != nil { + if message.id.namespace != Namespaces.Message.Cloud { + matches = false + break + } + } + } + } + if matches { var maxItemIndex: MessageIndex? for (message, _) in item.content { @@ -1236,6 +1247,9 @@ public final class ChatHistoryListNodeImpl: ListView, ChatHistoryNode, ChatHisto } self.chatLocation = chatLocation + self.interactiveReadActionDisposable?.dispose() + self.interactiveReadActionDisposable = nil + self.beginChatHistoryTransitions(resetScrolling: true, switchedToAnotherSource: false) self.beginReadHistoryManagement() }