ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-11-07 17:30:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cherry-pick various improvements

Browse Source
This commit is contained in:
Ilya Laktyushin 2023-11-06 23:19:22 +04:00
parent a7c63e1b55
commit c8c08d5e33
4 changed files with 59 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Telegram/Telegram-iOS/en.lproj/Localizable.strings
View File

@ -10433,3 +10433,21 @@ Sorry for the inconvenience.";
"CountriesList.SaveCountries" = "Save Countries"; "CountriesList.SaveCountries" = "Save Countries";
"CountriesList.SelectUpTo_1" = "select up to %@ country"; "CountriesList.SelectUpTo_1" = "select up to %@ country";
"CountriesList.SelectUpTo_any" = "select up to %@ countries"; "CountriesList.SelectUpTo_any" = "select up to %@ countries";
"Message.GiveawayOngoing" = "Giveaway: %1$@ on %2$@";
"Message.GiveawayOngoing.Winners_1" = "%@ winner to be selected";
"Message.GiveawayOngoing.Winners_any" = "%@ winners to be selected";
"Message.GiveawayFinished" = "Giveaway: %1$@ on %2$@";
"Message.GiveawayFinished.Winners_1" = "%@ winner was selected";
"Message.GiveawayFinished.Winners_any" = "%@ winners were selected";
"Conversation.PinnedGiveaway" = "Giveaway";
"Conversation.PinnedGiveaway.Ongoing" = "%1$@ on %2$@";
"Conversation.PinnedGiveaway.Ongoing.Winners_1" = "%@ winner to be selected";
"Conversation.PinnedGiveaway.Ongoing.Winners_any" = "%@ winners to be selected";
"Conversation.PinnedGiveaway.Finished" = "%1$@ on %2$@";
"Conversation.PinnedGiveaway.Finished.Winners_1" = "%@ winner was selected";
"Conversation.PinnedGiveaway.Finished.Winners_any" = "%@ winners were selected";

15
submodules/ChatListUI/Sources/Node/ChatListItemStrings.swift
View File

@ -305,9 +305,18 @@ public func chatListItemStrings(strings: PresentationStrings, nameDisplayOrder:
} else { } else {
messageText = strings.Notification_Story messageText = strings.Notification_Story
} }
case _ as TelegramMediaGiveaway: case let giveaway as TelegramMediaGiveaway:
messageText = strings.Message_Giveaway let dateString = stringForDateWithoutYear(date: Date(timeIntervalSince1970: TimeInterval(giveaway.untilDate)), timeZone: .current, strings: strings)
case let webpage as TelegramMediaWebpage: let currentTime = Int32(CFAbsoluteTimeGetCurrent() + kCFAbsoluteTimeIntervalSince1970)
let isFinished = currentTime >= giveaway.untilDate
if isFinished {
let winnersString = strings.Message_GiveawayFinished_Winners(giveaway.quantity)
messageText = strings.Message_GiveawayFinished(winnersString, dateString).string
} else {
let winnersString = strings.Message_GiveawayOngoing_Winners(giveaway.quantity)
messageText = strings.Message_GiveawayOngoing(winnersString, dateString).string
}
case let webpage as TelegramMediaWebpage:
if messageText.isEmpty, case let .Loaded(content) = webpage.content { if messageText.isEmpty, case let .Loaded(content) = webpage.content {
messageText = content.displayUrl messageText = content.displayUrl
} }

1
submodules/TelegramUI/Components/Chat/ChatMessageBubbleItemNode/BUILD
View File

