no message

Author: overtake

Telegram-Mac.xcworkspace/contents.xcworkspacedata

@@ -51,7 +51,8 @@ final class AccountContextBindings {
     let needFullsize:()->Void
     let displayUpgradeProgress:(CGFloat)->Void
     let callSession: ()->PCallSession?
-    init(rootNavigation: @escaping() -> MajorNavigationController = { fatalError() }, mainController: @escaping() -> MainViewController = { fatalError() }, showControllerToaster: @escaping(ControllerToaster, Bool) -> Void = { _, _ in fatalError() }, globalSearch: @escaping(String) -> Void = { _ in fatalError() }, entertainment: @escaping()->EntertainmentViewController = { fatalError() }, switchSplitLayout: @escaping(SplitViewState)->Void = { _ in fatalError() }, needFullsize: @escaping() -> Void = { fatalError() }, displayUpgradeProgress: @escaping(CGFloat)->Void = { _ in fatalError() }, callSession: @escaping()->PCallSession? = { fatalError() }) {
+    let groupCall: ()->GroupCallContext?
+    init(rootNavigation: @escaping() -> MajorNavigationController = { fatalError() }, mainController: @escaping() -> MainViewController = { fatalError() }, showControllerToaster: @escaping(ControllerToaster, Bool) -> Void = { _, _ in fatalError() }, globalSearch: @escaping(String) -> Void = { _ in fatalError() }, entertainment: @escaping()->EntertainmentViewController = { fatalError() }, switchSplitLayout: @escaping(SplitViewState)->Void = { _ in fatalError() }, needFullsize: @escaping() -> Void = { fatalError() }, displayUpgradeProgress: @escaping(CGFloat)->Void = { _ in fatalError() }, callSession: @escaping()->PCallSession? = { fatalError() }, groupCall: @escaping()->GroupCallContext? = { fatalError() }) {
         self.rootNavigation = rootNavigation
         self.mainController = mainController
         self.showControllerToaster = showControllerToaster
@@ -61,6 +62,7 @@ final class AccountContextBindings {
         self.needFullsize = needFullsize
         self.displayUpgradeProgress = displayUpgradeProgress
         self.callSession = callSession
+        self.groupCall = groupCall
     }
     #endif
 }

Telegram-Mac/AccountContext.swift

@@ -579,7 +579,7 @@ class AppDelegate: NSResponder, NSApplicationDelegate, NSUserNotificationCenterD
                               //  let tonContext = StoredTonContext(basePath: account.basePath, postbox: account.postbox, network: account.network, keychain: tonKeychain)
 
                                 let context = AccountContext(sharedContext: sharedApplicationContext.sharedContext, window: window, account: account)
-                                return AuthorizedApplicationContext(window: window, context: context, launchSettings: settings ?? LaunchSettings.defaultSettings, callSession: sharedContext.getCrossAccountCallSession())
+                                return AuthorizedApplicationContext(window: window, context: context, launchSettings: settings ?? LaunchSettings.defaultSettings, callSession: sharedContext.getCrossAccountCallSession(), groupCallContext: sharedContext.getCrossAccountGroupCall())
 
                             } else {
                                 return nil

Telegram-Mac/AppDelegate.swift

@@ -186,7 +186,7 @@ final class AuthorizedApplicationContext: NSObject, SplitViewDelegate {
 
     private var launchAction: ApplicationContextLaunchAction?
 
-    init(window: Window, context: AccountContext, launchSettings: LaunchSettings, callSession: PCallSession?) {
+    init(window: Window, context: AccountContext, launchSettings: LaunchSettings, callSession: PCallSession?, groupCallContext: GroupCallContext?) {
 
         self.context = context
         emptyController = EmptyChatViewController(context)
@@ -217,7 +217,7 @@ final class AuthorizedApplicationContext: NSObject, SplitViewDelegate {
 
 
         rightController.set(callHeader: CallNavigationHeader(35, initializer: { header -> NavigationHeaderView in
-            let view = CallNavigationHeaderView(header)
+            let view = GroupCallNavigationHeaderView(header)
             return view
         }))
 
@@ -276,6 +276,8 @@ final class AuthorizedApplicationContext: NSObject, SplitViewDelegate {
 
         }, callSession: { [weak self] in
             return (self?.rightController.callHeader?.view as? CallNavigationHeaderView)?.session
+        }, groupCall: { [weak self] in
+            return (self?.rightController.callHeader?.view as? GroupCallNavigationHeaderView)?.context
         })
 
 
@@ -675,6 +677,10 @@ final class AuthorizedApplicationContext: NSObject, SplitViewDelegate {
             context.sharedContext.showCallHeader(with: session)
         }
 
+        if let groupCallContext = groupCallContext {
+            context.sharedContext.showGroupCall(with: groupCallContext)
+        }
+        
         self.updateFoldersDisposable.set(combineLatest(queue: .mainQueue(), chatListFilterPreferences(postbox: context.account.postbox), context.sharedContext.layoutHandler.get()).start(next: { [weak self] value, layout in
             self?.updateLeftSidebar(with: value, layout: layout, animated: true)
         }))

Telegram-Mac/ApplicationContext.swift

@@ -1,6 +1,6 @@
 {
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

Telegram-Mac/Assets.xcassets/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "ic_decline.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "ic_decline@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Telegram-Mac/Assets.xcassets/Icon_GroupCall_Decline.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "ic_invite.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "ic_invite@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Telegram-Mac/Assets.xcassets/Icon_GroupCall_Decline.imageset/ic_decline.png

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "ic_invited.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "ic_invited@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Telegram-Mac/Assets.xcassets/Icon_GroupCall_Decline.imageset/ic_decline@2x.png

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "ic_settings.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "ic_settings@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Telegram-Mac/Assets.xcassets/Icon_GroupCall_Invite.imageset/Contents.json

@@ -76,17 +76,22 @@ final class CallControl : Control {
     override var mouseDownCanMoveWindow: Bool {
         return false
     }
+    private var previousState: ControlState?
 
     override func stateDidUpdated( _ state: ControlState) {
-        
         switch controlState {
         case .Highlight:
             imageBackgroundView?._change(opacity: 0.9)
             textView.change(opacity: 0.9)
+            imageBackgroundView?.layer?.animateScaleCenter(from: 1, to: 0.95, duration: 0.2, removeOnCompletion: false)
         default:
             imageBackgroundView?._change(opacity: 1.0)
             textView.change(opacity: 1.0)
+            if let previousState = previousState, previousState == .Highlight {
+                imageBackgroundView?.layer?.animateScaleCenter(from: 0.95, to: 1.0, duration: 0.2)
+            }
         }
+        previousState = state
     }
 
     func updateEnabled(_ enabled: Bool, animated: Bool) {