home/Yep
2
0
Fork 0
mirror of https://github.com/wahyd4/Yep.git synced 2026-08-09 04:46:35 +10:00
Code Issues Packages Projects Releases Wiki Activity

rename FeedAnyImagesCell

Browse Source
This commit is contained in:
nixzhu
2015-12-17 13:51:19 +08:00
parent 0cca79402e
commit 9a89c64c99
4 changed files with 18 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Yep.xcodeproj/project.pbxproj
+4 -4
View File
@@ -316,7 +316,7 @@
50F5AF831BBA67060033C9BC /* NewFeedViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50F5AF821BBA67060033C9BC /* NewFeedViewController.swift */; };
50F5AF861BBA676D0033C9BC /* NewFeed.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50F5AF851BBA676D0033C9BC /* NewFeed.storyboard */; };
50F5AF881BBBB2AE0033C9BC /* HorizontalLineView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50F5AF871BBBB2AE0033C9BC /* HorizontalLineView.swift */; };
50F5AF8C1BBBB64C0033C9BC /* FeedCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50F5AF8A1BBBB64C0033C9BC /* FeedCell.swift */; };
50F5AF8C1BBBB64C0033C9BC /* FeedAnyImagesCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50F5AF8A1BBBB64C0033C9BC /* FeedAnyImagesCell.swift */; };
50F5AF951BBBCDA30033C9BC /* FeedMediaAddCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50F5AF931BBBCDA30033C9BC /* FeedMediaAddCell.swift */; };
50F5AF961BBBCDA30033C9BC /* FeedMediaAddCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 50F5AF941BBBCDA30033C9BC /* FeedMediaAddCell.xib */; };
50F5AF991BBBD02A0033C9BC /* FeedMediaCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50F5AF971BBBD02A0033C9BC /* FeedMediaCell.swift */; };
@@ -680,7 +680,7 @@
50F5AF821BBA67060033C9BC /* NewFeedViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = NewFeedViewController.swift; path = ViewControllers/NewFeed/NewFeedViewController.swift; sourceTree = "<group>"; };
50F5AF851BBA676D0033C9BC /* NewFeed.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = NewFeed.storyboard; path = ViewControllers/NewFeed/NewFeed.storyboard; sourceTree = "<group>"; };
50F5AF871BBBB2AE0033C9BC /* HorizontalLineView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = HorizontalLineView.swift; path = Views/HorizontalLine/HorizontalLineView.swift; sourceTree = "<group>"; };
50F5AF8A1BBBB64C0033C9BC /* FeedCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = FeedCell.swift; path = Views/Cells/Feed/FeedCell.swift; sourceTree = "<group>"; };
50F5AF8A1BBBB64C0033C9BC /* FeedAnyImagesCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = FeedAnyImagesCell.swift; path = Views/Cells/Feed/FeedAnyImagesCell.swift; sourceTree = "<group>"; };
50F5AF931BBBCDA30033C9BC /* FeedMediaAddCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = FeedMediaAddCell.swift; path = Views/Cells/FeedMediaAdd/FeedMediaAddCell.swift; sourceTree = "<group>"; };
50F5AF941BBBCDA30033C9BC /* FeedMediaAddCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = FeedMediaAddCell.xib; path = Views/Cells/FeedMediaAdd/FeedMediaAddCell.xib; sourceTree = "<group>"; };
50F5AF971BBBD02A0033C9BC /* FeedMediaCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = FeedMediaCell.swift; path = Views/Cells/FeedMedia/FeedMediaCell.swift; sourceTree = "<group>"; };
@@ -1961,9 +1961,9 @@
isa = PBXGroup;
children = (
50858EBA1C22487900EDE492 /* FeedBasicCell.swift */,
50F5AF8A1BBBB64C0033C9BC /* FeedCell.swift */,
50858EBE1C224DA900EDE492 /* FeedBiggerImageCell.swift */,
50E392BB1C22752C00C0CECB /* FeedNormalImagesCell.swift */,
50F5AF8A1BBBB64C0033C9BC /* FeedAnyImagesCell.swift */,
50858EBC1C22488100EDE492 /* FeedSocialWorkCell.swift */,
);
name = Feed;
@@ -2750,7 +2750,7 @@
505082351C212E9200643CEB /* FeedLocationContainerView.swift in Sources */,
0A3E60671ACCAECE003DC853 /* YepLocationService.swift in Sources */,
6A8215051BCBE5170011F36C /* MiniCardSkillLayout.swift in Sources */,
50F5AF8C1BBBB64C0033C9BC /* FeedCell.swift in Sources */,
50F5AF8C1BBBB64C0033C9BC /* FeedAnyImagesCell.swift in Sources */,
50894CF11AEA4726000981AF /* SettingsViewController.swift in Sources */,
5023DE2A1AB685BA00B3EE96 /* ContactsViewController.swift in Sources */,
50CDBE491ACBAD3200459CE0 /* ChatLeftImageCell.swift in Sources */,
Yep/Caches/ImageCache.swift
+1 -1
View File
@@ -94,7 +94,7 @@ class ImageCache {
let finalImage = storeImage.decodedImage()
println("Image Decode size \(storeImage.size)")
//println("Image Decode size \(storeImage.size)")
dispatch_async(dispatch_get_main_queue()) {
completion(url: attachmentURL, image: finalImage, cacheType: .None)
Yep/ViewControllers/Feeds/FeedsViewController.swift
+5 -5
View File
@@ -108,9 +108,9 @@ class FeedsViewController: BaseViewController {
private let feedSkillUsersCellID = "FeedSkillUsersCell"
private let feedBasicCellID = "FeedBasicCell"
private let feedCellID = "FeedCell"
private let feedBiggerImageCellID = "FeedBiggerImageCell"
private let feedNormalImagesCellID = "FeedNormalImagesCell"
private let feedAnyImagesCellID = "FeedAnyImagesCell"
private let feedSocialWorkCellID = "FeedSocialWorkCell"
private let loadMoreTableViewCellID = "LoadMoreTableViewCell"
@@ -204,7 +204,7 @@ class FeedsViewController: BaseViewController {
height = FeedNormalImagesCell.heightOfFeed(feed)
} else {
height = FeedCell.heightOfFeed(feed)
height = FeedAnyImagesCell.heightOfFeed(feed)
}
case .GithubRepo, .DribbbleShot, .Audio, .Location:
@@ -300,9 +300,9 @@ class FeedsViewController: BaseViewController {
feedsTableView.registerNib(UINib(nibName: feedSkillUsersCellID, bundle: nil), forCellReuseIdentifier: feedSkillUsersCellID)
feedsTableView.registerClass(FeedBasicCell.self, forCellReuseIdentifier: feedBasicCellID)
feedsTableView.registerClass(FeedCell.self, forCellReuseIdentifier: feedCellID)
feedsTableView.registerClass(FeedBiggerImageCell.self, forCellReuseIdentifier: feedBiggerImageCellID)
feedsTableView.registerClass(FeedNormalImagesCell.self, forCellReuseIdentifier: feedNormalImagesCellID)
feedsTableView.registerClass(FeedAnyImagesCell.self, forCellReuseIdentifier: feedAnyImagesCellID)
feedsTableView.registerClass(FeedSocialWorkCell.self, forCellReuseIdentifier: feedSocialWorkCellID)
feedsTableView.registerNib(UINib(nibName: loadMoreTableViewCellID, bundle: nil), forCellReuseIdentifier: loadMoreTableViewCellID)
@@ -831,7 +831,7 @@ extension FeedsViewController: UITableViewDataSource, UITableViewDelegate {
return cell
} else {
let cell = tableView.dequeueReusableCellWithIdentifier(feedCellID) as! FeedCell
let cell = tableView.dequeueReusableCellWithIdentifier(feedAnyImagesCellID) as! FeedAnyImagesCell
return cell
}
@@ -968,7 +968,7 @@ extension FeedsViewController: UITableViewDataSource, UITableViewDelegate {
cell.tapMediaAction = tapMediaAction
} else {
guard let cell = cell as? FeedCell else {
guard let cell = cell as? FeedAnyImagesCell else {
break
}
Yep/Views/Cells/Feed/FeedCell.swift → Yep/Views/Cells/Feed/FeedAnyImagesCell.swift
+8 -20
View File
@@ -1,5 +1,5 @@
//
// FeedCell.swift
// FeedAnyImagesCell.swift
// Yep
//
// Created by nixzhu on 15/9/30.
@@ -8,15 +8,15 @@
import UIKit
let feedAttachmentImageSize = CGSize(width: 80, height: 80)
let feedAttachmentBiggerImageSize = CGSize(width: 160, height: 160)
let feedAttachmentImageSize = YepConfig.FeedNormalImagesCell.imageSize
let feedAttachmentBiggerImageSize = YepConfig.FeedBiggerImageCell.imageSize
private let feedMediaCellID = "FeedMediaCell"
private let screenWidth: CGFloat = UIScreen.mainScreen().bounds.width
typealias FeedTapMediaAction = (transitionView: UIView, image: UIImage?, attachments: [DiscoveredAttachment], index: Int) -> Void
class FeedCell: FeedBasicCell {
class FeedAnyImagesCell: FeedBasicCell {
lazy var mediaCollectionView: UICollectionView = {
@@ -68,14 +68,7 @@ class FeedCell: FeedBasicCell {
override class func heightOfFeed(feed: DiscoveredFeed) -> CGFloat {
var height = super.heightOfFeed(feed)
if let attachment = feed.attachment {
if case let .Images(attachments) = attachment {
let imageHeight: CGFloat = attachments.count == 1 ? feedAttachmentBiggerImageSize.height : feedAttachmentImageSize.height
height += (imageHeight + 15)
}
}
let height = super.heightOfFeed(feed) + feedAttachmentImageSize.height + 15
return ceil(height)
}
@@ -108,7 +101,7 @@ class FeedCell: FeedBasicCell {
if !mediaCollectionView.hidden {
let y = messageTextView.frame.origin.y + messageTextView.frame.height + 15
let height: CGFloat = attachments.count == 1 ? feedAttachmentBiggerImageSize.height : feedAttachmentImageSize.height
let height = feedAttachmentImageSize.height
mediaCollectionView.frame = CGRect(x: 0, y: y, width: screenWidth, height: height)
self.attachments = attachments
@@ -120,7 +113,7 @@ class FeedCell: FeedBasicCell {
}
}
extension FeedCell: UICollectionViewDataSource, UICollectionViewDelegate {
extension FeedAnyImagesCell: UICollectionViewDataSource, UICollectionViewDelegate {
func numberOfSectionsInCollectionView(collectionView: UICollectionView) -> Int {
return 1
@@ -146,12 +139,7 @@ extension FeedCell: UICollectionViewDataSource, UICollectionViewDelegate {
func collectionView(collectionView: UICollectionView!, layout collectionViewLayout: UICollectionViewLayout!, sizeForItemAtIndexPath indexPath: NSIndexPath!) -> CGSize {
if attachments.count > 1 {
return feedAttachmentImageSize
} else {
return feedAttachmentBiggerImageSize
}
return feedAttachmentImageSize
}
func collectionView(collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, insetForSectionAtIndex section: Int) -> UIEdgeInsets {