mirror of
https://github.com/Swiftgram/Telegram-iOS.git
synced 2025-06-16 05:55:20 +00:00
Remove experiment
This commit is contained in:
parent
d7806edfcb
commit
ace260e59c
@ -32,7 +32,6 @@ import MapResourceToAvatarSizes
|
|||||||
import SolidRoundedButtonNode
|
import SolidRoundedButtonNode
|
||||||
import AudioBlob
|
import AudioBlob
|
||||||
import DeviceAccess
|
import DeviceAccess
|
||||||
import LottieMeshSwift
|
|
||||||
|
|
||||||
let panelBackgroundColor = UIColor(rgb: 0x1c1c1e)
|
let panelBackgroundColor = UIColor(rgb: 0x1c1c1e)
|
||||||
let secondaryPanelBackgroundColor = UIColor(rgb: 0x2c2c2e)
|
let secondaryPanelBackgroundColor = UIColor(rgb: 0x2c2c2e)
|
||||||
@ -40,8 +39,8 @@ let fullscreenBackgroundColor = UIColor(rgb: 0x000000)
|
|||||||
private let smallButtonSize = CGSize(width: 36.0, height: 36.0)
|
private let smallButtonSize = CGSize(width: 36.0, height: 36.0)
|
||||||
private let sideButtonSize = CGSize(width: 56.0, height: 56.0)
|
private let sideButtonSize = CGSize(width: 56.0, height: 56.0)
|
||||||
private let topPanelHeight: CGFloat = 63.0
|
private let topPanelHeight: CGFloat = 63.0
|
||||||
let bottomAreaHeight: CGFloat = 206.0 + 32.0
|
let bottomAreaHeight: CGFloat = 206.0
|
||||||
private let fullscreenBottomAreaHeight: CGFloat = 80.0 + 32.0
|
private let fullscreenBottomAreaHeight: CGFloat = 80.0
|
||||||
private let bottomGradientHeight: CGFloat = 70.0
|
private let bottomGradientHeight: CGFloat = 70.0
|
||||||
|
|
||||||
func decorationCornersImage(top: Bool, bottom: Bool, dark: Bool) -> UIImage? {
|
func decorationCornersImage(top: Bool, bottom: Bool, dark: Bool) -> UIImage? {
|
||||||
@ -781,14 +780,11 @@ public final class VoiceChatController: ViewController {
|
|||||||
fileprivate let switchCameraButton: CallControllerButtonItemNode
|
fileprivate let switchCameraButton: CallControllerButtonItemNode
|
||||||
fileprivate let leaveButton: CallControllerButtonItemNode
|
fileprivate let leaveButton: CallControllerButtonItemNode
|
||||||
fileprivate let actionButton: VoiceChatActionButton
|
fileprivate let actionButton: VoiceChatActionButton
|
||||||
fileprivate let reactionStrip: ReactionStrip
|
|
||||||
private let leftBorderNode: ASDisplayNode
|
private let leftBorderNode: ASDisplayNode
|
||||||
private let rightBorderNode: ASDisplayNode
|
private let rightBorderNode: ASDisplayNode
|
||||||
private let mainStageContainerNode: ASDisplayNode
|
private let mainStageContainerNode: ASDisplayNode
|
||||||
private let mainStageBackgroundNode: ASDisplayNode
|
private let mainStageBackgroundNode: ASDisplayNode
|
||||||
private let mainStageNode: VoiceChatMainStageNode
|
private let mainStageNode: VoiceChatMainStageNode
|
||||||
|
|
||||||
private var meshAnimationView: UIView?
|
|
||||||
|
|
||||||
private let transitionMaskView: UIView
|
private let transitionMaskView: UIView
|
||||||
private let transitionMaskTopFillLayer: CALayer
|
private let transitionMaskTopFillLayer: CALayer
|
||||||
@ -1060,7 +1056,6 @@ public final class VoiceChatController: ViewController {
|
|||||||
self.switchCameraButton.isUserInteractionEnabled = false
|
self.switchCameraButton.isUserInteractionEnabled = false
|
||||||
self.leaveButton = CallControllerButtonItemNode()
|
self.leaveButton = CallControllerButtonItemNode()
|
||||||
self.actionButton = VoiceChatActionButton()
|
self.actionButton = VoiceChatActionButton()
|
||||||
self.reactionStrip = ReactionStrip()
|
|
||||||
|
|
||||||
if self.isScheduling {
|
if self.isScheduling {
|
||||||
self.cameraButton.alpha = 0.0
|
self.cameraButton.alpha = 0.0
|
||||||
@ -1141,38 +1136,8 @@ public final class VoiceChatController: ViewController {
|
|||||||
|
|
||||||
self.participantsNode = VoiceChatTimerNode(strings: self.presentationData.strings, dateTimeFormat: self.presentationData.dateTimeFormat)
|
self.participantsNode = VoiceChatTimerNode(strings: self.presentationData.strings, dateTimeFormat: self.presentationData.dateTimeFormat)
|
||||||
|
|
||||||
if #available(iOS 13.0, *) {
|
|
||||||
self.meshAnimationView = MeshRenderer()
|
|
||||||
self.meshAnimationView?.isUserInteractionEnabled = false
|
|
||||||
}
|
|
||||||
|
|
||||||
super.init()
|
super.init()
|
||||||
|
|
||||||
self.reactionStrip.selected = { [weak self] value in
|
|
||||||
guard let strongSelf = self else {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
let mapping: [String: String] = [
|
|
||||||
"🧡": "Hearts",
|
|
||||||
"🎆": "Fireworks",
|
|
||||||
"🎈": "Balloon",
|
|
||||||
"🎉": "Party",
|
|
||||||
"👍": "SuperThumbsUp1",
|
|
||||||
"👎": "SuperThumbsDown",
|
|
||||||
"💩": "Poo",
|
|
||||||
"💸": "Money",
|
|
||||||
"😂": "Joy"
|
|
||||||
]
|
|
||||||
|
|
||||||
if let name = mapping[value] {
|
|
||||||
if #available(iOS 13.0, *) {
|
|
||||||
if let animation = call.accountContext.meshAnimationCache.get(bundleName: name), let meshAnimationView = strongSelf.meshAnimationView as? MeshRenderer {
|
|
||||||
meshAnimationView.add(mesh: animation, offset: CGPoint())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
let context = self.context
|
let context = self.context
|
||||||
let currentAccountPeer = self.context.account.postbox.loadedPeerWithId(context.account.peerId)
|
let currentAccountPeer = self.context.account.postbox.loadedPeerWithId(context.account.peerId)
|
||||||
|> map { peer in
|
|> map { peer in
|
||||||
@ -1876,10 +1841,6 @@ public final class VoiceChatController: ViewController {
|
|||||||
self.addSubnode(self.dimNode)
|
self.addSubnode(self.dimNode)
|
||||||
self.addSubnode(self.contentContainer)
|
self.addSubnode(self.contentContainer)
|
||||||
|
|
||||||
if let meshAnimationView = self.meshAnimationView {
|
|
||||||
self.view.addSubview(meshAnimationView)
|
|
||||||
}
|
|
||||||
|
|
||||||
self.contentContainer.addSubnode(self.backgroundNode)
|
self.contentContainer.addSubnode(self.backgroundNode)
|
||||||
|
|
||||||
self.contentContainer.addSubnode(self.listContainer)
|
self.contentContainer.addSubnode(self.listContainer)
|
||||||
@ -1896,7 +1857,6 @@ public final class VoiceChatController: ViewController {
|
|||||||
self.contentContainer.addSubnode(self.mainStageContainerNode)
|
self.contentContainer.addSubnode(self.mainStageContainerNode)
|
||||||
self.contentContainer.addSubnode(self.transitionContainerNode)
|
self.contentContainer.addSubnode(self.transitionContainerNode)
|
||||||
self.contentContainer.addSubnode(self.bottomPanelNode)
|
self.contentContainer.addSubnode(self.bottomPanelNode)
|
||||||
self.contentContainer.addSubnode(self.reactionStrip)
|
|
||||||
self.contentContainer.addSubnode(self.timerNode)
|
self.contentContainer.addSubnode(self.timerNode)
|
||||||
self.contentContainer.addSubnode(self.scheduleTextNode)
|
self.contentContainer.addSubnode(self.scheduleTextNode)
|
||||||
self.contentContainer.addSubnode(self.fullscreenListContainer)
|
self.contentContainer.addSubnode(self.fullscreenListContainer)
|
||||||
@ -4318,12 +4278,6 @@ public final class VoiceChatController: ViewController {
|
|||||||
let previousLayout = self.validLayout?.0
|
let previousLayout = self.validLayout?.0
|
||||||
self.validLayout = (layout, navigationHeight)
|
self.validLayout = (layout, navigationHeight)
|
||||||
|
|
||||||
if #available(iOS 13.0, *) {
|
|
||||||
if let meshAnimationView = self.meshAnimationView as? MeshRenderer {
|
|
||||||
meshAnimationView.frame = CGRect(origin: CGPoint(x: 0.0, y: layout.size.height - layout.size.width), size: CGSize(width: layout.size.width, height: layout.size.width))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
let size = layout.size
|
let size = layout.size
|
||||||
let contentWidth: CGFloat
|
let contentWidth: CGFloat
|
||||||
let headerWidth: CGFloat
|
let headerWidth: CGFloat
|
||||||
@ -4781,9 +4735,6 @@ public final class VoiceChatController: ViewController {
|
|||||||
} : nil)
|
} : nil)
|
||||||
}
|
}
|
||||||
|
|
||||||
transition.updateFrame(node: self.reactionStrip, frame: CGRect(origin: CGPoint(x: 12.0, y: size.height - 44.0 - 10.0), size: CGSize(width: size.width - 12.0 * 2.0, height: 44.0)))
|
|
||||||
self.reactionStrip.update(size: self.reactionStrip.bounds.size)
|
|
||||||
|
|
||||||
self.cameraButton.isUserInteractionEnabled = hasCameraButton
|
self.cameraButton.isUserInteractionEnabled = hasCameraButton
|
||||||
|
|
||||||
var buttonsTransition: ContainedViewLayoutTransition = .immediate
|
var buttonsTransition: ContainedViewLayoutTransition = .immediate
|
||||||
|
Loading…
x
Reference in New Issue
Block a user