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

Fix blurred background preview

Browse Source
This commit is contained in:
Ali 2021-06-15 12:45:43 +04:00
parent 3dd5e94715
commit bea2f13f24
5 changed files with 65 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
submodules/SettingsUI/Sources/Themes/ThemeAccentColorController.swift
View File

@ -430,7 +430,13 @@ final class ThemeAccentColorController: ViewController {
motion = settings.motion motion = settings.motion
rotation = settings.rotation ?? 0 rotation = settings.rotation ?? 0
} else { } else {
backgroundColors = [] if let image = chatControllerBackgroundImage(theme: nil, wallpaper: wallpaper, mediaBox: strongSelf.context.sharedContext.accountManager.mediaBox, knockoutMode: false) {
backgroundColors = [averageColor(from: image).rgb]
} else if let image = chatControllerBackgroundImage(theme: nil, wallpaper: wallpaper, mediaBox: strongSelf.context.account.postbox.mediaBox, knockoutMode: false) {
backgroundColors = [averageColor(from: image).rgb]
} else {
backgroundColors = [UIColor.gray.rgb]
}
} }
} }

16
submodules/SettingsUI/Sources/Themes/WallpaperColorPanelNode.swift
View File

@ -525,19 +525,21 @@ final class WallpaperColorPanelNode: ASDisplayNode {
if colorWasRemovable != self.multiColorFieldNode.isRemovable { if colorWasRemovable != self.multiColorFieldNode.isRemovable {
updateLayout = true updateLayout = true
} }
if let index = self.state.selection {
if self.state.colors.count > index {
self.colorPickerNode.color = UIColor(rgb: self.state.colors[index])
}
}
if updateLayout, let size = self.validLayout { if updateLayout, let size = self.validLayout {
if let index = self.state.selection {
if self.state.colors.count > index {
self.colorPickerNode.color = UIColor(rgb: self.state.colors[index])
}
}
self.updateLayout(size: size, transition: animated ? .animated(duration: 0.3, curve: .easeInOut) : .immediate) self.updateLayout(size: size, transition: animated ? .animated(duration: 0.3, curve: .easeInOut) : .immediate)
} }
if let index = state.selection { if let index = state.selection {
self.multiColorFieldNode.setColor(UIColor(rgb: self.state.colors[index]), update: false) if self.state.colors.count > index {
self.multiColorFieldNode.setColor(UIColor(rgb: self.state.colors[index]), update: false)
}
} }
for i in 0 ..< state.colors.count { for i in 0 ..< state.colors.count {

2
submodules/SyncCore/Sources/TelegramWallpaper.swift
View File

@ -242,7 +242,7 @@ public enum TelegramWallpaper: OrderedItemListEntryContents, Equatable {
case let .image(representations, _): case let .image(representations, _):
return .image(representations, settings) return .image(representations, settings)
case let .file(id, accessHash, isCreator, isDefault, isPattern, isDark, slug, file, _): case let .file(id, accessHash, isCreator, isDefault, isPattern, isDark, slug, file, _):
return .file(id: id, accessHash: accessHash, isCreator: isCreator, isDefault: isDefault, isPattern: settings.colors.isEmpty ? isPattern : true, isDark: isDark, slug: slug, file: file, settings: settings) return .file(id: id, accessHash: accessHash, isCreator: isCreator, isDefault: isDefault, isPattern: isPattern, isDark: isDark, slug: slug, file: file, settings: settings)
} }
} }
} }

1
submodules/TelegramPresentationData/BUILD
View File

