From 316e4e62b226df138c4c54ee2edc8a107237c856 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Fri, 20 Mar 2020 06:58:11 -0500 Subject: [PATCH] Removed separator insets from layout code as they were no longer needed. --- .../Cell/MasterTimelineAccessibilityCellLayout.swift | 4 ---- iOS/MasterTimeline/Cell/MasterTimelineCellLayout.swift | 1 - iOS/MasterTimeline/Cell/MasterTimelineDefaultCellLayout.swift | 4 ---- iOS/MasterTimeline/Cell/MasterTimelineTableViewCell.swift | 2 +- 4 files changed, 1 insertion(+), 10 deletions(-) diff --git a/iOS/MasterTimeline/Cell/MasterTimelineAccessibilityCellLayout.swift b/iOS/MasterTimeline/Cell/MasterTimelineAccessibilityCellLayout.swift index f104a2d0e..60c8355f3 100644 --- a/iOS/MasterTimeline/Cell/MasterTimelineAccessibilityCellLayout.swift +++ b/iOS/MasterTimeline/Cell/MasterTimelineAccessibilityCellLayout.swift @@ -19,7 +19,6 @@ struct MasterTimelineAccessibilityCellLayout: MasterTimelineCellLayout { let summaryRect: CGRect let feedNameRect: CGRect let dateRect: CGRect - let separatorInsets: UIEdgeInsets init(width: CGFloat, insets: UIEdgeInsets, cellData: MasterTimelineCellData) { @@ -34,9 +33,6 @@ struct MasterTimelineAccessibilityCellLayout: MasterTimelineCellLayout { // Start the point at the beginning position of the main block currentPoint.x += MasterTimelineDefaultCellLayout.unreadCircleDimension + MasterTimelineDefaultCellLayout.unreadCircleMarginRight - // Separator Insets - self.separatorInsets = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 0) - // Icon Image if cellData.showIcon { self.iconImageRect = MasterTimelineAccessibilityCellLayout.rectForIconView(currentPoint, iconSize: cellData.iconSize) diff --git a/iOS/MasterTimeline/Cell/MasterTimelineCellLayout.swift b/iOS/MasterTimeline/Cell/MasterTimelineCellLayout.swift index b93c7601b..c235670c9 100644 --- a/iOS/MasterTimeline/Cell/MasterTimelineCellLayout.swift +++ b/iOS/MasterTimeline/Cell/MasterTimelineCellLayout.swift @@ -18,7 +18,6 @@ protocol MasterTimelineCellLayout { var summaryRect: CGRect {get} var feedNameRect: CGRect {get} var dateRect: CGRect {get} - var separatorInsets: UIEdgeInsets {get} } diff --git a/iOS/MasterTimeline/Cell/MasterTimelineDefaultCellLayout.swift b/iOS/MasterTimeline/Cell/MasterTimelineDefaultCellLayout.swift index b80666016..6b2ce58ad 100644 --- a/iOS/MasterTimeline/Cell/MasterTimelineDefaultCellLayout.swift +++ b/iOS/MasterTimeline/Cell/MasterTimelineDefaultCellLayout.swift @@ -51,7 +51,6 @@ struct MasterTimelineDefaultCellLayout: MasterTimelineCellLayout { let summaryRect: CGRect let feedNameRect: CGRect let dateRect: CGRect - let separatorInsets: UIEdgeInsets init(width: CGFloat, insets: UIEdgeInsets, cellData: MasterTimelineCellData) { @@ -66,9 +65,6 @@ struct MasterTimelineDefaultCellLayout: MasterTimelineCellLayout { // Start the point at the beginning position of the main block currentPoint.x += MasterTimelineDefaultCellLayout.unreadCircleDimension + MasterTimelineDefaultCellLayout.unreadCircleMarginRight - // Separator Insets - self.separatorInsets = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 0) - // Icon Image if cellData.showIcon { self.iconImageRect = MasterTimelineDefaultCellLayout.rectForIconView(currentPoint, iconSize: cellData.iconSize) diff --git a/iOS/MasterTimeline/Cell/MasterTimelineTableViewCell.swift b/iOS/MasterTimeline/Cell/MasterTimelineTableViewCell.swift index 39dbd51e5..aa964b218 100644 --- a/iOS/MasterTimeline/Cell/MasterTimelineTableViewCell.swift +++ b/iOS/MasterTimeline/Cell/MasterTimelineTableViewCell.swift @@ -79,7 +79,7 @@ class MasterTimelineTableViewCell: VibrantTableViewCell { feedNameView.setFrameIfNotEqual(layout.feedNameRect) dateView.setFrameIfNotEqual(layout.dateRect) - separatorInset = layout.separatorInsets + separatorInset = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 0) } func setIconImage(_ image: IconImage) {