mirror of
https://github.com/Swiftgram/Telegram-iOS.git
synced 2025-06-16 05:55:20 +00:00
Various fixes
This commit is contained in:
parent
fc7c72d196
commit
5dc97b4e3d
@ -2198,7 +2198,7 @@ public class CameraScreen: ViewController {
|
|||||||
self.animatedIn = false
|
self.animatedIn = false
|
||||||
|
|
||||||
let destinationInnerFrame = destinationView.convert(transitionOut.destinationRect, to: self.previewContainerView)
|
let destinationInnerFrame = destinationView.convert(transitionOut.destinationRect, to: self.previewContainerView)
|
||||||
let initialCenter = self.mainPreviewView.layer.position
|
let initialCenter = self.mainPreviewAnimationWrapperView.layer.position
|
||||||
|
|
||||||
self.mainPreviewAnimationWrapperView.center = destinationInnerFrame.center
|
self.mainPreviewAnimationWrapperView.center = destinationInnerFrame.center
|
||||||
self.mainPreviewAnimationWrapperView.layer.animatePosition(from: initialCenter, to: self.mainPreviewAnimationWrapperView.center, duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring, removeOnCompletion: false, completion: { _ in
|
self.mainPreviewAnimationWrapperView.layer.animatePosition(from: initialCenter, to: self.mainPreviewAnimationWrapperView.center, duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring, removeOnCompletion: false, completion: { _ in
|
||||||
|
@ -573,15 +573,7 @@ func contextMenuForChatPresentationInterfaceState(chatPresentationInterfaceState
|
|||||||
return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Clear"), color: theme.actionSheet.primaryTextColor)
|
return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Clear"), color: theme.actionSheet.primaryTextColor)
|
||||||
}, iconSource: nil, action: { c, _ in
|
}, iconSource: nil, action: { c, _ in
|
||||||
c.dismiss(completion: {
|
c.dismiss(completion: {
|
||||||
var replaceImpl: ((ViewController) -> Void)?
|
controllerInteraction.openNoAdsDemo()
|
||||||
let controller = context.sharedContext.makePremiumDemoController(context: context, subject: .noAds, action: {
|
|
||||||
let controller = context.sharedContext.makePremiumIntroController(context: context, source: .ads, forceDark: false, dismissed: nil)
|
|
||||||
replaceImpl?(controller)
|
|
||||||
})
|
|
||||||
replaceImpl = { [weak controller] c in
|
|
||||||
controller?.replace(with: c)
|
|
||||||
}
|
|
||||||
controllerInteraction.navigationController()?.pushViewController(controller)
|
|
||||||
})
|
})
|
||||||
})))
|
})))
|
||||||
} else {
|
} else {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user