From f3081861a0fe296f6297dd99eaeeb7661aabbc69 Mon Sep 17 00:00:00 2001 From: Nikita Semenov Date: Tue, 6 Sep 2022 15:42:12 +0300 Subject: [PATCH] fix: review notes --- .../DefaultFilterTableViewCell.swift | 2 +- .../DefaultPickerView.swift | 25 +++---------------- 2 files changed, 5 insertions(+), 22 deletions(-) diff --git a/TIEcommerce/Sources/Filters/FiltersViews/ListFilters/FiltersTableViewCell/DefaultFilterTableViewCell.swift b/TIEcommerce/Sources/Filters/FiltersViews/ListFilters/FiltersTableViewCell/DefaultFilterTableViewCell.swift index a6f38143..759c9270 100644 --- a/TIEcommerce/Sources/Filters/FiltersViews/ListFilters/FiltersTableViewCell/DefaultFilterTableViewCell.swift +++ b/TIEcommerce/Sources/Filters/FiltersViews/ListFilters/FiltersTableViewCell/DefaultFilterTableViewCell.swift @@ -62,7 +62,7 @@ open class DefaultFilterTableViewCell: ContainerTableViewCell open func updateAppearance(with appearance: FilterCellStateAppearance) { contentInsets = appearance.contentInsets wrappedView.textColor = appearance.fontColor - wrappedView.images = appearance.stateImages + wrappedView.images = appearance.stateImages ?? [:] backgroundColor = appearance.backgroundColor layer.borderColor = appearance.borderColor.cgColor diff --git a/TIEcommerce/Sources/Filters/FiltersViews/ListFilters/FiltersTableViewCell/DefaultPickerView.swift b/TIEcommerce/Sources/Filters/FiltersViews/ListFilters/FiltersTableViewCell/DefaultPickerView.swift index 12aefab3..a0bdff15 100644 --- a/TIEcommerce/Sources/Filters/FiltersViews/ListFilters/FiltersTableViewCell/DefaultPickerView.swift +++ b/TIEcommerce/Sources/Filters/FiltersViews/ListFilters/FiltersTableViewCell/DefaultPickerView.swift @@ -30,27 +30,10 @@ open class DefaultPickerView: BaseInitializableView, Selectable { private let titleLabel = UILabel() private let selectionStateImageView = UIImageView() - private var normalImage: UIImage? - private var selectedImage: UIImage? - - open var images: UIControl.StateImages? { + open var images: UIControl.StateImages = [:] { didSet { - guard let images = images else { return } - - for (state, image) in images { - switch state { - case .normal: - normalImage = image - - case .highlighted: - selectionStateImageView.highlightedImage = image - - case .selected: - selectedImage = image - - default: - continue - } + if images.contains(where: { $0.key == .highlighted }) { + selectionStateImageView.highlightedImage = images[.highlighted] ?? nil } } } @@ -75,7 +58,7 @@ open class DefaultPickerView: BaseInitializableView, Selectable { open var isSelected: Bool = false { didSet { - selectionStateImageView.image = isSelected ? selectedImage : normalImage + selectionStateImageView.image = images[isSelected ? .selected : .normal] ?? nil } }