Skip to content

Commit 05bfa18

Browse files
author
overtake
committed
no message
1 parent 3ec417a commit 05bfa18

File tree

105 files changed

+3869
-811
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+3869
-811
lines changed

‎Telegram-Mac.xcworkspace/contents.xcworkspacedata

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Telegram-Mac/AccountContext.swift

+3-1
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ final class AccountContextBindings {
7070
private var lastTimeFreeSpaceNotified: TimeInterval?
7171

7272

73+
7374
final class AccountContext {
7475
let sharedContext: SharedAccountContext
7576
let account: Account
@@ -86,7 +87,8 @@ final class AccountContext {
8687
let blockedPeersContext: BlockedPeersContext
8788
let activeSessionsContext: ActiveSessionsContext
8889
let cacheCleaner: AccountClearCache
89-
90+
91+
9092
// let walletPasscodeTimeoutContext: WalletPasscodeTimeoutContext
9193
#endif
9294

‎Telegram-Mac/AccountViewController.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -931,7 +931,7 @@ class LayoutAccountController : TableViewController {
931931
updateLocalizationAndTheme(theme: theme)
932932

933933

934-
context.window.set(handler: { [weak self] in
934+
context.window.set(handler: { [weak self] _ in
935935
if let strongSelf = self {
936936
return strongSelf.escapeKeyAction()
937937
}

‎Telegram-Mac/AppDelegate.swift

+6-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ import LocalAuthentication
1212
//import WalletCore
1313
import OpenSSLEncryption
1414
import CoreSpotlight
15+
import DDHotKey
16+
1517
#if !APP_STORE
1618
import AppCenter
1719
import AppCenterCrashes
@@ -247,7 +249,10 @@ class AppDelegate: NSResponder, NSApplicationDelegate, NSUserNotificationCenterD
247249
private func launchInterface() {
248250
initializeAccountManagement()
249251

250-
252+
// DDHotKeyCenter.shared()?.register(DDHotKey(keyCode: KeyboardKey.G.rawValue, modifierFlags: 0, task: { event in
253+
// var bp:Int = 0
254+
// bp += 1
255+
// }))
251256

252257
let rootPath = containerUrl!
253258
let window = self.window!

‎Telegram-Mac/Appearance.swift

+4-1
Original file line numberDiff line numberDiff line change
@@ -2354,7 +2354,10 @@ private func generateIcons(from palette: ColorPalette, bubbled: Bool) -> Telegra
23542354
chat_pinned_message: { NSImage(named: "Icon_ChatPinnedMessage")!.precomposed(palette.accentIcon, flipVertical: true) },
23552355
chat_pinned_message_bubble_incoming: { NSImage(named: "Icon_ChatPinnedMessage")!.precomposed(palette.grayIconBubble_incoming, flipVertical: true) },
23562356
chat_pinned_message_bubble_outgoing: { NSImage(named: "Icon_ChatPinnedMessage")!.precomposed(palette.grayIconBubble_outgoing, flipVertical: true) },
2357-
chat_pinned_message_overlay_bubble: { NSImage(named: "Icon_ChatPinnedMessage")!.precomposed(.white, flipVertical: true) }
2357+
chat_pinned_message_overlay_bubble: { NSImage(named: "Icon_ChatPinnedMessage")!.precomposed(.white, flipVertical: true) },
2358+
chat_voicechat_can_unmute: { NSImage(named: "Icon_GroupCall_Small_Muted")!.precomposed(.white) },
2359+
chat_voicechat_cant_unmute: { NSImage(named: "Icon_GroupCall_Small_Muted")!.precomposed(palette.redUI) },
2360+
chat_voicechat_unmuted: { NSImage(named: "Icon_GroupCall_Small_Unmuted")!.precomposed(.white) }
23582361

23592362
)
23602363

‎Telegram-Mac/ApplicationContext.swift

+33-33
Original file line numberDiff line numberDiff line change
@@ -351,180 +351,180 @@ final class AuthorizedApplicationContext: NSObject, SplitViewDelegate {
351351

352352

353353

354-
window.set(handler: { [weak self] () -> KeyHandlerResult in
354+
window.set(handler: { [weak self] _ -> KeyHandlerResult in
355355
self?.rightController.push(ChatController(context: context, chatLocation: .peer(context.peerId)))
356356
return .invoked
357357
}, with: self, for: .Zero, priority: .low, modifierFlags: [.command])
358358

359359

360-
window.set(handler: { [weak self] () -> KeyHandlerResult in
360+
window.set(handler: { [weak self] _ -> KeyHandlerResult in
361361
self?.openChat(0, false)
362362
return .invoked
363363
}, with: self, for: .One, priority: .low, modifierFlags: [.command])
364364

365-
window.set(handler: { [weak self] () -> KeyHandlerResult in
365+
window.set(handler: { [weak self] _ -> KeyHandlerResult in
366366
self?.openChat(1, false)
367367
return .invoked
368368
}, with: self, for: .Two, priority: .low, modifierFlags: [.command])
369369

370-
window.set(handler: { [weak self] () -> KeyHandlerResult in
370+
window.set(handler: { [weak self] _ -> KeyHandlerResult in
371371
self?.openChat(2, false)
372372
return .invoked
373373
}, with: self, for: .Three, priority: .low, modifierFlags: [.command])
374374

375-
window.set(handler: { [weak self] () -> KeyHandlerResult in
375+
window.set(handler: { [weak self] _ -> KeyHandlerResult in
376376
self?.openChat(3, false)
377377
return .invoked
378378
}, with: self, for: .Four, priority: .low, modifierFlags: [.command])
379379

380-
window.set(handler: { [weak self] () -> KeyHandlerResult in
380+
window.set(handler: { [weak self] _ -> KeyHandlerResult in
381381
self?.openChat(4, false)
382382
return .invoked
383383
}, with: self, for: .Five, priority: .low, modifierFlags: [.command])
384384

385-
window.set(handler: { [weak self] () -> KeyHandlerResult in
385+
window.set(handler: { [weak self] _ -> KeyHandlerResult in
386386
self?.openChat(5, false)
387387
return .invoked
388388
}, with: self, for: .Six, priority: .low, modifierFlags: [.command])
389389

390-
window.set(handler: { [weak self] () -> KeyHandlerResult in
390+
window.set(handler: { [weak self] _ -> KeyHandlerResult in
391391
self?.openChat(6, false)
392392
return .invoked
393393
}, with: self, for: .Seven, priority: .low, modifierFlags: [.command])
394394

395-
window.set(handler: { [weak self] () -> KeyHandlerResult in
395+
window.set(handler: { [weak self] _ -> KeyHandlerResult in
396396
self?.openChat(7, false)
397397
return .invoked
398398
}, with: self, for: .Eight, priority: .low, modifierFlags: [.command])
399399

400-
window.set(handler: { [weak self] () -> KeyHandlerResult in
400+
window.set(handler: { [weak self] _ -> KeyHandlerResult in
401401
self?.openChat(8, false)
402402
return .invoked
403403
}, with: self, for: .Nine, priority: .low, modifierFlags: [.command])
404404

405405

406406

407407

408-
window.set(handler: { [weak self] () -> KeyHandlerResult in
408+
window.set(handler: { [weak self] _ -> KeyHandlerResult in
409409
self?.openChat(0, true)
410410
return .invoked
411411
}, with: self, for: .One, priority: .low, modifierFlags: [.command, .option])
412412

413-
window.set(handler: { [weak self] () -> KeyHandlerResult in
413+
window.set(handler: { [weak self] _ -> KeyHandlerResult in
414414
self?.openChat(1, true)
415415
return .invoked
416416
}, with: self, for: .Two, priority: .low, modifierFlags: [.command, .option])
417417

418-
window.set(handler: { [weak self] () -> KeyHandlerResult in
418+
window.set(handler: { [weak self] _ -> KeyHandlerResult in
419419
self?.openChat(2, true)
420420
return .invoked
421421
}, with: self, for: .Three, priority: .low, modifierFlags: [.command, .option])
422422

423-
window.set(handler: { [weak self] () -> KeyHandlerResult in
423+
window.set(handler: { [weak self] _ -> KeyHandlerResult in
424424
self?.openChat(3, true)
425425
return .invoked
426426
}, with: self, for: .Four, priority: .low, modifierFlags: [.command, .option])
427427

428-
window.set(handler: { [weak self] () -> KeyHandlerResult in
428+
window.set(handler: { [weak self] _ -> KeyHandlerResult in
429429
self?.openChat(4, true)
430430
return .invoked
431431
}, with: self, for: .Five, priority: .low, modifierFlags: [.command, .option])
432432

433-
window.set(handler: { [weak self] () -> KeyHandlerResult in
433+
window.set(handler: { [weak self] _ -> KeyHandlerResult in
434434
self?.openChat(5, true)
435435
return .invoked
436436
}, with: self, for: .Six, priority: .low, modifierFlags: [.command, .option])
437437

438-
window.set(handler: { [weak self] () -> KeyHandlerResult in
438+
window.set(handler: { [weak self] _ -> KeyHandlerResult in
439439
self?.openChat(6, true)
440440
return .invoked
441441
}, with: self, for: .Seven, priority: .low, modifierFlags: [.command, .option])
442442

443-
window.set(handler: { [weak self] () -> KeyHandlerResult in
443+
window.set(handler: { [weak self] _ -> KeyHandlerResult in
444444
self?.openChat(7, true)
445445
return .invoked
446446
}, with: self, for: .Eight, priority: .low, modifierFlags: [.command, .option])
447447

448-
window.set(handler: { [weak self] () -> KeyHandlerResult in
448+
window.set(handler: { [weak self] _ -> KeyHandlerResult in
449449
self?.openChat(8, true)
450450
return .invoked
451451
}, with: self, for: .Nine, priority: .low, modifierFlags: [.command, .option])
452452

453-
window.set(handler: { [weak self] () -> KeyHandlerResult in
453+
window.set(handler: { [weak self] _ -> KeyHandlerResult in
454454
self?.openChat(9, true)
455455
return .invoked
456456
}, with: self, for: .Minus, priority: .low, modifierFlags: [.command, .option])
457457

458458

459459

460460

461-
window.set(handler: { [weak self] () -> KeyHandlerResult in
461+
window.set(handler: { [weak self] _ -> KeyHandlerResult in
462462
self?.openChat(0, true)
463463
return .invoked
464464
}, with: self, for: .One, priority: .low, modifierFlags: [.control])
465465

466-
window.set(handler: { [weak self] () -> KeyHandlerResult in
466+
window.set(handler: { [weak self] _ -> KeyHandlerResult in
467467
self?.openChat(1, true)
468468
return .invoked
469469
}, with: self, for: .Two, priority: .low, modifierFlags: [.control])
470470

471-
window.set(handler: { [weak self] () -> KeyHandlerResult in
471+
window.set(handler: { [weak self] _ -> KeyHandlerResult in
472472
self?.openChat(2, true)
473473
return .invoked
474474
}, with: self, for: .Three, priority: .low, modifierFlags: [.control])
475475

476-
window.set(handler: { [weak self] () -> KeyHandlerResult in
476+
window.set(handler: { [weak self] _ -> KeyHandlerResult in
477477
self?.openChat(3, true)
478478
return .invoked
479479
}, with: self, for: .Four, priority: .low, modifierFlags: [.control])
480480

481-
window.set(handler: { [weak self] () -> KeyHandlerResult in
481+
window.set(handler: { [weak self] _ -> KeyHandlerResult in
482482
self?.openChat(4, true)
483483
return .invoked
484484
}, with: self, for: .Five, priority: .low, modifierFlags: [.control])
485485

486-
window.set(handler: { [weak self] () -> KeyHandlerResult in
486+
window.set(handler: { [weak self] _ -> KeyHandlerResult in
487487
self?.openChat(5, true)
488488
return .invoked
489489
}, with: self, for: .Six, priority: .low, modifierFlags: [.control])
490490

491-
window.set(handler: { [weak self] () -> KeyHandlerResult in
491+
window.set(handler: { [weak self] _ -> KeyHandlerResult in
492492
self?.openChat(6, true)
493493
return .invoked
494494
}, with: self, for: .Seven, priority: .low, modifierFlags: [.control])
495495

496-
window.set(handler: { [weak self] () -> KeyHandlerResult in
496+
window.set(handler: { [weak self] _ -> KeyHandlerResult in
497497
self?.openChat(7, true)
498498
return .invoked
499499
}, with: self, for: .Eight, priority: .low, modifierFlags: [.control])
500500

501-
window.set(handler: { [weak self] () -> KeyHandlerResult in
501+
window.set(handler: { [weak self] _ -> KeyHandlerResult in
502502
self?.openChat(8, true)
503503
return .invoked
504504
}, with: self, for: .Nine, priority: .low, modifierFlags: [.control])
505505

506-
window.set(handler: { [weak self] () -> KeyHandlerResult in
506+
window.set(handler: { [weak self] _ -> KeyHandlerResult in
507507
self?.openChat(9, true)
508508
return .invoked
509509
}, with: self, for: .Minus, priority: .low, modifierFlags: [.control])
510510

511511

512512

513513

514-
// window.set(handler: { [weak self] () -> KeyHandlerResult in
514+
// window.set(handler: { [weak self] _ -> KeyHandlerResult in
515515
// self?.leftController.focusSearch(animated: true)
516516
// return .invoked
517517
// }, with: self, for: .F, priority: .supreme, modifierFlags: [.command, .shift])
518518

519-
window.set(handler: { () -> KeyHandlerResult in
519+
window.set(handler: { _ -> KeyHandlerResult in
520520
context.sharedContext.bindings.rootNavigation().push(ShortcutListController(context: context))
521521
return .invoked
522522
}, with: self, for: .Slash, priority: .low, modifierFlags: [.command])
523523

524524

525525

526526
#if DEBUG
527-
window.set(handler: { () -> KeyHandlerResult in
527+
window.set(handler: { _ -> KeyHandlerResult in
528528

529529

530530
// filePanel(with: ["mov", "mp4"], allowMultiple: false, for: window, completion: { values in

‎Telegram-Mac/Assets.xcassets/Icon_GroupCall_Big_Muted.imageset/Contents.json

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "ic_mutedbig.png",
5+
"idiom" : "universal",
6+
"scale" : "1x"
7+
},
8+
{
9+
"filename" : "ic_mutedbig@2x.png",
10+
"idiom" : "universal",
11+
"scale" : "2x"
12+
},
13+
{
14+
"idiom" : "universal",
15+
"scale" : "3x"
16+
}
17+
],
18+
"info" : {
19+
"author" : "xcode",
20+
"version" : 1
21+
}
22+
}

‎Telegram-Mac/Assets.xcassets/Icon_GroupCall_Big_Muted.imageset/ic_mutedbig.png

1.2 KB
Loading

‎Telegram-Mac/Assets.xcassets/Icon_GroupCall_Big_Muted.imageset/ic_mutedbig@2x.png

2.65 KB
Loading

‎Telegram-Mac/Assets.xcassets/Icon_GroupCall_Big_Unmuted.imageset/Contents.json

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "ic_unmutedbig.png",
5+
"idiom" : "universal",
6+
"scale" : "1x"
7+
},
8+
{
9+
"filename" : "ic_unmutedbig@2x.png",
10+
"idiom" : "universal",
11+
"scale" : "2x"
12+
},
13+
{
14+
"idiom" : "universal",
15+
"scale" : "3x"
16+
}
17+
],
18+
"info" : {
19+
"author" : "xcode",
20+
"version" : 1
21+
}
22+
}

‎Telegram-Mac/Assets.xcassets/Icon_GroupCall_Big_Unmuted.imageset/ic_unmutedbig.png

1.13 KB
Loading

‎Telegram-Mac/Assets.xcassets/Icon_GroupCall_Big_Unmuted.imageset/ic_unmutedbig@2x.png

2.48 KB
Loading

‎Telegram-Mac/CalendarController.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ class CalendarController: GenericViewController<CalendarControllerView> {
3636

3737
self.navigation.viewDidAppear(animated)
3838

39-
self.window?.set(handler: { [weak self] () -> KeyHandlerResult in
39+
self.window?.set(handler: { [weak self] _ -> KeyHandlerResult in
4040
if let current = self?.navigation.controller as? CalendarMonthController, current.isPrevEnabled, let backAction = self?.interactions.backAction {
4141
backAction(current.month.month)
4242
}
4343
return .invoked
4444
}, with: self, for: .LeftArrow, priority: .modal)
4545

46-
self.window?.set(handler: { [weak self] () -> KeyHandlerResult in
46+
self.window?.set(handler: { [weak self] _ -> KeyHandlerResult in
4747
if let current = self?.navigation.controller as? CalendarMonthController, current.isNextEnabled, let nextAction = self?.interactions.nextAction {
4848
nextAction(current.month.month)
4949
}

0 commit comments

Comments
 (0)