From 113428aa13ed69a00705512f8524f1d8d84f16d0 Mon Sep 17 00:00:00 2001
From: Peter <>
Date: Mon, 15 Oct 2018 17:41:02 +0300
Subject: [PATCH] Added icon for downloaded music

---
 .../FileCloudFetched.imageset/Contents.json   |  12 +++++++
 .../FileCloudFetched.imageset/phone.pdf       | Bin 0 -> 4213 bytes
 .../ChatMessageInteractiveFileNode.swift      |  31 +++++++++---------
 TelegramUI/PresentationResourceKey.swift      |   2 ++
 TelegramUI/PresentationResourcesChat.swift    |  12 +++++++
 5 files changed, 42 insertions(+), 15 deletions(-)
 create mode 100644 Images.xcassets/Chat/Message/FileCloudFetched.imageset/Contents.json
 create mode 100644 Images.xcassets/Chat/Message/FileCloudFetched.imageset/phone.pdf

diff --git a/Images.xcassets/Chat/Message/FileCloudFetched.imageset/Contents.json b/Images.xcassets/Chat/Message/FileCloudFetched.imageset/Contents.json
new file mode 100644
index 0000000000..70484f8552
--- /dev/null
+++ b/Images.xcassets/Chat/Message/FileCloudFetched.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "phone.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/Images.xcassets/Chat/Message/FileCloudFetched.imageset/phone.pdf b/Images.xcassets/Chat/Message/FileCloudFetched.imageset/phone.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..8aef36688bb8535471a575e9513f4bf49691d9f5
GIT binary patch
literal 4213
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
BG~ECI

literal 0
HcmV?d00001

