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

Roll back BlobView for release

Browse Source
This commit is contained in:
Isaac 2024-06-17 21:17:11 +04:00
parent 47555ae97d
commit 802db07316
1 changed files with 22 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
submodules/AudioBlob/Sources/BlobView.swift
View File

@ -3,8 +3,6 @@ import UIKit
import AsyncDisplayKit import AsyncDisplayKit
import Display import Display
import LegacyComponents import LegacyComponents
import CallScreen
import MetalEngine
public final class VoiceBlobNode: ASDisplayNode { public final class VoiceBlobNode: ASDisplayNode {
public init( public init(
@ -38,7 +36,9 @@ public final class VoiceBlobNode: ASDisplayNode {
} }
public final class VoiceBlobView: UIView, TGModernConversationInputMicButtonDecoration { public final class VoiceBlobView: UIView, TGModernConversationInputMicButtonDecoration {
private let blobsLayer: CallBlobsLayer private let smallBlob: BlobNode
private let mediumBlob: BlobNode
private let bigBlob: BlobNode
private let maxLevel: CGFloat private let maxLevel: CGFloat
@ -65,7 +65,7 @@ public final class VoiceBlobView: UIView, TGModernConversationInputMicButtonDeco
) { ) {
self.maxLevel = maxLevel self.maxLevel = maxLevel
/*self.smallBlob = BlobNode( self.smallBlob = BlobNode(
pointsCount: 8, pointsCount: 8,
minRandomness: 0.1, minRandomness: 0.1,
maxRandomness: 0.5, maxRandomness: 0.5,
@ -97,9 +97,7 @@ public final class VoiceBlobView: UIView, TGModernConversationInputMicButtonDeco
maxScale: bigBlobRange.max, maxScale: bigBlobRange.max,
scaleSpeed: 0.2, scaleSpeed: 0.2,
isCircle: false isCircle: false
)*/ )
self.blobsLayer = CallBlobsLayer(colors: [UIColor.white, UIColor.white.withAlphaComponent(0.3), UIColor.white.withAlphaComponent(0.15)])
var updateInHierarchy: ((Bool) -> Void)? var updateInHierarchy: ((Bool) -> Void)?
self.hierarchyTrackingNode = HierarchyTrackingNode({ value in self.hierarchyTrackingNode = HierarchyTrackingNode({ value in
@ -110,21 +108,18 @@ public final class VoiceBlobView: UIView, TGModernConversationInputMicButtonDeco
self.addSubnode(self.hierarchyTrackingNode) self.addSubnode(self.hierarchyTrackingNode)
/*self.addSubnode(self.bigBlob) self.addSubnode(self.bigBlob)
self.addSubnode(self.mediumBlob) self.addSubnode(self.mediumBlob)
self.addSubnode(self.smallBlob)*/ self.addSubnode(self.smallBlob)
self.layer.addSublayer(self.blobsLayer) displayLinkAnimator = ConstantDisplayLinkAnimator() { [weak self] in
self.displayLinkAnimator = ConstantDisplayLinkAnimator() { [weak self] in
guard let strongSelf = self else { return } guard let strongSelf = self else { return }
strongSelf.presentationAudioLevel = strongSelf.presentationAudioLevel * 0.9 + strongSelf.audioLevel * 0.1 strongSelf.presentationAudioLevel = strongSelf.presentationAudioLevel * 0.9 + strongSelf.audioLevel * 0.1
strongSelf.updateAudioLevel()
/*strongSelf.smallBlob.level = strongSelf.presentationAudioLevel strongSelf.smallBlob.level = strongSelf.presentationAudioLevel
strongSelf.mediumBlob.level = strongSelf.presentationAudioLevel strongSelf.mediumBlob.level = strongSelf.presentationAudioLevel
strongSelf.bigBlob.level = strongSelf.presentationAudioLevel*/ strongSelf.bigBlob.level = strongSelf.presentationAudioLevel
} }
updateInHierarchy = { [weak self] value in updateInHierarchy = { [weak self] value in
@ -143,20 +138,12 @@ public final class VoiceBlobView: UIView, TGModernConversationInputMicButtonDeco
} }
public func setColor(_ color: UIColor, animated: Bool) { public func setColor(_ color: UIColor, animated: Bool) {
let transition: ContainedViewLayoutTransition
if animated {
transition = .animated(duration: 0.2, curve: .easeInOut)
} else {
transition = .immediate
}
transition.updateTintColor(layer: self.blobsLayer, color: color)
if let isManuallyInHierarchy = self.isManuallyInHierarchy, !isManuallyInHierarchy { if let isManuallyInHierarchy = self.isManuallyInHierarchy, !isManuallyInHierarchy {
return return
} }
/*smallBlob.setColor(color, animated: animated) smallBlob.setColor(color, animated: animated)
mediumBlob.setColor(color.withAlphaComponent(0.3), animated: animated) mediumBlob.setColor(color.withAlphaComponent(0.3), animated: animated)
bigBlob.setColor(color.withAlphaComponent(0.15), animated: animated)*/ bigBlob.setColor(color.withAlphaComponent(0.15), animated: animated)
} }
public func updateLevel(_ level: CGFloat) { public func updateLevel(_ level: CGFloat) {
@ -166,9 +153,9 @@ public final class VoiceBlobView: UIView, TGModernConversationInputMicButtonDeco
public func updateLevel(_ level: CGFloat, immediately: Bool = false) { public func updateLevel(_ level: CGFloat, immediately: Bool = false) {
let normalizedLevel = min(1, max(level / maxLevel, 0)) let normalizedLevel = min(1, max(level / maxLevel, 0))
/*smallBlob.updateSpeedLevel(to: normalizedLevel) smallBlob.updateSpeedLevel(to: normalizedLevel)
mediumBlob.updateSpeedLevel(to: normalizedLevel) mediumBlob.updateSpeedLevel(to: normalizedLevel)
bigBlob.updateSpeedLevel(to: normalizedLevel)*/ bigBlob.updateSpeedLevel(to: normalizedLevel)
audioLevel = normalizedLevel audioLevel = normalizedLevel
if immediately { if immediately {
@ -176,13 +163,6 @@ public final class VoiceBlobView: UIView, TGModernConversationInputMicButtonDeco
} }
} }
private func updateAudioLevel() {
let additionalAvatarScale = CGFloat(max(0.0, min(self.presentationAudioLevel * 18.0, 5.0)) * 0.05)
let blobAmplificationFactor: CGFloat = 2.0
let blobScale = 1.0 + additionalAvatarScale * blobAmplificationFactor
self.blobsLayer.transform = CATransform3DMakeScale(blobScale, blobScale, 1.0)
}
public func startAnimating() { public func startAnimating() {
self.startAnimating(immediately: false) self.startAnimating(immediately: false)
} }
@ -191,13 +171,13 @@ public final class VoiceBlobView: UIView, TGModernConversationInputMicButtonDeco
guard !isAnimating else { return } guard !isAnimating else { return }
isAnimating = true isAnimating = true
/*if !immediately { if !immediately {
mediumBlob.layer.animateScale(from: 0.75, to: 1, duration: 0.35, removeOnCompletion: false) mediumBlob.layer.animateScale(from: 0.75, to: 1, duration: 0.35, removeOnCompletion: false)
bigBlob.layer.animateScale(from: 0.75, to: 1, duration: 0.35, removeOnCompletion: false) bigBlob.layer.animateScale(from: 0.75, to: 1, duration: 0.35, removeOnCompletion: false)
} else { } else {
mediumBlob.layer.removeAllAnimations() mediumBlob.layer.removeAllAnimations()
bigBlob.layer.removeAllAnimations() bigBlob.layer.removeAllAnimations()
}*/ }
updateBlobsState() updateBlobsState()
@ -212,8 +192,8 @@ public final class VoiceBlobView: UIView, TGModernConversationInputMicButtonDeco
guard isAnimating else { return } guard isAnimating else { return }
isAnimating = false isAnimating = false
/*mediumBlob.layer.animateScale(from: 1.0, to: 0.75, duration: duration, removeOnCompletion: false) mediumBlob.layer.animateScale(from: 1.0, to: 0.75, duration: duration, removeOnCompletion: false)
bigBlob.layer.animateScale(from: 1.0, to: 0.75, duration: duration, removeOnCompletion: false)*/ bigBlob.layer.animateScale(from: 1.0, to: 0.75, duration: duration, removeOnCompletion: false)
updateBlobsState() updateBlobsState()
@ -221,7 +201,7 @@ public final class VoiceBlobView: UIView, TGModernConversationInputMicButtonDeco
} }
private func updateBlobsState() { private func updateBlobsState() {
/*if self.isAnimating { if self.isAnimating {
if self.smallBlob.frame.size != .zero { if self.smallBlob.frame.size != .zero {
smallBlob.startAnimating() smallBlob.startAnimating()
mediumBlob.startAnimating() mediumBlob.startAnimating()
@ -231,19 +211,15 @@ public final class VoiceBlobView: UIView, TGModernConversationInputMicButtonDeco
smallBlob.stopAnimating() smallBlob.stopAnimating()
mediumBlob.stopAnimating() mediumBlob.stopAnimating()
bigBlob.stopAnimating() bigBlob.stopAnimating()
}*/ }
} }
override public func layoutSubviews() { override public func layoutSubviews() {
super.layoutSubviews() super.layoutSubviews()
/*self.smallBlob.frame = bounds self.smallBlob.frame = bounds
self.mediumBlob.frame = bounds self.mediumBlob.frame = bounds
self.bigBlob.frame = bounds*/ self.bigBlob.frame = bounds
let blobsFrame = bounds.insetBy(dx: floor(bounds.width * 0.12), dy: floor(bounds.height * 0.12))
self.blobsLayer.position = blobsFrame.center
self.blobsLayer.bounds = CGRect(origin: CGPoint(), size: blobsFrame.size)
self.updateBlobsState() self.updateBlobsState()
} }