From 960f09826b3f546518d43bafd1955140c9a2d719 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Tue, 3 Sep 2019 13:00:31 -0500 Subject: [PATCH] Add separator line to section headers so that they don't look smooshed together when collapsed --- .../MasterFeedTableViewSectionHeader.swift | 19 ++++++++++++++++++ .../separatorColor.colorset/Contents.json | 20 ------------------- 2 files changed, 19 insertions(+), 20 deletions(-) delete mode 100644 iOS/Resources/Assets.xcassets/separatorColor.colorset/Contents.json diff --git a/iOS/MasterFeed/Cell/MasterFeedTableViewSectionHeader.swift b/iOS/MasterFeed/Cell/MasterFeedTableViewSectionHeader.swift index 3eed3b7a2..c2dbd1888 100644 --- a/iOS/MasterFeed/Cell/MasterFeedTableViewSectionHeader.swift +++ b/iOS/MasterFeed/Cell/MasterFeedTableViewSectionHeader.swift @@ -70,6 +70,18 @@ class MasterFeedTableViewSectionHeader: UITableViewHeaderFooterView { return iView }() + private let topSeparatorView: UIView = { + let view = UIView() + view.backgroundColor = UIColor.separator + return view + }() + + private let bottomSeparatorView: UIView = { + let view = UIView() + view.backgroundColor = UIColor.separator + return view + }() + override init(reuseIdentifier: String?) { super.init(reuseIdentifier: reuseIdentifier) commonInit() @@ -114,6 +126,8 @@ private extension MasterFeedTableViewSectionHeader { updateDisclosureImage() addSubviewAtInit(disclosureView) addBackgroundView() + addSubviewAtInit(topSeparatorView) + addSubviewAtInit(bottomSeparatorView) } func updateDisclosureImage() { @@ -133,6 +147,11 @@ private extension MasterFeedTableViewSectionHeader { titleView.setFrameIfNotEqual(layout.titleRect) unreadCountView.setFrameIfNotEqual(layout.unreadCountRect) disclosureView.setFrameIfNotEqual(layout.disclosureButtonRect) + + let top = CGRect(x: safeAreaInsets.left, y: 0, width: frame.width - safeAreaInsets.right - safeAreaInsets.left, height: 0.5) + topSeparatorView.setFrameIfNotEqual(top) + let bottom = CGRect(x: safeAreaInsets.left, y: frame.height - 0.5, width: frame.width - safeAreaInsets.right - safeAreaInsets.left, height: 0.5) + bottomSeparatorView.setFrameIfNotEqual(bottom) } func addBackgroundView() { diff --git a/iOS/Resources/Assets.xcassets/separatorColor.colorset/Contents.json b/iOS/Resources/Assets.xcassets/separatorColor.colorset/Contents.json deleted file mode 100644 index 58bbf89d0..000000000 --- a/iOS/Resources/Assets.xcassets/separatorColor.colorset/Contents.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "info" : { - "version" : 1, - "author" : "xcode" - }, - "colors" : [ - { - "idiom" : "universal", - "color" : { - "color-space" : "srgb", - "components" : { - "red" : "177", - "alpha" : "1.000", - "blue" : "177", - "green" : "177" - } - } - } - ] -} \ No newline at end of file