ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-23 14:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix pattern wallpaper preview & setup interface

Browse Source
This commit is contained in:
Ilya Laktyushin
2019-12-15 20:13:04 +04:00
parent dece460fcf
commit 26f89fedef
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
submodules/SettingsUI/Sources/Themes/WallpaperPatternPanelNode.swift
View File

@@ -42,7 +42,9 @@ final class WallpaperPatternPanelNode: ASDisplayNode {
var backgroundColors: (UIColor, UIColor?)? = nil { var backgroundColors: (UIColor, UIColor?)? = nil {
didSet { didSet {
self.updateWallpapers() if oldValue?.0.rgb != self.backgroundColors?.0.rgb || oldValue?.1?.rgb != self.backgroundColors?.1?.rgb {
self.updateWallpapers()
}
} }
} }
@@ -136,7 +138,11 @@ final class WallpaperPatternPanelNode: ASDisplayNode {
let backgroundColors = self.backgroundColors ?? (UIColor(rgb: 0xd6e2ee), nil) let backgroundColors = self.backgroundColors ?? (UIColor(rgb: 0xd6e2ee), nil)
var selected = true var selectedFileId: Int64?
if let currentWallpaper = self.currentWallpaper, case let .file(file) = currentWallpaper {
selectedFileId = file.id
}
for wallpaper in wallpapers { for wallpaper in wallpapers {
let node = SettingsThemeWallpaperNode(overlayBackgroundColor: self.serviceBackgroundColor.withAlphaComponent(0.4)) let node = SettingsThemeWallpaperNode(overlayBackgroundColor: self.serviceBackgroundColor.withAlphaComponent(0.4))
node.clipsToBounds = true node.clipsToBounds = true
@@ -148,6 +154,11 @@ final class WallpaperPatternPanelNode: ASDisplayNode {
updatedWallpaper = .file(id: file.id, accessHash: file.accessHash, isCreator: file.isCreator, isDefault: file.isDefault, isPattern: file.isPattern, isDark: file.isDark, slug: file.slug, file: file.file, settings: settings) updatedWallpaper = .file(id: file.id, accessHash: file.accessHash, isCreator: file.isCreator, isDefault: file.isDefault, isPattern: file.isPattern, isDark: file.isDark, slug: file.slug, file: file.file, settings: settings)
} }
var selected = false
if case let .file(file) = wallpaper, file.id == selectedFileId {
selected = true
}
node.setWallpaper(context: self.context, wallpaper: updatedWallpaper, selected: selected, size: itemSize) node.setWallpaper(context: self.context, wallpaper: updatedWallpaper, selected: selected, size: itemSize)
node.pressed = { [weak self, weak node] in node.pressed = { [weak self, weak node] in
if let strongSelf = self { if let strongSelf = self {
@@ -163,8 +174,6 @@ final class WallpaperPatternPanelNode: ASDisplayNode {
} }
} }
self.scrollNode.addSubnode(node) self.scrollNode.addSubnode(node)
selected = false
} }
self.scrollNode.view.contentSize = CGSize(width: (itemSize.width + inset) * CGFloat(wallpapers.count) + inset, height: 112.0) self.scrollNode.view.contentSize = CGSize(width: (itemSize.width + inset) * CGFloat(wallpapers.count) + inset, height: 112.0)

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

@@ -480,7 +480,6 @@ public func patternWallpaperImageInternal(thumbnailData: Data?, fullSizeData: Da
if colors.count == 1 { if colors.count == 1 {
c.setFillColor(patternColor(for: color, intensity: intensity, prominent: prominent).cgColor) c.setFillColor(patternColor(for: color, intensity: intensity, prominent: prominent).cgColor)
c.fill(arguments.drawingRect)
c.fill(arguments.drawingRect) c.fill(arguments.drawingRect)
} else { } else {
let gradientColors = colors.map { patternColor(for: $0, intensity: intensity, prominent: prominent).cgColor } as CFArray let gradientColors = colors.map { patternColor(for: $0, intensity: intensity, prominent: prominent).cgColor } as CFArray