From 9c8f5b7d65692a59a4a2fc82bdaa950320964103 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Thu, 26 Sep 2019 20:01:13 -0500 Subject: [PATCH] Remove chevrons from timeline. Issue #1067 --- .../Cell/MasterTimelineAccessibilityCellLayout.swift | 2 +- .../Cell/MasterTimelineDefaultCellLayout.swift | 4 +--- iOS/MasterTimeline/Cell/MasterTimelineTableViewCell.swift | 5 ----- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/iOS/MasterTimeline/Cell/MasterTimelineAccessibilityCellLayout.swift b/iOS/MasterTimeline/Cell/MasterTimelineAccessibilityCellLayout.swift index 6a202d51b..31e8c5bc6 100644 --- a/iOS/MasterTimeline/Cell/MasterTimelineAccessibilityCellLayout.swift +++ b/iOS/MasterTimeline/Cell/MasterTimelineAccessibilityCellLayout.swift @@ -45,7 +45,7 @@ struct MasterTimelineAccessibilityCellLayout: MasterTimelineCellLayout { self.avatarImageRect = CGRect.zero } - let textAreaWidth = width - (currentPoint.x + MasterTimelineDefaultCellLayout.chevronWidth + MasterTimelineDefaultCellLayout.cellPadding.right + insets.right) + let textAreaWidth = width - (currentPoint.x + MasterTimelineDefaultCellLayout.cellPadding.right + insets.right) // Title Text Block let (titleRect, numberOfLinesForTitle) = MasterTimelineAccessibilityCellLayout.rectForTitle(cellData, currentPoint, textAreaWidth) diff --git a/iOS/MasterTimeline/Cell/MasterTimelineDefaultCellLayout.swift b/iOS/MasterTimeline/Cell/MasterTimelineDefaultCellLayout.swift index e43802c3e..62dfdf895 100644 --- a/iOS/MasterTimeline/Cell/MasterTimelineDefaultCellLayout.swift +++ b/iOS/MasterTimeline/Cell/MasterTimelineDefaultCellLayout.swift @@ -42,8 +42,6 @@ struct MasterTimelineDefaultCellLayout: MasterTimelineCellLayout { return UIFont.preferredFont(forTextStyle: .body) } - static let chevronWidth = CGFloat(integerLiteral: 28) - let height: CGFloat let unreadIndicatorRect: CGRect let starRect: CGRect @@ -78,7 +76,7 @@ struct MasterTimelineDefaultCellLayout: MasterTimelineCellLayout { self.avatarImageRect = CGRect.zero } - let textAreaWidth = width - (currentPoint.x + MasterTimelineDefaultCellLayout.chevronWidth + MasterTimelineDefaultCellLayout.cellPadding.right + insets.right) + let textAreaWidth = width - (currentPoint.x + MasterTimelineDefaultCellLayout.cellPadding.right + insets.right) // Title Text Block let (titleRect, numberOfLinesForTitle) = MasterTimelineDefaultCellLayout.rectForTitle(cellData, currentPoint, textAreaWidth) diff --git a/iOS/MasterTimeline/Cell/MasterTimelineTableViewCell.swift b/iOS/MasterTimeline/Cell/MasterTimelineTableViewCell.swift index a9b2d250c..025c4ade9 100644 --- a/iOS/MasterTimeline/Cell/MasterTimelineTableViewCell.swift +++ b/iOS/MasterTimeline/Cell/MasterTimelineTableViewCell.swift @@ -130,7 +130,6 @@ private extension MasterTimelineTableViewCell { func commonInit() { - addAccessoryView() addSubviewAtInit(titleView, hidden: false) addSubviewAtInit(summaryView, hidden: true) addSubviewAtInit(unreadIndicatorView, hidden: true) @@ -141,10 +140,6 @@ private extension MasterTimelineTableViewCell { } - func addAccessoryView() { - accessoryView = UIImageView(image: AppAssets.chevronRightImage) - } - func updatedLayout(width: CGFloat) -> MasterTimelineCellLayout { if UIApplication.shared.preferredContentSizeCategory.isAccessibilityCategory { return MasterTimelineAccessibilityCellLayout(width: width, insets: safeAreaInsets, cellData: cellData)