From 77d8d4f4eba7c488d1077595e3ab2af79cfbe8c2 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Fri, 11 Nov 2022 20:55:45 -0600 Subject: [PATCH] Rollback debugging code --- .../Cell/MasterFeedTableViewCell.swift | 64 ++++++++++--------- 1 file changed, 34 insertions(+), 30 deletions(-) diff --git a/iOS/MasterFeed/Cell/MasterFeedTableViewCell.swift b/iOS/MasterFeed/Cell/MasterFeedTableViewCell.swift index eca8d43e3..e144cab37 100644 --- a/iOS/MasterFeed/Cell/MasterFeedTableViewCell.swift +++ b/iOS/MasterFeed/Cell/MasterFeedTableViewCell.swift @@ -15,7 +15,7 @@ protocol MasterFeedTableViewCellDelegate: AnyObject { func masterFeedTableViewCellDisclosureDidToggle(_ sender: MasterFeedTableViewCell, expanding: Bool) } -class MasterFeedTableViewCell : UITableViewCell { +class MasterFeedTableViewCell : VibrantTableViewCell { weak var delegate: MasterFeedTableViewCellDelegate? @@ -128,12 +128,16 @@ class MasterFeedTableViewCell : UITableViewCell { 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) @@ -161,34 +165,34 @@ class MasterFeedTableViewCell : UITableViewCell { delegate?.masterFeedTableViewCellDisclosureDidToggle(self, expanding: isDisclosureExpanded) } } -// -// override func updateVibrancy(animated: Bool) { -// super.updateVibrancy(animated: animated) -// -// let iconTintColor: UIColor -// if isHighlighted || isSelected { -// disclosureButton?.tintColor = AppAssets.vibrantTextColor -// iconTintColor = AppAssets.vibrantTextColor -// } else { -// disclosureButton?.tintColor = AppAssets.secondaryAccentColor -// if let preferredColor = iconImage?.preferredColor { -// iconTintColor = UIColor(cgColor: preferredColor) -// } else { -// iconTintColor = AppAssets.secondaryAccentColor -// } -// } -// -// if animated { -// UIView.animate(withDuration: Self.duration) { -// self.iconView.tintColor = iconTintColor -// } -// } else { -// self.iconView.tintColor = iconTintColor -// } -// -// updateLabelVibrancy(titleView, color: labelColor, animated: animated) -// } -// + + override func updateVibrancy(animated: Bool) { + super.updateVibrancy(animated: animated) + + let iconTintColor: UIColor + if isHighlighted || isSelected { + disclosureButton?.tintColor = AppAssets.vibrantTextColor + iconTintColor = AppAssets.vibrantTextColor + } else { + disclosureButton?.tintColor = AppAssets.secondaryAccentColor + if let preferredColor = iconImage?.preferredColor { + iconTintColor = UIColor(cgColor: preferredColor) + } else { + iconTintColor = AppAssets.secondaryAccentColor + } + } + + if animated { + UIView.animate(withDuration: Self.duration) { + self.iconView.tintColor = iconTintColor + } + } else { + self.iconView.tintColor = iconTintColor + } + + updateLabelVibrancy(titleView, color: labelColor, animated: animated) + } + } private extension MasterFeedTableViewCell {