ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2026-01-06 05:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'beta'

Browse Source
This commit is contained in:
Peter
2019-08-28 16:01:22 +04:00
parent cfb90f3614 627af6dd0e
commit 9c7692e21e
4 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4579,7 +4579,7 @@ Any member of this group will be able to see messages in the channel.";
"VoiceOver.Chat.Title" = "Title: %@";
"VoiceOver.Chat.Caption" = "Caption: %@";
"VoiceOver.Chat.Duration" = "Duration: %@";
"VoiceOver.Chat.Size" = "Size %@";
"VoiceOver.Chat.Size" = "Size: %@";
"VoiceOver.Chat.MusicTitle" = "%1$@, by %2$@";
"VoiceOver.Chat.PlayHint" = "Double tap to play";
"VoiceOver.Chat.OpenHint" = "Double tap to open";

12
submodules/TelegramUI/Images.xcassets/Chat/Context Menu/Sticker.imageset/Contents.json vendored Normal file
View File

@@ -0,0 +1,12 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "ic_lt_sticker.pdf"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

BIN
submodules/TelegramUI/Images.xcassets/Chat/Context Menu/Sticker.imageset/ic_lt_sticker.pdf vendored Normal file
View File

Binary file not shown.

8
submodules/TelegramUI/TelegramUI/ChatInterfaceStateContextMenus.swift
View File

@@ -363,9 +363,9 @@ func contextMenuForChatPresentationIntefaceState(chatPresentationInterfaceState:
|> map { data -> [ContextMenuItem] in
var actions: [ContextMenuItem] = []
if let starStatus = data.starStatus, let image = starStatus ? starIconFilled : starIconEmpty {
actions.append(.action(ContextMenuActionItem(text: starStatus ? "Star" : "Unstar", icon: { theme in
return generateTintedImage(image: image, color: theme.actionSheet.primaryTextColor)
if let starStatus = data.starStatus {
actions.append(.action(ContextMenuActionItem(text: starStatus ? chatPresentationInterfaceState.strings.Stickers_RemoveFromFavorites : chatPresentationInterfaceState.strings.Stickers_AddToFavorites, icon: { theme in
return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Rate"), color: theme.actionSheet.primaryTextColor)
}, action: { _, f in
interfaceInteraction.toggleMessageStickerStarred(messages[0].id)
f(.default)
@@ -600,7 +600,7 @@ func contextMenuForChatPresentationIntefaceState(chatPresentationInterfaceState:
if data.messageActions.options.contains(.viewStickerPack) {
actions.append(.action(ContextMenuActionItem(text: chatPresentationInterfaceState.strings.StickerPack_ViewPack, icon: { theme in
return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Info"), color: theme.actionSheet.primaryTextColor)
return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Sticker"), color: theme.actionSheet.primaryTextColor)
}, action: { _, f in
let _ = controllerInteraction.openMessage(message, .default)
f(.dismissWithoutContent)