From 079f17f7f5ca646891c0344ffcb93ad6d48420ca Mon Sep 17 00:00:00 2001 From: nixzhu Date: Thu, 14 Jan 2016 16:21:15 +0800 Subject: [PATCH] test FeedURLCell --- Yep/ViewControllers/Feeds/FeedsViewController.swift | 5 ++++- Yep/Views/Cells/Feed/FeedCellLayout.swift | 3 ++- Yep/Views/Cells/Feed/FeedURLCell.swift | 10 ++++++++-- Yep/Views/ContainerViews/FeedURLContainerView.swift | 2 ++ 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/Yep/ViewControllers/Feeds/FeedsViewController.swift b/Yep/ViewControllers/Feeds/FeedsViewController.swift index 5f0e66a7..223680b7 100644 --- a/Yep/ViewControllers/Feeds/FeedsViewController.swift +++ b/Yep/ViewControllers/Feeds/FeedsViewController.swift @@ -127,6 +127,7 @@ class FeedsViewController: BaseViewController { private let feedDribbbleShotCellID = "FeedDribbbleShotCell" private let feedVoiceCellID = "FeedVoiceCell" private let feedLocationCellID = "FeedLocationCell" + private let feedURLCellID = "FeedURLCell" private let loadMoreTableViewCellID = "LoadMoreTableViewCell" private lazy var noFeedsFooterView: InfoView = InfoView(NSLocalizedString("No Feeds.", comment: "")) @@ -315,6 +316,7 @@ class FeedsViewController: BaseViewController { feedsTableView.registerClass(FeedDribbbleShotCell.self, forCellReuseIdentifier: feedDribbbleShotCellID) feedsTableView.registerClass(FeedVoiceCell.self, forCellReuseIdentifier: feedVoiceCellID) feedsTableView.registerClass(FeedLocationCell.self, forCellReuseIdentifier: feedLocationCellID) + feedsTableView.registerClass(FeedURLCell.self, forCellReuseIdentifier: feedURLCellID) feedsTableView.registerNib(UINib(nibName: loadMoreTableViewCellID, bundle: nil), forCellReuseIdentifier: loadMoreTableViewCellID) @@ -946,7 +948,8 @@ extension FeedsViewController: UITableViewDataSource, UITableViewDelegate { switch feed.kind { case .Text: - let cell = tableView.dequeueReusableCellWithIdentifier(feedBasicCellID) as! FeedBasicCell + //let cell = tableView.dequeueReusableCellWithIdentifier(feedBasicCellID) as! FeedBasicCell + let cell = tableView.dequeueReusableCellWithIdentifier(feedURLCellID) as! FeedURLCell return cell case .Image: diff --git a/Yep/Views/Cells/Feed/FeedCellLayout.swift b/Yep/Views/Cells/Feed/FeedCellLayout.swift index 4183603d..15f08ed2 100644 --- a/Yep/Views/Cells/Feed/FeedCellLayout.swift +++ b/Yep/Views/Cells/Feed/FeedCellLayout.swift @@ -125,7 +125,8 @@ struct FeedCellLayout { switch feed.kind { case .Text: - height = FeedBasicCell.heightOfFeed(feed) + //height = FeedBasicCell.heightOfFeed(feed) + height = FeedURLCell.heightOfFeed(feed) case .Image: if feed.imageAttachmentsCount == 1 { diff --git a/Yep/Views/Cells/Feed/FeedURLCell.swift b/Yep/Views/Cells/Feed/FeedURLCell.swift index 244a4561..e7404013 100644 --- a/Yep/Views/Cells/Feed/FeedURLCell.swift +++ b/Yep/Views/Cells/Feed/FeedURLCell.swift @@ -8,10 +8,12 @@ import UIKit +private let screenWidth: CGFloat = UIScreen.mainScreen().bounds.width + class FeedURLCell: FeedBasicCell { - lazy var feedURLContainerView: UIView = { - let view = UIView() + lazy var feedURLContainerView: FeedURLContainerView = { + let view = FeedURLContainerView() return view }() @@ -44,6 +46,10 @@ class FeedURLCell: FeedBasicCell { super.configureWithFeed(feed, layoutCache: (layout: layoutCache.layout, update: { newLayout in _newLayout = newLayout }), needShowSkill: needShowSkill) + + let y = messageTextView.frame.origin.y + messageTextView.frame.height + 15 + let height: CGFloat = leftBottomLabel.frame.origin.y - y - 15 + feedURLContainerView.frame = CGRect(x: 65, y: y, width: screenWidth - 65 - 60, height: height) } } diff --git a/Yep/Views/ContainerViews/FeedURLContainerView.swift b/Yep/Views/ContainerViews/FeedURLContainerView.swift index 001e4f70..ee4384be 100644 --- a/Yep/Views/ContainerViews/FeedURLContainerView.swift +++ b/Yep/Views/ContainerViews/FeedURLContainerView.swift @@ -38,6 +38,8 @@ class FeedURLContainerView: UIView { private func makeUI() { + backgroundColor = UIColor.lightGrayColor() + addSubview(siteNameLabel) addSubview(titleLabel)