From d1987c650ec20a6cbb95a0a4dfc76ca6a88e1c70 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Sat, 26 Oct 2019 11:09:34 -0700 Subject: [PATCH] Roll back the timeline background color change. Remove the white accent view. --- .../Cell/MasterTimelineTableViewCell.swift | 15 --------------- .../Contents.json | 9 ++------- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/iOS/MasterTimeline/Cell/MasterTimelineTableViewCell.swift b/iOS/MasterTimeline/Cell/MasterTimelineTableViewCell.swift index 9f9d1c342..91669f2de 100644 --- a/iOS/MasterTimeline/Cell/MasterTimelineTableViewCell.swift +++ b/iOS/MasterTimeline/Cell/MasterTimelineTableViewCell.swift @@ -23,12 +23,6 @@ class MasterTimelineTableViewCell: VibrantTableViewCell { return NonIntrinsicImageView(image: AppAssets.timelineStarImage) }() - private let separatorAccent: UIView = { - let view = UIView() - view.backgroundColor = UIColor.white - return view - }() - var cellData: MasterTimelineCellData! { didSet { updateSubviews() @@ -89,13 +83,6 @@ class MasterTimelineTableViewCell: VibrantTableViewCell { dateView.setFrameIfNotEqual(layout.dateRect) separatorInset = layout.separatorInsets - - if traitCollection.userInterfaceStyle == .light { - let separatorAccentRect = CGRect(x: safeAreaInsets.left, y: frame.height - 2, width: frame.width - safeAreaInsets.right - safeAreaInsets.left, height: 1) - separatorAccent.setFrameIfNotEqual(separatorAccentRect) - } else { - separatorAccent.setFrameIfNotEqual(.zero) - } } func setAvatarImage(_ image: UIImage) { @@ -151,8 +138,6 @@ private extension MasterTimelineTableViewCell { addSubviewAtInit(feedNameView, hidden: true) addSubviewAtInit(avatarView, hidden: true) addSubviewAtInit(starView, hidden: true) - addSubviewAtInit(separatorAccent, hidden: false) - } func updatedLayout(width: CGFloat) -> MasterTimelineCellLayout { diff --git a/iOS/Resources/Assets.xcassets/timelineBackgroundColor.colorset/Contents.json b/iOS/Resources/Assets.xcassets/timelineBackgroundColor.colorset/Contents.json index 2cc5212b8..702421056 100644 --- a/iOS/Resources/Assets.xcassets/timelineBackgroundColor.colorset/Contents.json +++ b/iOS/Resources/Assets.xcassets/timelineBackgroundColor.colorset/Contents.json @@ -7,13 +7,8 @@ { "idiom" : "universal", "color" : { - "color-space" : "srgb", - "components" : { - "red" : "247", - "alpha" : "1.000", - "blue" : "247", - "green" : "247" - } + "platform" : "ios", + "reference" : "systemBackgroundColor" } }, {