Fix lint issues.

iOS/MainTimeline/Cell/MainTimelineAccessibilityCellLayout.swift

@@ -19,7 +19,7 @@ struct MainTimelineAccessibilityCellLayout: MainTimelineCellLayout {
 	let summaryRect: CGRect
 	let feedNameRect: CGRect
 	let dateRect: CGRect
-	
+
 	init(width: CGFloat, insets: UIEdgeInsets, cellData: MainTimelineCellData) {
 
 		var currentPoint = CGPoint.zero
@@ -40,13 +40,13 @@ struct MainTimelineAccessibilityCellLayout: MainTimelineCellLayout {
 		} else {
 			self.iconImageRect = CGRect.zero
 		}
-		
+
 		let textAreaWidth = width - (currentPoint.x + MainTimelineDefaultCellLayout.cellPadding.right + insets.right)
 
 		// Title Text Block
 		let (titleRect, numberOfLinesForTitle) = MainTimelineAccessibilityCellLayout.rectForTitle(cellData, currentPoint, textAreaWidth)
 		self.titleRect = titleRect
-		
+
 		// Summary Text Block
 		if self.titleRect != CGRect.zero {
 			currentPoint.y = self.titleRect.maxY + MainTimelineDefaultCellLayout.titleBottomMargin
@@ -54,21 +54,21 @@ struct MainTimelineAccessibilityCellLayout: MainTimelineCellLayout {
 		self.summaryRect = MainTimelineAccessibilityCellLayout.rectForSummary(cellData, currentPoint, textAreaWidth, numberOfLinesForTitle)
 
 		currentPoint.y = [self.titleRect, self.summaryRect].maxY()
-		
+
 		if cellData.showFeedName != .none {
 			self.feedNameRect = MainTimelineAccessibilityCellLayout.rectForFeedName(cellData, currentPoint, textAreaWidth)
 			currentPoint.y = self.feedNameRect.maxY
 		} else {
 			self.feedNameRect = CGRect.zero
 		}
-		
+
 		// Feed Name and Pub Date
 		self.dateRect = MainTimelineAccessibilityCellLayout.rectForDate(cellData, currentPoint, textAreaWidth)
 
 		self.height = self.dateRect.maxY + MainTimelineDefaultCellLayout.cellPadding.bottom
 
 	}
-	
+
 }
 
 // MARK: - Calculate Rects
@@ -78,13 +78,13 @@ private extension MainTimelineAccessibilityCellLayout {
 	static func rectForDate(_ cellData: MainTimelineCellData, _ point: CGPoint, _ textAreaWidth: CGFloat) -> CGRect {
 
 		var r = CGRect.zero
-		
+
 		let size = SingleLineUILabelSizer.size(for: cellData.dateString, font: MainTimelineDefaultCellLayout.dateFont)
 		r.size = size
 		r.origin = point
-		
+
 		return r
-		
+
 	}
-	
+
 }

iOS/MainTimeline/Cell/MainTimelineCellData.swift

@@ -12,7 +12,7 @@ import Articles
 struct MainTimelineCellData {
 
 	private static let noText = NSLocalizedString("(No Text)", comment: "No Text")
-	
+
 	let title: String
 	let attributedTitle: NSAttributedString
 	let summary: String
@@ -38,16 +38,15 @@ struct MainTimelineCellData {
 		} else {
 			self.summary = truncatedSummary
 		}
-		
+
 		self.dateString = ArticleStringFormatter.dateString(article.logicalDatePublished)
 
 		if let feedName = feedName {
 			self.feedName = ArticleStringFormatter.truncatedFeedName(feedName)
-		}
-		else {
+		} else {
 			self.feedName = ""
 		}
-		
+
 		if let byline = byline {
 			self.byline = byline
 		} else {
@@ -63,10 +62,10 @@ struct MainTimelineCellData {
 		self.starred = article.status.starred
 		self.numberOfLines = numberOfLines
 		self.iconSize = iconSize
-		
+
 	}
 
-	init() { //Empty
+	init() { // Empty
 		self.title = ""
 		self.attributedTitle = NSAttributedString()
 		self.summary = ""
@@ -81,5 +80,5 @@ struct MainTimelineCellData {
 		self.numberOfLines = 0
 		self.iconSize = .medium
 	}
-	
+
 }

iOS/MainTimeline/Cell/MainTimelineCellLayout.swift

@@ -18,7 +18,7 @@ protocol MainTimelineCellLayout {
 	var summaryRect: CGRect {get}
 	var feedNameRect: CGRect {get}
 	var dateRect: CGRect {get}
-	
+
 }
 
 extension MainTimelineCellLayout {
@@ -30,8 +30,7 @@ extension MainTimelineCellLayout {
 		r.origin.y = point.y + 5
 		return r
 	}
-	
-	
+
 	static func rectForStar(_ point: CGPoint) -> CGRect {
 		var r = CGRect.zero
 		r.size.width = MainTimelineDefaultCellLayout.starDimension
@@ -40,7 +39,7 @@ extension MainTimelineCellLayout {
 		r.origin.y = point.y + 3
 		return r
 	}
-	
+
 	static func rectForIconView(_ point: CGPoint, iconSize: IconSize) -> CGRect {
 		var r = CGRect.zero
 		r.size = iconSize.size
@@ -48,16 +47,16 @@ extension MainTimelineCellLayout {
 		r.origin.y = point.y + 4
 		return r
 	}
-	
+
 	static func rectForTitle(_ cellData: MainTimelineCellData, _ point: CGPoint, _ textAreaWidth: CGFloat) -> (CGRect, Int) {
 
 		var r = CGRect.zero
 		if cellData.title.isEmpty {
 			return (r, 0)
 		}
-		
+
 		r.origin = point
-		
+
 		let sizeInfo = MultilineUILabelSizer.size(for: cellData.title, font: MainTimelineDefaultCellLayout.titleFont, numberOfLines: cellData.numberOfLines, width: Int(textAreaWidth))
 
 		r.size.width = textAreaWidth
@@ -65,22 +64,22 @@ extension MainTimelineCellLayout {
 		if sizeInfo.numberOfLinesUsed < 1 {
 			r.size.height = 0
 		}
-		
+
 		return (r, sizeInfo.numberOfLinesUsed)
-		
+
 	}
-	
+
 	static func rectForSummary(_ cellData: MainTimelineCellData, _ point: CGPoint, _ textAreaWidth: CGFloat, _ linesUsed: Int) -> CGRect {
 
 		let linesLeft = cellData.numberOfLines - linesUsed
-		
+
 		var r = CGRect.zero
 		if cellData.summary.isEmpty || linesLeft < 1 {
 			return r
 		}
-		
+
 		r.origin = point
-		
+
 		let sizeInfo = MultilineUILabelSizer.size(for: cellData.summary, font: MainTimelineDefaultCellLayout.summaryFont, numberOfLines: linesLeft, width: Int(textAreaWidth))
 
 		r.size.width = textAreaWidth
@@ -88,26 +87,26 @@ extension MainTimelineCellLayout {
 		if sizeInfo.numberOfLinesUsed < 1 {
 			r.size.height = 0
 		}
-		
+
 		return r
-		
+
 	}
 
 	static func rectForFeedName(_ cellData: MainTimelineCellData, _ point: CGPoint, _ textAreaWidth: CGFloat) -> CGRect {
 
 		var r = CGRect.zero
 		r.origin = point
-		
+
 		let feedName = cellData.showFeedName == .feed ? cellData.feedName : cellData.byline
 		let size = SingleLineUILabelSizer.size(for: feedName, font: MainTimelineDefaultCellLayout.feedNameFont)
 		r.size = size
-		
+
 		if r.size.width > textAreaWidth {
 			r.size.width = textAreaWidth
 		}
-		
+
 		return r
-		
+
 	}
-	
+
 }

iOS/MainTimeline/Cell/MainTimelineDefaultCellLayout.swift

@@ -12,7 +12,7 @@ import RSCore
 struct MainTimelineDefaultCellLayout: MainTimelineCellLayout {
 
 	static let cellPadding = UIEdgeInsets(top: 12, left: 8, bottom: 12, right: 20)
-	
+
 	static let unreadCircleMarginLeft = CGFloat(integerLiteral: 0)
 	static let unreadCircleDimension = CGFloat(integerLiteral: 12)
 	static let unreadCircleSize = CGSize(width: MainTimelineDefaultCellLayout.unreadCircleDimension, height: MainTimelineDefaultCellLayout.unreadCircleDimension)
@@ -33,7 +33,7 @@ struct MainTimelineDefaultCellLayout: MainTimelineCellLayout {
 		return UIFont.preferredFont(forTextStyle: .footnote)
 	}
 	static let feedRightMargin = CGFloat(integerLiteral: 8)
-	
+
 	static var dateFont: UIFont {
 		return UIFont.preferredFont(forTextStyle: .footnote)
 	}
@@ -72,13 +72,13 @@ struct MainTimelineDefaultCellLayout: MainTimelineCellLayout {
 		} else {
 			self.iconImageRect = CGRect.zero
 		}
-		
+
 		let textAreaWidth = width - (currentPoint.x + MainTimelineDefaultCellLayout.cellPadding.right + insets.right)
 
 		// Title Text Block
 		let (titleRect, numberOfLinesForTitle) = MainTimelineDefaultCellLayout.rectForTitle(cellData, currentPoint, textAreaWidth)
 		self.titleRect = titleRect
-		
+
 		// Summary Text Block
 		if self.titleRect != CGRect.zero {
 			currentPoint.y = self.titleRect.maxY + MainTimelineDefaultCellLayout.titleBottomMargin
@@ -93,7 +93,7 @@ struct MainTimelineDefaultCellLayout: MainTimelineCellLayout {
 			y -= tmp.height
 		}
 		currentPoint.y = y
-		
+
 		// Feed Name and Pub Date
 		self.dateRect = MainTimelineDefaultCellLayout.rectForDate(cellData, currentPoint, textAreaWidth)
 
@@ -103,7 +103,7 @@ struct MainTimelineDefaultCellLayout: MainTimelineCellLayout {
 		self.height = [self.iconImageRect, self.feedNameRect].maxY() + MainTimelineDefaultCellLayout.cellPadding.bottom
 
 	}
-	
+
 }
 
 // MARK: - Calculate Rects
@@ -113,14 +113,14 @@ extension MainTimelineDefaultCellLayout {
 	static func rectForDate(_ cellData: MainTimelineCellData, _ point: CGPoint, _ textAreaWidth: CGFloat) -> CGRect {
 
 		var r = CGRect.zero
-		
+
 		let size = SingleLineUILabelSizer.size(for: cellData.dateString, font: MainTimelineDefaultCellLayout.dateFont)
 		r.size = size
 		r.origin.x = (point.x + textAreaWidth) - size.width
 		r.origin.y = point.y
 
 		return r
-		
+
 	}
-	
+
 }

iOS/MainTimeline/Cell/MainTimelineTableViewCell.swift

@@ -18,11 +18,11 @@ class MainTimelineTableViewCell: VibrantTableViewCell {
 	private let feedNameView = MainTimelineTableViewCell.singleLineUILabel()
 
 	private lazy var iconView = IconView()
-	
+
 	private lazy var starView = {
 		return NonIntrinsicImageView(image: AppAssets.timelineStarImage)
 	}()
-	
+
 	private var unreadIndicatorPropertyAnimator: UIViewPropertyAnimator?
 	private var starViewPropertyAnimator: UIViewPropertyAnimator?
 
@@ -31,12 +31,12 @@ class MainTimelineTableViewCell: VibrantTableViewCell {
 			updateSubviews()
 		}
 	}
-	
+
 	required init?(coder: NSCoder) {
 		super.init(coder: coder)
 		commonInit()
 	}
-	
+
 	override func prepareForReuse() {
 		unreadIndicatorPropertyAnimator?.stopAnimation(true)
 		unreadIndicatorPropertyAnimator = nil
@@ -46,19 +46,19 @@ class MainTimelineTableViewCell: VibrantTableViewCell {
 		starViewPropertyAnimator = nil
 		starView.isHidden = true
 	}
-	
+
 	override var frame: CGRect {
 		didSet {
 			setNeedsLayout()
 		}
 	}
-	
+
 	override func updateVibrancy(animated: Bool) {
 		updateLabelVibrancy(titleView, color: labelColor, animated: animated)
 		updateLabelVibrancy(summaryView, color: labelColor, animated: animated)
 		updateLabelVibrancy(dateView, color: secondaryLabelColor, animated: animated)
 		updateLabelVibrancy(feedNameView, color: secondaryLabelColor, animated: animated)
-		
+
 		if animated {
 			UIView.animate(withDuration: Self.duration) {
 				if self.isHighlighted || self.isSelected {
@@ -75,16 +75,16 @@ class MainTimelineTableViewCell: VibrantTableViewCell {
 			}
 		}
 	}
-	
+
 	override func sizeThatFits(_ size: CGSize) -> CGSize {
 		let layout = updatedLayout(width: size.width)
 		return CGSize(width: size.width, height: layout.height)
 	}
 
 	override func layoutSubviews() {
-		
+
 		super.layoutSubviews()
-		
+
 		let layout = updatedLayout(width: bounds.width)
 
 		unreadIndicatorView.setFrameIfNotEqual(layout.unreadIndicatorRect)
@@ -97,11 +97,11 @@ class MainTimelineTableViewCell: VibrantTableViewCell {
 
 		separatorInset = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 0)
 	}
-	
+
 	func setIconImage(_ image: IconImage) {
 		iconView.iconImage = image
 	}
-	
+
 }
 
 // MARK: - Private
@@ -115,7 +115,7 @@ private extension MainTimelineTableViewCell {
 		label.adjustsFontForContentSizeCategory = true
 		return label
 	}
-	
+
 	static func multiLineUILabel() -> UILabel {
 		let label = NonIntrinsicLabel()
 		label.numberOfLines = 0
@@ -124,16 +124,16 @@ private extension MainTimelineTableViewCell {
 		label.adjustsFontForContentSizeCategory = true
 		return label
 	}
-	
+
 	func setFrame(for label: UILabel, rect: CGRect) {
-		
+
 		if Int(floor(rect.height)) == 0 || Int(floor(rect.width)) == 0 {
 			hideView(label)
 		} else {
 			showView(label)
 			label.setFrameIfNotEqual(rect)
 		}
-		
+
 	}
 
 	func addSubviewAtInit(_ view: UIView, hidden: Bool) {
@@ -141,9 +141,9 @@ private extension MainTimelineTableViewCell {
 		view.translatesAutoresizingMaskIntoConstraints = false
 		view.isHidden = hidden
 	}
-	
+
 	func commonInit() {
-		
+
 		addSubviewAtInit(titleView, hidden: false)
 		addSubviewAtInit(summaryView, hidden: true)
 		addSubviewAtInit(unreadIndicatorView, hidden: true)
@@ -152,7 +152,7 @@ private extension MainTimelineTableViewCell {
 		addSubviewAtInit(iconView, hidden: true)
 		addSubviewAtInit(starView, hidden: true)
 	}
-	
+
 	func updatedLayout(width: CGFloat) -> MainTimelineCellLayout {
 		if UIApplication.shared.preferredContentSizeCategory.isAccessibilityCategory {
 			return MainTimelineAccessibilityCellLayout(width: width, insets: safeAreaInsets, cellData: cellData)
@@ -160,25 +160,25 @@ private extension MainTimelineTableViewCell {
 			return MainTimelineDefaultCellLayout(width: width, insets: safeAreaInsets, cellData: cellData)
 		}
 	}
-	
+
 	func updateTitleView() {
 		titleView.font = MainTimelineDefaultCellLayout.titleFont
 		titleView.textColor = labelColor
 		updateTextFieldAttributedText(titleView, cellData?.attributedTitle)
 	}
-	
+
 	func updateSummaryView() {
 		summaryView.font = MainTimelineDefaultCellLayout.summaryFont
 		summaryView.textColor = labelColor
 		updateTextFieldText(summaryView, cellData?.summary)
 	}
-	
+
 	func updateDateView() {
 		dateView.font = MainTimelineDefaultCellLayout.dateFont
 		dateView.textColor = secondaryLabelColor
 		updateTextFieldText(dateView, cellData.dateString)
 	}
-	
+
 	func updateTextFieldText(_ label: UILabel, _ text: String?) {
 		let s = text ?? ""
 		if label.text != s {
@@ -199,7 +199,7 @@ private extension MainTimelineTableViewCell {
 			setNeedsLayout()
 		}
 	}
-	
+
 	func updateFeedNameView() {
 		switch cellData.showFeedName {
 		case .feed:
@@ -216,7 +216,7 @@ private extension MainTimelineTableViewCell {
 			hideView(feedNameView)
 		}
 	}
-	
+
 	func updateUnreadIndicator() {
 		if !unreadIndicatorView.isHidden && cellData.read && !cellData.starred {
 			unreadIndicatorPropertyAnimator = UIViewPropertyAnimator(duration: 0.66, curve: .easeInOut) { [weak self] in
@@ -233,7 +233,7 @@ private extension MainTimelineTableViewCell {
 			showOrHideView(unreadIndicatorView, cellData.read || cellData.starred)
 		}
 	}
-	
+
 	func updateStarView() {
 		if !starView.isHidden && cellData.read && !cellData.starred {
 			starViewPropertyAnimator = UIViewPropertyAnimator(duration: 0.66, curve: .easeInOut) { [weak self] in
@@ -250,7 +250,7 @@ private extension MainTimelineTableViewCell {
 			showOrHideView(starView, !cellData.starred)
 		}
 	}
-	
+
 	func updateIconImage() {
 		guard let image = cellData.iconImage, cellData.showIcon else {
 			makeIconEmpty()
@@ -258,20 +258,20 @@ private extension MainTimelineTableViewCell {
 		}
 
 		showView(iconView)
-		
+
 		if iconView.iconImage !== cellData.iconImage {
 			iconView.iconImage = image
 			setNeedsLayout()
 		}
 	}
-	
+
 	func updateAccessiblityLabel() {
 		let starredStatus = cellData.starred ? "\(NSLocalizedString("Starred", comment: "Starred article for accessibility")), " : ""
 		let unreadStatus = cellData.read ? "" : "\(NSLocalizedString("Unread", comment: "Unread")), "
 		let label = starredStatus + unreadStatus + "\(cellData.feedName), \(cellData.title), \(cellData.summary), \(cellData.dateString)"
 		accessibilityLabel = label
 	}
-	
+
 	func makeIconEmpty() {
 		if iconView.iconImage != nil {
 			iconView.iconImage = nil
@@ -279,23 +279,23 @@ private extension MainTimelineTableViewCell {
 		}
 		hideView(iconView)
 	}
-	
+
 	func hideView(_ view: UIView) {
 		if !view.isHidden {
 			view.isHidden = true
 		}
 	}
-	
+
 	func showView(_ view: UIView) {
 		if view.isHidden {
 			view.isHidden = false
 		}
 	}
-	
+
 	func showOrHideView(_ view: UIView, _ shouldHide: Bool) {
 		shouldHide ? hideView(view) : showView(view)
 	}
-	
+
 	func updateSubviews() {
 		updateTitleView()
 		updateSummaryView()
@@ -306,5 +306,5 @@ private extension MainTimelineTableViewCell {
 		updateIconImage()
 		updateAccessiblityLabel()
 	}
-	
+
 }

iOS/MainTimeline/Cell/MainUnreadIndicatorView.swift

@@ -15,5 +15,5 @@ class MainUnreadIndicatorView: UIView {
 		layer.cornerRadius = frame.size.width / 2.0
 		clipsToBounds = true
 	}
-    
+
 }

iOS/MainTimeline/Cell/MultilineUILabelSizer.swift

@@ -42,7 +42,7 @@ final class MultilineUILabelSizer {
 
 		self.singleLineHeightEstimate = MultilineUILabelSizer.calculateHeight("AqLjJ0/y", 200, font)
 		self.doubleLineHeightEstimate = MultilineUILabelSizer.calculateHeight("AqLjJ0/y\nAqLjJ0/y", 200, font)
-		
+
 	}
 
 	static func size(for string: String, font: UIFont, numberOfLines: Int, width: Int) -> TextFieldSizeInfo {
@@ -52,7 +52,7 @@ final class MultilineUILabelSizer {
 	static func emptyCache() {
 		sizers = [UILabelSizerSpecifier: MultilineUILabelSizer]()
 	}
-	
+
 }
 
 // MARK: - Private
@@ -69,7 +69,7 @@ private extension MultilineUILabelSizer {
 		let newSizer = MultilineUILabelSizer(numberOfLines: numberOfLines, font: font)
 		sizers[specifier] = newSizer
 		return newSizer
-		
+
 	}
 
 	func sizeInfo(for string: String, width: Int) -> TextFieldSizeInfo {
@@ -80,7 +80,7 @@ private extension MultilineUILabelSizer {
 		let size = CGSize(width: width, height: textFieldHeight)
 		let sizeInfo = TextFieldSizeInfo(size: size, numberOfLinesUsed: numberOfLinesUsed)
 		return sizeInfo
-		
+
 	}
 
 	func height(for string: String, width: Int) -> Int {
@@ -98,14 +98,14 @@ private extension MultilineUILabelSizer {
 		}
 
 		var height = MultilineUILabelSizer.calculateHeight(string, width, font)
-		
+
 		if numberOfLines != 0 {
 			let maxHeight = singleLineHeightEstimate * numberOfLines
 			if height > maxHeight {
 				height = maxHeight
 			}
 		}
-		
+
 		cache[string]![width] = height
 
 		return height
@@ -123,7 +123,7 @@ private extension MultilineUILabelSizer {
 		let averageHeight = CGFloat(doubleLineHeightEstimate) / 2.0
 		let lines = Int(round(CGFloat(height) / averageHeight))
 		return lines
-		
+
 	}
 
 	func heightIsProbablySingleLineHeight(_ height: Int) -> Bool {
@@ -140,7 +140,7 @@ private extension MultilineUILabelSizer {
 		let minimum = estimate - slop
 		let maximum = estimate + slop
 		return height >= minimum && height <= maximum
-		
+
 	}
 
 	func heightConsideringNeighbors(_ heightCache: WidthHeightCache, _ width: Int) -> Int? {
@@ -165,8 +165,7 @@ private extension MultilineUILabelSizer {
 
 			if oneWidth < width && (oneWidth > smallNeighbor.width || smallNeighbor.width == 0) {
 				smallNeighbor = (oneWidth, oneHeight)
-			}
-			else if oneWidth > width && (oneWidth < largeNeighbor.width || largeNeighbor.width == 0) {
+			} else if oneWidth > width && (oneWidth < largeNeighbor.width || largeNeighbor.width == 0) {
 				largeNeighbor = (oneWidth, oneHeight)
 			}
 
@@ -176,7 +175,7 @@ private extension MultilineUILabelSizer {
 		}
 
 		return nil
-		
+
 	}
-	
+
 }

iOS/MainTimeline/Cell/SingleLineUILabelSizer.swift

@@ -30,10 +30,10 @@ final class SingleLineUILabelSizer {
 		let height = text.height(withConstrainedWidth: .greatestFiniteMagnitude, font: font)
 		let width = text.width(withConstrainedHeight: .greatestFiniteMagnitude, font: font)
 		let calculatedSize = CGSize(width: ceil(width), height: ceil(height))
-		
+
 		cache[text] = calculatedSize
 		return calculatedSize
-		
+
 	}
 
 	static private var sizers = [UIFont: SingleLineUILabelSizer]()
@@ -48,7 +48,7 @@ final class SingleLineUILabelSizer {
 		sizers[font] = newSizer
 
 		return newSizer
-		
+
 	}
 
 	// Use this call. It’s easiest.
@@ -60,5 +60,5 @@ final class SingleLineUILabelSizer {
 	static func emptyCache() {
 		sizers = [UIFont: SingleLineUILabelSizer]()
 	}
-	
+
 }