From 00ee775170ff986da617f5fd7538db17d4cd81fd Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Fri, 31 May 2019 17:58:39 -0500 Subject: [PATCH] Made timeline layout tweaks to make indicator, avatar, and first line of text line up better. Issue #689 --- iOS/MasterTimeline/Cell/MasterTimelineCellLayout.swift | 7 ++++--- .../Cell/MasterTimelineDefaultCellLayout.swift | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/iOS/MasterTimeline/Cell/MasterTimelineCellLayout.swift b/iOS/MasterTimeline/Cell/MasterTimelineCellLayout.swift index 1e43ddc95..1b8066be7 100644 --- a/iOS/MasterTimeline/Cell/MasterTimelineCellLayout.swift +++ b/iOS/MasterTimeline/Cell/MasterTimelineCellLayout.swift @@ -28,7 +28,7 @@ extension MasterTimelineCellLayout { var r = CGRect.zero r.size = CGSize(width: MasterTimelineDefaultCellLayout.unreadCircleDimension, height: MasterTimelineDefaultCellLayout.unreadCircleDimension) r.origin.x = point.x - r.origin.y = point.y + 8 + r.origin.y = point.y + 4 return r } @@ -38,14 +38,15 @@ extension MasterTimelineCellLayout { r.size.width = MasterTimelineDefaultCellLayout.starDimension r.size.height = MasterTimelineDefaultCellLayout.starDimension r.origin.x = floor(point.x - ((MasterTimelineDefaultCellLayout.starDimension - MasterTimelineDefaultCellLayout.unreadCircleDimension) / 2.0)) - r.origin.y = point.y + 5 + r.origin.y = point.y + 2 return r } static func rectForAvatar(_ point: CGPoint) -> CGRect { var r = CGRect.zero r.size = MasterTimelineDefaultCellLayout.avatarSize - r.origin = point + r.origin.x = point.x + r.origin.y = point.y + 4 return r } diff --git a/iOS/MasterTimeline/Cell/MasterTimelineDefaultCellLayout.swift b/iOS/MasterTimeline/Cell/MasterTimelineDefaultCellLayout.swift index 924f9e6e4..323278956 100644 --- a/iOS/MasterTimeline/Cell/MasterTimelineDefaultCellLayout.swift +++ b/iOS/MasterTimeline/Cell/MasterTimelineDefaultCellLayout.swift @@ -17,7 +17,7 @@ struct MasterTimelineDefaultCellLayout: MasterTimelineCellLayout { static let unreadCircleDimension = CGFloat(integerLiteral: 12) static let unreadCircleMarginRight = CGFloat(integerLiteral: 8) - static let starDimension = CGFloat(integerLiteral: 13) + static let starDimension = CGFloat(integerLiteral: 16) static let avatarSize = CGSize(width: 48.0, height: 48.0) static let avatarMarginRight = CGFloat(integerLiteral: 8)