From b8107c6a2505365d99cb4e98a2373d315be84198 Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Fri, 10 Mar 2023 11:09:40 +0400 Subject: [PATCH 1/6] Fix attach menu buttons --- .../TelegramUI/Sources/ChatController.swift | 29 +++++++++++-------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/submodules/TelegramUI/Sources/ChatController.swift b/submodules/TelegramUI/Sources/ChatController.swift index 2058ece78f..212f45cf60 100644 --- a/submodules/TelegramUI/Sources/ChatController.swift +++ b/submodules/TelegramUI/Sources/ChatController.swift @@ -12759,24 +12759,29 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G break case .gift: initialButton = .gift - case let .bot(botId, _, _): - for bot in attachMenuBots.reversed() { - var peerType = peerType - if bot.peer.id == peer.id { - peerType.insert(.sameBot) - peerType.remove(.bot) - } - let button: AttachmentButtonType = .app(bot.peer, bot.shortName, bot.icons) - if !bot.peerTypes.intersection(peerType).isEmpty { - buttons.insert(button, at: 1) - + default: + break + } + + for bot in attachMenuBots.reversed() { + var peerType = peerType + if bot.peer.id == peer.id { + peerType.insert(.sameBot) + peerType.remove(.bot) + } + let button: AttachmentButtonType = .app(bot.peer, bot.shortName, bot.icons) + if !bot.peerTypes.intersection(peerType).isEmpty { + buttons.insert(button, at: 1) + + if case let .bot(botId, _, _) = subject { if initialButton == nil && bot.peer.id == botId { initialButton = button } } - allButtons.insert(button, at: 1) } + allButtons.insert(button, at: 1) } + return (buttons, allButtons, initialButton) } } else { From 9a3f95e88223c1d47b559310b001c5109033ba05 Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Fri, 10 Mar 2023 11:10:09 +0400 Subject: [PATCH 2/6] Version bump --- versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.json b/versions.json index b7bed4a746..cdf88cd30b 100644 --- a/versions.json +++ b/versions.json @@ -1,5 +1,5 @@ { - "app": "9.5.1", + "app": "9.5.2", "bazel": "5.3.1", "xcode": "14.2" } From b661a014747457e31ce9d440c755744ca4235394 Mon Sep 17 00:00:00 2001 From: Ali <> Date: Fri, 10 Mar 2023 12:07:25 +0400 Subject: [PATCH 3/6] Merge wallpaper background --- .../Sources/WallpaperBackgroundNode.swift | 49 +++++++++++++++++-- 1 file changed, 45 insertions(+), 4 deletions(-) diff --git a/submodules/WallpaperBackgroundNode/Sources/WallpaperBackgroundNode.swift b/submodules/WallpaperBackgroundNode/Sources/WallpaperBackgroundNode.swift index 9c6f3038b6..d089a30758 100644 --- a/submodules/WallpaperBackgroundNode/Sources/WallpaperBackgroundNode.swift +++ b/submodules/WallpaperBackgroundNode/Sources/WallpaperBackgroundNode.swift @@ -18,7 +18,7 @@ import HierarchyTrackingLayer private let motionAmount: CGFloat = 32.0 -private func generateBlurredContents(image: UIImage) -> UIImage? { +private func generateBlurredContents(image: UIImage, dimColor: UIColor?) -> UIImage? { let size = image.size.aspectFitted(CGSize(width: 64.0, height: 64.0)) guard let context = DrawingContext(size: size, scale: 1.0, opaque: true, clear: false) else { return nil @@ -31,6 +31,13 @@ private func generateBlurredContents(image: UIImage) -> UIImage? { telegramFastBlurMore(Int32(context.size.width), Int32(context.size.height), Int32(context.bytesPerRow), context.bytes) adjustSaturationInContext(context: context, saturation: 1.7) + + if let dimColor { + context.withFlippedContext { c in + c.setFillColor(dimColor.cgColor) + c.fill(CGRect(origin: CGPoint(), size: size)) + } + } return context.generateImage() } @@ -323,6 +330,7 @@ final class WallpaperBackgroundNodeImpl: ASDisplayNode, WallpaperBackgroundNode private var cleanWallpaperNode: ASDisplayNode? private var gradientWallpaperNode: GradientBackgroundNode.CloneNode? + private var overlayNode: ASDisplayNode? private weak var backgroundNode: WallpaperBackgroundNodeImpl? private var index: SparseBag.Index? @@ -369,11 +377,14 @@ final class WallpaperBackgroundNodeImpl: ASDisplayNode, WallpaperBackgroundNode guard let backgroundNode = self.backgroundNode else { return } + + var overlayColor: UIColor? if let bubbleTheme = backgroundNode.bubbleTheme, let bubbleCorners = backgroundNode.bubbleCorners { let wallpaper = backgroundNode.wallpaper ?? bubbleTheme.chat.defaultWallpaper let graphics = PresentationResourcesChat.principalGraphics(theme: bubbleTheme, wallpaper: wallpaper, bubbleCorners: bubbleCorners) + var needsCleanBackground = false switch self.bubbleType { case .incoming: @@ -401,6 +412,10 @@ final class WallpaperBackgroundNodeImpl: ASDisplayNode, WallpaperBackgroundNode self.contentNode.image = nil self.contentNode.backgroundColor = nil needsCleanBackground = true + + if wallpaper.isBuiltin { + overlayColor = selectDateFillStaticColor(theme: bubbleTheme, wallpaper: wallpaper) + } } var isInvertedGradient = false @@ -490,6 +505,21 @@ final class WallpaperBackgroundNodeImpl: ASDisplayNode, WallpaperBackgroundNode cleanWallpaperNode.removeFromSupernode() } } + + if let overlayColor { + let overlayNode: ASDisplayNode + if let current = self.overlayNode { + overlayNode = current + } else { + overlayNode = ASDisplayNode() + self.overlayNode = overlayNode + self.addSubnode(overlayNode) + } + overlayNode.backgroundColor = overlayColor + } else if let overlayNode = self.overlayNode { + self.overlayNode = nil + overlayNode.removeFromSupernode() + } if let (rect, containerSize) = self.currentLayout { self.update(rect: rect, within: containerSize) @@ -521,6 +551,9 @@ final class WallpaperBackgroundNodeImpl: ASDisplayNode, WallpaperBackgroundNode gradientWallpaperNode.layer.contentsRect = shiftedContentsRect } } + if let overlayNode = self.overlayNode { + transition.updateFrame(layer: overlayNode.layer, frame: self.bounds, delay: delay) + } } func update(rect: CGRect, within containerSize: CGSize, animator: ControlledTransitionAnimator) { @@ -538,6 +571,9 @@ final class WallpaperBackgroundNodeImpl: ASDisplayNode, WallpaperBackgroundNode animator.updateFrame(layer: gradientWallpaperNode.layer, frame: self.bounds, completion: nil) animator.updateContentsRect(layer: gradientWallpaperNode.layer, contentsRect: shiftedContentsRect, completion: nil) } + if let overlayNode = self.overlayNode { + animator.updateFrame(layer: overlayNode.layer, frame: self.bounds, completion: nil) + } } func update(rect: CGRect, within containerSize: CGSize, transition: CombinedTransition) { @@ -555,6 +591,9 @@ final class WallpaperBackgroundNodeImpl: ASDisplayNode, WallpaperBackgroundNode transition.updateFrame(layer: gradientWallpaperNode.layer, frame: self.bounds) gradientWallpaperNode.layer.contentsRect = shiftedContentsRect } + if let overlayNode = self.overlayNode { + transition.updateFrame(layer: overlayNode.layer, frame: self.bounds) + } } func offset(value: CGPoint, animationCurve: ContainedViewLayoutTransitionCurve, duration: Double) { @@ -856,6 +895,8 @@ final class WallpaperBackgroundNodeImpl: ASDisplayNode, WallpaperBackgroundNode var gradientColors: [UInt32] = [] var gradientAngle: Int32 = 0 + + let wallpaperDimColor: UIColor? = nil if case let .color(color) = wallpaper { gradientColors = [color] @@ -955,7 +996,7 @@ final class WallpaperBackgroundNodeImpl: ASDisplayNode, WallpaperBackgroundNode self.contentNode.backgroundColor = .white if let image = chatControllerBackgroundImage(theme: nil, wallpaper: wallpaper, mediaBox: self.context.sharedContext.accountManager.mediaBox, knockoutMode: false) { self.contentNode.contents = image.cgImage - self.blurredBackgroundContents = generateBlurredContents(image: image) + self.blurredBackgroundContents = generateBlurredContents(image: image, dimColor: nil) self.blurredBackgroundContentView?.image = self.blurredBackgroundContents self.wallpaperDisposable.set(nil) Queue.mainQueue().justDispatch { @@ -963,7 +1004,7 @@ final class WallpaperBackgroundNodeImpl: ASDisplayNode, WallpaperBackgroundNode } } else if let image = chatControllerBackgroundImage(theme: nil, wallpaper: wallpaper, mediaBox: self.context.account.postbox.mediaBox, knockoutMode: false) { self.contentNode.contents = image.cgImage - self.blurredBackgroundContents = generateBlurredContents(image: image) + self.blurredBackgroundContents = generateBlurredContents(image: image, dimColor: nil) self.blurredBackgroundContentView?.image = self.blurredBackgroundContents self.wallpaperDisposable.set(nil) Queue.mainQueue().justDispatch { @@ -977,7 +1018,7 @@ final class WallpaperBackgroundNodeImpl: ASDisplayNode, WallpaperBackgroundNode } strongSelf.contentNode.contents = image?.0?.cgImage if let image = image?.0 { - strongSelf.blurredBackgroundContents = generateBlurredContents(image: image) + strongSelf.blurredBackgroundContents = generateBlurredContents(image: image, dimColor: wallpaperDimColor) } else { strongSelf.blurredBackgroundContents = nil } From 8bb85d5889bb0dbf3b6a8494f3b5bb89260a25f2 Mon Sep 17 00:00:00 2001 From: Ali <> Date: Fri, 10 Mar 2023 12:16:10 +0400 Subject: [PATCH 4/6] Backport WallpaperBackgroundNode from master --- .../Sources/WallpaperBackgroundNode.swift | 114 ++++++++---------- 1 file changed, 49 insertions(+), 65 deletions(-) diff --git a/submodules/WallpaperBackgroundNode/Sources/WallpaperBackgroundNode.swift b/submodules/WallpaperBackgroundNode/Sources/WallpaperBackgroundNode.swift index d089a30758..f8f170e47b 100644 --- a/submodules/WallpaperBackgroundNode/Sources/WallpaperBackgroundNode.swift +++ b/submodules/WallpaperBackgroundNode/Sources/WallpaperBackgroundNode.swift @@ -641,6 +641,7 @@ final class WallpaperBackgroundNodeImpl: ASDisplayNode, WallpaperBackgroundNode super.init() self.view.addSubview(portalView.view) + self.clipsToBounds = true } deinit { @@ -691,10 +692,21 @@ final class WallpaperBackgroundNodeImpl: ASDisplayNode, WallpaperBackgroundNode private let contentNode: ASDisplayNode private var blurredBackgroundContents: UIImage? - private var blurredBackgroundPortalSourceView: PortalSourceView? - private var blurredBackgroundDimmedNode: GradientBackgroundNode.CloneNode? - private var blurredBackgroundDimmedOverlayView: UIView? - private var blurredBackgroundContentView: UIImageView? + + private var freeBackgroundPortalSourceView: PortalSourceView? + private var freeBackgroundNode: WallpaperBackgroundNodeImpl.BubbleBackgroundNodeImpl? { + didSet { + if self.freeBackgroundNode !== oldValue { + if let oldValue { + oldValue.view.removeFromSuperview() + } + if let freeBackgroundNode = self.freeBackgroundNode, let freeBackgroundPortalSourceView = self.freeBackgroundPortalSourceView { + freeBackgroundPortalSourceView.addSubview(freeBackgroundNode.view) + freeBackgroundNode.frame = CGRect(origin: CGPoint(), size: freeBackgroundPortalSourceView.bounds.size) + } + } + } + } private var incomingBackgroundPortalSourceView: PortalSourceView? private var incomingBackgroundNode: WallpaperBackgroundNodeImpl.BubbleBackgroundNodeImpl? { @@ -855,23 +867,19 @@ final class WallpaperBackgroundNodeImpl: ASDisplayNode, WallpaperBackgroundNode super.init() if #available(iOS 12.0, *) { - let blurredBackgroundPortalSourceView = PortalSourceView() - self.blurredBackgroundPortalSourceView = blurredBackgroundPortalSourceView - blurredBackgroundPortalSourceView.alpha = 0.0001 - self.view.addSubview(blurredBackgroundPortalSourceView) - - let blurredBackgroundContentView = UIImageView() - self.blurredBackgroundContentView = blurredBackgroundContentView - blurredBackgroundPortalSourceView.addSubview(blurredBackgroundContentView) + let freeBackgroundPortalSourceView = PortalSourceView() + self.freeBackgroundPortalSourceView = freeBackgroundPortalSourceView + freeBackgroundPortalSourceView.alpha = 0.0 + self.view.addSubview(freeBackgroundPortalSourceView) let incomingBackgroundPortalSourceView = PortalSourceView() self.incomingBackgroundPortalSourceView = incomingBackgroundPortalSourceView - incomingBackgroundPortalSourceView.alpha = 0.00001 + incomingBackgroundPortalSourceView.alpha = 0.0 self.view.addSubview(incomingBackgroundPortalSourceView) let outgoingBackgroundPortalSourceView = PortalSourceView() self.outgoingBackgroundPortalSourceView = outgoingBackgroundPortalSourceView - outgoingBackgroundPortalSourceView.alpha = 0.00001 + outgoingBackgroundPortalSourceView.alpha = 0.0 self.view.addSubview(outgoingBackgroundPortalSourceView) } @@ -925,28 +933,11 @@ final class WallpaperBackgroundNodeImpl: ASDisplayNode, WallpaperBackgroundNode scheduleLoopingEvent = true } } - if let gradientBackgroundNode = self.gradientBackgroundNode { - if self.blurredBackgroundDimmedNode == nil { - let blurredBackgroundDimmedNode = GradientBackgroundNode.CloneNode(parentNode: gradientBackgroundNode) - self.blurredBackgroundDimmedNode = blurredBackgroundDimmedNode - self.blurredBackgroundPortalSourceView?.addSubnode(blurredBackgroundDimmedNode) - } - if self.blurredBackgroundDimmedOverlayView == nil { - let blurredBackgroundDimmedOverlayView = UIView() - self.blurredBackgroundDimmedOverlayView = blurredBackgroundDimmedOverlayView - self.blurredBackgroundPortalSourceView?.addSubview(blurredBackgroundDimmedOverlayView) - } - } self.gradientBackgroundNode?.updateColors(colors: mappedColors) - - if let bubbleTheme = self.bubbleTheme { - self.blurredBackgroundDimmedOverlayView?.backgroundColor = selectDateFillStaticColor(theme: bubbleTheme, wallpaper: wallpaper) - } self.contentNode.backgroundColor = nil self.contentNode.contents = nil self.blurredBackgroundContents = nil - self.blurredBackgroundContentView?.image = self.blurredBackgroundContents self.motionEnabled = false self.wallpaperDisposable.set(nil) } else { @@ -956,14 +947,6 @@ final class WallpaperBackgroundNodeImpl: ASDisplayNode, WallpaperBackgroundNode gradientBackgroundNode.setPatternOverlay(layer: nil) self.layer.insertSublayer(self.patternImageLayer, above: self.contentNode.layer) } - if let blurredBackgroundDimmedNode = self.blurredBackgroundDimmedNode { - self.blurredBackgroundDimmedNode = nil - blurredBackgroundDimmedNode.removeFromSupernode() - } - if let blurredBackgroundDimmedOverlayView = self.blurredBackgroundDimmedOverlayView { - self.blurredBackgroundDimmedOverlayView = nil - blurredBackgroundDimmedOverlayView.removeFromSuperview() - } self.motionEnabled = wallpaper.settings?.motion ?? false @@ -984,28 +967,24 @@ final class WallpaperBackgroundNodeImpl: ASDisplayNode, WallpaperBackgroundNode }) self.contentNode.contents = image?.cgImage self.blurredBackgroundContents = image - self.blurredBackgroundContentView?.image = self.blurredBackgroundContents self.wallpaperDisposable.set(nil) } else if gradientColors.count >= 1 { self.contentNode.backgroundColor = UIColor(rgb: gradientColors[0]) self.contentNode.contents = nil self.blurredBackgroundContents = nil - self.blurredBackgroundContentView?.image = self.blurredBackgroundContents self.wallpaperDisposable.set(nil) } else { self.contentNode.backgroundColor = .white if let image = chatControllerBackgroundImage(theme: nil, wallpaper: wallpaper, mediaBox: self.context.sharedContext.accountManager.mediaBox, knockoutMode: false) { self.contentNode.contents = image.cgImage - self.blurredBackgroundContents = generateBlurredContents(image: image, dimColor: nil) - self.blurredBackgroundContentView?.image = self.blurredBackgroundContents + self.blurredBackgroundContents = generateBlurredContents(image: image, dimColor: wallpaperDimColor) self.wallpaperDisposable.set(nil) Queue.mainQueue().justDispatch { self._isReady.set(true) } } else if let image = chatControllerBackgroundImage(theme: nil, wallpaper: wallpaper, mediaBox: self.context.account.postbox.mediaBox, knockoutMode: false) { self.contentNode.contents = image.cgImage - self.blurredBackgroundContents = generateBlurredContents(image: image, dimColor: nil) - self.blurredBackgroundContentView?.image = self.blurredBackgroundContents + self.blurredBackgroundContents = generateBlurredContents(image: image, dimColor: wallpaperDimColor) self.wallpaperDisposable.set(nil) Queue.mainQueue().justDispatch { self._isReady.set(true) @@ -1022,7 +1001,6 @@ final class WallpaperBackgroundNodeImpl: ASDisplayNode, WallpaperBackgroundNode } else { strongSelf.blurredBackgroundContents = nil } - strongSelf.blurredBackgroundContentView?.image = strongSelf.blurredBackgroundContents strongSelf._isReady.set(true) })) } @@ -1030,6 +1008,12 @@ final class WallpaperBackgroundNodeImpl: ASDisplayNode, WallpaperBackgroundNode } } + if self.hasBubbleBackground(for: .free) { + self.freeBackgroundNode = WallpaperBackgroundNodeImpl.BubbleBackgroundNodeImpl(backgroundNode: self, bubbleType: .free) + } else { + self.freeBackgroundNode = nil + } + if self.hasBubbleBackground(for: .incoming) { self.incomingBackgroundNode = WallpaperBackgroundNodeImpl.BubbleBackgroundNodeImpl(backgroundNode: self, bubbleType: .incoming) } else { @@ -1283,17 +1267,8 @@ final class WallpaperBackgroundNodeImpl: ASDisplayNode, WallpaperBackgroundNode let isFirstLayout = self.validLayout == nil self.validLayout = (size, displayMode) - if let blurredBackgroundPortalSourceView = self.blurredBackgroundPortalSourceView { - transition.updateFrame(view: blurredBackgroundPortalSourceView, frame: CGRect(origin: CGPoint(), size: size)) - } - if let blurredBackgroundContentView = self.blurredBackgroundContentView { - transition.updateFrame(view: blurredBackgroundContentView, frame: CGRect(origin: CGPoint(), size: size)) - } - if let blurredBackgroundDimmedNode = self.blurredBackgroundDimmedNode { - transition.updateFrame(view: blurredBackgroundDimmedNode.view, frame: CGRect(origin: CGPoint(), size: size)) - } - if let blurredBackgroundDimmedOverlayView = self.blurredBackgroundDimmedOverlayView { - transition.updateFrame(view: blurredBackgroundDimmedOverlayView, frame: CGRect(origin: CGPoint(), size: size)) + if let freeBackgroundPortalSourceView = self.freeBackgroundPortalSourceView { + transition.updateFrame(view: freeBackgroundPortalSourceView, frame: CGRect(origin: CGPoint(), size: size)) } if let incomingBackgroundPortalSourceView = self.incomingBackgroundPortalSourceView { @@ -1317,6 +1292,11 @@ final class WallpaperBackgroundNodeImpl: ASDisplayNode, WallpaperBackgroundNode outgoingBubbleGradientBackgroundNode.updateLayout(size: size, transition: transition, extendAnimation: false, backwards: false, completion: {}) } + if let freeBackgroundNode = self.freeBackgroundNode { + transition.updateFrame(node: freeBackgroundNode, frame: CGRect(origin: CGPoint(), size: size)) + freeBackgroundNode.update(rect: CGRect(origin: CGPoint(), size: size), within: size, transition: transition) + } + if let incomingBackgroundNode = self.incomingBackgroundNode { transition.updateFrame(node: incomingBackgroundNode, frame: CGRect(origin: CGPoint(), size: size)) incomingBackgroundNode.update(rect: CGRect(origin: CGPoint(), size: size), within: size, transition: transition) @@ -1388,8 +1368,10 @@ final class WallpaperBackgroundNodeImpl: ASDisplayNode, WallpaperBackgroundNode self.outgoingBubbleGradientBackgroundNode = nil } - if let wallpaper = self.wallpaper { - self.blurredBackgroundDimmedOverlayView?.backgroundColor = selectDateFillStaticColor(theme: bubbleTheme, wallpaper: wallpaper) + if self.hasBubbleBackground(for: .free) { + self.freeBackgroundNode = WallpaperBackgroundNodeImpl.BubbleBackgroundNodeImpl(backgroundNode: self, bubbleType: .free) + } else { + self.freeBackgroundNode = nil } if self.hasBubbleBackground(for: .incoming) { @@ -1464,11 +1446,11 @@ final class WallpaperBackgroundNodeImpl: ASDisplayNode, WallpaperBackgroundNode return nil } - #if DEBUG && false + #if false var sourceView: PortalSourceView? switch type { case .free: - sourceView = self.blurredBackgroundPortalSourceView + sourceView = self.freeBackgroundPortalSourceView case .incoming: sourceView = self.incomingBackgroundPortalSourceView case .outgoing: @@ -1491,14 +1473,16 @@ final class WallpaperBackgroundNodeImpl: ASDisplayNode, WallpaperBackgroundNode } func makeFreeBackground() -> PortalView? { - guard let blurredBackgroundPortalSourceView = self.blurredBackgroundPortalSourceView else { + if !self.hasBubbleBackground(for: .free) { return nil } - guard let portalView = PortalView(matchPosition: true) else { + + if let sourceView = self.freeBackgroundPortalSourceView, let portalView = PortalView(matchPosition: true) { + sourceView.addPortal(view: portalView) + return portalView + } else { return nil } - blurredBackgroundPortalSourceView.addPortal(view: portalView) - return portalView } func hasExtraBubbleBackground() -> Bool { From 67907a38ac0a8ee5ef53857f0863c4ace1c594bc Mon Sep 17 00:00:00 2001 From: Ali <> Date: Wed, 8 Mar 2023 13:40:30 +0400 Subject: [PATCH 5/6] Display timestamps when available --- .../Sources/ChatInterfaceStateContextMenus.swift | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/submodules/TelegramUI/Sources/ChatInterfaceStateContextMenus.swift b/submodules/TelegramUI/Sources/ChatInterfaceStateContextMenus.swift index 1b559b012e..36378e61d9 100644 --- a/submodules/TelegramUI/Sources/ChatInterfaceStateContextMenus.swift +++ b/submodules/TelegramUI/Sources/ChatInterfaceStateContextMenus.swift @@ -1787,6 +1787,16 @@ func contextMenuForChatPresentationInterfaceState(chatPresentationInterfaceState if let stats, !stats.readTimestamps.isEmpty { displayReadTimestamps = true } + let tempState = EngineMessageReactionListContext.State(message: EngineMessage(message), readStats: stats, reaction: nil) + var allItemsHaveTimestamp = true + for item in tempState.items { + if item.timestamp == nil { + allItemsHaveTimestamp = false + } + } + if allItemsHaveTimestamp { + displayReadTimestamps = true + } c.pushItems(items: .single(ContextController.Items(content: .custom(ReactionListContextMenuContent( context: context, From 48dcf4c9a211c2b2178f16f754ff2fd0f2f0185b Mon Sep 17 00:00:00 2001 From: Ali <> Date: Fri, 10 Mar 2023 13:09:08 +0400 Subject: [PATCH 6/6] Always add dim color --- .../Sources/WallpaperBackgroundNode.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/submodules/WallpaperBackgroundNode/Sources/WallpaperBackgroundNode.swift b/submodules/WallpaperBackgroundNode/Sources/WallpaperBackgroundNode.swift index f8f170e47b..db6ad6c36b 100644 --- a/submodules/WallpaperBackgroundNode/Sources/WallpaperBackgroundNode.swift +++ b/submodules/WallpaperBackgroundNode/Sources/WallpaperBackgroundNode.swift @@ -413,9 +413,9 @@ final class WallpaperBackgroundNodeImpl: ASDisplayNode, WallpaperBackgroundNode self.contentNode.backgroundColor = nil needsCleanBackground = true - if wallpaper.isBuiltin { + //if wallpaper.isBuiltin { overlayColor = selectDateFillStaticColor(theme: bubbleTheme, wallpaper: wallpaper) - } + //} } var isInvertedGradient = false @@ -1446,7 +1446,7 @@ final class WallpaperBackgroundNodeImpl: ASDisplayNode, WallpaperBackgroundNode return nil } - #if false + #if true var sourceView: PortalSourceView? switch type { case .free: