From 90e252dc785662c580203ec172c33c10be565f3e Mon Sep 17 00:00:00 2001 From: jonkykong Date: Tue, 10 Oct 2017 17:36:29 -0700 Subject: [PATCH] Renamed class and refactored how blurring works in UITableViewVibrantCell. --- ...swift => SideMenuTableViewController.swift} | 18 ++++++++++++++---- Pod/Classes/UITableViewVibrantCell.swift | 15 ++++++++++----- SideMenu.xcodeproj/project.pbxproj | 8 ++++---- 3 files changed, 28 insertions(+), 13 deletions(-) rename Example/{SideMenuTableView.swift => SideMenuTableViewController.swift} (50%) diff --git a/Example/SideMenuTableView.swift b/Example/SideMenuTableViewController.swift similarity index 50% rename from Example/SideMenuTableView.swift rename to Example/SideMenuTableViewController.swift index 923bacf..e669f57 100644 --- a/Example/SideMenuTableView.swift +++ b/Example/SideMenuTableViewController.swift @@ -1,5 +1,5 @@ // -// SideMenuTableView.swift +// SideMenuTableViewController.swift // SideMenu // // Created by Jon Kent on 4/5/16. @@ -9,13 +9,15 @@ import Foundation import SideMenu -class SideMenuTableView: UITableViewController { +class SideMenuTableViewController: UITableViewController { override func viewWillAppear(_ animated: Bool) { super.viewWillAppear(animated) - // this will be non-nil if a blur effect is applied - guard tableView.backgroundView == nil else { + // refresh cell blur effect in case it changed + tableView.reloadData() + + guard SideMenuManager.default.menuBlurEffectStyle == nil else { return } @@ -26,4 +28,12 @@ class SideMenuTableView: UITableViewController { tableView.backgroundView = imageView } + override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { + let cell = super.tableView(tableView, cellForRowAt: indexPath) as! UITableViewVibrantCell + + cell.blurEffectStyle = SideMenuManager.default.menuBlurEffectStyle + + return cell + } + } diff --git a/Pod/Classes/UITableViewVibrantCell.swift b/Pod/Classes/UITableViewVibrantCell.swift index 58303e4..2ececb7 100644 --- a/Pod/Classes/UITableViewVibrantCell.swift +++ b/Pod/Classes/UITableViewVibrantCell.swift @@ -13,6 +13,11 @@ open class UITableViewVibrantCell: UITableViewCell { fileprivate var vibrancyView:UIVisualEffectView = UIVisualEffectView() fileprivate var vibrancySelectedBackgroundView:UIVisualEffectView = UIVisualEffectView() fileprivate var defaultSelectedBackgroundView:UIView? + open var blurEffectStyle: UIBlurEffectStyle? { + didSet { + updateBlur() + } + } // For registering with UITableView without subclassing otherwise dequeuing instance of the cell causes an exception public override init(style: UITableViewCellStyle, reuseIdentifier: String?) { @@ -32,16 +37,16 @@ open class UITableViewVibrantCell: UITableViewCell { let blurSelectionEffect = UIBlurEffect(style: .light) vibrancySelectedBackgroundView.effect = blurSelectionEffect defaultSelectedBackgroundView = selectedBackgroundView + + updateBlur() } - override open func layoutSubviews() { - super.layoutSubviews() - + internal func updateBlur() { // shouldn't be needed but backgroundColor is set to white on iPad: backgroundColor = UIColor.clear - if !UIAccessibilityIsReduceTransparencyEnabled() && SideMenuManager.menuBlurEffectStyle != nil { - let blurEffect = UIBlurEffect(style: SideMenuManager.menuBlurEffectStyle!) + if let blurEffectStyle = blurEffectStyle, !UIAccessibilityIsReduceTransparencyEnabled() { + let blurEffect = UIBlurEffect(style: blurEffectStyle) vibrancyView.effect = UIVibrancyEffect(blurEffect: blurEffect) if selectedBackgroundView != nil && selectedBackgroundView != vibrancySelectedBackgroundView { diff --git a/SideMenu.xcodeproj/project.pbxproj b/SideMenu.xcodeproj/project.pbxproj index 433906e..4900d78 100644 --- a/SideMenu.xcodeproj/project.pbxproj +++ b/SideMenu.xcodeproj/project.pbxproj @@ -15,7 +15,7 @@ 7B48A0EB1DCB2487002990A1 /* Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B48A0EA1DCB2487002990A1 /* Tests.swift */; }; 7B48A0F61DCB2518002990A1 /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B48A0F31DCB2518002990A1 /* MainViewController.swift */; }; 7B48A0F71DCB2518002990A1 /* PresentedViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B48A0F41DCB2518002990A1 /* PresentedViewController.swift */; }; - 7B48A0F81DCB2518002990A1 /* SideMenuTableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B48A0F51DCB2518002990A1 /* SideMenuTableView.swift */; }; + 7B48A0F81DCB2518002990A1 /* SideMenuTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B48A0F51DCB2518002990A1 /* SideMenuTableViewController.swift */; }; 7B552D5D1DCC65830010301C /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7B552D5C1DCC65830010301C /* Launch Screen.storyboard */; }; 7B5FA9B61DCB269700278DF6 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7B5FA9B51DCB269700278DF6 /* Main.storyboard */; }; 8461A2D31E145A08001DA4F8 /* SideMenuManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8461A2CF1E145A08001DA4F8 /* SideMenuManager.swift */; }; @@ -53,7 +53,7 @@ 7B48A0EC1DCB2487002990A1 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 7B48A0F31DCB2518002990A1 /* MainViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MainViewController.swift; sourceTree = ""; }; 7B48A0F41DCB2518002990A1 /* PresentedViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PresentedViewController.swift; sourceTree = ""; }; - 7B48A0F51DCB2518002990A1 /* SideMenuTableView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SideMenuTableView.swift; sourceTree = ""; }; + 7B48A0F51DCB2518002990A1 /* SideMenuTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SideMenuTableViewController.swift; sourceTree = ""; }; 7B552D5C1DCC65830010301C /* Launch Screen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = ""; }; 7B5FA9B51DCB269700278DF6 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = ""; }; 7B9DC9041DC6E8C1000D4007 /* SideMenu.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SideMenu.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -124,10 +124,10 @@ 65FF1B391DE31DA3007B0845 /* SupportingFiles */, 7B48A0D51DCB2487002990A1 /* AppDelegate.swift */, 7B48A0F31DCB2518002990A1 /* MainViewController.swift */, + 7B48A0F51DCB2518002990A1 /* SideMenuTableViewController.swift */, 7B48A0F41DCB2518002990A1 /* PresentedViewController.swift */, 7B552D5C1DCC65830010301C /* Launch Screen.storyboard */, 7B5FA9B51DCB269700278DF6 /* Main.storyboard */, - 7B48A0F51DCB2518002990A1 /* SideMenuTableView.swift */, 7B48A0DC1DCB2487002990A1 /* Assets.xcassets */, 7B48A0E11DCB2487002990A1 /* Info.plist */, ); @@ -448,7 +448,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 7B48A0F81DCB2518002990A1 /* SideMenuTableView.swift in Sources */, + 7B48A0F81DCB2518002990A1 /* SideMenuTableViewController.swift in Sources */, 7B48A0F61DCB2518002990A1 /* MainViewController.swift in Sources */, 7B48A0F71DCB2518002990A1 /* PresentedViewController.swift in Sources */, 7B48A0D61DCB2487002990A1 /* AppDelegate.swift in Sources */,