- Bug fixes and minor improvements.

Telegram-Mac/CallNavigationHeaderView.swift

@@ -32,7 +32,7 @@ class CallNavigationHeaderView: NavigationHeaderView {
     private var statusTimer: SwiftSignalKit.Timer?
 
 
-    var status: CallControllerStatusValue = .text("") {
+    var status: CallControllerStatusValue = .text("", nil) {
         didSet {
             if self.status != oldValue {
                 self.statusTimer?.invalidate()
@@ -52,9 +52,9 @@ class CallNavigationHeaderView: NavigationHeaderView {
     private func updateStatus() {
         var statusText: String = ""
         switch self.status {
-        case let .text(text):
+        case let .text(text, _):
             statusText = text
-        case let .timer(referenceTime):
+        case let .timer(referenceTime, _):
             let duration = Int32(CFAbsoluteTimeGetCurrent() - referenceTime)
             let durationString: String
             if duration > 60 * 60 {

Telegram-Mac/CallReceptionControl.swift

@@ -0,0 +1,41 @@
+//
+//  CallReceptionControl.swift
+//  Telegram
+//
+//  Created by Mikhail Filimonov on 13/08/2020.
+//  Copyright © 2020 Telegram. All rights reserved.
+//
+
+import Cocoa
+import TGUIKit
+
+class CallReceptionControl: View {
+
+    var reception: Int32 = 4 {
+        didSet {
+            self.needsDisplay = true
+        }
+    }
+
+    override func draw(_ layer: CALayer, in context: CGContext) {
+        super.draw(layer, in: context)
+
+        context.setFillColor(NSColor.white.cgColor)
+
+        let width: CGFloat = 3.0
+        let spacing: CGFloat = 2.0
+
+        for i in 0 ..< 4 {
+            let height = 4.0 + 2.0 * CGFloat(i)
+            let rect = CGRect(x: bounds.minX + CGFloat(i) * (width + spacing), y: frame.height - height, width: width, height: height)
+
+            if i >= reception {
+                context.setAlpha(0.4)
+            }
+            let path = NSBezierPath(roundedRect: rect, xRadius: 0.5, yRadius: 0.5)
+            context.addPath(path.cgPath)
+            context.fillPath()
+        }
+    }
+
+}

Telegram-Mac/CallStatusView.swift

@@ -0,0 +1,114 @@
+//
+//  CallStatusView.swift
+//  Telegram
+//
+//  Created by Mikhail Filimonov on 13/08/2020.
+//  Copyright © 2020 Telegram. All rights reserved.
+//
+
+import Cocoa
+import TGUIKit
+import SwiftSignalKit
+
+enum CallControllerStatusValue: Equatable {
+    case text(String, Int32?)
+    case timer(Double, Int32?)
+}
+
+
+class CallStatusView: View {
+
+
+    private var statusTimer: SwiftSignalKit.Timer?
+
+    var status: CallControllerStatusValue = .text("", nil) {
+        didSet {
+            if self.status != oldValue {
+                self.statusTimer?.invalidate()
+                if case .timer = self.status {
+                    self.statusTimer = SwiftSignalKit.Timer(timeout: 0.5, repeat: true, completion: { [weak self] in
+                        self?.updateStatus()
+                        }, queue: Queue.mainQueue())
+                    self.statusTimer?.start()
+                    self.updateStatus()
+                } else {
+                    self.updateStatus()
+                }
+            }
+        }
+    }
+
+    private let statusTextView:NSTextField = NSTextField()
+    private let receptionView = CallReceptionControl(frame: NSMakeRect(0, 0, 24, 10))
+    required init(frame frameRect: NSRect) {
+        super.init(frame: frameRect)
+
+        statusTextView.font = .normal(18)
+        statusTextView.drawsBackground = false
+        statusTextView.backgroundColor = .random
+        statusTextView.textColor = nightAccentPalette.text
+        statusTextView.isSelectable = false
+        statusTextView.isEditable = false
+        statusTextView.isBordered = false
+        statusTextView.focusRingType = .none
+
+        addSubview(statusTextView)
+        addSubview(receptionView)
+    }
+
+    override func layout() {
+        super.layout()
+        if receptionView.isHidden {
+            statusTextView.center()
+        } else {
+            receptionView.centerY(x: 0)
+            statusTextView.centerY(x: receptionView.frame.maxX)
+        }
+
+    }
+
+    func sizeThatFits(_ size: NSSize) -> NSSize {
+        let textSize = statusTextView.sizeThatFits(size)
+        statusTextView.setFrameSize(textSize)
+        return NSMakeSize(max(textSize.width, 60) + 28, size.height)
+    }
+
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+
+    deinit {
+        statusTimer?.invalidate()
+    }
+
+    func updateStatus() {
+        var statusText: String = ""
+        switch self.status {
+        case let .text(text, reception):
+            statusText = text
+            if let reception = reception {
+                self.receptionView.reception = reception
+            }
+            self.receptionView.isHidden = reception == nil
+        case let .timer(referenceTime, reception):
+            let duration = Int32(CFAbsoluteTimeGetCurrent() - referenceTime)
+            let durationString: String
+            if duration > 60 * 60 {
+                durationString = String(format: "%02d:%02d:%02d", arguments: [duration / 3600, (duration / 60) % 60, duration % 60])
+            } else {
+                durationString = String(format: "%02d:%02d", arguments: [(duration / 60) % 60, duration % 60])
+            }
+            statusText = durationString
+            if let reception = reception {
+                self.receptionView.reception = reception
+            }
+            self.receptionView.isHidden = reception == nil
+        }
+        statusTextView.stringValue = statusText
+        statusTextView.sizeToFit()
+        statusTextView.alignment = .center
+        needsLayout = true
+    }
+
+}

Telegram-Mac/CallWindowController.swift

@@ -657,28 +657,8 @@ private class PhoneCallWindowView : View {
 
     let muteControl:ImageButton = ImageButton()
     private var textNameView: NSTextField = NSTextField()
-
-    private var statusTimer: SwiftSignalKit.Timer?
-
-    var status: CallControllerStatusValue = .text("") {
-        didSet {
-            if self.status != oldValue {
-                self.statusTimer?.invalidate()
-                if case .timer = self.status {
-                    self.statusTimer = SwiftSignalKit.Timer(timeout: 0.5, repeat: true, completion: { [weak self] in
-                        self?.updateStatus()
-                    }, queue: Queue.mainQueue())
-                    self.statusTimer?.start()
-                    self.updateStatus()
-                } else {
-                    self.updateStatus()
-                }
-            }
-        }
-    }
-
-
-    private var statusTextView:NSTextField = NSTextField()
+
+    private var statusView: CallStatusView = CallStatusView(frame: .zero)
 
     private let secureTextView:TextView = TextView()
 
@@ -735,7 +715,7 @@ private class PhoneCallWindowView : View {
 
 
         self.addSubview(textNameView)
-        self.addSubview(statusTextView)
+        self.addSubview(statusView)
 
 
         controls.addSubview(acceptControl)
@@ -753,14 +733,7 @@ private class PhoneCallWindowView : View {
         textNameView.alignment = .center
         textNameView.cell?.truncatesLastVisibleLine = true
         textNameView.lineBreakMode = .byTruncatingTail
-        statusTextView.font = .normal(18)
-        statusTextView.drawsBackground = false
-        statusTextView.backgroundColor = .clear
-        statusTextView.textColor = nightAccentPalette.text
-        statusTextView.isSelectable = false
-        statusTextView.isEditable = false
-        statusTextView.isBordered = false
-        statusTextView.focusRingType = .none
+
 
         imageView.setFrameSize(frameRect.size.width, frameRect.size.height)
 
@@ -826,6 +799,9 @@ private class PhoneCallWindowView : View {
                     size.height > (window.frame.height - 40) {
                     return
                 }
+                if size.width < 50 || size.height < 50 {
+                    return
+                }
                 self.outgoingVideoView.updateFrame(CGRect(origin: point, size: size), animated: false)
 
             } else {
@@ -910,10 +886,10 @@ private class PhoneCallWindowView : View {
 
         textNameView.setFrameSize(NSMakeSize(controls.frame.width - 40, 36))
         textNameView.centerX(y: 50)
-        statusTextView.setFrameSize(statusTextView.sizeThatFits(NSMakeSize(controls.frame.width - 40, 25)))
-        statusTextView.centerX(y: textNameView.frame.maxY + 4)
+        statusView.setFrameSize(statusView.sizeThatFits(NSMakeSize(controls.frame.width - 40, 25)))
+        statusView.centerX(y: textNameView.frame.maxY + 4)
 
-        secureTextView.centerX(y: statusTextView.frame.maxY + 4)
+        secureTextView.centerX(y: statusView.frame.maxY + 4)
 
         let controlsSize = NSMakeSize(frame.width, 220)
         controls.frame = NSMakeRect(0, frame.height - controlsSize.height, controlsSize.width, controlsSize.height)
@@ -1045,25 +1021,6 @@ private class PhoneCallWindowView : View {
         needsLayout = true
     }
 
-    func updateStatus() {
-        var statusText: String = ""
-        switch self.status {
-        case let .text(text):
-            statusText = text
-        case let .timer(referenceTime):
-            let duration = Int32(CFAbsoluteTimeGetCurrent() - referenceTime)
-            let durationString: String
-            if duration > 60 * 60 {
-                durationString = String(format: "%02d:%02d:%02d", arguments: [duration / 3600, (duration / 60) % 60, duration % 60])
-            } else {
-                durationString = String(format: "%02d:%02d", arguments: [(duration / 60) % 60, duration % 60])
-            }
-            statusText = durationString
-        }
-        statusTextView.stringValue = statusText
-        statusTextView.alignment = .center
-        needsLayout = true
-    }
 
     func updateControlsVisibility() {
         if let state = state {
@@ -1073,7 +1030,7 @@ private class PhoneCallWindowView : View {
                 self.controls.change(opacity: self.mouseInside() ? 1.0 : 0.0)
                 self.textNameView._change(opacity: self.mouseInside() ? 1.0 : 0.0)
                 self.secureTextView._change(opacity: self.mouseInside() ? 1.0 : 0.0)
-                self.statusTextView._change(opacity: self.mouseInside() ? 1.0 : 0.0)
+                self.statusView._change(opacity: self.mouseInside() ? 1.0 : 0.0)
 
                 for tooltip in tooltips {
                     tooltip.change(opacity: self.mouseInside() ? 1.0 : 0.0)
@@ -1084,7 +1041,7 @@ private class PhoneCallWindowView : View {
                 self.controls.change(opacity: 1.0)
                 self.textNameView._change(opacity: 1.0)
                 self.secureTextView._change(opacity: 1.0)
-                self.statusTextView._change(opacity: 1.0)
+                self.statusView._change(opacity: 1.0)
 
                 for tooltip in tooltips {
                     tooltip.change(opacity: 1.0)
@@ -1112,7 +1069,7 @@ private class PhoneCallWindowView : View {
         self.b_Mute.updateEnabled(state.muteIsAvailable, animated: animated)
 
         self.state = state
-        self.status = state.state.statusText(accountPeer, state.videoState)
+        self.statusView.status = state.state.statusText(accountPeer, state.videoState)
 
         switch state.state {
         case let .active(_, _, visual):
@@ -1448,7 +1405,6 @@ private class PhoneCallWindowView : View {
 
     deinit {
         fetching.dispose()
-        statusTimer?.invalidate()
     }
 }
 

Telegram-Mac/Info.plist

@@ -36,7 +36,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>204149</string>
+	<string>204161</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.social-networking</string>
 	<key>LSFileQuarantineEnabled</key>

Telegram-Mac/PCallSession.swift

@@ -25,53 +25,49 @@ enum CallTone {
 }
 
 
-enum CallControllerStatusValue: Equatable {
-    case text(String)
-    case timer(Double)
-}
 
 
 extension CallState.State {
     func statusText(_ accountPeer: Peer?, _ videoState: CallState.VideoState) -> CallControllerStatusValue {
         let statusValue: CallControllerStatusValue
         switch self {
         case .waiting, .connecting:
-            statusValue = .text(L10n.callStatusConnecting)
+            statusValue = .text(L10n.callStatusConnecting, nil)
         case let .requesting(ringing):
             if ringing {
-                statusValue = .text(L10n.callStatusRinging)
+                statusValue = .text(L10n.callStatusRinging, nil)
             } else {
-                statusValue = .text(L10n.callStatusRequesting)
+                statusValue = .text(L10n.callStatusRequesting, nil)
             }
         case .terminating:
-            statusValue = .text(L10n.callStatusEnded)
+            statusValue = .text(L10n.callStatusEnded, nil)
         case let .terminated(_, reason, _):
             if let reason = reason {
                 switch reason {
                 case let .ended(type):
                     switch type {
                     case .busy:
-                        statusValue = .text(L10n.callStatusBusy)
+                        statusValue = .text(L10n.callStatusBusy, nil)
                     case .hungUp, .missed:
-                        statusValue = .text(L10n.callStatusEnded)
+                        statusValue = .text(L10n.callStatusEnded, nil)
                     }
                 case .error:
-                    statusValue = .text(L10n.callStatusFailed)
+                    statusValue = .text(L10n.callStatusFailed, nil)
                 }
             } else {
-                statusValue = .text(L10n.callStatusEnded)
+                statusValue = .text(L10n.callStatusEnded, nil)
             }
         case .ringing:
             if let accountPeer = accountPeer {
-                statusValue = .text(L10n.callStatusCallingAccount(accountPeer.addressName ?? accountPeer.compactDisplayTitle))
+                statusValue = .text(L10n.callStatusCallingAccount(accountPeer.addressName ?? accountPeer.compactDisplayTitle), nil)
             } else {
-                statusValue = .text(L10n.callStatusCalling)
+                statusValue = .text(L10n.callStatusCalling, nil)
             }
-        case .active(let timestamp, _, _), .reconnecting(let timestamp, _, _):
+        case .active(let timestamp, let reception, _), .reconnecting(let timestamp, let reception, _):
             if case .reconnecting = self {
-                statusValue = .text(L10n.callStatusConnecting)
+                statusValue = .text(L10n.callStatusConnecting, reception)
             } else {
-                statusValue = .timer(timestamp)
+                statusValue = .timer(timestamp, reception)
             }
         }
         return statusValue