Hide album cover and apply bubble activity theme while loading music files (#95)

* fix(ChatUI): hide album cover and apply bubble activity theme while loading music files

* fix(ChatUI): observe received music transfer status without changing playback

* fix(ChatUI): preserve music playback during streaming and downloads

* fix(ChatUI): avoid placeholder animations on initial music downloads

Author: CHUKEPC

packages/ChatUI/Package.swift

@@ -33,6 +33,7 @@ let deps: [(String, String)] = [
     ("CurrencyFormat", "../CurrencyFormat"),
     ("AlertsUI", "../AlertsUI"),
     ("AudioPlayerCore", "../AudioPlayerCore"),
+    ("FetchManager", "../FetchManager"),
     ("AvatarUI", "../AvatarUI"),
     ("BoostUI", "../BoostUI"),
     ("FilePanels", "../FilePanels"),
@@ -100,6 +101,6 @@ let package = Package(
             linkerSettings: [
                 .linkedFramework("Speech"),
             ]),
-        .testTarget(name: "ChatUITests", dependencies: ["ChatUI", .product(name: "SceneEffects", package: "SceneEffects", condition: nil), .product(name: "TGUIKit", package: "TGUIKit", condition: nil), .product(name: "TelegramTheme", package: "TelegramTheme", condition: nil), .product(name: "GeneralRows", package: "GeneralRows", condition: nil), .product(name: "InAppSettings", package: "InAppSettings", condition: nil), .product(name: "ColorPalette", package: "ColorPalette", condition: nil), .product(name: "ThemeSettings", package: "ThemeSettings", condition: nil), .product(name: "rnoise", package: "rnoise", condition: nil), .product(name: "Localization", package: "Localization", condition: nil), .product(name: "TelegramCore", package: "TelegramCore", condition: nil)], path: "Tests/ChatUITests"),
+        .testTarget(name: "ChatUITests", dependencies: ["ChatUI", .product(name: "AudioPlayerCore", package: "AudioPlayerCore", condition: nil), .product(name: "FetchManager", package: "FetchManager", condition: nil), .product(name: "SwiftSignalKit", package: "SSignalKit", condition: nil), .product(name: "SceneEffects", package: "SceneEffects", condition: nil), .product(name: "TGUIKit", package: "TGUIKit", condition: nil), .product(name: "TelegramTheme", package: "TelegramTheme", condition: nil), .product(name: "GeneralRows", package: "GeneralRows", condition: nil), .product(name: "InAppSettings", package: "InAppSettings", condition: nil), .product(name: "ColorPalette", package: "ColorPalette", condition: nil), .product(name: "ThemeSettings", package: "ThemeSettings", condition: nil), .product(name: "rnoise", package: "rnoise", condition: nil), .product(name: "Localization", package: "Localization", condition: nil), .product(name: "TelegramCore", package: "TelegramCore", condition: nil)], path: "Tests/ChatUITests"),
     ]
 )

packages/ChatUI/Sources/ChatUI/ChatAudioContentView.swift

@@ -300,13 +300,17 @@ public class ChatAudioContentView: ChatMediaContentView, APDelegate {
         }
         self.setNeedsDisplay()
 
-        if !self.hasFetchStatusForCurrentMedia {
-            self.fetchStatus = self.initialFetchStatus
-        }
+        initializeFetchStatus()
         checkState(animated: animated)
 
     }
 
+    func initializeFetchStatus() {
+        if !hasFetchStatusForCurrentMedia {
+            fetchStatus = initialFetchStatus
+        }
+    }
+
     public var leftInset:CGFloat {
         return 40.0 + 10.0;
     }

packages/ChatUI/Sources/ChatUI/ChatMusicContentView.swift

@@ -16,6 +16,14 @@ import ColorPalette
 import MessageUtils
 import FoundationUtils
 import AudioPlayerCore
