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

Voice Chat UI fixes

Browse Source
This commit is contained in:
Ilya Laktyushin 2020-12-01 00:27:55 +04:00
parent c32b2bb2d5
commit 964104f041
2 changed files with 153 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
submodules/TelegramCallsUI/Sources/CallStatusBarNode.swift
View File

@ -9,6 +9,8 @@ import TelegramPresentationData
import TelegramUIPreferences
import AccountContext
private let colorSpace = CGColorSpaceCreateDeviceRGB()
private class CurveDrawingState: NSObject {
let path: UIBezierPath
let offset: CGFloat
@ -375,7 +377,6 @@ private class CallStatusBarBackgroundNode: ASDisplayNode {
let rightColor = UIColor(rgb: 0x00afff).interpolateTo(UIColor(rgb: 0x007fff), fraction: parameters.gradientTransition)!
let colors: [CGColor] = [leftColor.cgColor, rightColor.cgColor]
let colorSpace = CGColorSpaceCreateDeviceRGB()
let gradient = CGGradient(colorsSpace: colorSpace, colors: colors as CFArray, locations: &locations)!
var i = 0

47
submodules/TelegramCallsUI/Sources/VoiceChatActionButton.swift
View File

@ -2,6 +2,7 @@ import Foundation
import UIKit
import AsyncDisplayKit
import Display
import SwiftSignalKit
private let titleFont = Font.regular(17.0)
private let subtitleFont = Font.regular(13.0)
@ -426,13 +427,15 @@ private final class VoiceChatActionButtonBackgroundNodeTransitionContext {
}
private class VoiceChatActionButtonBackgroundNodeDrawingState: NSObject {
let maskContext: Atomic<CGContext>
let timestamp: Double
let state: VoiceChatActionButtonBackgroundNodeState
let simplified: Bool
let gradientMovement: CGPoint
let transition: VoiceChatActionButtonBackgroundNodeTransitionState?
init(timestamp: Double, state: VoiceChatActionButtonBackgroundNodeState, simplified: Bool, gradientMovement: CGPoint, transition: VoiceChatActionButtonBackgroundNodeTransitionState?) {
init(maskContext: Atomic<CGContext>, timestamp: Double, state: VoiceChatActionButtonBackgroundNodeState, simplified: Bool, gradientMovement: CGPoint, transition: VoiceChatActionButtonBackgroundNodeTransitionState?) {
self.maskContext = maskContext
self.timestamp = timestamp
self.state = state
self.simplified = simplified
@ -447,6 +450,9 @@ private class VoiceChatActionButtonBackgroundNode: ASDisplayNode {
private var transition: VoiceChatActionButtonBackgroundNodeTransitionContext?
private var simplified = false
private let bitmapData: UnsafeMutablePointer<UInt8>
private let maskContext: Atomic<CGContext>
private var gradientMovementArguments: (from: CGPoint, to: CGPoint, startTime: Double, duration: Double)?
private var gradientMovement = CGPoint()
@ -467,6 +473,20 @@ private class VoiceChatActionButtonBackgroundNode: ASDisplayNode {
override init() {
self.state = VoiceChatActionButtonBackgroundNodeConnectingContext()
let size = CGSize(width: 300.0, height: 300.0)
let width: Int = Int(size.width * deviceScale)
let height: Int = Int(size.height * deviceScale)
let bytesPerRow = width
let bitmapByteCount = width * height
self.bitmapData = .allocate(capacity: bitmapByteCount)
self.bitmapData.initialize(repeating: 0, count: bitmapByteCount)
let maskContext = CGContext(data: self.bitmapData, width: width, height: height, bitsPerComponent: 8, bytesPerRow: bytesPerRow, space: CGColorSpaceCreateDeviceGray(), bitmapInfo: CGImageAlphaInfo.alphaOnly.rawValue)!
maskContext.interpolationQuality = .low
maskContext.scaleBy(x: CGFloat(width) / size.width, y: CGFloat(height) / size.height)
self.maskContext = Atomic(value: maskContext)
super.init()
self.isLayerBacked = true
@ -474,6 +494,10 @@ private class VoiceChatActionButtonBackgroundNode: ASDisplayNode {
self.displaysAsynchronously = true
}
deinit {
self.bitmapData.deallocate()
}
func update(state: VoiceChatActionButtonBackgroundNodeContext, simplified: Bool, animated: Bool) {
var animated = animated
var hadState = true
@ -595,7 +619,7 @@ private class VoiceChatActionButtonBackgroundNode: ASDisplayNode {
override public func drawParameters(forAsyncLayer layer: _ASDisplayLayer) -> NSObjectProtocol? {
let timestamp = CACurrentMediaTime()
let transitionState = self.transition?.drawingTransitionState(time: timestamp)
return VoiceChatActionButtonBackgroundNodeDrawingState(timestamp: timestamp, state: self.state.drawingState(transition: transitionState), simplified: self.simplified, gradientMovement: self.gradientMovement, transition: transitionState)
return VoiceChatActionButtonBackgroundNodeDrawingState(maskContext: self.maskContext, timestamp: timestamp, state: self.state.drawingState(transition: transitionState), simplified: self.simplified, gradientMovement: self.gradientMovement, transition: transitionState)
}
@objc override public class func draw(_ bounds: CGRect, withParameters parameters: Any?, isCancelled: () -> Bool, isRasterizing: Bool) {
@ -628,22 +652,8 @@ private class VoiceChatActionButtonBackgroundNode: ASDisplayNode {
appearanceProgress = transition.transition
}
let width: Int = Int(bounds.width * deviceScale)
let height: Int = Int(bounds.height * deviceScale)
let bytesPerRow = width
let bitmapByteCount = width * height
let bitmapData: UnsafeMutablePointer<UInt8> = .allocate(capacity: bitmapByteCount)
defer {
bitmapData.deallocate()
}
bitmapData.initialize(repeating: 0, count: bitmapByteCount)
guard let maskContext = CGContext(data: bitmapData, width: width, height: height, bitsPerComponent: 8, bytesPerRow: bytesPerRow, space: CGColorSpaceCreateDeviceGray(), bitmapInfo: CGImageAlphaInfo.alphaOnly.rawValue) else {
return
}
maskContext.interpolationQuality = .low
maskContext.scaleBy(x: CGFloat(width) / bounds.width, y: CGFloat(height) / bounds.height)
parameters.maskContext.with { maskContext in
maskContext.clear(bounds)
var skipBlobs = false
if parameters.state is VoiceChatActionButtonBackgroundNodeBlobState, let transition = parameters.transition, transition.previousState == .connecting, transition.transition < 0.5 {
@ -782,6 +792,7 @@ private class VoiceChatActionButtonBackgroundNode: ASDisplayNode {
context.setFillColor(greyColor.cgColor)
context.fillEllipse(in: buttonRect.insetBy(dx: lineWidth / 2.0 + transition * radius, dy: lineWidth / 2.0 + transition * radius))
}
}
// print("drawn in \(CACurrentMediaTime() - start)")
}