FreshRSS
/
NetNewsWire
mirror of https://github.com/Ranchero-Software/NetNewsWire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed separator insets from layout code as they were no longer needed.

This commit is contained in:
Maurice Parker 2020-03-20 06:58:11 -05:00
parent 4d18c34759
commit 316e4e62b2
4 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
iOS/MasterTimeline/Cell/MasterTimelineAccessibilityCellLayout.swift
View File

@ -19,7 +19,6 @@ struct MasterTimelineAccessibilityCellLayout: MasterTimelineCellLayout {
let summaryRect: CGRect let summaryRect: CGRect
let feedNameRect: CGRect let feedNameRect: CGRect
let dateRect: CGRect let dateRect: CGRect
let separatorInsets: UIEdgeInsets
init(width: CGFloat, insets: UIEdgeInsets, cellData: MasterTimelineCellData) { 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 // Start the point at the beginning position of the main block
currentPoint.x += MasterTimelineDefaultCellLayout.unreadCircleDimension + MasterTimelineDefaultCellLayout.unreadCircleMarginRight currentPoint.x += MasterTimelineDefaultCellLayout.unreadCircleDimension + MasterTimelineDefaultCellLayout.unreadCircleMarginRight
// Separator Insets
self.separatorInsets = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 0)
// Icon Image // Icon Image
if cellData.showIcon { if cellData.showIcon {
self.iconImageRect = MasterTimelineAccessibilityCellLayout.rectForIconView(currentPoint, iconSize: cellData.iconSize) self.iconImageRect = MasterTimelineAccessibilityCellLayout.rectForIconView(currentPoint, iconSize: cellData.iconSize)

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

@ -18,7 +18,6 @@ protocol MasterTimelineCellLayout {
var summaryRect: CGRect {get} var summaryRect: CGRect {get}
var feedNameRect: CGRect {get} var feedNameRect: CGRect {get}
var dateRect: CGRect {get} var dateRect: CGRect {get}
var separatorInsets: UIEdgeInsets {get}
} }

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

@ -51,7 +51,6 @@ struct MasterTimelineDefaultCellLayout: MasterTimelineCellLayout {
let summaryRect: CGRect let summaryRect: CGRect
let feedNameRect: CGRect let feedNameRect: CGRect
let dateRect: CGRect let dateRect: CGRect
let separatorInsets: UIEdgeInsets
init(width: CGFloat, insets: UIEdgeInsets, cellData: MasterTimelineCellData) { 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 // Start the point at the beginning position of the main block
currentPoint.x += MasterTimelineDefaultCellLayout.unreadCircleDimension + MasterTimelineDefaultCellLayout.unreadCircleMarginRight currentPoint.x += MasterTimelineDefaultCellLayout.unreadCircleDimension + MasterTimelineDefaultCellLayout.unreadCircleMarginRight
// Separator Insets
self.separatorInsets = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 0)
// Icon Image // Icon Image
if cellData.showIcon { if cellData.showIcon {
self.iconImageRect = MasterTimelineDefaultCellLayout.rectForIconView(currentPoint, iconSize: cellData.iconSize) self.iconImageRect = MasterTimelineDefaultCellLayout.rectForIconView(currentPoint, iconSize: cellData.iconSize)

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

@ -79,7 +79,7 @@ class MasterTimelineTableViewCell: VibrantTableViewCell {
feedNameView.setFrameIfNotEqual(layout.feedNameRect) feedNameView.setFrameIfNotEqual(layout.feedNameRect)
dateView.setFrameIfNotEqual(layout.dateRect) dateView.setFrameIfNotEqual(layout.dateRect)
separatorInset = layout.separatorInsets separatorInset = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 0)
} }
func setIconImage(_ image: IconImage) { func setIconImage(_ image: IconImage) {