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 2023-04-03 16:37:30 +04:00
parent 6f4f3817a9
commit 555e36a19a
3 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
submodules/ChatSendMessageActionUI/Sources/ChatSendMessageActionSheetControllerNode.swift
View File

@ -688,7 +688,7 @@ final class ChatSendMessageActionSheetControllerNode: ViewControllerTracingNode,
sendButtonFrame.origin.y -= menuHeightWithInset sendButtonFrame.origin.y -= menuHeightWithInset
} }
sendButtonFrame.origin.y = min(sendButtonFrame.origin.y + contentOffset, layout.size.height - layout.intrinsicInsets.bottom - initialSendButtonFrame.height) sendButtonFrame.origin.y = min(sendButtonFrame.origin.y + contentOffset, layout.size.height - layout.intrinsicInsets.bottom - initialSendButtonFrame.height)
transition.updateFrame(node: self.sendButtonNode, frame: sendButtonFrame) transition.updateFrameAsPositionAndBounds(node: self.sendButtonNode, frame: sendButtonFrame)
var messageFrame = self.textFieldFrame var messageFrame = self.textFieldFrame
messageFrame.size.width += 32.0 messageFrame.size.width += 32.0

14
submodules/MediaPickerUI/Sources/MediaPickerScreen.swift
View File

@ -1316,14 +1316,14 @@ public final class MediaPickerScreen: ViewController, AttachmentContainable {
self.navigationItem.titleView = self.titleView self.navigationItem.titleView = self.titleView
if case let .assets(collection, isStandalone) = self.subject { if case let .assets(_, isStandalone) = self.subject, isStandalone {
if !isStandalone { self.navigationItem.leftBarButtonItem = UIBarButtonItem(backButtonAppearanceWithTitle: self.presentationData.strings.Common_Back, target: self, action: #selector(self.backPressed))
self.navigationItem.leftBarButtonItem = UIBarButtonItem(title: self.presentationData.strings.Common_Cancel, style: .plain, target: self, action: #selector(self.cancelPressed)) } else {
} else if collection != nil { if case let .assets(collection, _) = self.subject, collection != nil {
self.navigationItem.leftBarButtonItem = UIBarButtonItem(backButtonAppearanceWithTitle: self.presentationData.strings.Common_Back, target: self, action: #selector(self.backPressed)) self.navigationItem.leftBarButtonItem = UIBarButtonItem(backButtonAppearanceWithTitle: self.presentationData.strings.Common_Back, target: self, action: #selector(self.backPressed))
}
} else { } else {
self.navigationItem.leftBarButtonItem = UIBarButtonItem(title: self.presentationData.strings.Common_Cancel, style: .plain, target: self, action: #selector(self.cancelPressed)) self.navigationItem.leftBarButtonItem = UIBarButtonItem(title: self.presentationData.strings.Common_Cancel, style: .plain, target: self, action: #selector(self.cancelPressed))
}
if self.bannedSendPhotos != nil && self.bannedSendVideos != nil { if self.bannedSendPhotos != nil && self.bannedSendVideos != nil {
} else { } else {
@ -1596,6 +1596,9 @@ public final class MediaPickerScreen: ViewController, AttachmentContainable {
} }
@objc private func backPressed() { @objc private func backPressed() {
if let _ = self.navigationController {
self.dismiss()
} else {
self.updateNavigationStack { current in self.updateNavigationStack { current in
var mediaPickerContext: AttachmentMediaPickerContext? var mediaPickerContext: AttachmentMediaPickerContext?
if let first = current.first as? MediaPickerScreen { if let first = current.first as? MediaPickerScreen {
@ -1604,6 +1607,7 @@ public final class MediaPickerScreen: ViewController, AttachmentContainable {
return (current.filter { $0 !== self }, mediaPickerContext) return (current.filter { $0 !== self }, mediaPickerContext)
} }
} }
}
func dismissAllTooltips() { func dismissAllTooltips() {
self.undoOverlayController?.dismissWithCommitAction() self.undoOverlayController?.dismissWithCommitAction()

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

@ -76,7 +76,7 @@ final class ChatTextInputActionButtonsNode: ASDisplayNode {
} else { } else {
if highlighted { if highlighted {
strongSelf.sendContainerNode.layer.animateScale(from: 1.0, to: 0.75, duration: 0.4, removeOnCompletion: false) strongSelf.sendContainerNode.layer.animateScale(from: 1.0, to: 0.75, duration: 0.4, removeOnCompletion: false)
} else if let presentationLayer = strongSelf.sendButton.layer.presentation() { } else if let presentationLayer = strongSelf.sendContainerNode.layer.presentation() {
strongSelf.sendContainerNode.layer.animateScale(from: CGFloat((presentationLayer.value(forKeyPath: "transform.scale.y") as? NSNumber)?.floatValue ?? 1.0), to: 1.0, duration: 0.25, removeOnCompletion: false) strongSelf.sendContainerNode.layer.animateScale(from: CGFloat((presentationLayer.value(forKeyPath: "transform.scale.y") as? NSNumber)?.floatValue ?? 1.0), to: 1.0, duration: 0.25, removeOnCompletion: false)
} }
} }