Merge branch 'release/2.1'

Author: Alexander Perechnev

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 2.1
+
+* Now the top view controller is covered by transparent view when sidebar appears
+
 # 2.0.3
 
 * `UIViewController` class extension moved to a new file and fully documented

SidebarOverlay.podspec

@@ -1,14 +1,14 @@
 Pod::Spec.new do |s|
   s.name         = "SidebarOverlay"
-  s.version      = "2.0.3"
+  s.version      = "2.1"
   s.summary      = "Yet another implementation of sidebar menu, but here your menu appears over the top view controller."
 
   s.description  = "Yet another implementation of sidebar menu, but here your menu appears over the top view controller. You questions and pull requests are wolcome."
 
   s.homepage     = "https://github.com/alexkrzyzanowski/SidebarOverlay"
   s.license      = { :type => 'MIT', :file => 'LICENSE' }
   s.author       = { "Alex Krzyzanowski" => "alexkrzyzanowski@icloud.com" }
-  s.source       = { :git => "https://github.com/alexkrzyzanowski/SidebarOverlay.git", :tag => "2.0.3" }
+  s.source       = { :git => "https://github.com/alexkrzyzanowski/SidebarOverlay.git", :tag => "2.1" }
 
   s.platform     = :ios, '8.0'
   s.source_files = 'SidebarOverlay/SidebarOverlay/*.{h,m,swift}'

SidebarOverlay/SidebarOverlay/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.3</string>
+	<string>2.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

SidebarOverlay/SidebarOverlay/SOContainerViewController.swift

@@ -101,12 +101,36 @@ public class SOContainerViewController: UIViewController, UIGestureRecognizerDel
 
             let animations = { () -> () in
                 leftVC.view.frame = frame
+                self.contentCoverView.alpha = newValue ? 1.0 : 0.0
             }
 
             UIView.animateWithDuration(SideViewControllerOpenAnimationDuration, delay: 0, options: UIViewAnimationOptions.BeginFromCurrentState, animations: animations, completion: nil)
         }
     }
 
+    public override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: NSBundle?) {
+        self.contentCoverView = UIView()
+        super.init(nibName: nibNameOrNil, bundle: nibBundleOrNil)
+    }
+    
+    public required init?(coder aDecoder: NSCoder) {
+        self.contentCoverView = UIView()
+        super.init(coder: aDecoder)
+    }
+    
+    public override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        self.contentCoverView.frame = self.view.bounds
+        self.contentCoverView.backgroundColor = UIColor(red: 0.0, green: 0.0, blue: 0.0, alpha: 0.5)
+        self.contentCoverView.alpha = 0.0
+        
+        let tapOnContentCoverViewGesture = UITapGestureRecognizer(target: self, action: "contentCoverViewClicked")
+        self.contentCoverView.addGestureRecognizer(tapOnContentCoverViewGesture)
+        
+        self.view.addSubview(self.contentCoverView)
+    }
+    
     //
     // MARK: Gesture recognizer delegate
 
@@ -126,6 +150,11 @@ public class SOContainerViewController: UIViewController, UIGestureRecognizerDel
     var _topViewController: UIViewController?
     var _leftViewController: UIViewController?
 
+    var contentCoverView: UIView
+    
+    func contentCoverViewClicked() {
+        self.isLeftViewControllerPresented = false
+    }
 
     func moveMenu(panGesture: UIPanGestureRecognizer) {
         panGesture.view?.layer.removeAllAnimations()
@@ -138,15 +167,20 @@ public class SOContainerViewController: UIViewController, UIGestureRecognizerDel
             }
 
             panGesture.setTranslation(CGPointMake(0, 0), inView: self.view)
-        }
-        else if panGesture.state == UIGestureRecognizerState.Ended {
+            
+            if let view = self.leftViewController?.view {
+                self.contentCoverView.alpha = 1.0 - abs(view.frame.origin.x) / view.frame.size.width
+            }
+        } else if panGesture.state == UIGestureRecognizerState.Ended {
             if let sidebar = self.leftViewController {
                 self.isLeftViewControllerPresented = self.viewPulledOutMoreThanHalfOfItsWidth(sidebar)
             }
         }
     }
 
     func brindLeftViewToFront() {
+        self.view.bringSubviewToFront(self.contentCoverView)
+        
         if let vc = self.leftViewController {
             self.view.bringSubviewToFront(vc.view)
         }

SidebarOverlayExample/SidebarOverlayExample/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.2</string>
+	<string>2.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>