Merge pull request #81 from handsomecode/develop

Update to SideMenuItemShadow

Author: enmiller

CHANGELOG.md

@@ -1,6 +1,12 @@
 # Change Log
 All notable changes of the library will be documented in this file.
 
+## 2.3
+### Changed
+- Renamed `SideMenuItemShadow` to `SideMenuItemOptions` to allow for additional visual properties to be changed. (Sorry for the volitility. The new name gives better flexibility going forward.)
+- Moved the drop shadow customization for the opened menu item to a property on `SideMenuItemOption` called `shadow`.  Use the `Shadow` struct now to assign your custom values.
+- `MenuContainerViewController`'s `shadowOptions` property has been renamed to `currentItemOptions`
+
 ## 2.2
 ### Added
 - Ability to globally change the drop shadow of the current content view while the menu is open (#61)

InteractiveSideMenu.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "InteractiveSideMenu"
-  s.version      = "2.2.1"
+  s.version      = "2.3"
   s.summary      = "Interactive Side Menu in Swift"
   s.homepage     = "https://github.com/handsomecode/InteractiveSideMenu"
   s.license      = "Apache 2.0 license"

InteractiveSideMenu.xcodeproj/project.pbxproj

@@ -14,7 +14,7 @@
 		881EF0981E3101B80035DEB4 /* MenuContainerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 881EF0941E3101B80035DEB4 /* MenuContainerViewController.swift */; };
 		881EF0991E3101B80035DEB4 /* SideMenuItemContent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 881EF0951E3101B80035DEB4 /* SideMenuItemContent.swift */; };
 		881EF09A1E3101B80035DEB4 /* MenuViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 881EF0961E3101B80035DEB4 /* MenuViewController.swift */; };
-		D48B8AEC202CDE1A0010D9A4 /* SideMenuItemShadow.swift in Sources */ = {isa = PBXBuildFile; fileRef = D48B8AEB202CDE1A0010D9A4 /* SideMenuItemShadow.swift */; };
+		D48B8AEC202CDE1A0010D9A4 /* SideMenuItemOptions.swift in Sources */ = {isa = PBXBuildFile; fileRef = D48B8AEB202CDE1A0010D9A4 /* SideMenuItemOptions.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -27,7 +27,7 @@
 		881EF0941E3101B80035DEB4 /* MenuContainerViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MenuContainerViewController.swift; sourceTree = "<group>"; };
 		881EF0951E3101B80035DEB4 /* SideMenuItemContent.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SideMenuItemContent.swift; sourceTree = "<group>"; };
 		881EF0961E3101B80035DEB4 /* MenuViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MenuViewController.swift; sourceTree = "<group>"; };
-		D48B8AEB202CDE1A0010D9A4 /* SideMenuItemShadow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SideMenuItemShadow.swift; sourceTree = "<group>"; };
+		D48B8AEB202CDE1A0010D9A4 /* SideMenuItemOptions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SideMenuItemOptions.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -65,7 +65,7 @@
 				881EF0931E3101B80035DEB4 /* MenuAnimator.swift */,
 				881EF0941E3101B80035DEB4 /* MenuContainerViewController.swift */,
 				881EF0951E3101B80035DEB4 /* SideMenuItemContent.swift */,
-				D48B8AEB202CDE1A0010D9A4 /* SideMenuItemShadow.swift */,
+				D48B8AEB202CDE1A0010D9A4 /* SideMenuItemOptions.swift */,
 				881EF0961E3101B80035DEB4 /* MenuViewController.swift */,
 				881EF08F1E3101130035DEB4 /* Info.plist */,
 				881EF0901E3101130035DEB4 /* InteractiveSideMenu.h */,
@@ -157,7 +157,7 @@
 				84E2E6771F15406600E5FF37 /* MenuTransitioningDelegate.swift in Sources */,
 				881EF0981E3101B80035DEB4 /* MenuContainerViewController.swift in Sources */,
 				881EF0991E3101B80035DEB4 /* SideMenuItemContent.swift in Sources */,
-				D48B8AEC202CDE1A0010D9A4 /* SideMenuItemShadow.swift in Sources */,
+				D48B8AEC202CDE1A0010D9A4 /* SideMenuItemOptions.swift in Sources */,
 				84E2E6751F15401000E5FF37 /* Options.swift in Sources */,
 				881EF09A1E3101B80035DEB4 /* MenuViewController.swift in Sources */,
 			);

