diff --git a/VDS/Classes/SelfSizingCollectionView.swift b/VDS/Classes/SelfSizingCollectionView.swift index 5722d477..69270d9a 100644 --- a/VDS/Classes/SelfSizingCollectionView.swift +++ b/VDS/Classes/SelfSizingCollectionView.swift @@ -8,31 +8,31 @@ import Foundation import UIKit -final class SelfSizingCollectionView: UICollectionView { +public final class SelfSizingCollectionView: UICollectionView { private var contentSizeObservation: NSKeyValueObservation? // MARK: - Lifecycle - override init(frame: CGRect, collectionViewLayout layout: UICollectionViewLayout) { + public override init(frame: CGRect, collectionViewLayout layout: UICollectionViewLayout) { super.init(frame: frame, collectionViewLayout: layout) self.setupContentSizeObservation() } - required init?(coder: NSCoder) { + public required init?(coder: NSCoder) { super.init(coder: coder) self.setupContentSizeObservation() } // MARK: - UIView - override var intrinsicContentSize: CGSize { + public override var intrinsicContentSize: CGSize { let contentSize = self.contentSize //print(#function, contentSize) return CGSize(width: UIView.noIntrinsicMetric, height: contentSize.height) } - override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) { + public override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) { //print(type(of: self), #function) super.traitCollectionDidChange(previousTraitCollection) @@ -42,7 +42,7 @@ final class SelfSizingCollectionView: UICollectionView { } } - override func systemLayoutSizeFitting(_ targetSize: CGSize, withHorizontalFittingPriority horizontalFittingPriority: UILayoutPriority, verticalFittingPriority: UILayoutPriority) -> CGSize { + public override func systemLayoutSizeFitting(_ targetSize: CGSize, withHorizontalFittingPriority horizontalFittingPriority: UILayoutPriority, verticalFittingPriority: UILayoutPriority) -> CGSize { let size = super.systemLayoutSizeFitting(targetSize, withHorizontalFittingPriority: horizontalFittingPriority, verticalFittingPriority: verticalFittingPriority) //print(type(of: self), #function, targetSize, "->", size) return size @@ -63,13 +63,9 @@ final class SelfSizingCollectionView: UICollectionView { extension UITraitCollection { - func hasDifferentTextAppearance(comparedTo traitCollection: UITraitCollection?) -> Bool { + public func hasDifferentTextAppearance(comparedTo traitCollection: UITraitCollection?) -> Bool { var result = self.preferredContentSizeCategory != traitCollection?.preferredContentSizeCategory - - if #available(iOS 13.0, *) { - result = result || self.legibilityWeight != traitCollection?.legibilityWeight - } - + result = result || self.legibilityWeight != traitCollection?.legibilityWeight return result } }