From a37e4b79207189a31eaa3d14e68fdac81469cff3 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Sat, 28 Sep 2019 12:11:33 -0500 Subject: [PATCH] Fixed feed separators for disclosure rows --- iOS/MasterFeed/Cell/MasterFeedTableViewCellLayout.swift | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/iOS/MasterFeed/Cell/MasterFeedTableViewCellLayout.swift b/iOS/MasterFeed/Cell/MasterFeedTableViewCellLayout.swift index 1a89285bb..2df98fe02 100644 --- a/iOS/MasterFeed/Cell/MasterFeedTableViewCellLayout.swift +++ b/iOS/MasterFeed/Cell/MasterFeedTableViewCellLayout.swift @@ -13,7 +13,7 @@ struct MasterFeedTableViewCellLayout { private static let editingControlIndent = CGFloat(integerLiteral: 40) private static let imageSize = CGSize(width: 20, height: 20) - private static let imageMarginRight = CGFloat(integerLiteral: 8) + private static let imageMarginRight = CGFloat(integerLiteral: 11) private static let unreadCountMarginLeft = CGFloat(integerLiteral: 8) private static let unreadCountMarginRight = CGFloat(integerLiteral: 16) private static let disclosureButtonSize = CGSize(width: 44, height: 44) @@ -58,7 +58,11 @@ struct MasterFeedTableViewCellLayout { } // Separator Insets - separatorInsets = UIEdgeInsets(top: 0, left: rFavicon.maxX + MasterFeedTableViewCellLayout.imageMarginRight, bottom: 0, right: 0) + if shouldShowDisclosure { + separatorInsets = UIEdgeInsets(top: 0, left: MasterFeedTableViewCellLayout.disclosureButtonSize.width, bottom: 0, right: 0) + } else { + separatorInsets = UIEdgeInsets(top: 0, left: rFavicon.maxX + MasterFeedTableViewCellLayout.imageMarginRight, bottom: 0, right: 0) + } // Unread Count let unreadCountSize = unreadCountView.contentSize