diff --git a/submodules/AccountContext/BUILD b/submodules/AccountContext/BUILD index fbc7f6c627..a28b4a4daa 100644 --- a/submodules/AccountContext/BUILD +++ b/submodules/AccountContext/BUILD @@ -20,7 +20,7 @@ swift_library( "//submodules/Postbox:Postbox", "//submodules/TelegramCore:TelegramCore", "//submodules/MusicAlbumArtResources:MusicAlbumArtResources", - "//submodules/MeshAnimationCache:MeshAnimationCache" + #"//submodules/MeshAnimationCache:MeshAnimationCache" ], visibility = [ "//visibility:public", diff --git a/submodules/AccountContext/Sources/AccountContext.swift b/submodules/AccountContext/Sources/AccountContext.swift index b6eeed0ce3..8be6add26d 100644 --- a/submodules/AccountContext/Sources/AccountContext.swift +++ b/submodules/AccountContext/Sources/AccountContext.swift @@ -10,7 +10,7 @@ import AsyncDisplayKit import Display import DeviceLocationManager import TemporaryCachedPeerDataManager -import MeshAnimationCache +//import MeshAnimationCache public final class TelegramApplicationOpenUrlCompletion { public let completion: (Bool) -> Void @@ -737,7 +737,7 @@ public protocol AccountContext: AnyObject { var currentAppConfiguration: Atomic { get } var cachedGroupCallContexts: AccountGroupCallContextCache { get } - var meshAnimationCache: MeshAnimationCache { get } + //var meshAnimationCache: MeshAnimationCache { get } func storeSecureIdPassword(password: String) func getStoredSecureIdPassword() -> String? diff --git a/submodules/MeshAnimationCache/Sources/MeshAnimationCache.swift b/submodules/MeshAnimationCache/Sources/MeshAnimationCache.swift index 8e0e9fba7f..114254fc20 100644 --- a/submodules/MeshAnimationCache/Sources/MeshAnimationCache.swift +++ b/submodules/MeshAnimationCache/Sources/MeshAnimationCache.swift @@ -4,6 +4,8 @@ import Postbox import SwiftSignalKit import GZip +#error("Exclude") + public final class MeshAnimationCache { private final class Item { var isPending: Bool = false diff --git a/submodules/TelegramUI/BUILD b/submodules/TelegramUI/BUILD index 6c303a3abe..1dfb36ce03 100644 --- a/submodules/TelegramUI/BUILD +++ b/submodules/TelegramUI/BUILD @@ -243,8 +243,8 @@ swift_library( "//submodules/AdUI:AdUI", "//submodules/SparseItemGrid:SparseItemGrid", "//submodules/CalendarMessageScreen:CalendarMessageScreen", - "//submodules/LottieMeshSwift:LottieMeshSwift", - "//submodules/MeshAnimationCache:MeshAnimationCache", + #"//submodules/LottieMeshSwift:LottieMeshSwift", + #"//submodules/MeshAnimationCache:MeshAnimationCache", "//submodules/DirectMediaImageCache:DirectMediaImageCache", ] + select({ "@build_bazel_rules_apple//apple:ios_armv7": [], diff --git a/submodules/TelegramUI/Sources/AccountContext.swift b/submodules/TelegramUI/Sources/AccountContext.swift index 9249524e72..6ce770d6be 100644 --- a/submodules/TelegramUI/Sources/AccountContext.swift +++ b/submodules/TelegramUI/Sources/AccountContext.swift @@ -16,7 +16,7 @@ import TelegramCallsUI import TelegramBaseController import AsyncDisplayKit import PresentationDataUtils -import MeshAnimationCache +//import MeshAnimationCache private final class DeviceSpecificContactImportContext { let disposable = MetaDisposable() @@ -156,7 +156,7 @@ public final class AccountContextImpl: AccountContext { private var experimentalUISettingsDisposable: Disposable? public let cachedGroupCallContexts: AccountGroupCallContextCache - public let meshAnimationCache: MeshAnimationCache + //public let meshAnimationCache: MeshAnimationCache public init(sharedContext: SharedAccountContextImpl, account: Account, limitsConfiguration: LimitsConfiguration, contentSettings: ContentSettings, appConfiguration: AppConfiguration, temp: Bool = false) { @@ -189,7 +189,7 @@ public final class AccountContextImpl: AccountContext { } self.cachedGroupCallContexts = AccountGroupCallContextCacheImpl() - self.meshAnimationCache = MeshAnimationCache(mediaBox: account.postbox.mediaBox) + //self.meshAnimationCache = MeshAnimationCache(mediaBox: account.postbox.mediaBox) let updatedLimitsConfiguration = account.postbox.preferencesView(keys: [PreferencesKeys.limitsConfiguration]) |> map { preferences -> LimitsConfiguration in diff --git a/submodules/TelegramUI/Sources/ChatMessageAnimatedStickerItemNode.swift b/submodules/TelegramUI/Sources/ChatMessageAnimatedStickerItemNode.swift index 98bbc29b46..5fa2f2a777 100644 --- a/submodules/TelegramUI/Sources/ChatMessageAnimatedStickerItemNode.swift +++ b/submodules/TelegramUI/Sources/ChatMessageAnimatedStickerItemNode.swift @@ -24,7 +24,7 @@ import ShimmerEffect import WallpaperBackgroundNode import LocalMediaResources import AppBundle -import LottieMeshSwift +//import LottieMeshSwift private let nameFont = Font.medium(14.0) private let inlineBotPrefixFont = Font.regular(14.0) @@ -1435,7 +1435,7 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView { let incomingMessage = item.message.effectivelyIncoming(item.context.account.peerId) - if #available(iOS 13.0, *), item.context.sharedContext.immediateExperimentalUISettings.acceleratedStickers, let meshAnimation = item.context.meshAnimationCache.get(resource: file.resource) { + /*if #available(iOS 13.0, *), item.context.sharedContext.immediateExperimentalUISettings.acceleratedStickers, let meshAnimation = item.context.meshAnimationCache.get(resource: file.resource) { var overlayMeshAnimationNode: ChatMessageTransitionNode.DecorationItemNode? if let current = self.overlayMeshAnimationNode { overlayMeshAnimationNode = current @@ -1466,7 +1466,7 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView { if let meshRenderer = overlayMeshAnimationNode?.contentView as? MeshRenderer { meshRenderer.add(mesh: meshAnimation, offset: CGPoint(x: CGFloat.random(in: -30.0 ... 30.0), y: CGFloat.random(in: -30.0 ... 30.0))) } - } else { + } else*/ do { let pathPrefix = item.context.account.postbox.mediaBox.shortLivedResourceCachePathPrefix(file.resource.id) let additionalAnimationNode = AnimatedStickerNode() additionalAnimationNode.setup(source: source, width: Int(animationSize.width * 2.0), height: Int(animationSize.height * 2.0), playbackMode: .once, mode: .direct(cachePathPrefix: pathPrefix))