From d2482233abd63fe66fbd967989bbb5efbed3e546 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Mon, 29 Apr 2019 09:20:45 -0500 Subject: [PATCH] Change indent width to match other iOS outline view indent widths --- iOS/MasterFeed/Cell/MasterFeedTableViewCellLayout.swift | 3 +-- iOS/MasterFeed/Cell/MasterFeedTableViewSectionHeader.swift | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/iOS/MasterFeed/Cell/MasterFeedTableViewCellLayout.swift b/iOS/MasterFeed/Cell/MasterFeedTableViewCellLayout.swift index 4a07ebc76..23981e87a 100644 --- a/iOS/MasterFeed/Cell/MasterFeedTableViewCellLayout.swift +++ b/iOS/MasterFeed/Cell/MasterFeedTableViewCellLayout.swift @@ -11,7 +11,6 @@ import RSCore struct MasterFeedTableViewCellLayout { - private static let indent = CGFloat(integerLiteral: 14) private static let editingControlIndent = CGFloat(integerLiteral: 40) private static let imageSize = CGSize(width: 20, height: 20) private static let marginLeft = CGFloat(integerLiteral: 8) @@ -34,7 +33,7 @@ struct MasterFeedTableViewCellLayout { var initialIndent = MasterFeedTableViewCellLayout.marginLeft + insets.left if indent { - initialIndent += MasterFeedTableViewCellLayout.indent + initialIndent += MasterFeedTableViewCellLayout.imageSize.width + MasterFeedTableViewCellLayout.imageMarginRight } if showingEditingControl { initialIndent += MasterFeedTableViewCellLayout.editingControlIndent diff --git a/iOS/MasterFeed/Cell/MasterFeedTableViewSectionHeader.swift b/iOS/MasterFeed/Cell/MasterFeedTableViewSectionHeader.swift index 1671ddd22..fd005da73 100644 --- a/iOS/MasterFeed/Cell/MasterFeedTableViewSectionHeader.swift +++ b/iOS/MasterFeed/Cell/MasterFeedTableViewSectionHeader.swift @@ -92,7 +92,7 @@ class MasterFeedTableViewSectionHeader: UITableViewHeaderFooterView { // cell below. unreadCountView.unreadCount = 888 - let layout = MasterFeedTableViewCellLayout(cellWidth: size.width, insets: safeAreaInsets, shouldShowImage: false, label: titleView, unreadCountView: unreadCountView, showingEditingControl: false, indent: true, shouldShowDisclosure: true) + let layout = MasterFeedTableViewCellLayout(cellWidth: size.width, insets: safeAreaInsets, shouldShowImage: false, label: titleView, unreadCountView: unreadCountView, showingEditingControl: false, indent: false, shouldShowDisclosure: true) return CGSize(width: bounds.width, height: layout.height) @@ -100,7 +100,7 @@ class MasterFeedTableViewSectionHeader: UITableViewHeaderFooterView { override func layoutSubviews() { super.layoutSubviews() - let layout = MasterFeedTableViewCellLayout(cellWidth: bounds.size.width, insets: safeAreaInsets, shouldShowImage: false, label: titleView, unreadCountView: unreadCountView, showingEditingControl: false, indent: true, shouldShowDisclosure: true) + let layout = MasterFeedTableViewCellLayout(cellWidth: bounds.size.width, insets: safeAreaInsets, shouldShowImage: false, label: titleView, unreadCountView: unreadCountView, showingEditingControl: false, indent: false, shouldShowDisclosure: true) layoutWith(layout) }