diff --git a/TelegramUI/ChatMessageInteractiveFileNode.swift b/TelegramUI/ChatMessageInteractiveFileNode.swift
index a80593dc5c..a695098d5e 100644
--- a/TelegramUI/ChatMessageInteractiveFileNode.swift
+++ b/TelegramUI/ChatMessageInteractiveFileNode.swift
@@ -46,6 +46,7 @@ final class ChatMessageInteractiveFileNode: ASDisplayNode {
     private var streamingCacheStatusFrame: CGRect?
     private var fileIconImage: UIImage?
     private var cloudFetchIconImage: UIImage?
+    private var cloudFetchedIconImage: UIImage?
     
     override init() {
         self.titleNode = TextNode()
@@ -322,14 +323,7 @@ final class ChatMessageInteractiveFileNode: ASDisplayNode {
                 let streamingProgressDiameter: CGFloat = 28.0
                 var hasStreamingProgress = false
                 if isAudio && !isVoice {
-                    if let resourceStatus = currentResourceStatus {
-                        switch resourceStatus.fetchStatus {
-                            case .Fetching, .Remote:
-                                hasStreamingProgress = true
-                            case .Local:
-                                break
-                        }
-                    }
+                    hasStreamingProgress = true
                     
                     if hasStreamingProgress {
                         textConstrainedSize.width -= streamingProgressDiameter + 4.0
@@ -359,9 +353,11 @@ final class ChatMessageInteractiveFileNode: ASDisplayNode {
                 }
                 
                 var cloudFetchIconImage: UIImage?
+                var cloudFetchedIconImage: UIImage?
                 if hasStreamingProgress {
                     minLayoutWidth += streamingProgressDiameter + 4.0
                     cloudFetchIconImage = incoming ? PresentationResourcesChat.chatBubbleFileCloudFetchIncomingIcon(presentationData.theme.theme) : PresentationResourcesChat.chatBubbleFileCloudFetchOutgoingIcon(presentationData.theme.theme)
+                    cloudFetchedIconImage = incoming ? PresentationResourcesChat.chatBubbleFileCloudFetchedIncomingIcon(presentationData.theme.theme) : PresentationResourcesChat.chatBubbleFileCloudFetchedOutgoingIcon(presentationData.theme.theme)
                 }
                 
                 let fileIconImage: UIImage?
@@ -431,7 +427,7 @@ final class ChatMessageInteractiveFileNode: ASDisplayNode {
                     }
                     
                     if isAudio && !isVoice {
-                        streamingCacheStatusFrame = CGRect(origin: CGPoint(x: fittedLayoutSize.width + 6.0, y: 4.0), size: CGSize(width: streamingProgressDiameter, height: streamingProgressDiameter))
+                        streamingCacheStatusFrame = CGRect(origin: CGPoint(x: fittedLayoutSize.width + 6.0, y: 8.0), size: CGSize(width: streamingProgressDiameter, height: streamingProgressDiameter))
                         if hasStreamingProgress {
                             fittedLayoutSize.width += streamingProgressDiameter + 6.0
                         }
@@ -531,7 +527,7 @@ final class ChatMessageInteractiveFileNode: ASDisplayNode {
                                 strongSelf.statusDisposable.set((updatedStatusSignal |> deliverOnMainQueue).start(next: { [weak strongSelf] status in
                                     displayLinkDispatcher.dispatch {
                                         if let strongSelf = strongSelf {
-                                            var previousHadCacheStatus = false
+                                            /*var previousHadCacheStatus = false
                                             if let resourceStatus = strongSelf.resourceStatus {
                                                 switch resourceStatus.fetchStatus {
                                                     case .Fetching, .Remote:
@@ -546,13 +542,13 @@ final class ChatMessageInteractiveFileNode: ASDisplayNode {
                                                     hasCacheStatus = true
                                                 case .Local:
                                                     hasCacheStatus = false
-                                            }
+                                            }*/
                                             strongSelf.resourceStatus = status
-                                            if isAudio && !isVoice && previousHadCacheStatus != hasCacheStatus {
+                                            /*if isAudio && !isVoice && previousHadCacheStatus != hasCacheStatus {
                                                 strongSelf.requestUpdateLayout(false)
-                                            } else {
+                                            } else {*/
                                                 strongSelf.updateStatus()
-                                            }
+                                            //}
                                         }
                                     }
                                 }))
@@ -567,6 +563,7 @@ final class ChatMessageInteractiveFileNode: ASDisplayNode {
                             strongSelf.streamingCacheStatusFrame = streamingCacheStatusFrame
                             strongSelf.fileIconImage = fileIconImage
                             strongSelf.cloudFetchIconImage = cloudFetchIconImage
+                            strongSelf.cloudFetchedIconImage = cloudFetchedIconImage
                             
                             if let updatedFetchControls = updatedFetchControls {
                                 let _ = strongSelf.fetchControls.swap(updatedFetchControls)
@@ -632,7 +629,11 @@ final class ChatMessageInteractiveFileNode: ASDisplayNode {
                     }
                     streamingState = .cloudProgress(color: streamingStatusForegroundColor, strokeBackgroundColor: streamingStatusBackgroundColor, lineWidth: 2.0, value: CGFloat(adjustedProgress))
                 case .Local:
-                    streamingState = .none
+                    if let cloudFetchedIconImage = self.cloudFetchedIconImage {
+                        streamingState = .customIcon(cloudFetchedIconImage)
+                    } else {
+                        streamingState = .none
+                    }
                 case .Remote:
                     if let cloudFetchIconImage = self.cloudFetchIconImage {
                         streamingState = .customIcon(cloudFetchIconImage)
diff --git a/TelegramUI/PresentationResourceKey.swift b/TelegramUI/PresentationResourceKey.swift
index f306ec92c9..2b6616617e 100644
--- a/TelegramUI/PresentationResourceKey.swift
+++ b/TelegramUI/PresentationResourceKey.swift
@@ -112,6 +112,8 @@ enum PresentationResourceKey: Int32 {
     
     case chatBubbleFileCloudFetchIncomingIcon
     case chatBubbleFileCloudFetchOutgoingIcon
+    case chatBubbleFileCloudFetchedIncomingIcon
+    case chatBubbleFileCloudFetchedOutgoingIcon
     
     case chatBubbleReplyThumbnailPlayImage
     
diff --git a/TelegramUI/PresentationResourcesChat.swift b/TelegramUI/PresentationResourcesChat.swift
index 6f1fc9b850..9c25036f3d 100644
--- a/TelegramUI/PresentationResourcesChat.swift
+++ b/TelegramUI/PresentationResourcesChat.swift
@@ -1023,4 +1023,16 @@ struct PresentationResourcesChat {
             generateTintedImage(image: UIImage(bundleImageName: "Chat/Message/FileCloudFetch"), color: theme.chat.bubble.outgoingAccentControlColor)
         })
     }
+    
+    static func chatBubbleFileCloudFetchedIncomingIcon(_ theme: PresentationTheme) -> UIImage? {
+        return theme.image(PresentationResourceKey.chatBubbleFileCloudFetchedIncomingIcon.rawValue, { theme in
+            generateTintedImage(image: UIImage(bundleImageName: "Chat/Message/FileCloudFetched"), color: theme.chat.bubble.incomingAccentControlColor)
+        })
+    }
+    
+    static func chatBubbleFileCloudFetchedOutgoingIcon(_ theme: PresentationTheme) -> UIImage? {
+        return theme.image(PresentationResourceKey.chatBubbleFileCloudFetchedOutgoingIcon.rawValue, { theme in
+            generateTintedImage(image: UIImage(bundleImageName: "Chat/Message/FileCloudFetched"), color: theme.chat.bubble.outgoingAccentControlColor)
+        })
+    }
 }