ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-06-16 05:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Various Fixes

Browse Source
This commit is contained in:
Ilya Laktyushin 2021-01-27 12:37:06 +03:00
parent 22b1f0c482
commit 5011f833d4
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
submodules/TelegramBaseController/Sources/TelegramBaseController.swift
View File

@ -321,12 +321,20 @@ open class TelegramBaseController: ViewController, KeyShortcutResponder {
availableGroupCall = .single(nil) availableGroupCall = .single(nil)
} }
let previousCurrentGroupCall = Atomic<PresentationGroupCall?>(value: nil)
self.currentGroupCallDisposable = combineLatest(queue: .mainQueue(), availableGroupCall, currentGroupCall).start(next: { [weak self] availableState, currentGroupCall in self.currentGroupCallDisposable = combineLatest(queue: .mainQueue(), availableGroupCall, currentGroupCall).start(next: { [weak self] availableState, currentGroupCall in
guard let strongSelf = self else { guard let strongSelf = self else {
return return
} }
let panelData = currentGroupCall != nil || availableState?.participantCount == 0 ? nil : availableState let previousCurrentGroupCall = previousCurrentGroupCall.swap(currentGroupCall)
let panelData: GroupCallPanelData?
if previousCurrentGroupCall != nil && currentGroupCall == nil && availableState?.participantCount == 1 {
panelData = nil
} else {
panelData = currentGroupCall != nil || availableState?.participantCount == 0 ? nil : availableState
}
let wasEmpty = strongSelf.groupCallPanelData == nil let wasEmpty = strongSelf.groupCallPanelData == nil
strongSelf.groupCallPanelData = panelData strongSelf.groupCallPanelData = panelData

4
submodules/TelegramCallsUI/Sources/VoiceChatVolumeContextItem.swift
View File

@ -138,8 +138,8 @@ private final class VoiceChatVolumeContextItemNode: ASDisplayNode, ContextMenuCu
let iconSize = CGSize(width: 36.0, height: 36.0) let iconSize = CGSize(width: 36.0, height: 36.0)
let iconFrame = CGRect(origin: CGPoint(x: size.width - iconSize.width - 10.0, y: floor((size.height - iconSize.height) / 2.0)), size: iconSize) let iconFrame = CGRect(origin: CGPoint(x: size.width - iconSize.width - 10.0, y: floor((size.height - iconSize.height) / 2.0)), size: iconSize)
transition.updateFrameAdditive(node: self.backgroundIconNode, frame: iconFrame) self.backgroundIconNode.frame = iconFrame
transition.updateFrameAdditive(node: self.foregroundIconNode, frame: iconFrame) self.foregroundIconNode.frame = iconFrame
self.updateValue(transition: transition) self.updateValue(transition: transition)
}) })

2
submodules/TelegramUI/Sources/ChatEmptyNode.swift
View File

@ -838,7 +838,7 @@ final class ChatEmptyNode: ASDisplayNode {
} else if let _ = interfaceState.peerNearbyData { } else if let _ = interfaceState.peerNearbyData {
contentType = .peerNearby contentType = .peerNearby
} else if let _ = peer as? TelegramUser { } else if let _ = peer as? TelegramUser {
if case .joined = emptyType { if case .joined = emptyType, !peer.isDeleted {
contentType = .greeting contentType = .greeting
} else { } else {
contentType = .regular contentType = .regular