mirror of
https://github.com/Swiftgram/Telegram-iOS.git
synced 2025-06-16 05:55:20 +00:00
Conference
This commit is contained in:
parent
6ee705e786
commit
c6ff9717d4
@ -14118,8 +14118,8 @@ Sorry for the inconvenience.";
|
|||||||
|
|
||||||
"CallList.ToastCallLinkCopied.Text" = "Call link copied";
|
"CallList.ToastCallLinkCopied.Text" = "Call link copied";
|
||||||
"CallList.ToastCallLinkCopied.Action" = "View Call";
|
"CallList.ToastCallLinkCopied.Action" = "View Call";
|
||||||
"CallList.NewCall" = "New Call";
|
"CallList.NewCall" = "Start New Call";
|
||||||
"CallList.NewCallLink" = "New Call Link";
|
"CallList.NewCallLink" = "Create Call Link";
|
||||||
|
|
||||||
"Chat.SendStarsToBecomeTopInfo" = "Send %@ or more to highlight your profile";
|
"Chat.SendStarsToBecomeTopInfo" = "Send %@ or more to highlight your profile";
|
||||||
|
|
||||||
|
@ -444,7 +444,9 @@ final class VideoChatMicButtonComponent: Component {
|
|||||||
context.fill(CGRect(origin: CGPoint(), size: size))
|
context.fill(CGRect(origin: CGPoint(), size: size))
|
||||||
case .muted, .unmuted, .raiseHand, .scheduled:
|
case .muted, .unmuted, .raiseHand, .scheduled:
|
||||||
let colors: [UIColor]
|
let colors: [UIColor]
|
||||||
if case .muted = component.content {
|
if case .muted(forced: true) = component.content {
|
||||||
|
colors = [UIColor(rgb: 0x3252EF), UIColor(rgb: 0xC64688)]
|
||||||
|
} else if case .muted(forced: false) = component.content {
|
||||||
colors = [UIColor(rgb: 0x0080FF), UIColor(rgb: 0x00A1FE)]
|
colors = [UIColor(rgb: 0x0080FF), UIColor(rgb: 0x00A1FE)]
|
||||||
} else if case .raiseHand = component.content {
|
} else if case .raiseHand = component.content {
|
||||||
colors = [UIColor(rgb: 0x3252EF), UIColor(rgb: 0xC64688)]
|
colors = [UIColor(rgb: 0x3252EF), UIColor(rgb: 0xC64688)]
|
||||||
@ -617,7 +619,9 @@ final class VideoChatMicButtonComponent: Component {
|
|||||||
transition.setScale(view: blobView, scale: availableSize.width / 116.0)
|
transition.setScale(view: blobView, scale: availableSize.width / 116.0)
|
||||||
|
|
||||||
let blobsColor: UIColor
|
let blobsColor: UIColor
|
||||||
if case .muted = component.content {
|
if case .muted(forced: true) = component.content {
|
||||||
|
blobsColor = UIColor(rgb: 0x914BAD)
|
||||||
|
} else if case .muted(forced: false) = component.content {
|
||||||
blobsColor = UIColor(rgb: 0x0086FF)
|
blobsColor = UIColor(rgb: 0x0086FF)
|
||||||
} else if case .raiseHand = component.content {
|
} else if case .raiseHand = component.content {
|
||||||
blobsColor = UIColor(rgb: 0x914BAD)
|
blobsColor = UIColor(rgb: 0x914BAD)
|
||||||
@ -668,7 +672,9 @@ final class VideoChatMicButtonComponent: Component {
|
|||||||
}
|
}
|
||||||
|
|
||||||
let glowColor: UIColor
|
let glowColor: UIColor
|
||||||
if case .muted = component.content {
|
if case .muted(forced: true) = component.content {
|
||||||
|
glowColor = UIColor(rgb: 0x3252EF)
|
||||||
|
} else if case .muted(forced: false) = component.content {
|
||||||
glowColor = UIColor(rgb: 0x0086FF)
|
glowColor = UIColor(rgb: 0x0086FF)
|
||||||
} else if case .raiseHand = component.content {
|
} else if case .raiseHand = component.content {
|
||||||
glowColor = UIColor(rgb: 0x3252EF)
|
glowColor = UIColor(rgb: 0x3252EF)
|
||||||
|
@ -2718,6 +2718,9 @@ final class VideoChatScreenComponent: Component {
|
|||||||
displayVideoControlButton = false
|
displayVideoControlButton = false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if videoControlButtonContent == videoButtonContent {
|
||||||
|
displayVideoControlButton = false
|
||||||
|
}
|
||||||
|
|
||||||
let videoControlButtonSize = self.videoControlButton.update(
|
let videoControlButtonSize = self.videoControlButton.update(
|
||||||
transition: transition,
|
transition: transition,
|
||||||
|
@ -278,7 +278,7 @@ public class ChatMessageCallBubbleContentNode: ChatMessageBubbleContentNode {
|
|||||||
var avatarsWidth: CGFloat = 0.0
|
var avatarsWidth: CGFloat = 0.0
|
||||||
if !peopleAvatars.isEmpty {
|
if !peopleAvatars.isEmpty {
|
||||||
avatarsWidth += avatarsLeftInset
|
avatarsWidth += avatarsLeftInset
|
||||||
avatarsWidth += 1.0 * peopleAvatarSize + CGFloat(peopleAvatars.count - 1) * peopleAvatarSpacing
|
avatarsWidth += 1.0 * peopleAvatarSize + CGFloat(min(3, peopleAvatars.count) - 1) * peopleAvatarSpacing
|
||||||
avatarsWidth += avatarsRightInset
|
avatarsWidth += avatarsRightInset
|
||||||
labelsWidth += avatarsWidth
|
labelsWidth += avatarsWidth
|
||||||
}
|
}
|
||||||
|
@ -1977,6 +1977,22 @@ private func extractAccountManagerState(records: AccountRecordsView<TelegramAcco
|
|||||||
self.maybeCheckForUpdates()
|
self.maybeCheckForUpdates()
|
||||||
|
|
||||||
SharedDisplayLinkDriver.shared.updateForegroundState(self.isActiveValue)
|
SharedDisplayLinkDriver.shared.updateForegroundState(self.isActiveValue)
|
||||||
|
|
||||||
|
func cancelWindowPanGestures(view: UIView) {
|
||||||
|
if let gestureRecognizers = view.gestureRecognizers {
|
||||||
|
for recognizer in gestureRecognizers {
|
||||||
|
if let recognizer = recognizer as? WindowPanRecognizer {
|
||||||
|
recognizer.cancel()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for subview in view.subviews {
|
||||||
|
cancelWindowPanGestures(view: subview)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//cancelWindowPanGestures(view: self.mainWindow.hostView.containerView)
|
||||||
}
|
}
|
||||||
|
|
||||||
func applicationWillTerminate(_ application: UIApplication) {
|
func applicationWillTerminate(_ application: UIApplication) {
|
||||||
|
@ -265,6 +265,10 @@ class ContactMultiselectionControllerImpl: ViewController, ContactMultiselection
|
|||||||
if isCall && count == 0 {
|
if isCall && count == 0 {
|
||||||
self.titleView.title = CounterControllerTitle(title: self.params.title ?? self.presentationData.strings.Compose_NewGroupTitle, counter: nil)
|
self.titleView.title = CounterControllerTitle(title: self.params.title ?? self.presentationData.strings.Compose_NewGroupTitle, counter: nil)
|
||||||
} else {
|
} else {
|
||||||
|
var count = count
|
||||||
|
if isCall {
|
||||||
|
count += 1
|
||||||
|
}
|
||||||
self.titleView.title = CounterControllerTitle(title: self.params.title ?? self.presentationData.strings.Compose_NewGroupTitle, counter: "\(count)/\(maxCount)")
|
self.titleView.title = CounterControllerTitle(title: self.params.title ?? self.presentationData.strings.Compose_NewGroupTitle, counter: "\(count)/\(maxCount)")
|
||||||
}
|
}
|
||||||
if self.rightNavigationButton == nil && !isCall {
|
if self.rightNavigationButton == nil && !isCall {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user