@ -17,6 +17,7 @@ swift_library(
"//submodules/AppBundle:AppBundle", "//submodules/AppBundle:AppBundle",
"//submodules/StringPluralization:StringPluralization", "//submodules/StringPluralization:StringPluralization",
"//submodules/Sunrise:Sunrise", "//submodules/Sunrise:Sunrise",
"//submodules/TinyThumbnail:TinyThumbnail",
], ],
visibility = [ visibility = [
"//visibility:public", "//visibility:public",

63
submodules/TelegramPresentationData/Sources/ChatControllerBackgroundNode.swift
View File

@ -8,6 +8,7 @@ import SwiftSignalKit
import Postbox import Postbox
import MediaResources import MediaResources
import AppBundle import AppBundle
import TinyThumbnail
private var backgroundImageForWallpaper: (TelegramWallpaper, Bool, UIImage)? private var backgroundImageForWallpaper: (TelegramWallpaper, Bool, UIImage)?
@ -225,24 +226,46 @@ public func chatControllerBackgroundImageSignal(wallpaper: TelegramWallpaper, me
} else { } else {
if file.settings.blur { if file.settings.blur {
let representation = CachedBlurredWallpaperRepresentation() let representation = CachedBlurredWallpaperRepresentation()
let effectiveMediaBox: MediaBox
if FileManager.default.fileExists(atPath: mediaBox.cachedRepresentationCompletePath(file.file.resource.id, representation: representation)) { if FileManager.default.fileExists(atPath: mediaBox.cachedRepresentationCompletePath(file.file.resource.id, representation: representation)) {
effectiveMediaBox = mediaBox let effectiveMediaBox = mediaBox
} else {
effectiveMediaBox = accountMediaBox return effectiveMediaBox.cachedResourceRepresentation(file.file.resource, representation: representation, complete: true, fetch: true, attemptSynchronously: true)
} |> map { data -> (UIImage?, Bool)? in
if data.complete {
return effectiveMediaBox.cachedResourceRepresentation(file.file.resource, representation: representation, complete: true, fetch: true, attemptSynchronously: true) return (UIImage(contentsOfFile: data.path)?.precomposed(), true)
|> map { data -> (UIImage?, Bool)? in } else {
if data.complete { return nil
return (UIImage(contentsOfFile: data.path)?.precomposed(), true) }
} else { }
return nil |> afterNext { image in
cacheWallpaper(image?.0)
}
} else {
return Signal { subscriber in
let fetch = fetchedMediaResource(mediaBox: accountMediaBox, reference: MediaResourceReference.wallpaper(wallpaper: WallpaperReference.slug(file.slug), resource: file.file.resource)).start()
var didOutputBlurred = false
let data = accountMediaBox.cachedResourceRepresentation(file.file.resource, representation: representation, complete: true, fetch: true, attemptSynchronously: true).start(next: { data in
if data.complete {
if let image = UIImage(contentsOfFile: data.path)?.precomposed() {
mediaBox.copyResourceData(file.file.resource.id, fromTempPath: data.path)
subscriber.putNext((image, true))
}
} else if !didOutputBlurred {
didOutputBlurred = true
if let immediateThumbnailData = file.file.immediateThumbnailData, let decodedData = decodeTinyThumbnail(data: immediateThumbnailData) {
if let image = UIImage(data: decodedData)?.precomposed() {
subscriber.putNext((image, false))
}
}
}
})
return ActionDisposable {
fetch.dispose()
data.dispose()
}
} }
}
|> afterNext { image in
cacheWallpaper(image?.0)
} }
} else { } else {
var path: String? var path: String?
@ -259,12 +282,20 @@ public func chatControllerBackgroundImageSignal(wallpaper: TelegramWallpaper, me
} else { } else {
return Signal { subscriber in return Signal { subscriber in
let fetch = fetchedMediaResource(mediaBox: accountMediaBox, reference: MediaResourceReference.wallpaper(wallpaper: WallpaperReference.slug(file.slug), resource: file.file.resource)).start() let fetch = fetchedMediaResource(mediaBox: accountMediaBox, reference: MediaResourceReference.wallpaper(wallpaper: WallpaperReference.slug(file.slug), resource: file.file.resource)).start()
var didOutputBlurred = false
let data = accountMediaBox.resourceData(file.file.resource).start(next: { data in let data = accountMediaBox.resourceData(file.file.resource).start(next: { data in
if data.complete { if data.complete {
if let image = UIImage(contentsOfFile: data.path)?.precomposed() { if let image = UIImage(contentsOfFile: data.path)?.precomposed() {
mediaBox.copyResourceData(file.file.resource.id, fromTempPath: data.path) mediaBox.copyResourceData(file.file.resource.id, fromTempPath: data.path)
subscriber.putNext((image, true)) subscriber.putNext((image, true))
} }
} else if !didOutputBlurred {
didOutputBlurred = true
if let immediateThumbnailData = file.file.immediateThumbnailData, let decodedData = decodeTinyThumbnail(data: immediateThumbnailData) {
if let image = UIImage(data: decodedData)?.precomposed() {
subscriber.putNext((image, false))
}
}
} }
}) })