From fb39841cf8a4e7803b8684ddc10d5fc596d47afe Mon Sep 17 00:00:00 2001 From: nixzhu Date: Thu, 31 Dec 2015 11:51:08 +0800 Subject: [PATCH] white background for FeedGithubRepoContainerView --- .../Contents.json | 26 ++++++++++++++++++ .../feed_container_background.pdf | Bin 0 -> 3925 bytes .../FeedGithubRepoContainerView.swift | 17 ++++++++++++ 3 files changed, 43 insertions(+) create mode 100644 Yep/Images.xcassets/feed_container_background.imageset/Contents.json create mode 100644 Yep/Images.xcassets/feed_container_background.imageset/feed_container_background.pdf diff --git a/Yep/Images.xcassets/feed_container_background.imageset/Contents.json b/Yep/Images.xcassets/feed_container_background.imageset/Contents.json new file mode 100644 index 00000000..c0abd5b3 --- /dev/null +++ b/Yep/Images.xcassets/feed_container_background.imageset/Contents.json @@ -0,0 +1,26 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "feed_container_background.pdf", + "resizing" : { + "mode" : "9-part", + "center" : { + "mode" : "tile", + "width" : 1, + "height" : 1 + }, + "cap-insets" : { + "bottom" : 5, + "top" : 5, + "right" : 5, + "left" : 5 + } + } + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Yep/Images.xcassets/feed_container_background.imageset/feed_container_background.pdf b/Yep/Images.xcassets/feed_container_background.imageset/feed_container_background.pdf new file mode 100644 index 0000000000000000000000000000000000000000..8052f68837e5c867234e95f7996112cd4875a516 GIT binary patch literal 3925 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 IaR%W30e`-tZvX%Q literal 0 HcmV?d00001 diff --git a/Yep/Views/ContainerViews/FeedGithubRepoContainerView.swift b/Yep/Views/ContainerViews/FeedGithubRepoContainerView.swift index 8e0e68f8..f77a8fe0 100644 --- a/Yep/Views/ContainerViews/FeedGithubRepoContainerView.swift +++ b/Yep/Views/ContainerViews/FeedGithubRepoContainerView.swift @@ -12,6 +12,12 @@ class FeedGithubRepoContainerView: UIView { var tapAction: (() -> Void)? + lazy var backgroundImageView: UIImageView = { + let imageView = UIImageView() + imageView.image = UIImage(named: "feed_container_background") + return imageView + }() + lazy var iconImageView: UIImageView = { let imageView = UIImageView() imageView.image = UIImage(named: "icon_repo") @@ -51,23 +57,34 @@ class FeedGithubRepoContainerView: UIView { private func makeUI() { + backgroundColor = UIColor.whiteColor() + tintAdjustmentMode = .Normal + + addSubview(backgroundImageView) addSubview(iconImageView) addSubview(nameLabel) addSubview(descriptionLabel) addSubview(accessoryImageView) + backgroundImageView.translatesAutoresizingMaskIntoConstraints = false iconImageView.translatesAutoresizingMaskIntoConstraints = false nameLabel.translatesAutoresizingMaskIntoConstraints = false descriptionLabel.translatesAutoresizingMaskIntoConstraints = false accessoryImageView.translatesAutoresizingMaskIntoConstraints = false let views = [ + "backgroundImageView": backgroundImageView, "iconImageView": iconImageView, "nameLabel": nameLabel, "descriptionLabel": descriptionLabel, "accessoryImageView": accessoryImageView, ] + let backgroundH = NSLayoutConstraint.constraintsWithVisualFormat("H:|[backgroundImageView]|", options: [], metrics: nil, views: views) + let backgroundV = NSLayoutConstraint.constraintsWithVisualFormat("V:|[backgroundImageView]|", options: [], metrics: nil, views: views) + NSLayoutConstraint.activateConstraints(backgroundH) + NSLayoutConstraint.activateConstraints(backgroundV) + let constraintsH = NSLayoutConstraint.constraintsWithVisualFormat("H:|-10-[iconImageView(16)]-10-[nameLabel]-5-[accessoryImageView(8)]-10-|", options: [], metrics: nil, views: views) iconImageView.setContentHuggingPriority(UILayoutPriorityDefaultHigh, forAxis: .Horizontal)