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

Merge commit '8659a5d6eab0db8063bb9ec097d89560e18ac7b0'

Browse Source 
# Conflicts:
#	Telegram/Telegram-iOS/en.lproj/Localizable.strings
This commit is contained in:
Isaac 2023-12-20 22:17:56 +04:00
commit 6ef84f3735
32 changed files with 555 additions and 303 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10796,3 +10796,9 @@ Sorry for the inconvenience.";
"Channel.Appearance.UnsavedChangesAlertText" = "You have changed the channel appearance settings. Apply changes?"; "Channel.Appearance.UnsavedChangesAlertText" = "You have changed the channel appearance settings. Apply changes?";
"Channel.Appearance.UnsavedChangesAlertDiscard" = "Discard"; "Channel.Appearance.UnsavedChangesAlertDiscard" = "Discard";
"Channel.Appearance.UnsavedChangesAlertApply" = "Apply"; "Channel.Appearance.UnsavedChangesAlertApply" = "Apply";
"ChatList.PremiumGiftInSettingsInfo" = "You can gift **Telegram Premium** to a friend later in **Settings**.";
"ChannelAppearance.BoostLevel" = "Level %@";
"Message.FullDateFormat" = "%1$@, %2$@";

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

@ -2251,6 +2251,7 @@ final class ChatListSearchListPaneNode: ASDisplayNode, ChatListSearchPaneNode {
if let sourceNode = sourceNode as? ChatListItemNode { if let sourceNode = sourceNode as? ChatListItemNode {
self.interaction.openStories?(id, sourceNode.avatarNode) self.interaction.openStories?(id, sourceNode.avatarNode)
} }
}, dismissNotice: { _ in
}) })
chatListInteraction.isSearchMode = true chatListInteraction.isSearchMode = true
@ -3561,6 +3562,7 @@ public final class ChatListSearchShimmerNode: ASDisplayNode {
}, performActiveSessionAction: { _, _ in }, performActiveSessionAction: { _, _ in
}, openChatFolderUpdates: {}, hideChatFolderUpdates: { }, openChatFolderUpdates: {}, hideChatFolderUpdates: {
}, openStories: { _, _ in }, openStories: { _, _ in
}, dismissNotice: { _ in
}) })
var isInlineMode = false var isInlineMode = false
if case .topics = key { if case .topics = key {

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

@ -156,7 +156,8 @@ final class ChatListShimmerNode: ASDisplayNode {
let interaction = ChatListNodeInteraction(context: context, animationCache: animationCache, animationRenderer: animationRenderer, activateSearch: {}, peerSelected: { _, _, _, _ in }, disabledPeerSelected: { _, _ in }, togglePeerSelected: { _, _ in }, togglePeersSelection: { _, _ in }, additionalCategorySelected: { _ in let interaction = ChatListNodeInteraction(context: context, animationCache: animationCache, animationRenderer: animationRenderer, activateSearch: {}, peerSelected: { _, _, _, _ in }, disabledPeerSelected: { _, _ in }, togglePeerSelected: { _, _ in }, togglePeersSelection: { _, _ in }, additionalCategorySelected: { _ in
}, messageSelected: { _, _, _, _ in}, groupSelected: { _ in }, addContact: { _ in }, setPeerIdWithRevealedOptions: { _, _ in }, setItemPinned: { _, _ in }, setPeerMuted: { _, _ in }, setPeerThreadMuted: { _, _, _ in }, deletePeer: { _, _ in }, deletePeerThread: { _, _ in }, setPeerThreadStopped: { _, _, _ in }, setPeerThreadPinned: { _, _, _ in }, setPeerThreadHidden: { _, _, _ in }, updatePeerGrouping: { _, _ in }, togglePeerMarkedUnread: { _, _ in}, toggleArchivedFolderHiddenByDefault: {}, toggleThreadsSelection: { _, _ in }, hidePsa: { _ in }, activateChatPreview: { _, _, _, gesture, _ in }, messageSelected: { _, _, _, _ in}, groupSelected: { _ in }, addContact: { _ in }, setPeerIdWithRevealedOptions: { _, _ in }, setItemPinned: { _, _ in }, setPeerMuted: { _, _ in }, setPeerThreadMuted: { _, _, _ in }, deletePeer: { _, _ in }, deletePeerThread: { _, _ in }, setPeerThreadStopped: { _, _, _ in }, setPeerThreadPinned: { _, _, _ in }, setPeerThreadHidden: { _, _, _ in }, updatePeerGrouping: { _, _ in }, togglePeerMarkedUnread: { _, _ in}, toggleArchivedFolderHiddenByDefault: {}, toggleThreadsSelection: { _, _ in }, hidePsa: { _ in }, activateChatPreview: { _, _, _, gesture, _ in
gesture?.cancel() gesture?.cancel()
}, present: { _ in }, openForumThread: { _, _ in }, openStorageManagement: {}, openPasswordSetup: {}, openPremiumIntro: {}, openPremiumGift: {}, openActiveSessions: {}, performActiveSessionAction: { _, _ in }, openChatFolderUpdates: {}, hideChatFolderUpdates: {}, openStories: { _, _ in }) }, present: { _ in }, openForumThread: { _, _ in }, openStorageManagement: {}, openPasswordSetup: {}, openPremiumIntro: {}, openPremiumGift: {}, openActiveSessions: {}, performActiveSessionAction: { _, _ in }, openChatFolderUpdates: {}, hideChatFolderUpdates: {}, openStories: { _, _ in }, dismissNotice: { _ in
})
interaction.isInlineMode = isInlineMode interaction.isInlineMode = isInlineMode
let items = (0 ..< 2).map { _ -> ChatListItem in let items = (0 ..< 2).map { _ -> ChatListItem in

33
submodules/ChatListUI/Sources/Node/ChatListNode.swift
View File

@ -106,6 +106,7 @@ public final class ChatListNodeInteraction {
let openChatFolderUpdates: () -> Void let openChatFolderUpdates: () -> Void
let hideChatFolderUpdates: () -> Void let hideChatFolderUpdates: () -> Void
let openStories: (ChatListNode.OpenStoriesSubject, ASDisplayNode?) -> Void let openStories: (ChatListNode.OpenStoriesSubject, ASDisplayNode?) -> Void
let dismissNotice: (ChatListNotice) -> Void
public var searchTextHighightState: String? public var searchTextHighightState: String?
var highlightedChatLocation: ChatListHighlightedLocation? var highlightedChatLocation: ChatListHighlightedLocation?
@ -156,7 +157,8 @@ public final class ChatListNodeInteraction {
performActiveSessionAction: @escaping (NewSessionReview, Bool) -> Void, performActiveSessionAction: @escaping (NewSessionReview, Bool) -> Void,
openChatFolderUpdates: @escaping () -> Void, openChatFolderUpdates: @escaping () -> Void,
hideChatFolderUpdates: @escaping () -> Void, hideChatFolderUpdates: @escaping () -> Void,
openStories: @escaping (ChatListNode.OpenStoriesSubject, ASDisplayNode?) -> Void openStories: @escaping (ChatListNode.OpenStoriesSubject, ASDisplayNode?) -> Void,
dismissNotice: @escaping (ChatListNotice) -> Void
) { ) {
self.activateSearch = activateSearch self.activateSearch = activateSearch
self.peerSelected = peerSelected self.peerSelected = peerSelected
@ -195,6 +197,7 @@ public final class ChatListNodeInteraction {
self.openChatFolderUpdates = openChatFolderUpdates self.openChatFolderUpdates = openChatFolderUpdates
self.hideChatFolderUpdates = hideChatFolderUpdates self.hideChatFolderUpdates = hideChatFolderUpdates
self.openStories = openStories self.openStories = openStories
self.dismissNotice = dismissNotice
} }
} }
@ -701,7 +704,7 @@ private func mappedInsertEntries(context: AccountContext, nodeInteraction: ChatL
hideChatListContacts(context: context) hideChatListContacts(context: context)
} : nil), directionHint: entry.directionHint) } : nil), directionHint: entry.directionHint)
case let .Notice(presentationData, notice): case let .Notice(presentationData, notice):
return ListViewInsertItem(index: entry.index, previousIndex: entry.previousIndex, item: ChatListStorageInfoItem(theme: presentationData.theme, strings: presentationData.strings, notice: notice, action: { [weak nodeInteraction] action in return ListViewInsertItem(index: entry.index, previousIndex: entry.previousIndex, item: ChatListStorageInfoItem(context: context, theme: presentationData.theme, strings: presentationData.strings, notice: notice, action: { [weak nodeInteraction] action in
switch action { switch action {
case .activate: case .activate:
switch notice { switch notice {
@ -717,10 +720,7 @@ private func mappedInsertEntries(context: AccountContext, nodeInteraction: ChatL
break break
} }
case .hide: case .hide:
switch notice { nodeInteraction?.dismissNotice(notice)
default:
break
}
case let .buttonChoice(isPositive): case let .buttonChoice(isPositive):
switch notice { switch notice {
case let .reviewLogin(newSessionReview, _): case let .reviewLogin(newSessionReview, _):
@ -1023,7 +1023,7 @@ private func mappedUpdateEntries(context: AccountContext, nodeInteraction: ChatL
hideChatListContacts(context: context) hideChatListContacts(context: context)
} : nil), directionHint: entry.directionHint) } : nil), directionHint: entry.directionHint)
case let .Notice(presentationData, notice): case let .Notice(presentationData, notice):
return ListViewUpdateItem(index: entry.index, previousIndex: entry.previousIndex, item: ChatListStorageInfoItem(theme: presentationData.theme, strings: presentationData.strings, notice: notice, action: { [weak nodeInteraction] action in return ListViewUpdateItem(index: entry.index, previousIndex: entry.previousIndex, item: ChatListStorageInfoItem(context: context, theme: presentationData.theme, strings: presentationData.strings, notice: notice, action: { [weak nodeInteraction] action in
switch action { switch action {
case .activate: case .activate:
switch notice { switch notice {
@ -1039,10 +1039,7 @@ private func mappedUpdateEntries(context: AccountContext, nodeInteraction: ChatL
break break
} }
case .hide: case .hide:
switch notice { nodeInteraction?.dismissNotice(notice)
default:
break
}
case let .buttonChoice(isPositive): case let .buttonChoice(isPositive):
switch notice { switch notice {
case let .reviewLogin(newSessionReview, _): case let .reviewLogin(newSessionReview, _):
@ -1703,6 +1700,20 @@ public final class ChatListNode: ListView {
return return
} }
self.openStories?(subject, itemNode) self.openStories?(subject, itemNode)
}, dismissNotice: { [weak self] notice in
guard let self else {
return
}
let presentationData = self.context.sharedContext.currentPresentationData.with { $0 }
switch notice {
case .xmasPremiumGift:
let _ = dismissServerProvidedSuggestion(account: self.context.account, suggestion: .xmasPremiumGift).startStandalone()
self.present?(UndoOverlayController(presentationData: presentationData, content: .info(title: nil, text: presentationData.strings.ChatList_PremiumGiftInSettingsInfo, timeout: 5.0, customUndoText: nil), elevatedLayout: false, action: { _ in
return true
}))
default:
break
}
}) })
nodeInteraction.isInlineMode = isInlineMode nodeInteraction.isInlineMode = isInlineMode

2
submodules/ChatListUI/Sources/Node/ChatListNodeEntries.swift
View File

@ -79,7 +79,7 @@ public enum ChatListNodeEntryPromoInfo: Equatable {
case psa(type: String, message: String?) case psa(type: String, message: String?)
} }
enum ChatListNotice: Equatable { public enum ChatListNotice: Equatable {
case clearStorage(sizeFraction: Double) case clearStorage(sizeFraction: Double)
case setupPassword case setupPassword
case premiumUpgrade(discount: Int32) case premiumUpgrade(discount: Int32)

40
submodules/ChatListUI/Sources/Node/ChatListStorageInfoItem.swift
View File

@ -8,6 +8,8 @@ import ListSectionHeaderNode
import AppBundle import AppBundle
import ItemListUI import ItemListUI
import Markdown import Markdown
import AccountContext
import TelegramCore
class ChatListStorageInfoItem: ListViewItem { class ChatListStorageInfoItem: ListViewItem {
enum Action { enum Action {
@ -16,6 +18,7 @@ class ChatListStorageInfoItem: ListViewItem {
case buttonChoice(isPositive: Bool) case buttonChoice(isPositive: Bool)
} }
let context: AccountContext
let theme: PresentationTheme let theme: PresentationTheme
let strings: PresentationStrings let strings: PresentationStrings
let notice: ChatListNotice let notice: ChatListNotice
@ -23,7 +26,8 @@ class ChatListStorageInfoItem: ListViewItem {
let selectable: Bool = true let selectable: Bool = true
init(theme: PresentationTheme, strings: PresentationStrings, notice: ChatListNotice, action: @escaping (Action) -> Void) { init(context: AccountContext, theme: PresentationTheme, strings: PresentationStrings, notice: ChatListNotice, action: @escaping (Action) -> Void) {
self.context = context
self.theme = theme self.theme = theme
self.strings = strings self.strings = strings
self.notice = notice self.notice = notice
@ -86,6 +90,8 @@ class ChatListStorageInfoItemNode: ItemListRevealOptionsItemNode {
private let arrowNode: ASImageNode private let arrowNode: ASImageNode
private let separatorNode: ASDisplayNode private let separatorNode: ASDisplayNode
private var closeButton: HighlightableButtonNode?
private var okButtonText: TextNode? private var okButtonText: TextNode?
private var cancelButtonText: TextNode? private var cancelButtonText: TextNode?
private var okButton: HighlightableButtonNode? private var okButton: HighlightableButtonNode?
@ -127,6 +133,13 @@ class ChatListStorageInfoItemNode: ItemListRevealOptionsItemNode {
super.didLoad() super.didLoad()
} }
@objc private func closePressed() {
guard let item = self.item else {
return
}
item.action(.hide)
}
override func layoutForParams(_ params: ListViewItemLayoutParams, item: ListViewItem, previousItem: ListViewItem?, nextItem: ListViewItem?) { override func layoutForParams(_ params: ListViewItemLayoutParams, item: ListViewItem, previousItem: ListViewItem?, nextItem: ListViewItem?) {
let layout = self.asyncLayout() let layout = self.asyncLayout()
let (_, apply) = layout(item as! ChatListStorageInfoItem, params, nextItem == nil) let (_, apply) = layout(item as! ChatListStorageInfoItem, params, nextItem == nil)
@ -334,6 +347,31 @@ class ChatListStorageInfoItemNode: ItemListRevealOptionsItemNode {
} }
} }
let arrowIsHidden = strongSelf.arrowNode.isHidden
if case .xmasPremiumGift = item.notice {
strongSelf.arrowNode.isHidden = true
let closeButton: HighlightableButtonNode
if let current = strongSelf.closeButton {
closeButton = current
} else {
closeButton = HighlightableButtonNode()
closeButton.hitTestSlop = UIEdgeInsets(top: -8.0, left: -8.0, bottom: -8.0, right: -8.0)
closeButton.addTarget(self, action: #selector(strongSelf.closePressed), forControlEvents: [.touchUpInside])
strongSelf.contentContainer.addSubnode(closeButton)
strongSelf.closeButton = closeButton
}
if themeUpdated {
closeButton.setImage(PresentationResourcesItemList.itemListCloseIconImage(item.theme), for: .normal)
}
let closeButtonSize = closeButton.measure(CGSize(width: 100.0, height: 100.0))
closeButton.frame = CGRect(origin: CGPoint(x: layout.size.width - sideInset - closeButtonSize.width, y: floor((layout.size.height - closeButtonSize.height) / 2.0)), size: closeButtonSize)
} else {
strongSelf.arrowNode.isHidden = arrowIsHidden
}
strongSelf.contentSize = layout.contentSize strongSelf.contentSize = layout.contentSize
strongSelf.insets = layout.insets strongSelf.insets = layout.insets

10
submodules/Display/Source/TextNode.swift
View File

@ -1485,7 +1485,7 @@ open class TextNode: ASDisplayNode {
var blockQuotes: [TextNodeBlockQuote] = [] var blockQuotes: [TextNodeBlockQuote] = []
loop: for i in 0 ..< calculatedSegments.count { for i in 0 ..< calculatedSegments.count {
let segment = calculatedSegments[i] let segment = calculatedSegments[i]
if i != 0 { if i != 0 {
if segment.blockQuote != nil { if segment.blockQuote != nil {
@ -1510,10 +1510,6 @@ open class TextNode: ASDisplayNode {
} }
for line in segment.lines { for line in segment.lines {
var isLastLine = false
if maximumNumberOfLines > 0 && lines.count == maximumNumberOfLines - 1 {
isLastLine = true
}
line.frame = CGRect(origin: CGPoint(x: line.frame.origin.x, y: -insets.bottom + size.height + line.frame.size.height), size: line.frame.size) line.frame = CGRect(origin: CGPoint(x: line.frame.origin.x, y: -insets.bottom + size.height + line.frame.size.height), size: line.frame.size)
line.frame.size.width += max(0.0, segment.additionalWidth - 2.0) line.frame.size.width += max(0.0, segment.additionalWidth - 2.0)
//line.frame.size.width = max(blockWidth, line.frame.size.width) //line.frame.size.width = max(blockWidth, line.frame.size.width)
@ -1579,10 +1575,6 @@ open class TextNode: ASDisplayNode {
} }
lines.append(line) lines.append(line)
if isLastLine {
break loop
}
} }
let blockMaxY = size.height - insets.bottom let blockMaxY = size.height - insets.bottom

50
submodules/DrawingUI/Sources/DrawingStickerEntityView.swift
View File

@ -276,20 +276,27 @@ public class DrawingStickerEntityView: DrawingEntityView {
self.animatedImageView = imageView self.animatedImageView = imageView
self.addSubview(imageView) self.addSubview(imageView)
self.setNeedsLayout() self.setNeedsLayout()
} else if case let .message(_, innerFile, _) = self.stickerEntity.content { } else if case .message = self.stickerEntity.content {
let imageView = UIImageView() if let image = self.stickerEntity.renderImage {
imageView.contentMode = .scaleAspectFit self.setupWithImage(image)
imageView.image = self.stickerEntity.renderImage
self.animatedImageView = imageView
self.addSubview(imageView)
self.setNeedsLayout()
let _ = innerFile
// if let innerFile, innerFile.isAnimated {
// self.setupWithVideo(innerFile)
// }
} }
} }
}
private func setupWithImage(_ image: UIImage) {
let imageView: UIImageView
if let current = self.animatedImageView {
imageView = current
} else {
imageView = UIImageView()
imageView.contentMode = .scaleAspectFit
self.addSubview(imageView)
self.animatedImageView = imageView
}
imageView.image = image
self.currentSize = nil
self.setNeedsLayout()
}
private func setupWithVideo(_ file: TelegramMediaFile) { private func setupWithVideo(_ file: TelegramMediaFile) {
let videoNode = UniversalVideoNode( let videoNode = UniversalVideoNode(
@ -366,10 +373,10 @@ public class DrawingStickerEntityView: DrawingEntityView {
self.applyVisibility() self.applyVisibility()
} }
private var isNight = false public var isNightTheme = false {
public func toggleNightTheme() { didSet {
self.isNight = !self.isNight self.animatedImageView?.image = self.isNightTheme ? self.stickerEntity.secondaryRenderImage : self.stickerEntity.renderImage
self.animatedImageView?.image = self.isNight ? self.stickerEntity.secondaryRenderImage : self.stickerEntity.renderImage }
} }
func applyVisibility() { func applyVisibility() {
@ -616,6 +623,13 @@ public class DrawingStickerEntityView: DrawingEntityView {
self.updateAnimationColor() self.updateAnimationColor()
if case .message = self.stickerEntity.content, self.animatedImageView == nil {
let image = self.isNightTheme ? self.stickerEntity.secondaryRenderImage : self.stickerEntity.renderImage
if let image {
self.setupWithImage(image)
}
}
self.updateMirroring(animated: animated) self.updateMirroring(animated: animated)
self.updated() self.updated()
@ -983,9 +997,9 @@ final class DrawingStickerEntititySelectionView: DrawingEntitySelectionView {
var count = 12 var count = 12
if case .message = entity.content { if case .message = entity.content {
cornerRadius *= 2.1 cornerRadius *= 2.1
count = 20 count = 24
} else if case .image = entity.content { } else if case .image = entity.content {
count = 20 count = 24
} }
let perimeter: CGFloat = 2.0 * (width + height - cornerRadius * (4.0 - .pi)) let perimeter: CGFloat = 2.0 * (width + height - cornerRadius * (4.0 - .pi))

1
submodules/HashtagSearchUI/Sources/HashtagSearchController.swift
View File

@ -101,6 +101,7 @@ public final class HashtagSearchController: TelegramBaseController {
}, openChatFolderUpdates: { }, openChatFolderUpdates: {
}, hideChatFolderUpdates: { }, hideChatFolderUpdates: {
}, openStories: { _, _ in }, openStories: { _, _ in
}, dismissNotice: { _ in
}) })
let previousSearchItems = Atomic<[ChatListSearchEntry]?>(value: nil) let previousSearchItems = Atomic<[ChatListSearchEntry]?>(value: nil)

2
submodules/PremiumUI/Sources/CreateGiveawayController.swift
View File

@ -1013,7 +1013,7 @@ public func createGiveawayController(context: AccountContext, updatedPresentatio
let controller = ItemListController(context: context, state: signal) let controller = ItemListController(context: context, state: signal)
controller.navigationPresentation = .modal controller.navigationPresentation = .modal
controller.beganInteractiveDragging = { controller.beganInteractiveDragging = {
dismissInputImpl?() // dismissInputImpl?()
} }
presentControllerImpl = { [weak controller] c in presentControllerImpl = { [weak controller] c in
controller?.present(c, in: .window(.root)) controller?.present(c, in: .window(.root))

1
submodules/SettingsUI/Sources/Text Size/TextSizeSelectionController.swift
View File

@ -226,6 +226,7 @@ private final class TextSizeSelectionControllerNode: ASDisplayNode, UIScrollView
}, performActiveSessionAction: { _, _ in }, performActiveSessionAction: { _, _ in
}, openChatFolderUpdates: {}, hideChatFolderUpdates: { }, openChatFolderUpdates: {}, hideChatFolderUpdates: {
}, openStories: { _, _ in }, openStories: { _, _ in
}, dismissNotice: { _ in
}) })
let chatListPresentationData = ChatListPresentationData(theme: self.presentationData.theme, fontSize: self.presentationData.listsFontSize, strings: self.presentationData.strings, dateTimeFormat: self.presentationData.dateTimeFormat, nameSortOrder: self.presentationData.nameSortOrder, nameDisplayOrder: self.presentationData.nameDisplayOrder, disableAnimations: true) let chatListPresentationData = ChatListPresentationData(theme: self.presentationData.theme, fontSize: self.presentationData.listsFontSize, strings: self.presentationData.strings, dateTimeFormat: self.presentationData.dateTimeFormat, nameSortOrder: self.presentationData.nameSortOrder, nameDisplayOrder: self.presentationData.nameDisplayOrder, disableAnimations: true)

1
submodules/SettingsUI/Sources/Themes/ThemePreviewControllerNode.swift
View File

@ -375,6 +375,7 @@ final class ThemePreviewControllerNode: ASDisplayNode, UIScrollViewDelegate {
}, performActiveSessionAction: { _, _ in }, performActiveSessionAction: { _, _ in
}, openChatFolderUpdates: {}, hideChatFolderUpdates: { }, openChatFolderUpdates: {}, hideChatFolderUpdates: {
}, openStories: { _, _ in }, openStories: { _, _ in
}, dismissNotice: { _ in
}) })
func makeChatListItem( func makeChatListItem(

11
submodules/TelegramUI/Components/Chat/ChatMessageAttachedContentNode/Sources/ChatMessageAttachedContentNode.swift
View File

@ -491,9 +491,12 @@ public final class ChatMessageAttachedContentNode: ASDisplayNode {
if remainingCutoutHeight > 0.0 { if remainingCutoutHeight > 0.0 {
cutout = TextNodeCutout(topRight: CGSize(width: cutoutWidth, height: remainingCutoutHeight)) cutout = TextNodeCutout(topRight: CGSize(width: cutoutWidth, height: remainingCutoutHeight))
} }
var maximumNumberOfLines: Int = 12
if isPreview {
maximumNumberOfLines = mediaAndFlags != nil ? 4 : 6
}
let textString = stringWithAppliedEntities(text, entities: entities ?? [], baseColor: messageTheme.primaryTextColor, linkColor: incoming ? mainColor : messageTheme.linkTextColor, baseFont: textFont, linkFont: textFont, boldFont: textBoldFont, italicFont: textItalicFont, boldItalicFont: textBoldItalicFont, fixedFont: textFixedFont, blockQuoteFont: textBlockQuoteFont, message: nil, adjustQuoteFontSize: true) let textString = stringWithAppliedEntities(text, entities: entities ?? [], baseColor: messageTheme.primaryTextColor, linkColor: incoming ? mainColor : messageTheme.linkTextColor, baseFont: textFont, linkFont: textFont, boldFont: textBoldFont, italicFont: textItalicFont, boldItalicFont: textBoldItalicFont, fixedFont: textFixedFont, blockQuoteFont: textBlockQuoteFont, message: nil, adjustQuoteFontSize: true)
let textLayoutAndApplyValue = makeTextLayout(TextNodeLayoutArguments(attributedString: textString, backgroundColor: nil, maximumNumberOfLines: 12, truncationType: .end, constrainedSize: CGSize(width: maxContentsWidth, height: 10000.0), alignment: .natural, lineSpacing: textLineSpacing, cutout: cutout, insets: UIEdgeInsets())) let textLayoutAndApplyValue = makeTextLayout(TextNodeLayoutArguments(attributedString: textString, backgroundColor: nil, maximumNumberOfLines: maximumNumberOfLines, truncationType: .end, constrainedSize: CGSize(width: maxContentsWidth, height: 10000.0), alignment: .natural, lineSpacing: textLineSpacing, cutout: cutout, insets: UIEdgeInsets()))
textLayoutAndApply = textLayoutAndApplyValue textLayoutAndApply = textLayoutAndApplyValue
remainingCutoutHeight -= textLayoutAndApplyValue.0.size.height remainingCutoutHeight -= textLayoutAndApplyValue.0.size.height
@ -631,8 +634,8 @@ public final class ChatMessageAttachedContentNode: ASDisplayNode {
let statusLayoutAndContinueValue = makeStatusLayout(ChatMessageDateAndStatusNode.Arguments( let statusLayoutAndContinueValue = makeStatusLayout(ChatMessageDateAndStatusNode.Arguments(
context: context, context: context,
presentationData: presentationData, presentationData: presentationData,
edited: edited, edited: edited && !isPreview,
impressionCount: viewCount, impressionCount: !isPreview ? viewCount : nil,
dateText: dateText, dateText: dateText,
type: statusType, type: statusType,
layoutInput: .trailingContent( layoutInput: .trailingContent(

4
submodules/TelegramUI/Components/Chat/ChatMessageBubbleItemNode/Sources/ChatMessageBubbleItemNode.swift
View File

@ -1887,7 +1887,7 @@ public class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePreviewI
} else { } else {
bubbleReactions = ReactionsMessageAttribute(canViewList: false, reactions: [], recentPeers: []) bubbleReactions = ReactionsMessageAttribute(canViewList: false, reactions: [], recentPeers: [])
} }
if !bubbleReactions.reactions.isEmpty { if !bubbleReactions.reactions.isEmpty && !item.presentationData.isPreview {
bottomNodeMergeStatus = .Both bottomNodeMergeStatus = .Both
} }
@ -2093,7 +2093,7 @@ public class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePreviewI
context: item.context, context: item.context,
presentationData: item.presentationData, presentationData: item.presentationData,
edited: edited && !item.presentationData.isPreview, edited: edited && !item.presentationData.isPreview,
impressionCount: viewCount, impressionCount: !item.presentationData.isPreview ? viewCount : nil,
dateText: dateText, dateText: dateText,
type: statusType, type: statusType,
layoutInput: .standalone(reactionSettings: shouldDisplayInlineDateReactions(message: item.message, isPremium: item.associatedData.isPremium, forceInline: item.associatedData.forceInlineReactions) ? ChatMessageDateAndStatusNode.StandaloneReactionSettings() : nil), layoutInput: .standalone(reactionSettings: shouldDisplayInlineDateReactions(message: item.message, isPremium: item.associatedData.isPremium, forceInline: item.associatedData.forceInlineReactions) ? ChatMessageDateAndStatusNode.StandaloneReactionSettings() : nil),

4
submodules/TelegramUI/Components/Chat/ChatMessageDateAndStatusNode/Sources/StringForMessageTimestampStatus.swift
View File

@ -111,9 +111,7 @@ public func stringForMessageTimestampStatus(accountPeerId: PeerId, message: Mess
} else { } else {
dayText = strings.Date_ChatDateHeaderYear(monthAtIndex(Int(timeinfo.tm_mon), strings: strings), "\(timeinfo.tm_mday)", "\(1900 + timeinfo.tm_year)").string dayText = strings.Date_ChatDateHeaderYear(monthAtIndex(Int(timeinfo.tm_mon), strings: strings), "\(timeinfo.tm_mday)", "\(1900 + timeinfo.tm_year)").string
} }
dateText = strings.Message_FullDateFormat(dayText, stringForMessageTimestamp(timestamp: timestamp, dateTimeFormat: dateTimeFormat)).string
//TODO:localize
dateText = "\(dayText), \(stringForMessageTimestamp(timestamp: timestamp, dateTimeFormat: dateTimeFormat))"
} }
else if let forwardInfo = message.forwardInfo, forwardInfo.flags.contains(.isImported) { else if let forwardInfo = message.forwardInfo, forwardInfo.flags.contains(.isImported) {
dateText = strings.Message_ImportedDateFormat(dateStringForDay(strings: strings, dateTimeFormat: dateTimeFormat, timestamp: forwardInfo.date), stringForMessageTimestamp(timestamp: forwardInfo.date, dateTimeFormat: dateTimeFormat), dateText).string dateText = strings.Message_ImportedDateFormat(dateStringForDay(strings: strings, dateTimeFormat: dateTimeFormat, timestamp: forwardInfo.date), stringForMessageTimestamp(timestamp: forwardInfo.date, dateTimeFormat: dateTimeFormat), dateText).string

2
submodules/TelegramUI/Components/Chat/ChatMessageGiveawayBubbleContentNode/Sources/ChatMessageGiveawayBubbleContentNode.swift
View File

@ -508,7 +508,7 @@ public class ChatMessageGiveawayBubbleContentNode: ChatMessageBubbleContentNode,
context: item.context, context: item.context,
presentationData: item.presentationData, presentationData: item.presentationData,
edited: edited, edited: edited,
impressionCount: viewCount, impressionCount: !item.presentationData.isPreview ? viewCount : nil,
dateText: dateText, dateText: dateText,
type: statusType, type: statusType,
layoutInput: .trailingContent(contentWidth: 1000.0, reactionSettings: shouldDisplayInlineDateReactions(message: item.message, isPremium: item.associatedData.isPremium, forceInline: item.associatedData.forceInlineReactions) ? ChatMessageDateAndStatusNode.TrailingReactionSettings(displayInline: true, preferAdditionalInset: false) : nil), layoutInput: .trailingContent(contentWidth: 1000.0, reactionSettings: shouldDisplayInlineDateReactions(message: item.message, isPremium: item.associatedData.isPremium, forceInline: item.associatedData.forceInlineReactions) ? ChatMessageDateAndStatusNode.TrailingReactionSettings(displayInline: true, preferAdditionalInset: false) : nil),

4
submodules/TelegramUI/Components/Chat/ChatMessageInteractiveFileNode/Sources/ChatMessageInteractiveFileNode.swift
View File

@ -919,8 +919,8 @@ public final class ChatMessageInteractiveFileNode: ASDisplayNode {
statusSuggestedWidthAndContinue = statusLayout(ChatMessageDateAndStatusNode.Arguments( statusSuggestedWidthAndContinue = statusLayout(ChatMessageDateAndStatusNode.Arguments(
context: arguments.context, context: arguments.context,
presentationData: arguments.presentationData, presentationData: arguments.presentationData,
edited: edited, edited: edited && !arguments.presentationData.isPreview,
impressionCount: viewCount, impressionCount: !arguments.presentationData.isPreview ? viewCount : nil,
dateText: dateText, dateText: dateText,
type: statusType, type: statusType,
layoutInput: statusLayoutInput, layoutInput: statusLayoutInput,

2
submodules/TelegramUI/Components/Chat/ChatMessageInteractiveInstantVideoNode/Sources/ChatMessageInteractiveInstantVideoNode.swift
View File

@ -554,7 +554,7 @@ public class ChatMessageInteractiveInstantVideoNode: ASDisplayNode {
context: item.context, context: item.context,
presentationData: item.presentationData, presentationData: item.presentationData,
edited: edited && !sentViaBot && !item.presentationData.isPreview, edited: edited && !sentViaBot && !item.presentationData.isPreview,
impressionCount: item.presentationData.isPreview ? nil : viewCount, impressionCount: !item.presentationData.isPreview ? viewCount : nil,
dateText: dateText, dateText: dateText,
type: statusType, type: statusType,
layoutInput: .standalone(reactionSettings: shouldDisplayInlineDateReactions(message: item.message, isPremium: item.associatedData.isPremium, forceInline: item.associatedData.forceInlineReactions) ? ChatMessageDateAndStatusNode.StandaloneReactionSettings() : nil), layoutInput: .standalone(reactionSettings: shouldDisplayInlineDateReactions(message: item.message, isPremium: item.associatedData.isPremium, forceInline: item.associatedData.forceInlineReactions) ? ChatMessageDateAndStatusNode.StandaloneReactionSettings() : nil),

20
submodules/TelegramUI/Components/Chat/ChatMessageInteractiveMediaNode/Sources/ChatMessageInteractiveMediaNode.swift
View File

@ -862,7 +862,7 @@ public final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTr
context: context, context: context,
presentationData: presentationData, presentationData: presentationData,
edited: dateAndStatus.edited && !presentationData.isPreview, edited: dateAndStatus.edited && !presentationData.isPreview,
impressionCount: dateAndStatus.viewCount, impressionCount: !presentationData.isPreview ? dateAndStatus.viewCount : nil,
dateText: dateAndStatus.dateText, dateText: dateAndStatus.dateText,
type: dateAndStatus.type, type: dateAndStatus.type,
layoutInput: .standalone(reactionSettings: shouldDisplayInlineDateReactions(message: message, isPremium: associatedData.isPremium, forceInline: associatedData.forceInlineReactions) ? ChatMessageDateAndStatusNode.StandaloneReactionSettings() : nil), layoutInput: .standalone(reactionSettings: shouldDisplayInlineDateReactions(message: message, isPremium: associatedData.isPremium, forceInline: associatedData.forceInlineReactions) ? ChatMessageDateAndStatusNode.StandaloneReactionSettings() : nil),
@ -1862,6 +1862,9 @@ public final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTr
badgeContent = .text(inset: 0.0, backgroundColor: messageTheme.mediaDateAndStatusFillColor, foregroundColor: messageTheme.mediaDateAndStatusTextColor, text: string, iconName: nil) badgeContent = .text(inset: 0.0, backgroundColor: messageTheme.mediaDateAndStatusFillColor, foregroundColor: messageTheme.mediaDateAndStatusTextColor, text: string, iconName: nil)
} }
} }
let gifTitle = game != nil ? strings.Message_Game.uppercased() : strings.Message_Animation.uppercased()
var animated = animated var animated = animated
if let updatingMedia = attributes.updatingMedia, case .update = updatingMedia.media { if let updatingMedia = attributes.updatingMedia, case .update = updatingMedia.media {
state = .progress(color: messageTheme.mediaOverlayControlColors.foregroundColor, lineWidth: nil, value: CGFloat(updatingMedia.progress), cancelEnabled: true, animateRotation: true) state = .progress(color: messageTheme.mediaOverlayControlColors.foregroundColor, lineWidth: nil, value: CGFloat(updatingMedia.progress), cancelEnabled: true, animateRotation: true)
@ -1916,8 +1919,6 @@ public final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTr
} }
} }
let gifTitle = game != nil ? strings.Message_Game.uppercased() : strings.Message_Animation.uppercased()
let formatting = DataSizeStringFormatting(strings: strings, decimalSeparator: decimalSeparator) let formatting = DataSizeStringFormatting(strings: strings, decimalSeparator: decimalSeparator)
var media = self.media var media = self.media
@ -2079,7 +2080,11 @@ public final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTr
} }
} }
} }
if isPreview, let _ = media as? TelegramMediaFile { if isPreview, let file = media as? TelegramMediaFile {
if let duration = file.duration, !file.isVideoSticker {
let durationString = file.isAnimated ? gifTitle : stringForDuration(Int32(duration), position: nil)
badgeContent = .mediaDownload(backgroundColor: messageTheme.mediaDateAndStatusFillColor, foregroundColor: messageTheme.mediaDateAndStatusTextColor, duration: durationString, size: nil, muted: false, active: false)
}
state = .play(messageTheme.mediaOverlayControlColors.foregroundColor) state = .play(messageTheme.mediaOverlayControlColors.foregroundColor)
} }
@ -2125,6 +2130,13 @@ public final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTr
animated = true animated = true
} }
if isPreview {
if case .play = state {
} else {
state = .none
}
}
statusNode.transitionToState(state, animated: animated, completion: { [weak statusNode] in statusNode.transitionToState(state, animated: animated, completion: { [weak statusNode] in
if removeStatusNode { if removeStatusNode {
statusNode?.removeFromSupernode() statusNode?.removeFromSupernode()

2
submodules/TelegramUI/Components/Chat/ChatMessageMapBubbleContentNode/Sources/ChatMessageMapBubbleContentNode.swift
View File

@ -267,7 +267,7 @@ public class ChatMessageMapBubbleContentNode: ChatMessageBubbleContentNode {
context: item.context, context: item.context,
presentationData: item.presentationData, presentationData: item.presentationData,
edited: edited, edited: edited,
impressionCount: viewCount, impressionCount: !item.presentationData.isPreview ? viewCount : nil,
dateText: dateText, dateText: dateText,
type: statusType, type: statusType,
layoutInput: .standalone(reactionSettings: shouldDisplayInlineDateReactions(message: item.message, isPremium: item.associatedData.isPremium, forceInline: item.associatedData.forceInlineReactions) ? ChatMessageDateAndStatusNode.StandaloneReactionSettings() : nil), layoutInput: .standalone(reactionSettings: shouldDisplayInlineDateReactions(message: item.message, isPremium: item.associatedData.isPremium, forceInline: item.associatedData.forceInlineReactions) ? ChatMessageDateAndStatusNode.StandaloneReactionSettings() : nil),

4
submodules/TelegramUI/Components/Chat/ChatMessageTextBubbleContentNode/Sources/ChatMessageTextBubbleContentNode.swift
View File

@ -521,6 +521,8 @@ public class ChatMessageTextBubbleContentNode: ChatMessageBubbleContentNode {
} else { } else {
maximumNumberOfLines = 6 maximumNumberOfLines = 6
} }
} else if let _ = item.message.media.first(where: { $0 is TelegramMediaWebpage }) as? TelegramMediaWebpage {
maximumNumberOfLines = 9
} else { } else {
maximumNumberOfLines = 12 maximumNumberOfLines = 12
} }
@ -562,7 +564,7 @@ public class ChatMessageTextBubbleContentNode: ChatMessageBubbleContentNode {
context: item.context, context: item.context,
presentationData: item.presentationData, presentationData: item.presentationData,
edited: edited && !item.presentationData.isPreview, edited: edited && !item.presentationData.isPreview,
impressionCount: viewCount, impressionCount: !item.presentationData.isPreview ? viewCount : nil,
dateText: dateText, dateText: dateText,
type: statusType, type: statusType,
layoutInput: dateLayoutInput, layoutInput: dateLayoutInput,

11
submodules/TelegramUI/Components/Chat/ChatMessageWallpaperBubbleContentNode/Sources/ChatMessageWallpaperBubbleContentNode.swift
View File

@ -337,9 +337,18 @@ public class ChatMessageWallpaperBubbleContentNode: ChatMessageBubbleContentNode
var patternArguments: PatternWallpaperArguments? var patternArguments: PatternWallpaperArguments?
var mediaContent = media.content var mediaContent = media.content
if case let .emoticon(emoticon) = mediaContent, let theme = item.associatedData.chatThemes.first(where: { $0.emoticon?.strippedEmoji == emoticon.strippedEmoji }), let themeWallpaper = theme.settings?.first?.wallpaper, let themeWallpaperContent = WallpaperPreviewMedia(wallpaper: themeWallpaper)?.content { if case let .emoticon(emoticon) = mediaContent, let theme = item.associatedData.chatThemes.first(where: { $0.emoticon?.strippedEmoji == emoticon.strippedEmoji }) {
let themeSettings: TelegramThemeSettings?
if let matching = theme.settings?.first(where: { $0.baseTheme == item.presentationData.theme.theme.referenceTheme.baseTheme }) {
themeSettings = matching
} else {
themeSettings = theme.settings?.first
}
if let themeWallpaper = themeSettings?.wallpaper, let themeWallpaperContent = WallpaperPreviewMedia(wallpaper: themeWallpaper)?.content {
mediaContent = themeWallpaperContent mediaContent = themeWallpaperContent
} }
}
switch mediaContent { switch mediaContent {
case let .file(file, patternColors, rotation, intensity, _, _): case let .file(file, patternColors, rotation, intensity, _, _):

89
submodules/TelegramUI/Components/MediaEditor/Sources/DrawingMessageRenderer.swift
View File

@ -11,26 +11,28 @@ import WallpaperBackgroundNode
public final class DrawingWallpaperRenderer { public final class DrawingWallpaperRenderer {
private let context: AccountContext private let context: AccountContext
private let customWallpaper: TelegramWallpaper? private let customDayWallpaper: TelegramWallpaper?
private let customNightWallpaper: TelegramWallpaper?
private let wallpaperBackgroundNode: WallpaperBackgroundNode private let wallpaperBackgroundNode: WallpaperBackgroundNode
private let darkWallpaperBackgroundNode: WallpaperBackgroundNode private let darkWallpaperBackgroundNode: WallpaperBackgroundNode
public init (context: AccountContext, customWallpaper: TelegramWallpaper?) { public init (context: AccountContext, customDayWallpaper: TelegramWallpaper?, customNightWallpaper: TelegramWallpaper?) {
self.context = context self.context = context
self.customWallpaper = customWallpaper self.customDayWallpaper = customDayWallpaper
self.customNightWallpaper = customNightWallpaper
self.wallpaperBackgroundNode = createWallpaperBackgroundNode(context: context, forChatDisplay: true, useSharedAnimationPhase: false) self.wallpaperBackgroundNode = createWallpaperBackgroundNode(context: context, forChatDisplay: true, useSharedAnimationPhase: false)
self.wallpaperBackgroundNode.displaysAsynchronously = false self.wallpaperBackgroundNode.displaysAsynchronously = false
let wallpaper = self.customWallpaper ?? context.sharedContext.currentPresentationData.with { $0 }.chatWallpaper let wallpaper = self.customDayWallpaper ?? context.sharedContext.currentPresentationData.with { $0 }.chatWallpaper
self.wallpaperBackgroundNode.update(wallpaper: wallpaper, animated: false) self.wallpaperBackgroundNode.update(wallpaper: wallpaper, animated: false)
self.darkWallpaperBackgroundNode = createWallpaperBackgroundNode(context: context, forChatDisplay: true, useSharedAnimationPhase: false) self.darkWallpaperBackgroundNode = createWallpaperBackgroundNode(context: context, forChatDisplay: true, useSharedAnimationPhase: false)
self.darkWallpaperBackgroundNode.displaysAsynchronously = false self.darkWallpaperBackgroundNode.displaysAsynchronously = false
let darkTheme = defaultDarkColorPresentationTheme let darkTheme = defaultDarkColorPresentationTheme
let darkWallpaper = darkTheme.chat.defaultWallpaper let darkWallpaper = self.customNightWallpaper ?? darkTheme.chat.defaultWallpaper
self.darkWallpaperBackgroundNode.update(wallpaper: darkWallpaper, animated: false) self.darkWallpaperBackgroundNode.update(wallpaper: darkWallpaper, animated: false)
} }
@ -39,7 +41,7 @@ public final class DrawingWallpaperRenderer {
let resultSize = CGSize(width: 1080, height: 1920) let resultSize = CGSize(width: 1080, height: 1920)
self.generate(view: self.wallpaperBackgroundNode.view) { dayImage in self.generate(view: self.wallpaperBackgroundNode.view) { dayImage in
if self.customWallpaper != nil { if self.customDayWallpaper != nil && self.customNightWallpaper == nil {
completion(resultSize, dayImage, nil, nil) completion(resultSize, dayImage, nil, nil)
} else { } else {
Queue.mainQueue().justDispatch { Queue.mainQueue().justDispatch {
@ -77,33 +79,34 @@ public final class DrawingWallpaperRenderer {
} }
public final class DrawingMessageRenderer { public final class DrawingMessageRenderer {
class ContainerNode: ASDisplayNode {
private let context: AccountContext private let context: AccountContext
private let messages: [Message] private let messages: [Message]
private let isNight: Bool
private let containerNode: ASDisplayNode
private let messagesContainerNode: ASDisplayNode private let messagesContainerNode: ASDisplayNode
private var avatarHeaderNode: ListViewItemHeaderNode? private var avatarHeaderNode: ListViewItemHeaderNode?
private var messageNodes: [ListViewItemNode]? private var messageNodes: [ListViewItemNode]?
public init(context: AccountContext, messages: [Message]) { init(context: AccountContext, messages: [Message], isNight: Bool = false) {
self.context = context self.context = context
self.messages = messages self.messages = messages
self.isNight = isNight
self.containerNode = ASDisplayNode()
self.messagesContainerNode = ASDisplayNode() self.messagesContainerNode = ASDisplayNode()
self.messagesContainerNode.clipsToBounds = true self.messagesContainerNode.clipsToBounds = true
self.messagesContainerNode.transform = CATransform3DMakeScale(1.0, -1.0, 1.0) self.messagesContainerNode.transform = CATransform3DMakeScale(1.0, -1.0, 1.0)
self.containerNode.addSubnode(self.messagesContainerNode) super.init()
self.addSubnode(self.messagesContainerNode)
} }
public func render(completion: @escaping (CGSize, UIImage?, UIImage?) -> Void) { public func render(completion: @escaping (CGSize, UIImage?) -> Void) {
let presentationData = self.context.sharedContext.currentPresentationData.with { $0 } let presentationData = self.context.sharedContext.currentPresentationData.with { $0 }
let defaultPresentationData = defaultPresentationData() let defaultPresentationData = defaultPresentationData()
let mockPresentationData = PresentationData( var mockPresentationData = PresentationData(
strings: presentationData.strings, strings: presentationData.strings,
theme: defaultPresentationTheme, theme: defaultPresentationTheme,
autoNightModeTriggered: false, autoNightModeTriggered: false,
@ -118,25 +121,24 @@ public final class DrawingMessageRenderer {
largeEmoji: true largeEmoji: true
) )
if self.isNight {
let darkTheme = defaultDarkColorPresentationTheme
mockPresentationData = mockPresentationData.withUpdated(theme: darkTheme).withUpdated(chatWallpaper: darkTheme.chat.defaultWallpaper)
}
let layout = ContainerViewLayout(size: CGSize(width: 360.0, height: 640.0), metrics: LayoutMetrics(widthClass: .compact, heightClass: .compact, orientation: .portrait), deviceMetrics: .iPhoneX, intrinsicInsets: .zero, safeInsets: .zero, additionalInsets: .zero, statusBarHeight: 0.0, inputHeight: nil, inputHeightIsInteractivellyChanging: false, inVoiceOver: false) let layout = ContainerViewLayout(size: CGSize(width: 360.0, height: 640.0), metrics: LayoutMetrics(widthClass: .compact, heightClass: .compact, orientation: .portrait), deviceMetrics: .iPhoneX, intrinsicInsets: .zero, safeInsets: .zero, additionalInsets: .zero, statusBarHeight: 0.0, inputHeight: nil, inputHeightIsInteractivellyChanging: false, inVoiceOver: false)
let size = self.updateMessagesLayout(layout: layout, presentationData: mockPresentationData) let size = self.updateMessagesLayout(layout: layout, presentationData: mockPresentationData)
Queue.mainQueue().after(0.01, { Queue.mainQueue().after(0.03, {
self.generate(size: size) { dayImage in self.generate(size: size) { image in
let darkTheme = defaultDarkColorPresentationTheme completion(size, image)
let darkPresentationData = mockPresentationData.withUpdated(theme: darkTheme)
let _ = self.updateMessagesLayout(layout: layout, presentationData: darkPresentationData)
self.generate(size: size) { nightImage in
completion(size, dayImage, nightImage)
}
} }
}) })
} }
private func generate(size: CGSize, completion: @escaping (UIImage) -> Void) { private func generate(size: CGSize, completion: @escaping (UIImage) -> Void) {
UIGraphicsBeginImageContextWithOptions(size, false, 3.0) UIGraphicsBeginImageContextWithOptions(size, false, 3.0)
self.containerNode.view.drawHierarchy(in: CGRect(origin: CGPoint(), size: size), afterScreenUpdates: true) self.view.drawHierarchy(in: CGRect(origin: CGPoint(), size: size), afterScreenUpdates: true)
let img = UIGraphicsGetImageFromCurrentImageContext() let img = UIGraphicsGetImageFromCurrentImageContext()
UIGraphicsEndImageContext() UIGraphicsEndImageContext()
@ -248,9 +250,46 @@ public final class DrawingMessageRenderer {
avatarHeaderNode.updateLayout(size: size, leftInset: layout.safeInsets.left, rightInset: layout.safeInsets.right) avatarHeaderNode.updateLayout(size: size, leftInset: layout.safeInsets.left, rightInset: layout.safeInsets.right)
let containerSize = CGSize(width: width + leftInset + 6.0, height: height) let containerSize = CGSize(width: width + leftInset + 6.0, height: height)
self.containerNode.frame = CGRect(origin: CGPoint(), size: containerSize) self.frame = CGRect(origin: CGPoint(), size: containerSize)
self.messagesContainerNode.frame = CGRect(origin: CGPoint(), size: containerSize) self.messagesContainerNode.frame = CGRect(origin: CGPoint(), size: containerSize)
return containerSize return containerSize
} }
}
private let context: AccountContext
private let messages: [Message]
private let dayContainerNode: ContainerNode
private let nightContainerNode: ContainerNode
public init(context: AccountContext, messages: [Message]) {
self.context = context
self.messages = messages
self.dayContainerNode = ContainerNode(context: context, messages: messages)
self.nightContainerNode = ContainerNode(context: context, messages: messages, isNight: true)
}
public func render(completion: @escaping (CGSize, UIImage?, UIImage?) -> Void) {
var finalSize: CGSize = .zero
var dayImage: UIImage?
var nightImage: UIImage?
let completeIfReady = {
if let dayImage, let nightImage {
completion(finalSize, dayImage, nightImage)
}
}
self.dayContainerNode.render { size, image in
finalSize = size
dayImage = image
completeIfReady()
}
self.nightContainerNode.render { size, image in
finalSize = size
nightImage = image
completeIfReady()
}
}
} }

9
submodules/TelegramUI/Components/MediaEditor/Sources/MediaEditorDraft.swift
View File

@ -73,6 +73,7 @@ public final class MediaEditorDraft: Codable, Equatable {
case values case values
case caption case caption
case privacy case privacy
case forwardInfo
case timestamp case timestamp
case locationLatitude case locationLatitude
case locationLongitude case locationLongitude
@ -87,11 +88,12 @@ public final class MediaEditorDraft: Codable, Equatable {
public let values: MediaEditorValues public let values: MediaEditorValues
public let caption: NSAttributedString public let caption: NSAttributedString
public let privacy: MediaEditorResultPrivacy? public let privacy: MediaEditorResultPrivacy?
public let forwardInfo: StoryId?
public let timestamp: Int32 public let timestamp: Int32
public let location: CLLocationCoordinate2D? public let location: CLLocationCoordinate2D?
public let expiresOn: Int32? public let expiresOn: Int32?
public init(path: String, isVideo: Bool, thumbnail: UIImage, dimensions: PixelDimensions, duration: Double?, values: MediaEditorValues, caption: NSAttributedString, privacy: MediaEditorResultPrivacy?, timestamp: Int32, location: CLLocationCoordinate2D?, expiresOn: Int32?) { public init(path: String, isVideo: Bool, thumbnail: UIImage, dimensions: PixelDimensions, duration: Double?, values: MediaEditorValues, caption: NSAttributedString, privacy: MediaEditorResultPrivacy?, forwardInfo: StoryId?, timestamp: Int32, location: CLLocationCoordinate2D?, expiresOn: Int32?) {
self.path = path self.path = path
self.isVideo = isVideo self.isVideo = isVideo
self.thumbnail = thumbnail self.thumbnail = thumbnail
@ -100,6 +102,7 @@ public final class MediaEditorDraft: Codable, Equatable {
self.values = values self.values = values
self.caption = caption self.caption = caption
self.privacy = privacy self.privacy = privacy
self.forwardInfo = forwardInfo
self.timestamp = timestamp self.timestamp = timestamp
self.location = location self.location = location
self.expiresOn = expiresOn self.expiresOn = expiresOn
@ -135,6 +138,8 @@ public final class MediaEditorDraft: Codable, Equatable {
self.privacy = nil self.privacy = nil
} }
self.forwardInfo = try container.decodeIfPresent(StoryId.self, forKey: .forwardInfo)
self.timestamp = try container.decodeIfPresent(Int32.self, forKey: .timestamp) ?? 1688909663 self.timestamp = try container.decodeIfPresent(Int32.self, forKey: .timestamp) ?? 1688909663
if let latitude = try container.decodeIfPresent(Double.self, forKey: .locationLatitude), let longitude = try container.decodeIfPresent(Double.self, forKey: .locationLongitude) { if let latitude = try container.decodeIfPresent(Double.self, forKey: .locationLatitude), let longitude = try container.decodeIfPresent(Double.self, forKey: .locationLongitude) {
@ -172,6 +177,8 @@ public final class MediaEditorDraft: Codable, Equatable {
} else { } else {
try container.encodeNil(forKey: .privacy) try container.encodeNil(forKey: .privacy)
} }
try container.encodeIfPresent(self.forwardInfo, forKey: .forwardInfo)
try container.encode(self.timestamp, forKey: .timestamp) try container.encode(self.timestamp, forKey: .timestamp)
if let location = self.location { if let location = self.location {

30
submodules/TelegramUI/Components/MediaEditor/Sources/MediaEditorUtils.swift
View File

@ -136,10 +136,36 @@ public func getChatWallpaperImage(context: AccountContext, messageId: EngineMess
return context.account.postbox.transaction { transaction -> TelegramWallpaper? in return context.account.postbox.transaction { transaction -> TelegramWallpaper? in
return (transaction.getPeerCachedData(peerId: messageId.peerId) as? CachedChannelData)?.wallpaper return (transaction.getPeerCachedData(peerId: messageId.peerId) as? CachedChannelData)?.wallpaper
} }
|> mapToSignal { customWallpaper -> Signal<(CGSize, UIImage?, UIImage?), NoError> in |> mapToSignal { wallpaper -> Signal<(TelegramWallpaper?, TelegramWallpaper?), NoError> in
if let wallpaper, case let .emoticon(emoticon) = wallpaper {
return context.engine.themes.getChatThemes(accountManager: context.sharedContext.accountManager)
|> map { themes -> (TelegramWallpaper?, TelegramWallpaper?) in
if let theme = themes.first(where: { $0.emoticon?.strippedEmoji == emoticon.strippedEmoji }) {
if let dayMatch = theme.settings?.first(where: { $0.baseTheme == .classic || $0.baseTheme == .day }) {
if let dayWallpaper = dayMatch.wallpaper {
var nightWallpaper: TelegramWallpaper?
if let nightMatch = theme.settings?.first(where: { $0.baseTheme == .night || $0.baseTheme == .tinted }) {
nightWallpaper = nightMatch.wallpaper
}
return (dayWallpaper, nightWallpaper)
} else {
return (nil, nil)
}
} else {
return (nil, nil)
}
} else {
return (nil, nil)
}
}
} else {
return .single((wallpaper, nil))
}
}
|> mapToSignal { customDayWallpaper, customNightWallpaper -> Signal<(CGSize, UIImage?, UIImage?), NoError> in
return Signal { subscriber in return Signal { subscriber in
Queue.mainQueue().async { Queue.mainQueue().async {
let wallpaperRenderer = DrawingWallpaperRenderer(context: context, customWallpaper: customWallpaper) let wallpaperRenderer = DrawingWallpaperRenderer(context: context, customDayWallpaper: customDayWallpaper, customNightWallpaper: customNightWallpaper)
wallpaperRenderer.render { size, image, darkImage, mediaRect in wallpaperRenderer.render { size, image, darkImage, mediaRect in
subscriber.putNext((size, image, darkImage)) subscriber.putNext((size, image, darkImage))
subscriber.putCompletion() subscriber.putCompletion()

105
submodules/TelegramUI/Components/MediaEditorScreen/Sources/MediaEditorDrafts.swift
View File

@ -45,13 +45,14 @@ extension MediaEditorScreen {
} }
func saveDraft(id: Int64?) { func saveDraft(id: Int64?) {
guard let subject = self.node.subject, let mediaEditor = self.node.mediaEditor else { guard let subject = self.node.subject, let actualSubject = self.node.actualSubject, let mediaEditor = self.node.mediaEditor else {
return return
} }
try? FileManager.default.createDirectory(atPath: draftPath(engine: self.context.engine), withIntermediateDirectories: true) try? FileManager.default.createDirectory(atPath: draftPath(engine: self.context.engine), withIntermediateDirectories: true)
let values = mediaEditor.values let values = mediaEditor.values
let privacy = self.state.privacy let privacy = self.state.privacy
let forwardSource = self.forwardSource
let caption = self.getCaption() let caption = self.getCaption()
let duration = mediaEditor.duration ?? 0.0 let duration = mediaEditor.duration ?? 0.0
@ -59,7 +60,7 @@ extension MediaEditorScreen {
var timestamp: Int32 var timestamp: Int32
var location: CLLocationCoordinate2D? var location: CLLocationCoordinate2D?
let expiresOn: Int32 let expiresOn: Int32
if case let .draft(draft, _) = subject { if case let .draft(draft, _) = actualSubject {
timestamp = draft.timestamp timestamp = draft.timestamp
location = draft.location location = draft.location
if let _ = id { if let _ = id {
@ -85,29 +86,74 @@ extension MediaEditorScreen {
guard let resultImage else { guard let resultImage else {
return return
} }
enum MediaInput {
case image(image: UIImage, dimensions: PixelDimensions)
case video(path: String, dimensions: PixelDimensions, duration: Double)
var isVideo: Bool {
switch self {
case .video:
return true
case .image:
return false
}
}
var dimensions: PixelDimensions {
switch self {
case let .image(_, dimensions):
return dimensions
case let .video(_, dimensions, _):
return dimensions
}
}
var duration: Double? {
switch self {
case .image:
return nil
case let .video(_, _, duration):
return duration
}
}
var fileExtension: String {
switch self {
case .image:
return "jpg"
case .video:
return "mp4"
}
}
}
let context = self.context
func innerSaveDraft(media: MediaInput) {
let fittedSize = resultImage.size.aspectFitted(CGSize(width: 128.0, height: 128.0)) let fittedSize = resultImage.size.aspectFitted(CGSize(width: 128.0, height: 128.0))
let context = self.context
let saveImageDraft: (UIImage, PixelDimensions) -> Void = { image, dimensions in
if let thumbnailImage = generateScaledImage(image: resultImage, size: fittedSize) { if let thumbnailImage = generateScaledImage(image: resultImage, size: fittedSize) {
let path = "\(Int64.random(in: .min ... .max)).jpg" let path = "\(Int64.random(in: .min ... .max)).\(media.fileExtension)"
let draft = MediaEditorDraft(
path: path,
isVideo: media.isVideo,
thumbnail: thumbnailImage,
dimensions: media.dimensions,
duration: media.duration,
values: values,
caption: caption,
privacy: privacy,
forwardInfo: forwardSource.flatMap { StoryId(peerId: $0.0.id, id: $0.1.id) },
timestamp: timestamp,
location: location,
expiresOn: expiresOn
)
switch media {
case let .image(image, _):
if let data = image.jpegData(compressionQuality: 0.87) { if let data = image.jpegData(compressionQuality: 0.87) {
let draft = MediaEditorDraft(path: path, isVideo: false, thumbnail: thumbnailImage, dimensions: dimensions, duration: nil, values: values, caption: caption, privacy: privacy, timestamp: timestamp, location: location, expiresOn: expiresOn)
try? data.write(to: URL(fileURLWithPath: draft.fullPath(engine: context.engine))) try? data.write(to: URL(fileURLWithPath: draft.fullPath(engine: context.engine)))
if let id {
saveStorySource(engine: context.engine, item: draft, peerId: context.account.peerId, id: id)
} else {
addStoryDraft(engine: context.engine, item: draft)
} }
case let .video(path, _, _):
try? FileManager.default.copyItem(atPath: path, toPath: draft.fullPath(engine: context.engine))
} }
}
}
let saveVideoDraft: (String, PixelDimensions, Double) -> Void = { videoPath, dimensions, duration in
if let thumbnailImage = generateScaledImage(image: resultImage, size: fittedSize) {
let path = "\(Int64.random(in: .min ... .max)).mp4"
let draft = MediaEditorDraft(path: path, isVideo: true, thumbnail: thumbnailImage, dimensions: dimensions, duration: duration, values: values, caption: caption, privacy: privacy, timestamp: timestamp, location: location, expiresOn: expiresOn)
try? FileManager.default.copyItem(atPath: videoPath, toPath: draft.fullPath(engine: context.engine))
if let id { if let id {
saveStorySource(engine: context.engine, item: draft, peerId: context.account.peerId, id: id) saveStorySource(engine: context.engine, item: draft, peerId: context.account.peerId, id: id)
} else { } else {
@ -118,14 +164,14 @@ extension MediaEditorScreen {
switch subject { switch subject {
case let .image(image, dimensions, _, _): case let .image(image, dimensions, _, _):
saveImageDraft(image, dimensions) innerSaveDraft(media: .image(image: image, dimensions: dimensions))
case let .video(path, _, _, _, _, dimensions, _, _, _): case let .video(path, _, _, _, _, dimensions, _, _, _):
saveVideoDraft(path, dimensions, duration) innerSaveDraft(media: .video(path: path, dimensions: dimensions, duration: duration))
case let .asset(asset): case let .asset(asset):
if asset.mediaType == .video { if asset.mediaType == .video {
PHImageManager.default().requestAVAsset(forVideo: asset, options: nil) { avAsset, _, _ in PHImageManager.default().requestAVAsset(forVideo: asset, options: nil) { avAsset, _, _ in
if let urlAsset = avAsset as? AVURLAsset { if let urlAsset = avAsset as? AVURLAsset {
saveVideoDraft(urlAsset.url.relativePath, PixelDimensions(width: Int32(asset.pixelWidth), height: Int32(asset.pixelHeight)), duration) innerSaveDraft(media: .video(path: urlAsset.url.relativePath, dimensions: PixelDimensions(width: Int32(asset.pixelWidth), height: Int32(asset.pixelHeight)), duration: duration))
} }
} }
} else { } else {
@ -133,19 +179,24 @@ extension MediaEditorScreen {
options.deliveryMode = .highQualityFormat options.deliveryMode = .highQualityFormat
PHImageManager.default().requestImage(for: asset, targetSize: PHImageManagerMaximumSize, contentMode: .default, options: options) { image, _ in PHImageManager.default().requestImage(for: asset, targetSize: PHImageManagerMaximumSize, contentMode: .default, options: options) { image, _ in
if let image { if let image {
saveImageDraft(image, PixelDimensions(image.size)) innerSaveDraft(media: .image(image: image, dimensions: PixelDimensions(image.size)))
} }
} }
} }
case let .draft(draft, _): case let .draft(draft, _):
if draft.isVideo { if draft.isVideo {
saveVideoDraft(draft.fullPath(engine: context.engine), draft.dimensions, draft.duration ?? 0.0) innerSaveDraft(media: .video(path: draft.fullPath(engine: context.engine), dimensions: draft.dimensions, duration: draft.duration ?? 0.0))
} else if let image = UIImage(contentsOfFile: draft.fullPath(engine: context.engine)) { } else if let image = UIImage(contentsOfFile: draft.fullPath(engine: context.engine)) {
saveImageDraft(image, draft.dimensions) innerSaveDraft(media: .image(image: image, dimensions: draft.dimensions))
} }
case .message:
if let pixel = generateSingleColorImage(size: CGSize(width: 1, height: 1), color: .black) {
innerSaveDraft(media: .image(image: pixel, dimensions: PixelDimensions(width: 1080, height: 1920)))
}
}
if case let .draft(draft, _) = actualSubject {
removeStoryDraft(engine: self.context.engine, path: draft.path, delete: false) removeStoryDraft(engine: self.context.engine, path: draft.path, delete: false)
case let .message(messageId):
let _ = messageId
} }
}) })
} }

71
submodules/TelegramUI/Components/MediaEditorScreen/Sources/MediaEditorScreen.swift
View File

@ -668,7 +668,7 @@ final class MediaEditorScreenComponent: Component {
if self.component == nil { if self.component == nil {
if let initialCaption = controller.initialCaption { if let initialCaption = controller.initialCaption {
self.inputPanelExternalState.initialText = initialCaption self.inputPanelExternalState.initialText = initialCaption
} else if case let .draft(draft, _) = controller.node.subject { } else if case let .draft(draft, _) = controller.node.actualSubject {
self.inputPanelExternalState.initialText = draft.caption self.inputPanelExternalState.initialText = draft.caption
} }
} }
@ -1633,7 +1633,7 @@ final class MediaEditorScreenComponent: Component {
mediaEditor.toggleNightTheme() mediaEditor.toggleNightTheme()
controller.node.entitiesView.eachView { view in controller.node.entitiesView.eachView { view in
if let stickerEntityView = view as? DrawingStickerEntityView { if let stickerEntityView = view as? DrawingStickerEntityView {
stickerEntityView.toggleNightTheme() stickerEntityView.isNightTheme = mediaEditor.values.nightTheme
} }
} }
} }
@ -2036,6 +2036,8 @@ public final class MediaEditorScreen: ViewController, UIDropInteractionDelegate
private let initializationTimestamp = CACurrentMediaTime() private let initializationTimestamp = CACurrentMediaTime()
var subject: MediaEditorScreen.Subject? var subject: MediaEditorScreen.Subject?
var actualSubject: MediaEditorScreen.Subject?
private var subjectDisposable: Disposable? private var subjectDisposable: Disposable?
private var appInForegroundDisposable: Disposable? private var appInForegroundDisposable: Disposable?
@ -2270,7 +2272,19 @@ public final class MediaEditorScreen: ViewController, UIDropInteractionDelegate
} }
private func setup(with subject: MediaEditorScreen.Subject) { private func setup(with subject: MediaEditorScreen.Subject) {
self.subject = subject self.actualSubject = subject
var effectiveSubject = subject
if case let .draft(draft, _ ) = subject {
for entity in draft.values.entities {
if case let .sticker(sticker) = entity, case let .message(ids, _, _) = sticker.content {
effectiveSubject = .message(ids)
break
}
}
}
self.subject = effectiveSubject
guard let controller = self.controller else { guard let controller = self.controller else {
return return
} }
@ -2299,7 +2313,7 @@ public final class MediaEditorScreen: ViewController, UIDropInteractionDelegate
controller.isSavingAvailable = isSavingAvailable controller.isSavingAvailable = isSavingAvailable
controller.requestLayout(transition: .immediate) controller.requestLayout(transition: .immediate)
let mediaDimensions = subject.dimensions let mediaDimensions = effectiveSubject.dimensions
let maxSide: CGFloat = 1920.0 / UIScreen.main.scale let maxSide: CGFloat = 1920.0 / UIScreen.main.scale
let fittedSize = mediaDimensions.cgSize.fitted(CGSize(width: maxSide, height: maxSide)) let fittedSize = mediaDimensions.cgSize.fitted(CGSize(width: maxSide, height: maxSide))
let mediaEntity = DrawingMediaEntity(size: fittedSize) let mediaEntity = DrawingMediaEntity(size: fittedSize)
@ -2354,7 +2368,7 @@ public final class MediaEditorScreen: ViewController, UIDropInteractionDelegate
} }
} }
let mediaEditor = MediaEditor(context: self.context, subject: subject.editorSubject, values: initialValues, hasHistogram: true) let mediaEditor = MediaEditor(context: self.context, subject: effectiveSubject.editorSubject, values: initialValues, hasHistogram: true)
if let initialVideoPosition = controller.initialVideoPosition { if let initialVideoPosition = controller.initialVideoPosition {
mediaEditor.seek(initialVideoPosition, andPlay: true) mediaEditor.seek(initialVideoPosition, andPlay: true)
} }
@ -2372,12 +2386,12 @@ public final class MediaEditorScreen: ViewController, UIDropInteractionDelegate
} }
} }
if case .message = subject { if case .message = effectiveSubject {
} else { } else {
self.readyValue.set(.single(true)) self.readyValue.set(.single(true))
} }
if case let .image(_, _, additionalImage, position) = subject, let additionalImage { if case let .image(_, _, additionalImage, position) = effectiveSubject, let additionalImage {
let image = generateImage(CGSize(width: additionalImage.size.width, height: additionalImage.size.width), contextGenerator: { size, context in let image = generateImage(CGSize(width: additionalImage.size.width, height: additionalImage.size.width), contextGenerator: { size, context in
let bounds = CGRect(origin: .zero, size: size) let bounds = CGRect(origin: .zero, size: size)
context.clear(bounds) context.clear(bounds)
@ -2393,7 +2407,7 @@ public final class MediaEditorScreen: ViewController, UIDropInteractionDelegate
imageEntity.scale = 1.625 imageEntity.scale = 1.625
imageEntity.position = position.getPosition(storyDimensions) imageEntity.position = position.getPosition(storyDimensions)
self.entitiesView.add(imageEntity, announce: false) self.entitiesView.add(imageEntity, announce: false)
} else if case let .video(_, _, mirror, additionalVideoPath, _, _, _, changes, position) = subject { } else if case let .video(_, _, mirror, additionalVideoPath, _, _, _, changes, position) = effectiveSubject {
mediaEditor.setVideoIsMirrored(mirror) mediaEditor.setVideoIsMirrored(mirror)
if let additionalVideoPath { if let additionalVideoPath {
let videoEntity = DrawingStickerEntity(content: .dualVideoReference(false)) let videoEntity = DrawingStickerEntity(content: .dualVideoReference(false))
@ -2412,7 +2426,8 @@ public final class MediaEditorScreen: ViewController, UIDropInteractionDelegate
} }
} }
} }
} else if case let .message(messageIds) = subject { } else if case let .message(messageIds) = effectiveSubject {
let isNightTheme = mediaEditor.values.nightTheme
let _ = ((self.context.engine.data.get( let _ = ((self.context.engine.data.get(
EngineDataMap(messageIds.map(TelegramEngine.EngineData.Item.Messages.Message.init(id:))) EngineDataMap(messageIds.map(TelegramEngine.EngineData.Item.Messages.Message.init(id:)))
)) ))
@ -2431,6 +2446,19 @@ public final class MediaEditorScreen: ViewController, UIDropInteractionDelegate
let renderer = DrawingMessageRenderer(context: self.context, messages: messages) let renderer = DrawingMessageRenderer(context: self.context, messages: messages)
renderer.render(completion: { size, dayImage, nightImage in renderer.render(completion: { size, dayImage, nightImage in
if case .draft = subject, let existingEntityView = self.entitiesView.getView(where: { entityView in
if let stickerEntityView = entityView as? DrawingStickerEntityView, case .message = (stickerEntityView.entity as! DrawingStickerEntity).content {
return true
} else {
return false
}
}) as? DrawingStickerEntityView {
existingEntityView.isNightTheme = isNightTheme
let messageEntity = existingEntityView.entity as! DrawingStickerEntity
messageEntity.renderImage = dayImage
messageEntity.secondaryRenderImage = nightImage
existingEntityView.update(animated: false)
} else {
let messageEntity = DrawingStickerEntity(content: .message(messageIds, maybeFile?.isVideo == true ? maybeFile : nil, size)) let messageEntity = DrawingStickerEntity(content: .message(messageIds, maybeFile?.isVideo == true ? maybeFile : nil, size))
messageEntity.renderImage = dayImage messageEntity.renderImage = dayImage
messageEntity.secondaryRenderImage = nightImage messageEntity.secondaryRenderImage = nightImage
@ -2441,6 +2469,7 @@ public final class MediaEditorScreen: ViewController, UIDropInteractionDelegate
messageEntity.scale = min(6.0, 3.3 * fraction) messageEntity.scale = min(6.0, 3.3 * fraction)
self.entitiesView.add(messageEntity, announce: false) self.entitiesView.add(messageEntity, announce: false)
}
self.readyValue.set(.single(true)) self.readyValue.set(.single(true))
}) })
@ -2477,7 +2506,7 @@ public final class MediaEditorScreen: ViewController, UIDropInteractionDelegate
if controller.isEmbeddedEditor == true { if controller.isEmbeddedEditor == true {
mediaEditor.onFirstDisplay = { [weak self] in mediaEditor.onFirstDisplay = { [weak self] in
if let self { if let self {
if subject.isPhoto { if effectiveSubject.isPhoto {
self.previewContainerView.layer.allowsGroupOpacity = true self.previewContainerView.layer.allowsGroupOpacity = true
self.previewContainerView.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.25, completion: { _ in self.previewContainerView.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.25, completion: { _ in
self.previewContainerView.layer.allowsGroupOpacity = false self.previewContainerView.layer.allowsGroupOpacity = false
@ -2955,7 +2984,7 @@ public final class MediaEditorScreen: ViewController, UIDropInteractionDelegate
} }
} }
} else { } else {
if case .message = self.subject, let layout = self.validLayout { if case .message = self.actualSubject, let layout = self.validLayout {
self.layer.animatePosition(from: CGPoint(x: 0.0, y: layout.size.height), to: .zero, duration: 0.4, timingFunction: kCAMediaTimingFunctionSpring, additive: true) self.layer.animatePosition(from: CGPoint(x: 0.0, y: layout.size.height), to: .zero, duration: 0.4, timingFunction: kCAMediaTimingFunctionSpring, additive: true)
completion() completion()
} else if let view = self.componentHost.view as? MediaEditorScreenComponent.View { } else if let view = self.componentHost.view as? MediaEditorScreenComponent.View {
@ -2981,7 +3010,7 @@ public final class MediaEditorScreen: ViewController, UIDropInteractionDelegate
self.backgroundDimView.layer.animateAlpha(from: previousDimAlpha, to: 0.0, duration: 0.15) self.backgroundDimView.layer.animateAlpha(from: previousDimAlpha, to: 0.0, duration: 0.15)
var isNew: Bool? = false var isNew: Bool? = false
if let subject = self.subject { if let subject = self.actualSubject {
if saveDraft { if saveDraft {
isNew = true isNew = true
} }
@ -3368,7 +3397,7 @@ public final class MediaEditorScreen: ViewController, UIDropInteractionDelegate
} }
var location: CLLocationCoordinate2D? var location: CLLocationCoordinate2D?
if let subject = self.subject { if let subject = self.actualSubject {
if case let .asset(asset) = subject { if case let .asset(asset) = subject {
location = asset.location?.coordinate location = asset.location?.coordinate
} else if case let .draft(draft, _) = subject { } else if case let .draft(draft, _) = subject {
@ -4862,7 +4891,7 @@ public final class MediaEditorScreen: ViewController, UIDropInteractionDelegate
let presentationData = self.context.sharedContext.currentPresentationData.with { $0 } let presentationData = self.context.sharedContext.currentPresentationData.with { $0 }
let title: String let title: String
let save: String let save: String
if case .draft = self.node.subject { if case .draft = self.node.actualSubject {
title = presentationData.strings.Story_Editor_DraftDiscardDraft title = presentationData.strings.Story_Editor_DraftDiscardDraft
save = presentationData.strings.Story_Editor_DraftKeepDraft save = presentationData.strings.Story_Editor_DraftKeepDraft
} else { } else {
@ -4898,13 +4927,13 @@ public final class MediaEditorScreen: ViewController, UIDropInteractionDelegate
self.dismissAllTooltips() self.dismissAllTooltips()
var showDraftTooltip = saveDraft var showDraftTooltip = saveDraft
if let subject = self.node.subject, case .draft = subject { if let subject = self.node.actualSubject, case .draft = subject {
showDraftTooltip = false showDraftTooltip = false
} }
if saveDraft { if saveDraft {
self.saveDraft(id: nil) self.saveDraft(id: nil)
} else { } else {
if case let .draft(draft, id) = self.node.subject, id == nil { if case let .draft(draft, id) = self.node.actualSubject, id == nil {
removeStoryDraft(engine: self.context.engine, path: draft.path, delete: true) removeStoryDraft(engine: self.context.engine, path: draft.path, delete: true)
} }
} }
@ -4957,7 +4986,7 @@ public final class MediaEditorScreen: ViewController, UIDropInteractionDelegate
private var didComplete = false private var didComplete = false
func requestCompletion(animated: Bool) { func requestCompletion(animated: Bool) {
guard let mediaEditor = self.node.mediaEditor, let subject = self.node.subject, !self.didComplete else { guard let mediaEditor = self.node.mediaEditor, let subject = self.node.subject, let actualSubject = self.node.actualSubject, !self.didComplete else {
return return
} }
@ -4983,14 +5012,14 @@ public final class MediaEditorScreen: ViewController, UIDropInteractionDelegate
var hasEntityChanges = false var hasEntityChanges = false
let randomId: Int64 let randomId: Int64
if case let .draft(_, id) = subject, let id { if case let .draft(_, id) = actualSubject, let id {
randomId = id randomId = id
} else { } else {
randomId = Int64.random(in: .min ... .max) randomId = Int64.random(in: .min ... .max)
} }
var mediaAreas: [MediaArea] = [] var mediaAreas: [MediaArea] = []
if case let .draft(draft, _) = subject { if case let .draft(draft, _) = actualSubject {
if draft.values.entities != codableEntities { if draft.values.entities != codableEntities {
hasEntityChanges = true hasEntityChanges = true
} }
@ -5281,7 +5310,7 @@ public final class MediaEditorScreen: ViewController, UIDropInteractionDelegate
} }
}) })
if case let .draft(draft, id) = subject, id == nil { if case let .draft(draft, id) = actualSubject, id == nil {
removeStoryDraft(engine: self.context.engine, path: draft.path, delete: false) removeStoryDraft(engine: self.context.engine, path: draft.path, delete: false)
} }
} else { } else {
@ -5299,7 +5328,7 @@ public final class MediaEditorScreen: ViewController, UIDropInteractionDelegate
} }
}) })
}) })
if case let .draft(draft, id) = subject, id == nil { if case let .draft(draft, id) = actualSubject, id == nil {
removeStoryDraft(engine: self.context.engine, path: draft.path, delete: true) removeStoryDraft(engine: self.context.engine, path: draft.path, delete: true)
} }
} }

1
submodules/TelegramUI/Components/Settings/ThemeAccentColorScreen/Sources/ThemeAccentColorControllerNode.swift
View File

@ -869,6 +869,7 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate
}, performActiveSessionAction: { _, _ in }, performActiveSessionAction: { _, _ in
}, openChatFolderUpdates: {}, hideChatFolderUpdates: { }, openChatFolderUpdates: {}, hideChatFolderUpdates: {
}, openStories: { _, _ in }, openStories: { _, _ in
}, dismissNotice: { _ in
}) })
let chatListPresentationData = ChatListPresentationData(theme: self.presentationData.theme, fontSize: self.presentationData.listsFontSize, strings: self.presentationData.strings, dateTimeFormat: self.presentationData.dateTimeFormat, nameSortOrder: self.presentationData.nameSortOrder, nameDisplayOrder: self.presentationData.nameDisplayOrder, disableAnimations: true) let chatListPresentationData = ChatListPresentationData(theme: self.presentationData.theme, fontSize: self.presentationData.listsFontSize, strings: self.presentationData.strings, dateTimeFormat: self.presentationData.dateTimeFormat, nameSortOrder: self.presentationData.nameSortOrder, nameDisplayOrder: self.presentationData.nameDisplayOrder, disableAnimations: true)

10
submodules/TelegramUI/Components/Settings/WallpaperGridScreen/Sources/ThemeGridControllerNode.swift
View File

@ -258,8 +258,8 @@ final class ThemeGridControllerNode: ASDisplayNode {
if case let .peer(_, _, _, _, customLevel) = mode { if case let .peer(_, _, _, _, customLevel) = mode {
requiredCustomWallpaperLevel = customLevel requiredCustomWallpaperLevel = customLevel
} }
//TODO:localize
self.galleryItem = ItemListPeerActionItem(presentationData: ItemListPresentationData(presentationData), icon: generateTintedImage(image: UIImage(bundleImageName: "Chat/Attach Menu/Image"), color: presentationData.theme.list.itemAccentColor), title: presentationData.strings.Wallpaper_SetCustomBackground, additionalBadgeIcon: requiredCustomWallpaperLevel.flatMap { generateDisclosureActionBoostLevelBadgeImage(text: "Level \($0)") }, alwaysPlain: false, hasSeparator: true, sectionId: 0, height: .generic, color: .accent, editing: false, action: { self.galleryItem = ItemListPeerActionItem(presentationData: ItemListPresentationData(presentationData), icon: generateTintedImage(image: UIImage(bundleImageName: "Chat/Attach Menu/Image"), color: presentationData.theme.list.itemAccentColor), title: presentationData.strings.Wallpaper_SetCustomBackground, additionalBadgeIcon: requiredCustomWallpaperLevel.flatMap { generateDisclosureActionBoostLevelBadgeImage(text: presentationData.strings.ChannelAppearance_BoostLevel("\($0)").string) }, alwaysPlain: false, hasSeparator: true, sectionId: 0, height: .generic, color: .accent, editing: false, action: {
presentGallery() presentGallery()
}) })
self.galleryItemNode = ItemListPeerActionItemNode() self.galleryItemNode = ItemListPeerActionItemNode()
@ -329,7 +329,7 @@ final class ThemeGridControllerNode: ASDisplayNode {
if let strongSelf = self, !strongSelf.currentState.editing { if let strongSelf = self, !strongSelf.currentState.editing {
let entries = previousEntries.with { $0 } let entries = previousEntries.with { $0 }
if let entries = entries, !entries.isEmpty { if let entries = entries, !entries.isEmpty {
let wallpapers = entries.map { $0.wallpaper } let wallpapers = entries.map { $0.wallpaper }.filter { !$0.isColorOrGradient }
var options = WallpaperPresentationOptions() var options = WallpaperPresentationOptions()
if wallpaper == strongSelf.presentationData.chatWallpaper, let settings = wallpaper.settings { if wallpaper == strongSelf.presentationData.chatWallpaper, let settings = wallpaper.settings {
@ -684,7 +684,7 @@ final class ThemeGridControllerNode: ASDisplayNode {
if case let .peer(_, _, _, _, customLevel) = mode { if case let .peer(_, _, _, _, customLevel) = mode {
requiredCustomWallpaperLevel = customLevel requiredCustomWallpaperLevel = customLevel
} }
self.galleryItem = ItemListPeerActionItem(presentationData: ItemListPresentationData(presentationData), icon: generateTintedImage(image: UIImage(bundleImageName: "Chat/Attach Menu/Image"), color: presentationData.theme.list.itemAccentColor), title: presentationData.strings.Wallpaper_SetCustomBackground, additionalBadgeIcon: requiredCustomWallpaperLevel.flatMap { generateDisclosureActionBoostLevelBadgeImage(text: "Level \($0)") }, alwaysPlain: false, hasSeparator: true, sectionId: 0, height: .generic, color: .accent, editing: false, action: { [weak self] in self.galleryItem = ItemListPeerActionItem(presentationData: ItemListPresentationData(presentationData), icon: generateTintedImage(image: UIImage(bundleImageName: "Chat/Attach Menu/Image"), color: presentationData.theme.list.itemAccentColor), title: presentationData.strings.Wallpaper_SetCustomBackground, additionalBadgeIcon: requiredCustomWallpaperLevel.flatMap { generateDisclosureActionBoostLevelBadgeImage(text: presentationData.strings.ChannelAppearance_BoostLevel("\($0)").string) }, alwaysPlain: false, hasSeparator: true, sectionId: 0, height: .generic, color: .accent, editing: false, action: { [weak self] in
self?.presentGallery() self?.presentGallery()
}) })
self.removeItem = ItemListPeerActionItem(presentationData: ItemListPresentationData(presentationData), icon: generateTintedImage(image: UIImage(bundleImageName: "Chat/Input/Accessory Panels/MessageSelectionTrash"), color: presentationData.theme.list.itemDestructiveColor), title: presentationData.strings.Wallpaper_ChannelRemoveBackground, alwaysPlain: false, hasSeparator: true, sectionId: 0, height: .generic, color: .destructive, editing: false, action: { [weak self] in self.removeItem = ItemListPeerActionItem(presentationData: ItemListPresentationData(presentationData), icon: generateTintedImage(image: UIImage(bundleImageName: "Chat/Input/Accessory Panels/MessageSelectionTrash"), color: presentationData.theme.list.itemDestructiveColor), title: presentationData.strings.Wallpaper_ChannelRemoveBackground, alwaysPlain: false, hasSeparator: true, sectionId: 0, height: .generic, color: .destructive, editing: false, action: { [weak self] in
@ -805,7 +805,7 @@ final class ThemeGridControllerNode: ASDisplayNode {
var hasCustomWallpaper = false var hasCustomWallpaper = false
if case let .peer(_, _, wallpaper, _, _) = self.mode { if case let .peer(_, _, wallpaper, _, _) = self.mode {
isChannel = true isChannel = true
if let wallpaper, !wallpaper.isPattern { if let wallpaper, !wallpaper.isEmoticon {
hasCustomWallpaper = true hasCustomWallpaper = true
} }
} }

2
submodules/TelegramUI/Components/Stories/StoryContainerScreen/Sources/StoryItemSetContainerComponent.swift
View File

@ -979,7 +979,7 @@ public final class StoryItemSetContainerComponent: Component {
return abs(rotatedX) <= area.coordinates.width / 100.0 * referenceSize.width / 2.0 * 1.1 && abs(rotatedY) <= area.coordinates.height / 100.0 * referenceSize.height / 2.0 * 1.1 return abs(rotatedX) <= area.coordinates.width / 100.0 * referenceSize.width / 2.0 * 1.1 && abs(rotatedY) <= area.coordinates.height / 100.0 * referenceSize.height / 2.0 * 1.1
} }
for area in component.slice.item.storyItem.mediaAreas { for area in component.slice.item.storyItem.mediaAreas.reversed() {
if case .reaction = area { if case .reaction = area {
continue continue
} }

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

@ -2415,14 +2415,15 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
if let strongSelf = self, let messages = strongSelf.chatDisplayNode.historyNode.messageGroupInCurrentHistoryView(id), let message = messages.first { if let strongSelf = self, let messages = strongSelf.chatDisplayNode.historyNode.messageGroupInCurrentHistoryView(id), let message = messages.first {
let chatPresentationInterfaceState = strongSelf.presentationInterfaceState let chatPresentationInterfaceState = strongSelf.presentationInterfaceState
var warnAboutPrivate = false var warnAboutPrivate = false
var canShareToStory = false
if case .peer = chatPresentationInterfaceState.chatLocation, let channel = message.peers[message.id.peerId] as? TelegramChannel { if case .peer = chatPresentationInterfaceState.chatLocation, let channel = message.peers[message.id.peerId] as? TelegramChannel {
canShareToStory = true
if channel.addressName == nil { if channel.addressName == nil {
warnAboutPrivate = true warnAboutPrivate = true
} }
} }
let shareController = ShareController(context: strongSelf.context, subject: .messages(messages), updatedPresentationData: strongSelf.updatedPresentationData, shareAsLink: true) let shareController = ShareController(context: strongSelf.context, subject: .messages(messages), updatedPresentationData: strongSelf.updatedPresentationData, shareAsLink: true)
var canShareToStory = true
if let message = messages.first, message.media.contains(where: { media in if let message = messages.first, message.media.contains(where: { media in
if media is TelegramMediaContact || media is TelegramMediaPoll { if media is TelegramMediaContact || media is TelegramMediaPoll {
return true return true
@ -6376,7 +6377,13 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
var useDarkAppearance = presentationData.theme.overallDarkAppearance var useDarkAppearance = presentationData.theme.overallDarkAppearance
if let wallpaper = chatWallpaper, case let .emoticon(wallpaperEmoticon) = wallpaper, let theme = chatThemes.first(where: { $0.emoticon?.strippedEmoji == wallpaperEmoticon.strippedEmoji }) { if let wallpaper = chatWallpaper, case let .emoticon(wallpaperEmoticon) = wallpaper, let theme = chatThemes.first(where: { $0.emoticon?.strippedEmoji == wallpaperEmoticon.strippedEmoji }) {
if let themeWallpaper = theme.settings?.first?.wallpaper { let themeSettings: TelegramThemeSettings?
if let matching = theme.settings?.first(where: { $0.baseTheme == presentationData.theme.referenceTheme.baseTheme }) {
themeSettings = matching
} else {
themeSettings = theme.settings?.first
}
if let themeWallpaper = themeSettings?.wallpaper {
chatWallpaper = themeWallpaper chatWallpaper = themeWallpaper
} }
} }

1
submodules/TelegramUI/Sources/ChatSearchResultsContollerNode.swift
View File

@ -272,6 +272,7 @@ class ChatSearchResultsControllerNode: ViewControllerTracingNode, UIScrollViewDe
}, openChatFolderUpdates: { }, openChatFolderUpdates: {
}, hideChatFolderUpdates: { }, hideChatFolderUpdates: {
}, openStories: { _, _ in }, openStories: { _, _ in
}, dismissNotice: { _ in
}) })
interaction.searchTextHighightState = searchQuery interaction.searchTextHighightState = searchQuery
self.interaction = interaction self.interaction = interaction