Skip to content

Commit 54d2b58

Browse files
author
Isaac
committed
Updates
1 parent bdca60c commit 54d2b58

File tree

5 files changed

+19
-4
lines changed

5 files changed

+19
-4
lines changed

submodules/TelegramCore/Sources/State/PendingMessageManager.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ public final class PendingMessageManager {
494494
stateManager: strongSelf.stateManager,
495495
accountPeerId: strongSelf.accountPeerId,
496496
peerId: message.id.peerId,
497-
title: "Topic #\(message.stableId)",
497+
title: "New Thread",
498498
iconColor: 0,
499499
iconFileId: nil
500500
).startStrict(next: { [weak strongSelf] topicId in

submodules/TelegramPresentationData/Sources/DefaultDayPresentationTheme.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -964,7 +964,7 @@ public func makeDefaultDayPresentationTheme(extendingThemeReference: Presentatio
964964
panelIconColor: UIColor(rgb: 0x858e99),
965965
panelHighlightedIconBackgroundColor: UIColor(rgb: 0x858e99, alpha: 0.2),
966966
panelHighlightedIconColor: UIColor(rgb: 0x4D5561),
967-
panelContentVibrantOverlayColor: UIColor(white: 0.7, alpha: 0.65),
967+
panelContentVibrantOverlayColor: UIColor(white: 0.6, alpha: 0.65),
968968
panelContentControlVibrantOverlayColor: UIColor(white: 0.85, alpha: 0.65),
969969
panelContentControlVibrantSelectionColor: UIColor(white: 0.85, alpha: 0.1),
970970
panelContentControlOpaqueOverlayColor: UIColor(white: 0.0, alpha: 0.2),

submodules/TelegramUI/Components/GlassBackgroundComponent/Sources/GlassBackgroundComponent.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -711,7 +711,8 @@ public extension GlassBackgroundView {
711711
} else if s <= 0.3 && !isDark {
712712
image.draw(in: CGRect(origin: CGPoint(), size: size).insetBy(dx: inset - imageInset, dy: inset - imageInset), blendMode: .normal, alpha: 0.7)
713713
} else if b >= 0.2 {
714-
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)))
714+
let maxAlpha: CGFloat = isDark ? 0.7 : 0.8
715+
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)))
715716
} else {
716717
image.draw(in: CGRect(origin: CGPoint(), size: size).insetBy(dx: inset - imageInset, dy: inset - imageInset), blendMode: .normal, alpha: 0.5)
717718
}

submodules/TelegramUI/Sources/ChatControllerNode.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5173,7 +5173,7 @@ class ChatControllerNode: ASDisplayNode, ASScrollViewDelegate {
51735173
}
51745174

51755175
func prepareSwitchToChatLocation(chatLocation: ChatLocation, historyNode: ChatHistoryListNodeImpl, animationDirection: ChatControllerAnimateInnerChatSwitchDirection?) {
5176-
self.chatLocation = historyNode.chatLocation
5176+
self.chatLocation = chatLocation
51775177
if historyNode === self.historyNode {
51785178
historyNode.updateChatLocation(chatLocation: chatLocation)
51795179
} else {

submodules/TelegramUI/Sources/ChatHistoryListNode.swift

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1092,6 +1092,17 @@ public final class ChatHistoryListNodeImpl: ListView, ChatHistoryNode, ChatHisto
10921092
}
10931093
}
10941094

1095+
if matches {
1096+
for (message, _) in item.content {
1097+
if strongSelf.chatLocation.threadId != nil {
1098+
if message.id.namespace != Namespaces.Message.Cloud {
1099+
matches = false
1100+
break
1101+
}
1102+
}
1103+
}
1104+
}
1105+
10951106
if matches {
10961107
var maxItemIndex: MessageIndex?
10971108
for (message, _) in item.content {
@@ -1236,6 +1247,9 @@ public final class ChatHistoryListNodeImpl: ListView, ChatHistoryNode, ChatHisto
12361247
}
12371248
self.chatLocation = chatLocation
12381249

1250+
self.interactiveReadActionDisposable?.dispose()
1251+
self.interactiveReadActionDisposable = nil
1252+
12391253
self.beginChatHistoryTransitions(resetScrolling: true, switchedToAnotherSource: false)
12401254
self.beginReadHistoryManagement()
12411255
}

0 commit comments

Comments
 (0)