diff --git a/Telegram/Telegram-iOS/en.lproj/Localizable.strings b/Telegram/Telegram-iOS/en.lproj/Localizable.strings index ab0406233a..3c508b2d67 100644 --- a/Telegram/Telegram-iOS/en.lproj/Localizable.strings +++ b/Telegram/Telegram-iOS/en.lproj/Localizable.strings @@ -14118,8 +14118,8 @@ Sorry for the inconvenience."; "CallList.ToastCallLinkCopied.Text" = "Call link copied"; "CallList.ToastCallLinkCopied.Action" = "View Call"; -"CallList.NewCall" = "New Call"; -"CallList.NewCallLink" = "New Call Link"; +"CallList.NewCall" = "Start New Call"; +"CallList.NewCallLink" = "Create Call Link"; "Chat.SendStarsToBecomeTopInfo" = "Send %@ or more to highlight your profile"; diff --git a/submodules/TelegramCallsUI/Sources/VideoChatMicButtonComponent.swift b/submodules/TelegramCallsUI/Sources/VideoChatMicButtonComponent.swift index 4a057d4354..6156b426d7 100644 --- a/submodules/TelegramCallsUI/Sources/VideoChatMicButtonComponent.swift +++ b/submodules/TelegramCallsUI/Sources/VideoChatMicButtonComponent.swift @@ -444,7 +444,9 @@ final class VideoChatMicButtonComponent: Component { context.fill(CGRect(origin: CGPoint(), size: size)) case .muted, .unmuted, .raiseHand, .scheduled: 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)] } else if case .raiseHand = component.content { colors = [UIColor(rgb: 0x3252EF), UIColor(rgb: 0xC64688)] @@ -617,7 +619,9 @@ final class VideoChatMicButtonComponent: Component { transition.setScale(view: blobView, scale: availableSize.width / 116.0) 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) } else if case .raiseHand = component.content { blobsColor = UIColor(rgb: 0x914BAD) @@ -668,7 +672,9 @@ final class VideoChatMicButtonComponent: Component { } 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) } else if case .raiseHand = component.content { glowColor = UIColor(rgb: 0x3252EF) diff --git a/submodules/TelegramCallsUI/Sources/VideoChatScreen.swift b/submodules/TelegramCallsUI/Sources/VideoChatScreen.swift index dab1867904..249521f415 100644 --- a/submodules/TelegramCallsUI/Sources/VideoChatScreen.swift +++ b/submodules/TelegramCallsUI/Sources/VideoChatScreen.swift @@ -2718,6 +2718,9 @@ final class VideoChatScreenComponent: Component { displayVideoControlButton = false } } + if videoControlButtonContent == videoButtonContent { + displayVideoControlButton = false + } let videoControlButtonSize = self.videoControlButton.update( transition: transition, diff --git a/submodules/TelegramUI/Components/Chat/ChatMessageCallBubbleContentNode/Sources/ChatMessageCallBubbleContentNode.swift b/submodules/TelegramUI/Components/Chat/ChatMessageCallBubbleContentNode/Sources/ChatMessageCallBubbleContentNode.swift index 2bebc550ab..29f242f634 100644 --- a/submodules/TelegramUI/Components/Chat/ChatMessageCallBubbleContentNode/Sources/ChatMessageCallBubbleContentNode.swift +++ b/submodules/TelegramUI/Components/Chat/ChatMessageCallBubbleContentNode/Sources/ChatMessageCallBubbleContentNode.swift @@ -278,7 +278,7 @@ public class ChatMessageCallBubbleContentNode: ChatMessageBubbleContentNode { var avatarsWidth: CGFloat = 0.0 if !peopleAvatars.isEmpty { avatarsWidth += avatarsLeftInset - avatarsWidth += 1.0 * peopleAvatarSize + CGFloat(peopleAvatars.count - 1) * peopleAvatarSpacing + avatarsWidth += 1.0 * peopleAvatarSize + CGFloat(min(3, peopleAvatars.count) - 1) * peopleAvatarSpacing avatarsWidth += avatarsRightInset labelsWidth += avatarsWidth } diff --git a/submodules/TelegramUI/Sources/AppDelegate.swift b/submodules/TelegramUI/Sources/AppDelegate.swift index 75b293b704..299138d62f 100644 --- a/submodules/TelegramUI/Sources/AppDelegate.swift +++ b/submodules/TelegramUI/Sources/AppDelegate.swift @@ -1977,6 +1977,22 @@ private func extractAccountManagerState(records: AccountRecordsView