From 83a9300bdc60a4fda2be3f0022023656f3ef7aaa Mon Sep 17 00:00:00 2001 From: nixzhu Date: Mon, 30 Nov 2015 11:05:36 +0800 Subject: [PATCH] location UI in FeedSocialWorkCell --- .../FeedSocialWork/FeedSocialWorkCell.swift | 21 ++++++++ .../FeedSocialWork/FeedSocialWorkCell.xib | 48 +++++++++++++++++++ 2 files changed, 69 insertions(+) diff --git a/Yep/Views/Cells/FeedSocialWork/FeedSocialWorkCell.swift b/Yep/Views/Cells/FeedSocialWork/FeedSocialWorkCell.swift index ab703539..2cb178ab 100644 --- a/Yep/Views/Cells/FeedSocialWork/FeedSocialWorkCell.swift +++ b/Yep/Views/Cells/FeedSocialWork/FeedSocialWorkCell.swift @@ -43,6 +43,10 @@ class FeedSocialWorkCell: FeedBasicCell { @IBOutlet weak var voiceSampleViewWidthConstraint: NSLayoutConstraint! + @IBOutlet weak var locationContainerView: UIView! + @IBOutlet weak var locationMapImageView: UIImageView! + @IBOutlet weak var locationNameLabel: UILabel! + @IBOutlet weak var socialWorkBorderImageView: UIImageView! @IBOutlet weak var socialWorkContainerViewHeightConstraint: NSLayoutConstraint! @IBOutlet weak var githubRepoImageViewTrailingConstraint: NSLayoutConstraint! @@ -145,6 +149,8 @@ class FeedSocialWorkCell: FeedBasicCell { height += (dribbbleShotHeight + 15) case .Audio: height += (44 + 15) + case .Location: + height += (120 + 15) default: break } @@ -184,6 +190,7 @@ class FeedSocialWorkCell: FeedBasicCell { mediaContainerView.hidden = true githubRepoContainerView.hidden = false voiceContainerView.hidden = true + locationContainerView.hidden = true socialWorkBorderImageView.hidden = false githubRepoImageView.tintColor = UIColor.yepIconImageViewTintColor() @@ -202,6 +209,7 @@ class FeedSocialWorkCell: FeedBasicCell { mediaContainerView.hidden = false githubRepoContainerView.hidden = true voiceContainerView.hidden = true + locationContainerView.hidden = true socialWorkBorderImageView.hidden = false linkImageView.tintColor = UIColor.yepIconImageViewTintColor() @@ -224,6 +232,7 @@ class FeedSocialWorkCell: FeedBasicCell { mediaContainerView.hidden = true githubRepoContainerView.hidden = true voiceContainerView.hidden = false + locationContainerView.hidden = true socialWorkBorderImageView.hidden = true if let attachment = feed.attachment { @@ -294,6 +303,18 @@ class FeedSocialWorkCell: FeedBasicCell { socialWorkContainerViewHeightConstraint.constant = 44 + case .Location: + + mediaContainerView.hidden = true + githubRepoContainerView.hidden = true + voiceContainerView.hidden = true + locationContainerView.hidden = false + socialWorkBorderImageView.hidden = false + + locationMapImageView.maskView = socialWorkMaskImageView + + socialWorkContainerViewHeightConstraint.constant = 120 + default: break } diff --git a/Yep/Views/Cells/FeedSocialWork/FeedSocialWorkCell.xib b/Yep/Views/Cells/FeedSocialWork/FeedSocialWorkCell.xib index 24b970ac..1c350ae2 100644 --- a/Yep/Views/Cells/FeedSocialWork/FeedSocialWorkCell.xib +++ b/Yep/Views/Cells/FeedSocialWork/FeedSocialWorkCell.xib @@ -226,6 +226,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -238,14 +279,18 @@ + + + + @@ -303,6 +348,9 @@ + + +