ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-08-23 22:12:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'beta'

Browse Source 
# Conflicts:
#	submodules/TelegramUI/Components/Stories/StoryContainerScreen/Sources/StoryItemSetContainerComponent.swift
#	versions.json
This commit is contained in:
Isaac 2025-07-29 20:55:11 +02:00
commit e23a02eb44
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
submodules/TelegramCallsUI/Sources/PresentationCallManager.swift
View File

@ -362,7 +362,7 @@ public final class PresentationCallManagerImpl: PresentationCallManager {
) )
strongSelf.updateCurrentCall(call) strongSelf.updateCurrentCall(call)
})) }))
} else if let currentCall = self.currentCall, currentCall.peerId == firstState.1.id, currentCall.peerId.id._internalGetInt64Value() < firstState.0.account.peerId.id._internalGetInt64Value() { } else if !"".isEmpty, let currentCall = self.currentCall, currentCall.peerId == firstState.1.id, currentCall.peerId.id._internalGetInt64Value() < firstState.0.account.peerId.id._internalGetInt64Value() {
let _ = currentCall.hangUp().startStandalone() let _ = currentCall.hangUp().startStandalone()
self.currentCallDisposable.set((combineLatest( self.currentCallDisposable.set((combineLatest(

20
submodules/TelegramUI/Components/ShareWithPeersScreen/Sources/ShareWithPeersScreen.swift
View File

@ -1833,7 +1833,8 @@ final class ShareWithPeersScreenComponent: Component {
sectionOffset += footerSize.height sectionOffset += footerSize.height
} else if section.id == 4 && section.itemCount > 0 { } else if section.id == 4 && section.itemCount > 0 {
var sectionItemOffset: CGFloat = 0.0 var sectionItemOffset: CGFloat = 0.0
if self.selectedOptions.contains(.pin) { //TODO:release
if self.selectedOptions.contains(.pin) && !"".isEmpty {
let itemFrame = CGRect(origin: CGPoint(x: itemLayout.sideInset, y: sectionOffset + section.insets.top + sectionItemOffset), size: CGSize(width: itemLayout.containerSize.width, height: section.itemHeight)) let itemFrame = CGRect(origin: CGPoint(x: itemLayout.sideInset, y: sectionOffset + section.insets.top + sectionItemOffset), size: CGSize(width: itemLayout.containerSize.width, height: section.itemHeight))
if !visibleBounds.intersects(itemFrame) { if !visibleBounds.intersects(itemFrame) {
continue continue
@ -2728,15 +2729,18 @@ final class ShareWithPeersScreenComponent: Component {
if hasCover { if hasCover {
itemCount += 1 itemCount += 1
} }
if self.selectedOptions.contains(.pin) { //TODO:release
/*if self.selectedOptions.contains(.pin) {
itemCount += 1 itemCount += 1
}*/
if itemCount != 0 {
sections.append(ItemLayout.Section(
id: 4,
insets: UIEdgeInsets(top: 28.0, left: 0.0, bottom: 0.0, right: 0.0),
itemHeight: optionItemSize.height,
itemCount: itemCount
))
} }
sections.append(ItemLayout.Section(
id: 4,
insets: UIEdgeInsets(top: 28.0, left: 0.0, bottom: 0.0, right: 0.0),
itemHeight: optionItemSize.height,
itemCount: 1
))
} }
} else { } else {
sections.append(ItemLayout.Section( sections.append(ItemLayout.Section(