Fix lint issues.

iOS/MainFeed/Cell/MainFeedRowIdentifier.swift

@@ -11,13 +11,13 @@ import Foundation
 class MainFeedRowIdentifier: NSObject, NSCopying {
 
 	var indexPath: IndexPath
-	
+
 	init(indexPath: IndexPath) {
 		self.indexPath = indexPath
 	}
-	
+
 	func copy(with zone: NSZone? = nil) -> Any {
 		return self
 	}
-	
+
 }

iOS/MainFeed/Cell/MainFeedTableViewCell.swift

@@ -15,7 +15,7 @@ protocol MainFeedTableViewCellDelegate: AnyObject {
 	func mainFeedTableViewCellDisclosureDidToggle(_ sender: MainFeedTableViewCell, expanding: Bool)
 }
 
-class MainFeedTableViewCell : VibrantTableViewCell {
+class MainFeedTableViewCell: VibrantTableViewCell {
 
 	weak var delegate: MainFeedTableViewCellDelegate?
 
@@ -44,7 +44,7 @@ class MainFeedTableViewCell : VibrantTableViewCell {
 			}
 		}
 	}
-	
+
 	var isSeparatorShown = true {
 		didSet {
 			if isSeparatorShown != oldValue {
@@ -56,7 +56,7 @@ class MainFeedTableViewCell : VibrantTableViewCell {
 			}
 		}
 	}
-	
+
 	var unreadCount: Int {
 		get {
 			return unreadCountView.unreadCount
@@ -100,17 +100,17 @@ class MainFeedTableViewCell : VibrantTableViewCell {
 		view.alpha = 0.5
 		return view
 	}()
-	
+
 	private var isDisclosureExpanded = false
 	private var disclosureButton: UIButton?
 	private var unreadCountView = MainFeedUnreadCountView(frame: CGRect.zero)
 	private var isShowingEditControl = false
-	
+
 	required init?(coder: NSCoder) {
 		super.init(coder: coder)
 		commonInit()
 	}
-	
+
 	func setDisclosure(isExpanded: Bool, animated: Bool) {
 		isDisclosureExpanded = isExpanded
 		let duration = animated ? 0.3 : 0.0
@@ -120,42 +120,38 @@ class MainFeedTableViewCell : VibrantTableViewCell {
 				self.disclosureButton?.accessibilityLabel = NSLocalizedString("Collapse Folder", comment: "Collapse Folder")
 				self.disclosureButton?.imageView?.transform = CGAffineTransform(rotationAngle: 1.570796)
 			} else {
-				self.disclosureButton?.accessibilityLabel = NSLocalizedString("Expand Folder", comment: "Expand Folder") 
+				self.disclosureButton?.accessibilityLabel = NSLocalizedString("Expand Folder", comment: "Expand Folder")
 				self.disclosureButton?.imageView?.transform = CGAffineTransform(rotationAngle: 0)
 			}
 		}
 	}
-	
-	override func applyThemeProperties() {
-		super.applyThemeProperties()
-	}
 
 	override func willTransition(to state: UITableViewCell.StateMask) {
 		super.willTransition(to: state)
 		isShowingEditControl = state.contains(.showingEditControl)
 	}
-	
+
 	override func sizeThatFits(_ size: CGSize) -> CGSize {
 		let layout = MainFeedTableViewCellLayout(cellWidth: bounds.size.width, insets: safeAreaInsets, label: titleView, unreadCountView: unreadCountView, showingEditingControl: isShowingEditControl, indent: indentationLevel == 1, shouldShowDisclosure: isDisclosureAvailable)
 		return CGSize(width: bounds.width, height: layout.height)
 	}
-	
+
 	override func layoutSubviews() {
 		super.layoutSubviews()
 		let layout = MainFeedTableViewCellLayout(cellWidth: bounds.size.width, insets: safeAreaInsets, label: titleView, unreadCountView: unreadCountView, showingEditingControl: isShowingEditControl, indent: indentationLevel == 1, shouldShowDisclosure: isDisclosureAvailable)
 		layoutWith(layout)
 	}
-	
+
 	@objc func buttonPressed(_ sender: UIButton) {
 		if isDisclosureAvailable {
 			setDisclosure(isExpanded: !isDisclosureExpanded, animated: true)
 			delegate?.mainFeedTableViewCellDisclosureDidToggle(self, expanding: isDisclosureExpanded)
 		}
 	}
-	
+
 	override func updateVibrancy(animated: Bool) {
 		super.updateVibrancy(animated: animated)
-		
+
 		let iconTintColor: UIColor
 		if isHighlighted || isSelected {
 			iconTintColor = AppAssets.vibrantTextColor
@@ -166,7 +162,7 @@ class MainFeedTableViewCell : VibrantTableViewCell {
 				iconTintColor = AppAssets.secondaryAccentColor
 			}
 		}
-		
+
 		if animated {
 			UIView.animate(withDuration: Self.duration) {
 				self.iconView.tintColor = iconTintColor
@@ -174,10 +170,10 @@ class MainFeedTableViewCell : VibrantTableViewCell {
 		} else {
 			self.iconView.tintColor = iconTintColor
 		}
-		
+
 		updateLabelVibrancy(titleView, color: labelColor, animated: animated)
 	}
-	
+
 }
 
 private extension MainFeedTableViewCell {
@@ -200,7 +196,7 @@ private extension MainFeedTableViewCell {
 		disclosureButton?.addInteraction(UIPointerInteraction())
 		addSubviewAtInit(disclosureButton!)
 	}
-	
+
 	func addSubviewAtInit(_ view: UIView) {
 		addSubview(view)
 		view.translatesAutoresizingMaskIntoConstraints = false
@@ -220,11 +216,11 @@ private extension MainFeedTableViewCell {
 			view.isHidden = true
 		}
 	}
-	
+
 	func showView(_ view: UIView) {
 		if view.isHidden {
 			view.isHidden = false
 		}
 	}
-	
+
 }

iOS/MainFeed/Cell/MainFeedTableViewCellLayout.swift

@@ -21,7 +21,7 @@ struct MainFeedTableViewCellLayout {
 	private static let verticalPadding = CGFloat(integerLiteral: 11)
 
 	private static let minRowHeight = CGFloat(integerLiteral: 44)
-	
+
 	static let faviconCornerRadius = CGFloat(integerLiteral: 2)
 
 	let faviconRect: CGRect
@@ -29,9 +29,9 @@ struct MainFeedTableViewCellLayout {
 	let unreadCountRect: CGRect
 	let disclosureButtonRect: CGRect
 	let separatorRect: CGRect
-	
+
 	let height: CGFloat
-	
+
 	init(cellWidth: CGFloat, insets: UIEdgeInsets, label: UILabel, unreadCountView: MainFeedUnreadCountView, showingEditingControl: Bool, indent: Bool, shouldShowDisclosure: Bool) {
 
 		var initialIndent = insets.left
@@ -39,7 +39,7 @@ struct MainFeedTableViewCellLayout {
 			initialIndent += MainFeedTableViewCellLayout.indentWidth
 		}
 		let bounds = CGRect(x: initialIndent, y: 0.0, width: floor(cellWidth - initialIndent - insets.right), height: 0.0)
-		
+
 		// Disclosure Button
 		var rDisclosure = CGRect.zero
 		if shouldShowDisclosure {
@@ -66,7 +66,7 @@ struct MainFeedTableViewCellLayout {
 			rUnread.size = unreadCountSize
 			rUnread.origin.x = bounds.maxX - (MainFeedTableViewCellLayout.unreadCountMarginRight + unreadCountSize.width)
 		}
-		
+
 		// Title
 		var rLabelx = insets.left + MainFeedTableViewCellLayout.disclosureButtonSize.width
 		if !shouldShowDisclosure {
@@ -80,7 +80,7 @@ struct MainFeedTableViewCellLayout {
 		} else {
 			labelWidth = cellWidth - (rLabelx + MainFeedTableViewCellLayout.labelMarginRight)
 		}
-		
+
 		let labelSizeInfo = MultilineUILabelSizer.size(for: label.text ?? "", font: label.font, numberOfLines: 0, width: Int(floor(labelWidth)))
 
 		// Now that we've got everything (especially the label) computed without the editing controls, update for them.
@@ -99,7 +99,7 @@ struct MainFeedTableViewCellLayout {
 		}
 
 		var rLabel = CGRect(x: rLabelx, y: rLabely, width: labelWidth, height: labelSizeInfo.size.height)
-		
+
 		// Determine cell height
 		let paddedLabelHeight = rLabel.maxY + UIFontMetrics.default.scaledValue(for: MainFeedTableViewCellLayout.verticalPadding)
 		let maxGraphicsHeight = [rFavicon, rUnread, rDisclosure].maxY()
@@ -107,7 +107,7 @@ struct MainFeedTableViewCellLayout {
 		if cellHeight < MainFeedTableViewCellLayout.minRowHeight {
 			cellHeight = MainFeedTableViewCellLayout.minRowHeight
 		}
-		
+
 		// Center in Cell
 		let newBounds = CGRect(x: bounds.origin.x, y: bounds.origin.y, width: bounds.width, height: cellHeight)
 		if !unreadCountIsHidden {
@@ -126,16 +126,16 @@ struct MainFeedTableViewCellLayout {
 		//  Separator Insets
 		let separatorInset = MainFeedTableViewCellLayout.disclosureButtonSize.width
 		separatorRect = CGRect(x: separatorInset, y: cellHeight - 0.5, width: cellWidth - separatorInset, height: 0.5)
-		
+
 		//  Assign the properties
 		self.height = cellHeight
 		self.faviconRect = rFavicon
 		self.unreadCountRect = rUnread
 		self.disclosureButtonRect = rDisclosure
 		self.titleRect = rLabel
-		
+
 	}
-	
+
 	// Ideally this will be implemented in RSCore (see RSGeometry)
 	static func centerVertically(_ originalRect: CGRect, _ containerRect: CGRect) -> CGRect {
 		var result = originalRect
@@ -144,5 +144,5 @@ struct MainFeedTableViewCellLayout {
 		result.size = originalRect.size
 		return result
 	}
-	
+
 }

iOS/MainFeed/Cell/MainFeedTableViewSectionHeader.swift

@@ -15,7 +15,7 @@ protocol MainFeedTableViewSectionHeaderDelegate {
 class MainFeedTableViewSectionHeader: UITableViewHeaderFooterView {
 
 	var delegate: MainFeedTableViewSectionHeaderDelegate?
-	
+
 	override var accessibilityLabel: String? {
 		set {}
 		get {
@@ -37,7 +37,7 @@ class MainFeedTableViewSectionHeader: UITableViewHeaderFooterView {
 			return NSLocalizedString("Collapsed", comment: "Disclosure button collapsed state for accessibility")
 		}
 	}
-	
+
 	var unreadCount: Int {
 		get {
 			return unreadCountView.unreadCount
@@ -50,7 +50,7 @@ class MainFeedTableViewSectionHeader: UITableViewHeaderFooterView {
 			}
 		}
 	}
-	
+
 	var name: String {
 		get {
 			return titleView.text ?? ""
@@ -62,16 +62,16 @@ class MainFeedTableViewSectionHeader: UITableViewHeaderFooterView {
 			}
 		}
 	}
-	
+
 	var disclosureExpanded = false {
 		didSet {
 			updateExpandedState(animate: true)
 			updateUnreadCountView()
 		}
 	}
-	
+
 	var isLastSection = false
-	
+
 	private let titleView: UILabel = {
 		let label = NonIntrinsicLabel()
 		label.numberOfLines = 0
@@ -80,7 +80,7 @@ class MainFeedTableViewSectionHeader: UITableViewHeaderFooterView {
 		label.font = .preferredFont(forTextStyle: .body)
 		return label
 	}()
-	
+
 	private let unreadCountView = MainFeedUnreadCountView(frame: CGRect.zero)
 
 	private lazy var disclosureButton: UIButton = {
@@ -98,27 +98,27 @@ class MainFeedTableViewSectionHeader: UITableViewHeaderFooterView {
 		view.backgroundColor = UIColor.separator
 		return view
 	}()
-	
+
 	private let bottomSeparatorView: UIView = {
 		let view = UIView()
 		view.backgroundColor = UIColor.separator
 		return view
 	}()
-	
+
 	override init(reuseIdentifier: String?) {
 		super.init(reuseIdentifier: reuseIdentifier)
 		commonInit()
 	}
-	
+
 	required init?(coder: NSCoder) {
 		super.init(coder: coder)
 		commonInit()
 	}
-	
+
 	override func sizeThatFits(_ size: CGSize) -> CGSize {
 		let layout = MainFeedTableViewSectionHeaderLayout(cellWidth: size.width, insets: safeAreaInsets, label: titleView, unreadCountView: unreadCountView)
 		return CGSize(width: bounds.width, height: layout.height)
-		
+
 	}
 
 	override func layoutSubviews() {
@@ -137,7 +137,7 @@ private extension MainFeedTableViewSectionHeader {
 	@objc func toggleDisclosure() {
 		delegate?.mainFeedTableViewSectionHeaderDisclosureDidToggle(self)
 	}
-	
+
 	func commonInit() {
 		addSubviewAtInit(unreadCountView)
 		addSubviewAtInit(titleView)
@@ -147,14 +147,14 @@ private extension MainFeedTableViewSectionHeader {
 		addSubviewAtInit(topSeparatorView)
 		addSubviewAtInit(bottomSeparatorView)
 	}
-	
+
 	func updateExpandedState(animate: Bool) {
 		if !isLastSection && self.disclosureExpanded {
 			self.bottomSeparatorView.isHidden = false
 		}
-		
+
 		let duration = animate ? 0.3 : 0.0
-		
+
 		UIView.animate(
 			withDuration: duration,
 			animations: {
@@ -169,7 +169,7 @@ private extension MainFeedTableViewSectionHeader {
 				}
 			})
 	}
-	
+
 	func updateUnreadCountView() {
 		if !disclosureExpanded && unreadCount > 0 {
 			UIView.animate(withDuration: 0.3) {
@@ -186,7 +186,7 @@ private extension MainFeedTableViewSectionHeader {
 		contentView.addSubview(view)
 		view.translatesAutoresizingMaskIntoConstraints = false
 	}
-	
+
 	func layoutWith(_ layout: MainFeedTableViewSectionHeaderLayout) {
 		titleView.setFrameIfNotEqual(layout.titleRect)
 		unreadCountView.setFrameIfNotEqual(layout.unreadCountRect)
@@ -198,14 +198,14 @@ private extension MainFeedTableViewSectionHeader {
 
 		let top = CGRect(x: x, y: 0, width: width, height: height)
 		topSeparatorView.setFrameIfNotEqual(top)
-		
+
 		let bottom = CGRect(x: x, y: frame.height - height, width: width, height: height)
 		bottomSeparatorView.setFrameIfNotEqual(bottom)
 	}
-	
+
 	func addBackgroundView() {
 		self.backgroundView = UIView(frame: self.bounds)
 		self.backgroundView?.backgroundColor = AppAssets.sectionHeaderColor
 	}
-	
+
 }

iOS/MainFeed/Cell/MainFeedTableViewSectionHeaderLayout.swift

@@ -17,17 +17,17 @@ struct MainFeedTableViewSectionHeaderLayout {
 	private static let verticalPadding = CGFloat(integerLiteral: 11)
 
 	private static let minRowHeight = CGFloat(integerLiteral: 44)
-	
+
 	let titleRect: CGRect
 	let unreadCountRect: CGRect
 	let disclosureButtonRect: CGRect
-	
+
 	let height: CGFloat
-	
+
 	init(cellWidth: CGFloat, insets: UIEdgeInsets, label: UILabel, unreadCountView: MainFeedUnreadCountView) {
 
 		let bounds = CGRect(x: insets.left, y: 0.0, width: floor(cellWidth - insets.right), height: 0.0)
-		
+
 		// Disclosure Button
 		var rDisclosure = CGRect.zero
 		rDisclosure.size = MainFeedTableViewSectionHeaderLayout.disclosureButtonSize
@@ -42,7 +42,7 @@ struct MainFeedTableViewSectionHeaderLayout {
 			rUnread.size = unreadCountSize
 			rUnread.origin.x = bounds.maxX - (MainFeedTableViewSectionHeaderLayout.unreadCountMarginRight + unreadCountSize.width)
 		}
-		
+
 		// Max Unread Count
 		// We can't reload Section Headers so we don't let the title extend into the (probably) worse case Unread Count area.
 		let maxUnreadCountView = MainFeedUnreadCountView(frame: CGRect.zero)
@@ -58,7 +58,7 @@ struct MainFeedTableViewSectionHeaderLayout {
 
 		let labelSizeInfo = MultilineUILabelSizer.size(for: label.text ?? "", font: label.font, numberOfLines: 0, width: Int(floor(labelWidth)))
 		var rLabel = CGRect(x: rLabelx, y: rLabely, width: labelWidth, height: labelSizeInfo.size.height)
-		
+
 		// Determine cell height
 		let paddedLabelHeight = rLabel.maxY + UIFontMetrics.default.scaledValue(for: MainFeedTableViewSectionHeaderLayout.verticalPadding)
 		let maxGraphicsHeight = [rUnread, rDisclosure].maxY()
@@ -66,7 +66,7 @@ struct MainFeedTableViewSectionHeaderLayout {
 		if cellHeight < MainFeedTableViewSectionHeaderLayout.minRowHeight {
 			cellHeight = MainFeedTableViewSectionHeaderLayout.minRowHeight
 		}
-		
+
 		// Center in Cell
 		let newBounds = CGRect(x: bounds.origin.x, y: bounds.origin.y, width: bounds.width, height: cellHeight)
 		if !unreadCountIsHidden {
@@ -78,13 +78,13 @@ struct MainFeedTableViewSectionHeaderLayout {
 		if cellHeight == MainFeedTableViewSectionHeaderLayout.minRowHeight {
 			rLabel = MainFeedTableViewCellLayout.centerVertically(rLabel, newBounds)
 		}
-		
+
 		//  Assign the properties
 		self.height = cellHeight
 		self.unreadCountRect = rUnread
 		self.disclosureButtonRect = rDisclosure
 		self.titleRect = rLabel
-		
+
 	}
-	
+
 }

iOS/MainFeed/Cell/MainFeedUnreadCountView.swift

@@ -8,18 +8,18 @@
 
 import UIKit
 
-class MainFeedUnreadCountView : UIView {
+class MainFeedUnreadCountView: UIView {
 
 	var padding: UIEdgeInsets {
 		return UIEdgeInsets(top: 1.0, left: 9.0, bottom: 1.0, right: 9.0)
 	}
-	
+
 	let cornerRadius = 8.0
 	let bgColor = AppAssets.controlBackgroundColor
 	var textColor: UIColor {
 		return UIColor.white
 	}
-	
+
 	var textAttributes: [NSAttributedString.Key: AnyObject] {
 		let textFont = UIFont.preferredFont(forTextStyle: .caption1).bold()
 		return [NSAttributedString.Key.foregroundColor: textColor, NSAttributedString.Key.font: textFont, NSAttributedString.Key.kern: NSNull()]
@@ -33,7 +33,7 @@ class MainFeedUnreadCountView : UIView {
 			setNeedsDisplay()
 		}
 	}
-	
+
 	var unreadCountString: String {
 		return unreadCount < 1 ? "" : "\(unreadCount)"
 	}
@@ -45,18 +45,18 @@ class MainFeedUnreadCountView : UIView {
 		super.init(frame: frame)
 		self.isOpaque = false
 	}
-	
+
 	required init?(coder aDecoder: NSCoder) {
 		super.init(coder: aDecoder)
 		self.isOpaque = false
 	}
-	
+
 	override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
 		textSizeCache = [Int: CGSize]()
 		contentSizeIsValid = false
 		setNeedsDisplay()
 	}
-	
+
 	var contentSize: CGSize {
 		if !contentSizeIsValid {
 			var size = CGSize.zero
@@ -70,7 +70,7 @@ class MainFeedUnreadCountView : UIView {
 		}
 		return _contentSize
 	}
-	
+
 	// Prevent autolayout from messing around with our frame settings
 	override var intrinsicContentSize: CGSize {
 		return CGSize(width: UIView.noIntrinsicMetric, height: UIView.noIntrinsicMetric)
@@ -92,7 +92,7 @@ class MainFeedUnreadCountView : UIView {
 
 		textSizeCache[unreadCount] = size
 		return size
-		
+
 	}
 
 	func textRect() -> CGRect {
@@ -103,7 +103,7 @@ class MainFeedUnreadCountView : UIView {
 		r.origin.x = (bounds.maxX - padding.right) - r.size.width
 		r.origin.y = padding.top
 		return r
-		
+
 	}
 
 	override func draw(_ dirtyRect: CGRect) {
@@ -116,8 +116,7 @@ class MainFeedUnreadCountView : UIView {
 		if unreadCount > 0 {
 			unreadCountString.draw(at: textRect().origin, withAttributes: textAttributes)
 		}
-		
-	}
-	
-}
 
+	}
+
+}