ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-10-08 19:10:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Various improvements

Browse Source
This commit is contained in:
Isaac 2023-12-29 21:21:20 +04:00
parent 9591394c24
commit 6eb222809d
15 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10850,3 +10850,16 @@ Sorry for the inconvenience.";
"Chat.TapToPlayVoiceMessageOnceTooltip" = "Tap to set this message to **Play Once**";
"Chat.PlayVoiceMessageOnceTooltip" = "The recipients will be able to listen to it only once.";
"ChatList.AuthorHidden" = "Author Hidden";
"SavedMessages.SubChatDeleted" = "Saved messages deleted.";
"PeerInfo.SavedMessagesTabTitle" = "Saved";
"Chat.PanelStatusAuthorHidden" = "Senders of these messages restricted to link\ntheir name when forwarding.";
"Chat.SavedMessagesChatsTooltip" = "Tap to view your Saved Messages organized by type or source";
"Chat.ConfirmationRemoveFromSavedMessages" = "Remove from Saved Messages";
"Premium.MaxSavedPinsText" = "Sorry, you can't pin more than **%1$@** chats to the top. Unpin some that are currently pinned or subscribe to **Telegram Premium** to double the limit to **%2$@** chats.";
"Premium.MaxSavedPinsNoPremiumText" = "Sorry, you can't pin more than **%@** chats to the top. Unpin some that are currently pinned.";
"Premium.MaxSavedPinsFinalText" = "Sorry, you can't pin more than **%@** chats to the top. Unpin some that are currently pinned.";

3
submodules/ChatListUI/Sources/ChatListSearchListPaneNode.swift
View File

