From 43f324405e1e1a974bb4b37fe55804151f6fe2b2 Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Tue, 5 Jan 2016 15:13:42 +0800
Subject: [PATCH] show DiscoveredAttachment's image if it isTemporary

---
 Yep/Services/YepService.swift                         |  4 ++++
 .../NewFeed/NewFeedViewController.swift               |  2 +-
 Yep/Views/Cells/Feed/FeedBiggerImageCell.swift        |  9 +++++++--
 Yep/Views/Cells/Feed/FeedNormalImagesCell.swift       | 10 ++++++++--
 Yep/Views/Cells/FeedMedia/FeedMediaCell.swift         | 11 ++++++++---
 5 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/Yep/Services/YepService.swift b/Yep/Services/YepService.swift
index 51ee2984..454783de 100644
--- a/Yep/Services/YepService.swift
+++ b/Yep/Services/YepService.swift
@@ -2778,6 +2778,10 @@ struct DiscoveredAttachment {
 
     var image: UIImage?
 
+    var isTemporary: Bool {
+        return image != nil
+    }
+
     var thumbnailImage: UIImage? {
 
         guard (metadata as NSString).length > 0 else {
diff --git a/Yep/ViewControllers/NewFeed/NewFeedViewController.swift b/Yep/ViewControllers/NewFeed/NewFeedViewController.swift
index d9d1f0d7..501e9b2d 100644
--- a/Yep/ViewControllers/NewFeed/NewFeedViewController.swift
+++ b/Yep/ViewControllers/NewFeed/NewFeedViewController.swift
@@ -585,7 +585,7 @@ class NewFeedViewController: SegueViewController {
             // resize to smaller, not need fixRotation
 
             if let image = image.resizeToSize(fixedSize, withInterpolationQuality: .Medium) {
-                return DiscoveredAttachment(metadata: "", URLString: "", image: nil)
+                return DiscoveredAttachment(metadata: "", URLString: "", image: image)
             } else {
                 return nil
             }
diff --git a/Yep/Views/Cells/Feed/FeedBiggerImageCell.swift b/Yep/Views/Cells/Feed/FeedBiggerImageCell.swift
index f0627b24..0cb4be0f 100644
--- a/Yep/Views/Cells/Feed/FeedBiggerImageCell.swift
+++ b/Yep/Views/Cells/Feed/FeedBiggerImageCell.swift
@@ -71,8 +71,13 @@ class FeedBiggerImageCell: FeedBasicCell {
         }
 
         if let onlyAttachment = feed.imageAttachments?.first {
-            biggerImageView.yep_showActivityIndicatorWhenLoading = true
-            biggerImageView.yep_setImageOfAttachment(onlyAttachment, withSize: YepConfig.FeedBiggerImageCell.imageSize)
+            if onlyAttachment.isTemporary {
+                biggerImageView.image = onlyAttachment.image
+
+            } else {
+                biggerImageView.yep_showActivityIndicatorWhenLoading = true
+                biggerImageView.yep_setImageOfAttachment(onlyAttachment, withSize: YepConfig.FeedBiggerImageCell.imageSize)
+            }
         }
 
         if layoutCache.layout == nil {
diff --git a/Yep/Views/Cells/Feed/FeedNormalImagesCell.swift b/Yep/Views/Cells/Feed/FeedNormalImagesCell.swift
index 29eec605..32c2ed51 100644
--- a/Yep/Views/Cells/Feed/FeedNormalImagesCell.swift
+++ b/Yep/Views/Cells/Feed/FeedNormalImagesCell.swift
@@ -112,8 +112,14 @@ class FeedNormalImagesCell: FeedBasicCell {
             for i in 0..<imageViews.count {
 
                 if let attachment = attachments[safe: i] {
-                    imageViews[i].yep_showActivityIndicatorWhenLoading = true
-                    imageViews[i].yep_setImageOfAttachment(attachment, withSize: YepConfig.FeedNormalImagesCell.imageSize)
+
+                    if attachment.isTemporary {
+                        imageViews[i].image = attachment.image
+
+                    } else {
+                        imageViews[i].yep_showActivityIndicatorWhenLoading = true
+                        imageViews[i].yep_setImageOfAttachment(attachment, withSize: YepConfig.FeedNormalImagesCell.imageSize)
+                    }
 
                     imageViews[i].hidden = false
 
diff --git a/Yep/Views/Cells/FeedMedia/FeedMediaCell.swift b/Yep/Views/Cells/FeedMedia/FeedMediaCell.swift
index 47b54425..e53e7a2e 100644
--- a/Yep/Views/Cells/FeedMedia/FeedMediaCell.swift
+++ b/Yep/Views/Cells/FeedMedia/FeedMediaCell.swift
@@ -38,10 +38,15 @@ class FeedMediaCell: UICollectionViewCell {
 
     func configureWithAttachment(attachment: DiscoveredAttachment, bigger: Bool) {
 
-        let size = bigger ? feedAttachmentBiggerImageSize : feedAttachmentImageSize
+        if attachment.isTemporary {
+            imageView.image = attachment.image
 
-        imageView.yep_showActivityIndicatorWhenLoading = true
-        imageView.yep_setImageOfAttachment(attachment, withSize: size)
+        } else {
+            let size = bigger ? feedAttachmentBiggerImageSize : feedAttachmentImageSize
+
+            imageView.yep_showActivityIndicatorWhenLoading = true
+            imageView.yep_setImageOfAttachment(attachment, withSize: size)
+        }
 
         deleteImageView.hidden = true
     }