From 719f7afed4ff83a179463323384abe7f3c2b9727 Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Thu, 13 Apr 2023 04:13:33 +0400 Subject: [PATCH] Chat wallpaper fixes --- submodules/Display/Source/UIKitUtils.swift | 40 +++++++++++++------ .../Sources/TGPhotoEditorTabController.m | 11 +++-- .../Sources/MediaPickerScreen.swift | 2 +- .../Sources/ThemeCarouselItem.swift | 1 + .../Themes/ThemeColorsGridController.swift | 2 +- .../Sources/Themes/WallpaperGalleryItem.swift | 6 +-- .../TelegramUI/Sources/ChatThemeScreen.swift | 1 + .../Sources/WallpaperResources.swift | 21 ++++++++-- 8 files changed, 60 insertions(+), 24 deletions(-) diff --git a/submodules/Display/Source/UIKitUtils.swift b/submodules/Display/Source/UIKitUtils.swift index ef9d40ef51..1830677525 100644 --- a/submodules/Display/Source/UIKitUtils.swift +++ b/submodules/Display/Source/UIKitUtils.swift @@ -437,10 +437,22 @@ public extension UIImage { } } -private func makeSubtreeSnapshot(layer: CALayer, keepTransform: Bool = false) -> UIView? { +private func makeSubtreeSnapshot(layer: CALayer, keepPortals: Bool = false, keepTransform: Bool = false) -> UIView? { if layer is AVSampleBufferDisplayLayer { return nil } + if keepPortals && layer.description.contains("PortalLayer") { + let sourceView = (layer.delegate as? UIView)?.value(forKey: "sourceView") as? UIView + if let snapshotView = sourceView?.snapshotContentTree() { + let globalFrame = layer.convert(layer.bounds, to: sourceView?.layer) + snapshotView.frame = CGRect(origin: CGPoint(x: -globalFrame.minX, y: -globalFrame.minY), size: snapshotView.frame.size) + snapshotView.alpha = 1.0 + snapshotView.tag = 0xbeef + return snapshotView + } else { + return nil + } + } let view = UIView() view.layer.isHidden = layer.isHidden view.layer.opacity = layer.opacity @@ -475,21 +487,23 @@ private func makeSubtreeSnapshot(layer: CALayer, keepTransform: Bool = false) -> view.layer.backgroundColor = layer.backgroundColor if let sublayers = layer.sublayers { for sublayer in sublayers { - let subtree = makeSubtreeSnapshot(layer: sublayer, keepTransform: keepTransform) + let subtree = makeSubtreeSnapshot(layer: sublayer, keepPortals: keepPortals, keepTransform: keepTransform) if let subtree = subtree { if keepTransform { subtree.layer.transform = sublayer.transform } - subtree.layer.transform = sublayer.transform - subtree.layer.position = sublayer.position - subtree.layer.bounds = sublayer.bounds - subtree.layer.anchorPoint = sublayer.anchorPoint - subtree.layer.layerTintColor = sublayer.layerTintColor + if subtree.tag != 0xbeef { + subtree.layer.transform = sublayer.transform + subtree.layer.position = sublayer.position + subtree.layer.bounds = sublayer.bounds + subtree.layer.anchorPoint = sublayer.anchorPoint + subtree.layer.layerTintColor = sublayer.layerTintColor + } if let maskLayer = subtree.layer.mask { - maskLayer.transform = sublayer.transform - maskLayer.position = sublayer.position - maskLayer.bounds = sublayer.bounds - maskLayer.anchorPoint = sublayer.anchorPoint +// maskLayer.transform = sublayer.transform +// maskLayer.position = sublayer.position +// maskLayer.bounds = sublayer.bounds +// maskLayer.anchorPoint = sublayer.anchorPoint maskLayer.layerTintColor = sublayer.layerTintColor } view.addSubview(subtree) @@ -685,12 +699,12 @@ private func makeLayerSubtreeSnapshotAsView(layer: CALayer) -> UIView? { public extension UIView { - func snapshotContentTree(unhide: Bool = false, keepTransform: Bool = false) -> UIView? { + func snapshotContentTree(unhide: Bool = false, keepPortals: Bool = false, keepTransform: Bool = false) -> UIView? { let wasHidden = self.isHidden if unhide && wasHidden { self.isHidden = false } - let snapshot = makeSubtreeSnapshot(layer: self.layer, keepTransform: keepTransform) + let snapshot = makeSubtreeSnapshot(layer: self.layer, keepPortals: keepPortals, keepTransform: keepTransform) if unhide && wasHidden { self.isHidden = true } diff --git a/submodules/LegacyComponents/Sources/TGPhotoEditorTabController.m b/submodules/LegacyComponents/Sources/TGPhotoEditorTabController.m index 9410ea9a1c..497c2548dc 100644 --- a/submodules/LegacyComponents/Sources/TGPhotoEditorTabController.m +++ b/submodules/LegacyComponents/Sources/TGPhotoEditorTabController.m @@ -169,7 +169,7 @@ const CGFloat TGPhotoEditorToolbarSize = 49.0f; _upperTransitionView.alpha = 0.0; _upperTransitionView.frame = [parentView convertRect:referenceFrame toView:self.view]; _upperTransitionTargetFrame = [self _targetFrameForTransitionInFromFrame:referenceFrame]; - [self.view insertSubview:_upperTransitionView atIndex:0]; + [self.view insertSubview:_upperTransitionView atIndex:2]; } } @@ -219,8 +219,13 @@ const CGFloat TGPhotoEditorToolbarSize = 49.0f; } [self _finishedTransitionInWithView:transitionView]; - [_upperTransitionView removeFromSuperview]; - _upperTransitionView = nil; + + [UIView animateWithDuration:0.2 animations:^{ + _upperTransitionView.alpha = 0.0; + } completion:^(BOOL finished) { + [_upperTransitionView removeFromSuperview]; + _upperTransitionView = nil; + }]; }]; } diff --git a/submodules/MediaPickerUI/Sources/MediaPickerScreen.swift b/submodules/MediaPickerUI/Sources/MediaPickerScreen.swift index f13bd2e941..88c3d66f36 100644 --- a/submodules/MediaPickerUI/Sources/MediaPickerScreen.swift +++ b/submodules/MediaPickerUI/Sources/MediaPickerScreen.swift @@ -2030,7 +2030,6 @@ public func wallpaperMediaPickerController( return nil }) controller.animateAppearance = animateAppearance - //controller.supportedOrientations = ViewControllerSupportedOrientations(regularSize: .all, compactSize: .portrait) controller.requestController = { [weak controller] _, present in let presentationData = context.sharedContext.currentPresentationData.with { $0 } let mediaPickerController = MediaPickerScreen(context: context, peer: nil, threadTitle: nil, chatLocation: nil, bannedSendPhotos: nil, bannedSendVideos: nil, subject: .assets(nil, .wallpaper), mainButtonState: AttachmentMainButtonState(text: presentationData.strings.Conversation_Theme_SetColorWallpaper, font: .regular, background: .color(.clear), textColor: presentationData.theme.actionSheet.controlAccentColor, isVisible: true, progress: .none, isEnabled: true), mainButtonAction: { @@ -2040,5 +2039,6 @@ public func wallpaperMediaPickerController( mediaPickerController.customSelection = completion present(mediaPickerController, mediaPickerController.mediaPickerContext) } + controller.supportedOrientations = ViewControllerSupportedOrientations(regularSize: .all, compactSize: .portrait) return controller } diff --git a/submodules/SettingsUI/Sources/ThemeCarouselItem.swift b/submodules/SettingsUI/Sources/ThemeCarouselItem.swift index 7061318417..7744e5a771 100644 --- a/submodules/SettingsUI/Sources/ThemeCarouselItem.swift +++ b/submodules/SettingsUI/Sources/ThemeCarouselItem.swift @@ -232,6 +232,7 @@ private final class ThemeCarouselThemeItemIconNode : ListViewItemNode { self.imageNode.isLayerBacked = true self.imageNode.cornerRadius = 8.0 self.imageNode.clipsToBounds = true + self.imageNode.contentAnimations = [.subsequentUpdates] self.overlayNode = ASImageNode() self.overlayNode.frame = CGRect(origin: CGPoint(), size: CGSize(width: 84.0, height: 110.0)) diff --git a/submodules/SettingsUI/Sources/Themes/ThemeColorsGridController.swift b/submodules/SettingsUI/Sources/Themes/ThemeColorsGridController.swift index 75ec7e4f8a..e35dbd8b14 100644 --- a/submodules/SettingsUI/Sources/Themes/ThemeColorsGridController.swift +++ b/submodules/SettingsUI/Sources/Themes/ThemeColorsGridController.swift @@ -394,7 +394,6 @@ public func standaloneColorPickerController( let controller = AttachmentController(context: context, updatedPresentationData: updatedPresentationData, chatLocation: nil, buttons: [.standalone], initialButton: .standalone, fromMenu: false, hasTextInput: false, makeEntityInputView: { return nil }) - //controller.supportedOrientations = ViewControllerSupportedOrientations(regularSize: .all, compactSize: .portrait) controller.requestController = { _, present in let colorPickerController = ThemeColorsGridController(context: context, mode: .peer(peer)) colorPickerController.pushController = { controller in @@ -406,5 +405,6 @@ public func standaloneColorPickerController( colorPickerController.openGallery = openGallery present(colorPickerController, colorPickerController.mediaPickerContext) } + controller.supportedOrientations = ViewControllerSupportedOrientations(regularSize: .all, compactSize: .portrait) return controller } diff --git a/submodules/SettingsUI/Sources/Themes/WallpaperGalleryItem.swift b/submodules/SettingsUI/Sources/Themes/WallpaperGalleryItem.swift index 4e751c1845..e4b08e7db2 100644 --- a/submodules/SettingsUI/Sources/Themes/WallpaperGalleryItem.swift +++ b/submodules/SettingsUI/Sources/Themes/WallpaperGalleryItem.swift @@ -343,7 +343,7 @@ final class WallpaperGalleryItemNode: GalleryItemNode { private func switchTheme() { if let messageNodes = self.messageNodes { for messageNode in messageNodes.prefix(2) { - if let snapshotView = messageNode.view.snapshotContentTree() { + if let snapshotView = messageNode.view.snapshotContentTree(keepPortals: true) { messageNode.view.addSubview(snapshotView) snapshotView.frame = messageNode.bounds snapshotView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.35, removeOnCompletion: false, completion: { [weak snapshotView] _ in @@ -857,7 +857,7 @@ final class WallpaperGalleryItemNode: GalleryItemNode { case let .asset(asset): let dimensions = CGSize(width: asset.pixelWidth, height: asset.pixelHeight) contentSize = dimensions - displaySize = dimensions.dividedByScreenScale().integralFloor + displaySize = dimensions.aspectFittedOrSmaller(CGSize(width: 2048.0, height: 2048.0)) signal = photoWallpaper(postbox: context.account.postbox, photoLibraryResource: PhotoLibraryMediaResource(localIdentifier: asset.localIdentifier, uniqueId: Int64.random(in: Int64.min ... Int64.max))) fetchSignal = .complete() statusSignal = .single(.Local) @@ -899,7 +899,7 @@ final class WallpaperGalleryItemNode: GalleryItemNode { if let imageResource = imageResource, let imageDimensions = imageDimensions { contentSize = imageDimensions - displaySize = imageDimensions.dividedByScreenScale().integralFloor + displaySize = imageDimensions.aspectFittedOrSmaller(CGSize(width: 2048.0, height: 2048.0)) var representations: [TelegramMediaImageRepresentation] = [] if let thumbnailResource = thumbnailResource, let thumbnailDimensions = thumbnailDimensions { diff --git a/submodules/TelegramUI/Sources/ChatThemeScreen.swift b/submodules/TelegramUI/Sources/ChatThemeScreen.swift index f53617080e..076c33ee08 100644 --- a/submodules/TelegramUI/Sources/ChatThemeScreen.swift +++ b/submodules/TelegramUI/Sources/ChatThemeScreen.swift @@ -270,6 +270,7 @@ private final class ThemeSettingsThemeItemIconNode : ListViewItemNode { self.imageNode.isLayerBacked = true self.imageNode.cornerRadius = 8.0 self.imageNode.clipsToBounds = true + self.imageNode.contentAnimations = [.subsequentUpdates] self.overlayNode = ASImageNode() self.overlayNode.frame = CGRect(origin: CGPoint(), size: CGSize(width: 84.0, height: 110.0)) diff --git a/submodules/WallpaperResources/Sources/WallpaperResources.swift b/submodules/WallpaperResources/Sources/WallpaperResources.swift index 41c46e91b5..fac8add04e 100644 --- a/submodules/WallpaperResources/Sources/WallpaperResources.swift +++ b/submodules/WallpaperResources/Sources/WallpaperResources.swift @@ -553,6 +553,8 @@ private func patternWallpaperImageInternal(fullSizeData: Data?, fullSizeComplete c.restoreGState() } + var patternIsLoaded = false + var patternIsInverted = false let displayMode = customArguments.displayMode let overlayImage = generateImage(arguments.drawingRect.size, rotatedContext: { size, c in c.clear(CGRect(origin: CGPoint(), size: size)) @@ -566,6 +568,7 @@ private func patternWallpaperImageInternal(fullSizeData: Data?, fullSizeComplete } if let customPatternColor = customArguments.customPatternColor, customPatternColor.alpha < 1.0 { + patternIsInverted = true c.setBlendMode(.copy) c.setFillColor(UIColor.black.cgColor) c.fill(CGRect(origin: CGPoint(), size: size)) @@ -574,6 +577,7 @@ private func patternWallpaperImageInternal(fullSizeData: Data?, fullSizeComplete } if let image = image { + patternIsLoaded = true var fittedSize = image.size if abs(fittedSize.width - arguments.boundingSize.width).isLessThanOrEqualTo(CGFloat(1.0)) { fittedSize.width = arguments.boundingSize.width @@ -660,6 +664,10 @@ private func patternWallpaperImageInternal(fullSizeData: Data?, fullSizeComplete c.translateBy(x: -drawingRect.midX, y: -drawingRect.midY) c.setAlpha(1.0) } + if !patternIsLoaded && patternIsInverted { + c.setFillColor(UIColor.black.cgColor) + c.fill(CGRect(origin: .zero, size: drawingRect.size)) + } } addCorners(context, arguments: arguments) return context @@ -1526,7 +1534,7 @@ public func themeIconImage(account: Account, accountManager: AccountManager= 3 { - let image = GradientBackgroundNode.generatePreview(size: CGSize(width: 60.0, height: 60.0), colors: colors.0.2.map(UIColor.init(rgb:))) - c.draw(image.cgImage!, in: drawingRect) + if isPattern && patternIntensity < 0.0 && colors.3 == nil { + c.setFillColor(UIColor.black.cgColor) + c.fill(drawingRect) + } else { + let image = GradientBackgroundNode.generatePreview(size: CGSize(width: 60.0, height: 60.0), colors: colors.0.2.map(UIColor.init(rgb:))) + c.draw(image.cgImage!, in: drawingRect) + } } else if let secondBackgroundColor = colors.0.1 { let gradientColors = [colors.0.0, secondBackgroundColor].map { $0.cgColor } as CFArray var locations: [CGFloat] = [0.0, 1.0]