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

Merge commit '6be3c2e694b81c6b8fe661ae79c14e41e626a52f'

Browse Source
This commit is contained in:
Ali 2023-07-07 02:04:21 +04:00
commit 328049a053
4 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
submodules/Camera/Sources/CameraDevice.swift
View File

@ -107,15 +107,17 @@ final class CameraDevice {
if let bestFormat = candidates.last {
device.activeFormat = bestFormat
Logger.shared.log("Camera", "Selected format:")
Logger.shared.log("Camera", bestFormat.description)
} else {
Logger.shared.log("Camera", "No format selected")
}
Logger.shared.log("Camera", "Available formats:")
for format in device.formats {
Logger.shared.log("Camera", format.description)
}
Logger.shared.log("Camera", "Selected format:")
Logger.shared.log("Camera", bestFormat.description)
}
if let targetFPS = device.actualFPS(maxFramerate) {
device.activeVideoMinFrameDuration = targetFPS.duration
device.activeVideoMaxFrameDuration = targetFPS.duration

5
submodules/TelegramUI/Components/Stories/StoryContainerScreen/Sources/StoryContainerScreen.swift
View File

@ -799,9 +799,10 @@ private final class StoryContainerScreenComponent: Component {
if currentItemView.hasActiveDeactivateableInput() {
currentItemView.deactivateInput()
} else {
if location.x < currentItemView.frame.minX {
let itemViewFrame = currentItemView.convert(currentItemView.bounds, to: self)
if location.x < itemViewFrame.minX {
self.navigate(direction: .previous)
} else if location.x > currentItemView.frame.maxX {
} else if location.x > itemViewFrame.maxX {
self.navigate(direction: .next)
}
}

4
submodules/TelegramUI/Sources/ChatController.swift
View File

@ -17433,7 +17433,11 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
}, joinVoiceChat: { [weak self] peerId, invite, call in
self?.joinGroupCall(peerId: peerId, invite: invite, activeCall: EngineGroupCallDescription(call))
}, present: { [weak self] c, a in
if c is UndoOverlayController {
self?.present(c, in: .current)
} else {
self?.present(c, in: .window(.root), with: a)
}
}, dismissInput: { [weak self] in
self?.chatDisplayNode.dismissInput()
}, contentContext: nil)

6
submodules/TelegramUI/Sources/OpenResolvedUrl.swift
View File

@ -834,7 +834,11 @@ func openResolvedUrlImpl(_ resolvedUrl: ResolvedUrl, context: AccountContext, ur
})
} else {
//TODO:localize
present(UndoOverlayController(presentationData: presentationData, content: .universal(animation: "story_expired", scale: 0.066, colors: [:], title: nil, text: "This story does not exist", customUndoText: nil, timeout: nil), elevatedLayout: true, animateInAsReplacement: false, action: { _ in
var elevatedLayout = true
if case .chat = urlContext {
elevatedLayout = false
}
present(UndoOverlayController(presentationData: presentationData, content: .universal(animation: "story_expired", scale: 0.066, colors: [:], title: nil, text: "This story does not exist", customUndoText: nil, timeout: nil), elevatedLayout: elevatedLayout, animateInAsReplacement: false, action: { _ in
return true
}), nil)
}