FreshRSS/NetNewsWire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made timeline layout tweaks to make indicator, avatar, and first line of text line up better. Issue #689

Browse Source
This commit is contained in:
Maurice Parker 2019-05-31 17:58:39 -05:00
parent 2d91e64148
commit 00ee775170
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
iOS/MasterTimeline/Cell/MasterTimelineCellLayout.swift
View File

@ -28,7 +28,7 @@ extension MasterTimelineCellLayout {
var r = CGRect.zero var r = CGRect.zero
r.size = CGSize(width: MasterTimelineDefaultCellLayout.unreadCircleDimension, height: MasterTimelineDefaultCellLayout.unreadCircleDimension) r.size = CGSize(width: MasterTimelineDefaultCellLayout.unreadCircleDimension, height: MasterTimelineDefaultCellLayout.unreadCircleDimension)
r.origin.x = point.x r.origin.x = point.x
r.origin.y = point.y + 8 r.origin.y = point.y + 4
return r return r
} }
@ -38,14 +38,15 @@ extension MasterTimelineCellLayout {
r.size.width = MasterTimelineDefaultCellLayout.starDimension r.size.width = MasterTimelineDefaultCellLayout.starDimension
r.size.height = MasterTimelineDefaultCellLayout.starDimension r.size.height = MasterTimelineDefaultCellLayout.starDimension
r.origin.x = floor(point.x - ((MasterTimelineDefaultCellLayout.starDimension - MasterTimelineDefaultCellLayout.unreadCircleDimension) / 2.0)) 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 return r
} }
static func rectForAvatar(_ point: CGPoint) -> CGRect { static func rectForAvatar(_ point: CGPoint) -> CGRect {
var r = CGRect.zero var r = CGRect.zero
r.size = MasterTimelineDefaultCellLayout.avatarSize r.size = MasterTimelineDefaultCellLayout.avatarSize
r.origin = point r.origin.x = point.x
r.origin.y = point.y + 4
return r return r
} }

2
iOS/MasterTimeline/Cell/MasterTimelineDefaultCellLayout.swift
View File

@ -17,7 +17,7 @@ struct MasterTimelineDefaultCellLayout: MasterTimelineCellLayout {
static let unreadCircleDimension = CGFloat(integerLiteral: 12) static let unreadCircleDimension = CGFloat(integerLiteral: 12)
static let unreadCircleMarginRight = CGFloat(integerLiteral: 8) 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 avatarSize = CGSize(width: 48.0, height: 48.0)
static let avatarMarginRight = CGFloat(integerLiteral: 8) static let avatarMarginRight = CGFloat(integerLiteral: 8)