@ -79,7 +79,6 @@ swift_library(
"//submodules/TelegramUI/Components/Chat/ChatMessageWallpaperBubbleContentNode", "//submodules/TelegramUI/Components/Chat/ChatMessageWallpaperBubbleContentNode",
"//submodules/TelegramUI/Components/Chat/ChatMessageGiftBubbleContentNode", "//submodules/TelegramUI/Components/Chat/ChatMessageGiftBubbleContentNode",
"//submodules/TelegramUI/Components/Chat/ChatMessageGiveawayBubbleContentNode", "//submodules/TelegramUI/Components/Chat/ChatMessageGiveawayBubbleContentNode",
"//submodules/TelegramUI/Components/Chat/ChatMessageJoinedChannelBubbleContentNode",
], ],
visibility = [ visibility = [
"//visibility:public", "//visibility:public",

39
submodules/TelegramUI/Sources/ChatPinnedMessageTitlePanelNode.swift
View File

@ -583,19 +583,25 @@ final class ChatPinnedMessageTitlePanelNode: ChatTitleAccessoryPanelNode {
var updatedMediaReference: AnyMediaReference? var updatedMediaReference: AnyMediaReference?
var imageDimensions: CGSize? var imageDimensions: CGSize?
let giveaway = pinnedMessage.message.media.first(where: { $0 is TelegramMediaGiveaway }) as? TelegramMediaGiveaway
var titleStrings: [AnimatedCountLabelNode.Segment] = [] var titleStrings: [AnimatedCountLabelNode.Segment] = []
if pinnedMessage.totalCount == 2 { if let _ = giveaway {
if pinnedMessage.index == 0 { titleStrings.append(.text(0, NSAttributedString(string: "\(strings.Conversation_PinnedGiveaway) ", font: Font.medium(15.0), textColor: theme.chat.inputPanel.panelControlAccentColor)))
titleStrings.append(.text(0, NSAttributedString(string: "\(strings.Conversation_PinnedPreviousMessage) ", font: Font.medium(15.0), textColor: theme.chat.inputPanel.panelControlAccentColor))) } else {
if pinnedMessage.totalCount == 2 {
if pinnedMessage.index == 0 {
titleStrings.append(.text(0, NSAttributedString(string: "\(strings.Conversation_PinnedPreviousMessage) ", font: Font.medium(15.0), textColor: theme.chat.inputPanel.panelControlAccentColor)))
} else {
titleStrings.append(.text(0, NSAttributedString(string: "\(strings.Conversation_PinnedMessage) ", font: Font.medium(15.0), textColor: theme.chat.inputPanel.panelControlAccentColor)))
}
} else if pinnedMessage.totalCount > 1 && pinnedMessage.index != pinnedMessage.totalCount - 1 {
titleStrings.append(.text(0, NSAttributedString(string: "\(strings.Conversation_PinnedMessage)", font: Font.medium(15.0), textColor: theme.chat.inputPanel.panelControlAccentColor)))
titleStrings.append(.text(1, NSAttributedString(string: " #", font: Font.medium(15.0), textColor: theme.chat.inputPanel.panelControlAccentColor)))
titleStrings.append(.number(pinnedMessage.index + 1, NSAttributedString(string: "\(pinnedMessage.index + 1)", font: Font.medium(15.0), textColor: theme.chat.inputPanel.panelControlAccentColor)))
} else { } else {
titleStrings.append(.text(0, NSAttributedString(string: "\(strings.Conversation_PinnedMessage) ", font: Font.medium(15.0), textColor: theme.chat.inputPanel.panelControlAccentColor))) titleStrings.append(.text(0, NSAttributedString(string: "\(strings.Conversation_PinnedMessage) ", font: Font.medium(15.0), textColor: theme.chat.inputPanel.panelControlAccentColor)))
} }
} else if pinnedMessage.totalCount > 1 && pinnedMessage.index != pinnedMessage.totalCount - 1 {
titleStrings.append(.text(0, NSAttributedString(string: "\(strings.Conversation_PinnedMessage)", font: Font.medium(15.0), textColor: theme.chat.inputPanel.panelControlAccentColor)))
titleStrings.append(.text(1, NSAttributedString(string: " #", font: Font.medium(15.0), textColor: theme.chat.inputPanel.panelControlAccentColor)))
titleStrings.append(.number(pinnedMessage.index + 1, NSAttributedString(string: "\(pinnedMessage.index + 1)", font: Font.medium(15.0), textColor: theme.chat.inputPanel.panelControlAccentColor)))
} else {
titleStrings.append(.text(0, NSAttributedString(string: "\(strings.Conversation_PinnedMessage) ", font: Font.medium(15.0), textColor: theme.chat.inputPanel.panelControlAccentColor)))
} }
if !message.containsSecretMedia { if !message.containsSecretMedia {
@ -679,7 +685,20 @@ final class ChatPinnedMessageTitlePanelNode: ChatTitleAccessoryPanelNode {
let messageText: NSAttributedString let messageText: NSAttributedString
let textFont = Font.regular(15.0) let textFont = Font.regular(15.0)
if isText { if let giveaway {
let dateString = stringForDateWithoutYear(date: Date(timeIntervalSince1970: TimeInterval(giveaway.untilDate)), timeZone: .current, strings: strings)
let currentTime = Int32(CFAbsoluteTimeGetCurrent() + kCFAbsoluteTimeIntervalSince1970)
let isFinished = currentTime >= giveaway.untilDate
let text: String
if isFinished {
let winnersString = strings.Conversation_PinnedGiveaway_Finished_Winners(giveaway.quantity)
text = strings.Conversation_PinnedGiveaway_Finished(winnersString, dateString).string
} else {
let winnersString = strings.Conversation_PinnedGiveaway_Ongoing_Winners(giveaway.quantity)
text = strings.Conversation_PinnedGiveaway_Ongoing(winnersString, dateString).string
}
messageText = NSAttributedString(string: text, font: textFont, textColor: theme.chat.inputPanel.primaryTextColor)
} else if isText {
var text = message.text var text = message.text
var messageEntities = message.textEntitiesAttribute?.entities ?? [] var messageEntities = message.textEntitiesAttribute?.entities ?? []