Sample/Sample/Controllers/HostViewController.swift

@@ -45,6 +45,8 @@ class HostViewController: MenuContainerViewController {
 
         // Select initial content controller. It's needed even if the first view controller should be selected.
         self.selectContentViewController(contentViewControllers.first!)
+
+        self.currentItemOptions.cornerRadius = 10.0
     }
 
     override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {

Sample/Sample/Menu Controllers/TweakViewController.storyboard

@@ -61,7 +61,6 @@
                                         <nil key="highlightedColor"/>
                                     </label>
                                 </subviews>
-                                <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <constraints>
                                     <constraint firstItem="nuF-oz-bcT" firstAttribute="top" secondItem="MYI-N6-xji" secondAttribute="bottom" constant="4" id="0mz-3G-vMu"/>
                                     <constraint firstItem="MYI-N6-xji" firstAttribute="leading" secondItem="xZP-x5-Bib" secondAttribute="leading" constant="20" id="0zE-3h-1yb"/>
@@ -100,7 +99,6 @@
                                         <nil key="highlightedColor"/>
                                     </label>
                                 </subviews>
-                                <color key="backgroundColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <constraints>
                                     <constraint firstItem="SjD-jD-nvG" firstAttribute="leading" secondItem="14M-Ay-GAi" secondAttribute="leading" constant="20" id="7Wd-jH-3nZ"/>
                                     <constraint firstItem="SjD-jD-nvG" firstAttribute="top" secondItem="dc6-ru-tjk" secondAttribute="bottom" constant="6" id="FGC-aD-pSR"/>
@@ -139,7 +137,6 @@
                                         <nil key="highlightedColor"/>
                                     </label>
                                 </subviews>
-                                <color key="backgroundColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <constraints>
                                     <constraint firstAttribute="trailing" secondItem="gOZ-qG-agZ" secondAttribute="trailing" id="3S5-zP-4s7"/>
                                     <constraint firstItem="LmW-e8-ol0" firstAttribute="centerX" secondItem="f8c-TI-8tN" secondAttribute="centerX" id="5ZE-bl-Fw6"/>

Sources/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.2.1</string>
+	<string>2.3</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

Sources/MenuAnimator.swift

@@ -27,7 +27,7 @@ final class MenuInteractiveTransition: NSObject {
 
     var present = false
     var interactionInProgress = false
-    var shadowOptions: SideMenuItemShadow
+    var currentItemOptions: SideMenuItemOptions
 
     var options = TransitionOptions()
     fileprivate let presentAction: Action
@@ -41,8 +41,8 @@ final class MenuInteractiveTransition: NSObject {
     fileprivate var tapRecognizer: UITapGestureRecognizer?
     fileprivate var panRecognizer: UIPanGestureRecognizer?
 
-    required init(shadowOptions: SideMenuItemShadow, presentAction: @escaping Action, dismissAction: @escaping Action) {
-        self.shadowOptions = shadowOptions
+    required init(currentItemOptions: SideMenuItemOptions, presentAction: @escaping Action, dismissAction: @escaping Action) {
+        self.currentItemOptions = currentItemOptions
         self.presentAction = presentAction
         self.dismissAction = dismissAction
         super.init()
@@ -201,15 +201,24 @@ private extension MenuInteractiveTransition {
             addShadow(to: placeholderView)
             return placeholderView
         }
-        addShadow(to: snapshotView)
-        return snapshotView
+
+        snapshotView.layer.cornerRadius = currentItemOptions.cornerRadius
+        snapshotView.layer.masksToBounds = true
+
+        let baseView = UIView(frame: from.bounds)
+        baseView.addSubview(snapshotView)
+        addShadow(to: baseView)
+        return baseView
     }
 
     func addShadow(to view: UIView) {
-        view.layer.shadowColor = shadowOptions.color?.cgColor
-        view.layer.shadowOpacity = Float(shadowOptions.opacity)
-        view.layer.shadowOffset = shadowOptions.offset
-        view.layer.shadowRadius = shadowOptions.radius
+        view.layer.shadowColor = currentItemOptions.shadow.color?.cgColor
+        view.layer.shadowOpacity = Float(currentItemOptions.shadow.opacity)
+        view.layer.shadowOffset = currentItemOptions.shadow.offset
+        view.layer.shadowRadius = currentItemOptions.shadow.radius
+        view.layer.shadowPath = UIBezierPath(roundedRect: view.bounds, cornerRadius: currentItemOptions.cornerRadius).cgPath
+        view.layer.shouldRasterize = true
+        view.layer.rasterizationScale = UIScreen.main.scale
     }
 
     func removeShadow(from view: UIView) {

Sources/MenuContainerViewController.swift

@@ -35,9 +35,9 @@ open class MenuContainerViewController: UIViewController {
      */
     fileprivate var isShown = false
 
-    public var shadowOptions = SideMenuItemShadow() {
+    public var currentItemOptions = SideMenuItemOptions() {
         didSet {
-            navigationMenuTransitionDelegate?.shadowOptions = shadowOptions
+            navigationMenuTransitionDelegate?.currentItemOptions = currentItemOptions
         }
     }
 
@@ -80,7 +80,7 @@ open class MenuContainerViewController: UIViewController {
         super.viewDidLoad()
 
         let interactiveTransition = MenuInteractiveTransition(
-            shadowOptions: shadowOptions,
+            currentItemOptions: currentItemOptions,
             presentAction: { [unowned self] in
                 self.presentNavigationMenu()
             },

Sources/MenuTransitioningDelegate.swift

@@ -25,9 +25,9 @@ final class MenuTransitioningDelegate: NSObject {
 
     let interactiveTransition: MenuInteractiveTransition
 
-    public var shadowOptions = SideMenuItemShadow() {
+    public var currentItemOptions = SideMenuItemOptions() {
         didSet {
-            interactiveTransition.shadowOptions = shadowOptions
+            interactiveTransition.currentItemOptions = currentItemOptions
         }
     }
 

Sources/SideMenuItemOptions.swift

@@ -0,0 +1,46 @@
+//
+//  SideMenuItemOptions.swift
+//  InteractiveSideMenu
+//
+//  Created by Eric Miller on 2/8/18.
+//  Copyright © 2018 Handsome. All rights reserved.
+//
+
+import Foundation
+
+/**
+ Defines the parameters for the shadow that is shown under to content controller when the side menu is open.
+*/
+public struct SideMenuItemOptions {
+
+    public struct Shadow {
+        public var color: UIColor? = UIColor.black
+        public var opacity: CGFloat = 0.3
+        public var offset: CGSize = CGSize(width: -5, height: 5)
+        public var radius: CGFloat = 3
+
+        public init() { }
+
+        public init(color: UIColor? = UIColor.black,
+                    opacity: CGFloat = 0.3,
+                    offset: CGSize = CGSize(width: -5, height: 5),
+                    radius: CGFloat = 3) {
+            self.color = color
+            self.opacity = opacity
+            self.offset = offset
+            self.radius = radius
+        }
+    }
+
+    public var shadow = Shadow()
+
+    public var cornerRadius: CGFloat = 0.0 {
+        willSet {
+            if newValue < 0 {
+                preconditionFailure("Invalid `cornerRadius` value: \(newValue). Must be non-negative")
+            }
+        }
+    }
+
+    public init() { }
+}