@ -1418,8 +1418,7 @@ final class ChatListSearchListPaneNode: ASDisplayNode, ChatListSearchPaneNode {
PeerIndexNameRepresentation.title(title: presentationData.strings.DialogList_SavedMessages.lowercased(), addressNames: [])
],
PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt64Value(2666000)): [
//TODO:localize
PeerIndexNameRepresentation.title(title: "author hidden", addressNames: [])
PeerIndexNameRepresentation.title(title: presentationData.strings.ChatList_AuthorHidden.lowercased(), addressNames: [])
]
])
|> map { peers -> (peers: [EngineRenderedPeer], unread: [EnginePeer.Id: (Int32, Bool)], recentlySearchedPeerIds: Set<EnginePeer.Id>) in

3
submodules/ChatListUI/Sources/Node/ChatListItem.swift
View File

@ -2306,8 +2306,7 @@ class ChatListItemNode: ItemListRevealOptionsItemNode {
} else if let id = itemPeer.chatMainPeer?.id, id.isReplies {
titleAttributedString = NSAttributedString(string: item.presentationData.strings.DialogList_Replies, font: titleFont, textColor: theme.titleColor)
} else if let id = itemPeer.chatMainPeer?.id, id.isAnonymousSavedMessages {
//TODO:localize
titleAttributedString = NSAttributedString(string: "Author Hidden", font: titleFont, textColor: theme.titleColor)
titleAttributedString = NSAttributedString(string: item.presentationData.strings.ChatList_AuhtorHidden, font: titleFont, textColor: theme.titleColor)
} else if let displayTitle = itemPeer.chatMainPeer?.displayTitle(strings: item.presentationData.strings, displayOrder: item.presentationData.nameDisplayOrder) {
let textColor: UIColor
if case let .chatList(index) = item.index, index.messageIndex.id.peerId.namespace == Namespaces.Peer.SecretChat {

3
submodules/ContactsPeerItem/Sources/ContactsPeerItem.swift
View File

@ -784,8 +784,7 @@ public class ContactsPeerItemNode: ItemListRevealOptionsItemNode {
} else if peer.id.isReplies {
titleAttributedString = NSAttributedString(string: item.presentationData.strings.DialogList_Replies, font: titleBoldFont, textColor: textColor)
} else if peer.id.isAnonymousSavedMessages {
//TODO:localize
titleAttributedString = NSAttributedString(string: "Author Hidden", font: titleBoldFont, textColor: textColor)
titleAttributedString = NSAttributedString(string: item.presentationData.strings.ChatList_AuthorHidden, font: titleBoldFont, textColor: textColor)
} else if let firstName = user.firstName, let lastName = user.lastName, !firstName.isEmpty, !lastName.isEmpty {
let string = NSMutableAttributedString()
switch item.displayOrder {

1
submodules/DeleteChatPeerActionSheetItem/Sources/DeleteChatPeerActionSheetItem.swift
View File

@ -133,7 +133,6 @@ private final class DeleteChatPeerActionSheetItemNode: ActionSheetItemNode {
text = strings.ChatList_DeleteChatConfirmation(peer.displayTitle(strings: strings, displayOrder: nameOrder))
}
case .deleteSavedPeer:
//TODO:localize
let peerTitle = peer.displayTitle(strings: strings, displayOrder: nameOrder)
text = strings.ChatList_DeleteSavedPeerConfirmation(peerTitle)
case let .clearHistory(canClearCache):

3
submodules/ItemListPeerItem/Sources/ItemListPeerItem.swift
View File

@ -1042,8 +1042,7 @@ public class ItemListPeerItemNode: ItemListRevealOptionsItemNode, ItemListItemNo
} else if item.peer.id.isReplies {
titleAttributedString = NSAttributedString(string: item.presentationData.strings.DialogList_Replies, font: currentBoldFont, textColor: titleColor)
} else if item.peer.id.isAnonymousSavedMessages {
//TODO:localize
titleAttributedString = NSAttributedString(string: "Author Hidden", font: currentBoldFont, textColor: titleColor)
titleAttributedString = NSAttributedString(string: item.presentationData.strings.ChatList_AuthorHidden, font: currentBoldFont, textColor: titleColor)
} else if case let .user(user) = item.peer {
if let firstName = user.firstName, let lastName = user.lastName, !firstName.isEmpty, !lastName.isEmpty {
let string = NSMutableAttributedString()

5
submodules/PremiumUI/Sources/PremiumLimitScreen.swift
View File

@ -1026,12 +1026,11 @@ private final class LimitSheetContent: CombinedComponent {
string = strings.Premium_MaxPinsNoPremiumText("\(limit)").string
}
case .pinnedSavedPeers:
//TODO:localize
let limit = state.limits.maxPinnedSavedChatCount
let premiumLimit = state.premiumLimits.maxPinnedSavedChatCount
iconName = "Premium/Pin"
badgeText = "\(component.count)"
string = component.count >= premiumLimit ? strings.Premium_MaxPinsFinalText("\(premiumLimit)").string : strings.Premium_MaxPinsText("\(limit)", "\(premiumLimit)").string
string = component.count >= premiumLimit ? strings.Premium_MaxSavedPinsFinalText("\(premiumLimit)").string : strings.Premium_MaxSavedPinsText("\(limit)", "\(premiumLimit)").string
defaultValue = component.count > limit ? "\(limit)" : ""
premiumValue = component.count >= premiumLimit ? "" : "\(premiumLimit)"
badgePosition = max(0.15, min(0.85, CGFloat(component.count) / CGFloat(premiumLimit)))
@ -1040,7 +1039,7 @@ private final class LimitSheetContent: CombinedComponent {
if isPremiumDisabled {
badgeText = "\(limit)"
string = strings.Premium_MaxPinsNoPremiumText("\(limit)").string
string = strings.Premium_MaxSavedPinsNoPremiumText("\(limit)").string
}
case .files:
let limit = Int64(state.limits.maxUploadFileParts) * 512 * 1024 + 1024 * 1024 * 100

3
submodules/TelegramStringFormatting/Sources/PeerDisplayName.swift
View File

@ -26,8 +26,7 @@ public func stringForFullAuthorName(message: EngineMessage, strings: Presentatio
if message.id.peerId == accountPeerId {
authorString = [strings.DialogList_SavedMessages]
} else if message.id.peerId.isAnonymousSavedMessages {
//TODO:localize
authorString = ["Author Hidden"]
authorString = [strings.ChatList_AuthorHidden]
} else if message.flags.contains(.Incoming) {
authorString = [peer.displayTitle(strings: strings, displayOrder: nameDisplayOrder)]
} else {

3
submodules/TelegramUI/Components/ChatTitleView/Sources/ChatTitleView.swift
View File

@ -248,8 +248,7 @@ public final class ChatTitleView: UIView, NavigationBarTitleView {
} else if peerView.peerId == self.context.account.peerId {
segments = [.text(0, NSAttributedString(string: self.strings.Conversation_SavedMessages, font: titleFont, textColor: titleTheme.rootController.navigationBar.primaryTextColor))]
} else if peerView.peerId.isAnonymousSavedMessages {
//TODO:localize
segments = [.text(0, NSAttributedString(string: "Author Hidden", font: titleFont, textColor: titleTheme.rootController.navigationBar.primaryTextColor))]
segments = [.text(0, NSAttributedString(string: self.strings.ChatList_AuthorHidden, font: titleFont, textColor: titleTheme.rootController.navigationBar.primaryTextColor))]
} else {
if !peerView.isContact, let user = peer as? TelegramUser, !user.flags.contains(.isSupport), user.botInfo == nil, let phone = user.phone, !phone.isEmpty {
segments = [.text(0, NSAttributedString(string: formatPhoneNumber(context: self.context, number: phone), font: titleFont, textColor: titleTheme.rootController.navigationBar.primaryTextColor))]

3
submodules/TelegramUI/Components/PeerInfo/PeerInfoChatListPaneNode/Sources/PeerInfoChatListPaneNode.swift
View File

@ -225,8 +225,7 @@ public final class PeerInfoChatListPaneNode: ASDisplayNode, PeerInfoPaneNode, UI
return true
})
//TODO:localize
self.parentController?.present(UndoOverlayController(presentationData: self.context.sharedContext.currentPresentationData.with { $0 }, content: .removedChat(title: "Saved messages deleted.", text: nil), elevatedLayout: false, animateInAsReplacement: true, action: { [weak self] value in
self.parentController?.present(UndoOverlayController(presentationData: self.context.sharedContext.currentPresentationData.with { $0 }, content: .removedChat(title: self.presentationData.strings.SavedMessages_SubChatDeleted, text: nil), elevatedLayout: false, animateInAsReplacement: true, action: { [weak self] value in
guard let self else {
return false
}

3
submodules/TelegramUI/Components/PeerInfo/PeerInfoScreen/Sources/PeerInfoHeaderNode.swift
View File

@ -969,8 +969,7 @@ final class PeerInfoHeaderNode: ASDisplayNode {
if peer.id == self.context.account.peerId && !self.isSettings {
title = presentationData.strings.Conversation_SavedMessages
} else if peer.id.isAnonymousSavedMessages {
//TODO:localize
title = "Author Hidden"
title = presentationData.strings.ChatList_AuthorHidden
} else if let threadData = threadData {
title = threadData.info.title
} else {

3
submodules/TelegramUI/Components/PeerInfo/PeerInfoScreen/Sources/PeerInfoPaneContainerNode.swift
View File

@ -1012,8 +1012,7 @@ final class PeerInfoPaneContainerNode: ASDisplayNode, UIGestureRecognizerDelegat
case .savedMessagesChats:
title = presentationData.strings.DialogList_TabTitle
case .savedMessages:
//TODO:localize
title = "Saved"
title = presentationData.strings.PeerInfo_SavedMessagesTabTitle
}
return PeerInfoPaneSpecifier(key: key, title: title)
}, selectedPane: self.currentPaneKey, transitionFraction: self.transitionFraction, transition: transition)

9
submodules/TelegramUI/Sources/ChatController.swift
View File

@ -7216,6 +7216,9 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
}
if case .peer(self.context.account.peerId) = self.chatLocation {
var didDisplayTooltip = false
if "".isEmpty {
didDisplayTooltip = true
}
self.chatDisplayNode.historyNode.hasLotsOfMessagesUpdated = { [weak self] hasLotsOfMessages in
guard let self, hasLotsOfMessages else {
return
@ -7237,8 +7240,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
return
}
//TODO:localize
let tooltipScreen = TooltipScreen(account: self.context.account, sharedContext: self.context.sharedContext, text: .plain(text: "Tap to view your Saved Messages organized by type or source"), location: .point(navigationBar.frame, .top), displayDuration: .manual, shouldDismissOnTouch: { point, _ in
let tooltipScreen = TooltipScreen(account: self.context.account, sharedContext: self.context.sharedContext, text: .plain(text: self.presentationData.strings.Chat_SavedMessagesChatsTooltip), location: .point(navigationBar.frame, .top), displayDuration: .manual, shouldDismissOnTouch: { point, _ in
return .ignore
})
self.present(tooltipScreen, in: .current)
@ -17503,8 +17505,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
if options.contains(.deleteLocally) {
var localOptionText = self.presentationData.strings.Conversation_DeleteMessagesForMe
if self.chatLocation.peerId == self.context.account.peerId {
//TODO:localize
localOptionText = "Remove from Saved Messages"
localOptionText = self.presentationData.strings.Chat_ConfirmationRemoveFromSavedMessages
} else if case .scheduledMessages = self.presentationInterfaceState.subject {
localOptionText = messageIds.count > 1 ? self.presentationData.strings.ScheduledMessages_DeleteMany : self.presentationData.strings.ScheduledMessages_Delete
} else {

3
submodules/TelegramUI/Sources/ChatRestrictedInputPanelNode.swift
View File

@ -47,8 +47,7 @@ final class ChatRestrictedInputPanelNode: ChatInputPanelNode {
var iconImage: UIImage?
if case let .replyThread(message) = interfaceState.chatLocation, message.peerId == self.context?.account.peerId {
//TODO:localize
self.textNode.attributedText = NSAttributedString(string: "Senders of these messages restricted to link\ntheir name when forwarding.", font: Font.regular(13.0), textColor: interfaceState.theme.chat.inputPanel.secondaryTextColor)
self.textNode.attributedText = NSAttributedString(string: interfaceState.strings.Chat_PanelStatusAuthorHidden, font: Font.regular(13.0), textColor: interfaceState.theme.chat.inputPanel.secondaryTextColor)
} else if let threadData = interfaceState.threadData, threadData.isClosed {
iconImage = PresentationResourcesChat.chatPanelLockIcon(interfaceState.theme)
self.textNode.attributedText = NSAttributedString(string: interfaceState.strings.Chat_PanelTopicClosedText, font: Font.regular(15.0), textColor: interfaceState.theme.chat.inputPanel.secondaryTextColor)

2
versions.json
View File

@ -1,5 +1,5 @@
{
"app": "10.4.1",
"app": "10.5",
"bazel": "6.4.0",
"xcode": "15.0",
"macos": "13.0"