+import FetchManager
+
+func chatMusicFetchStatus(fetchManager: FetchManager, message: Message?, file: TelegramMediaFile) -> Signal<MediaResourceStatus, NoError> {
+    guard let message = message, !(file.resource is LocalFileReferenceMediaResource) else {
+        return .single(.Local)
+    }
+    return fetchManager.fetchStatus(category: .file, location: .chat(message.id.peerId), locationKey: .messageId(message.id), resource: file.resource, reportExternalFetches: false)
+}
 
 public class ChatMusicContentView: ChatAudioContentView {
     private let imageView: TransformImageView = TransformImageView(frame: NSMakeRect(0, 0, 40, 40))
@@ -24,29 +32,41 @@ public class ChatMusicContentView: ChatAudioContentView {
     public required init(frame frameRect: NSRect) {
         super.init(frame: frameRect)
         addSubview(imageView, positioned: .below, relativeTo: progressView)
-        progressView.theme = RadialProgressTheme(backgroundColor: theme.colors.blackTransparent, foregroundColor: .white, icon: nil)
     }
-    
+
     public override var fetchStatus: MediaResourceStatus? {
         didSet {
-            if let fetchStatus = fetchStatus {
-                switch fetchStatus {
-                case let .Fetching(_, progress), let .Paused(progress):
-                    let sentGrouped = parent?.groupingKey != nil && (parent!.flags.contains(.Sending) || parent!.flags.contains(.Unsent))
-                    if progress == 1.0, sentGrouped {
-                        progressView.setState(.Success, animated: statusChangeIsAnimatable)
-                    } else {
-                        progressView.setState(.Fetching(progress: progress, force: false), animated: statusChangeIsAnimatable)
-                    }
-                    progressView.isHidden = false
-                case .Remote:
-                    progressView.isHidden = true
-                case .Local:
-                    progressView.isHidden = true
-                }
-            }
+            updateFetchPresentation()
         }
     }
+
+    private func updateFetchPresentation() {
+        let presentation: ChatMediaPresentation = parameters?.presentation ?? .Empty
+        let showProgress: Bool
+        switch fetchStatus {
+        case .Fetching?, .Paused?:
+            showProgress = playAnimationView == nil || (parent?.flags.contains(.Unsent) == true && parent?.flags.contains(.Failed) != true)
+        default:
+            showProgress = false
+        }
+        if showProgress {
+            progressView.theme = RadialProgressTheme(backgroundColor: presentation.activityBackground, foregroundColor: presentation.activityForeground, icon: nil, blendMode: presentation.blendingMode)
+        }
+        progressView.isHidden = !showProgress
+        imageView.isHidden = showProgress
+    }
+
+    public override func executeInteraction(_ isControl: Bool) {
+        if !isControl, userInteractionEnabled, parent?.flags.contains(.Unsent) != true || parent?.flags.contains(.Failed) == true {
+            open()
+        } else {
+            super.executeInteraction(isControl)
+        }
+    }
+
+    public override func draggingAbility(_ event: NSEvent) -> Bool {
+        return NSPointInRect(convert(event.locationInWindow, from: nil), bounds)
+    }
 
     public override func viewDidMoveToWindow() {
         if window != nil {
@@ -67,8 +87,14 @@ public class ChatMusicContentView: ChatAudioContentView {
     }
 
     public override func update(with media: Media, size: NSSize, context: any AccountContextProtocol, parent: Message?, table: TableView?, parameters: ChatMediaLayoutParameters?, animated: Bool, positionFlags: LayoutPositionFlags? = nil, approximateSynchronousValue: Bool = false) {
+        self.statusDisposable.set(nil)
         super.update(with: media, size: size, context: context, parent: parent, table: table, parameters: parameters, animated: animated, positionFlags: positionFlags)
-        
+
+        if let file = media as? TelegramMediaFile, parent?.flags.contains(.Unsent) != true || parent?.flags.contains(.Failed) == true {
+            self.updateFetchStatus(chatMusicFetchStatus(fetchManager: context.fetchManager, message: parent, file: file))
+        }
+        updateFetchPresentation()
+
         if let parameters = parameters as? ChatMediaMusicLayoutParameters {
             textView.update(parameters.nameLayout)
             durationView.update(parameters.durationLayout)
@@ -114,30 +140,44 @@ public class ChatMusicContentView: ChatAudioContentView {
       //  imageView.layer?.cornerRadius = 20
     }
 
+    override func initializeFetchStatus() {
+        if !hasFetchStatusForCurrentMedia {
+            fetchStatus = nil
+        }
+    }
+
+    func updateFetchStatus(_ status: Signal<MediaResourceStatus, NoError>) {
+        self.statusDisposable.set((status |> deliverOnMainQueue).start(next: { [weak self] status in
+            self?.fetchStatus = status
+        }))
+    }
+
     public override func checkState(animated: Bool) {
-        if let parent = parent, let controller = ChatMediaUIHooks.shared.getAudioPlayer(context), let song = controller.currentSong {
-            if song.entry.isEqual(to: parent) {
-                if playAnimationView == nil {
-                    playAnimationView = PeerMediaPlayerAnimationView()
-                    playAnimationView?.layer?.cornerRadius = 20
-                    imageView.addSubview(playAnimationView!)
-                }
-                if case .playing = song.state {
-                    playAnimationView?.isPlaying = true
-                } else if case .stoped = song.state {
-                    playAnimationView?.removeFromSuperview()
-                    playAnimationView = nil
-                } else  {
-                    playAnimationView?.isPlaying = false
-                }
-            } else {
-                playAnimationView?.removeFromSuperview()
-                playAnimationView = nil
-            }
+        if let parent = parent, let controller = ChatMediaUIHooks.shared.getAudioPlayer(context), let song = controller.currentSong, song.entry.isEqual(to: parent) {
+            updatePlaybackState(song.state)
         } else {
+            updatePlaybackState(nil)
+        }
+    }
+
+    func updatePlaybackState(_ state: APState?) {
+        switch state {
+        case .none, .stoped?:
             playAnimationView?.removeFromSuperview()
             playAnimationView = nil
+        default:
+            if playAnimationView == nil {
+                playAnimationView = PeerMediaPlayerAnimationView()
+                playAnimationView?.layer?.cornerRadius = 20
+                imageView.addSubview(playAnimationView!)
+            }
+            if case .playing? = state {
+                playAnimationView?.isPlaying = true
+            } else {
+                playAnimationView?.isPlaying = false
+            }
         }
+        updateFetchPresentation()
     }
 
     public override func preloadStreamblePart() {