Dismiss picker on view disappearing (#126)

* Dismiss picker on view disappearing [ci skip] * Update icon when dismissing by tapping anywhere * fixed #124 * Disable usage of swipe to back when picker is open * Use isUserInteractionEnabled * Use interactivePopGestureRecognizer.isEnabled * Fix picker arrow when dismissing somehow
TUM-Dev · May 11, 2017 · 6219514 · 6219514
1 parent dcd2224
commit 6219514
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 5 deletions.
diff --git a/TUM Campus App/CafeteriaViewController.swift b/TUM Campus App/CafeteriaViewController.swift
@@ -91,12 +91,15 @@ extension CafeteriaViewController {
         pickerView.show()
         barItem?.action = #selector(CafeteriaViewController.hideCafeterias(_:))
         barItem?.image = UIImage(named: "collapse")
+        navigationController?.interactivePopGestureRecognizer?.isEnabled = false
+
     }
 
     func hideCafeterias(_ send: AnyObject?) {
         pickerView.dismiss()
         barItem?.action = #selector(CafeteriaViewController.showCafeterias(_:))
         barItem?.image = UIImage(named: "expand")
+        navigationController?.interactivePopGestureRecognizer?.isEnabled = true
     }
 
     func setUpPickerView() {
@@ -112,10 +115,11 @@ extension CafeteriaViewController {
             items.append(item!)
         }
         pickerView = AYSlidingPickerView.sharedInstance()
-        pickerView.mainView = view
+        pickerView.mainView = navigationController?.view ?? view
         pickerView.items = items
         pickerView.selectedIndex = 0
         pickerView.closeOnSelection = true
+        pickerView.didDismissHandler = { self.hideCafeterias(nil) }
         barItem = UIBarButtonItem(image: UIImage(named: "expand"), style: UIBarButtonItemStyle.plain, target: self, action:  #selector(CafeteriaViewController.showCafeterias(_:)))
         navigationItem.rightBarButtonItem = barItem
     }

diff --git a/TUM Campus App/MovieDetailTableViewController.swift b/TUM Campus App/MovieDetailTableViewController.swift
@@ -83,12 +83,14 @@ extension MovieDetailTableViewController {
         pickerView.show()
         barItem?.action = #selector(MovieDetailTableViewController.hideMovies(_:))
         barItem?.image = UIImage(named: "collapse")
+        navigationController?.interactivePopGestureRecognizer?.isEnabled = false
     }
 
     func hideMovies(_ send: AnyObject?) {
         pickerView.dismiss()
         barItem?.action = #selector(MovieDetailTableViewController.showMovies(_:))
         barItem?.image = UIImage(named: "expand")
+        navigationController?.interactivePopGestureRecognizer?.isEnabled = true
     }
 
     func setUpPickerView() {
@@ -105,10 +107,11 @@ extension MovieDetailTableViewController {
             items.append(item!)
         }
         pickerView = AYSlidingPickerView.sharedInstance()
-        pickerView.mainView = view
+        pickerView.mainView = navigationController?.view ?? view
         pickerView.items = items
         pickerView.selectedIndex = 0
         pickerView.closeOnSelection = true
+        pickerView.didDismissHandler = { self.hideMovies(nil) }
         barItem = UIBarButtonItem(image: UIImage(named: "expand"), style: UIBarButtonItemStyle.plain, target: self, action:  #selector(MovieDetailTableViewController.showMovies(_:)))
         navigationItem.rightBarButtonItem = barItem
     }

diff --git a/TUM Campus App/RoomFinderViewController.swift b/TUM Campus App/RoomFinderViewController.swift
@@ -85,12 +85,14 @@ extension RoomFinderViewController {
         pickerView.show()
         barItem?.action = #selector(RoomFinderViewController.hideMaps(_:))
         barItem?.image = UIImage(named: "collapse")
+        navigationController?.interactivePopGestureRecognizer?.isEnabled = false
     }
 
     func hideMaps(_ send: AnyObject?) {
         pickerView.dismiss()
         barItem?.action = #selector(RoomFinderViewController.showMaps(_:))
         barItem?.image = UIImage(named: "expand")
+        navigationController?.interactivePopGestureRecognizer?.isEnabled = true
     }
 
 }
@@ -118,10 +120,11 @@ extension RoomFinderViewController {
             items.append(item!)
         }
         pickerView = AYSlidingPickerView.sharedInstance()
-        pickerView.mainView = view
+        pickerView.mainView = navigationController?.view ?? view
         pickerView.items = items
         pickerView.selectedIndex = 0
         pickerView.closeOnSelection = true
+        pickerView.didDismissHandler = { self.hideMaps(nil) }
         barItem = UIBarButtonItem(image: UIImage(named: "expand"), style: UIBarButtonItemStyle.plain, target: self, action:  #selector(RoomFinderViewController.showMaps(_:)))
         navigationItem.rightBarButtonItem = barItem
     }

diff --git a/TUM Campus App/StudyRoomsTableViewController.swift b/TUM Campus App/StudyRoomsTableViewController.swift
@@ -105,12 +105,14 @@ extension StudyRoomsTableViewController {
         pickerView.show()
         barItem?.action = #selector(StudyRoomsTableViewController.hideRooms(_:))
         barItem?.image = UIImage(named: "collapse")
+        navigationController?.interactivePopGestureRecognizer?.isEnabled = false
     }
 
     func hideRooms(_ send: AnyObject?) {
         pickerView.dismiss()
         barItem?.action = #selector(StudyRoomsTableViewController.showRooms(_:))
         barItem?.image = UIImage(named: "expand")
+        navigationController?.interactivePopGestureRecognizer?.isEnabled = true
     }
 
     func setUpPickerView() {
@@ -126,10 +128,11 @@ extension StudyRoomsTableViewController {
             items.append(item!)
         }
         pickerView = AYSlidingPickerView.sharedInstance()
-        pickerView.mainView = view
+        pickerView.mainView = navigationController?.view ?? view
         pickerView.items = items
         pickerView.selectedIndex = 0
         pickerView.closeOnSelection = true
+        pickerView.didDismissHandler = { self.hideRooms(nil) }
         barItem = UIBarButtonItem(image: UIImage(named: "expand"), style: UIBarButtonItemStyle.plain, target: self, action:  #selector(StudyRoomsTableViewController.showRooms(_:)))
         navigationItem.rightBarButtonItem = barItem
     }

diff --git a/TUM Campus App/TuitionTableViewController.swift b/TUM Campus App/TuitionTableViewController.swift
@@ -75,9 +75,10 @@ extension TuitionTableViewController {
         }
         pickerView = AYSlidingPickerView.sharedInstance()
         pickerView.items = items
-        pickerView.mainView = view
+        pickerView.mainView = navigationController?.view ?? view
         pickerView.selectedIndex = 0
         pickerView.closeOnSelection = true
+        pickerView.didDismissHandler = { self.hideSemesters(nil) }
         barItem = UIBarButtonItem(image: UIImage(named: "expand"), style: UIBarButtonItemStyle.plain, target: self, action:  #selector(TuitionTableViewController.showSemesters(_:)))
         navigationItem.rightBarButtonItem = barItem
     }
@@ -86,12 +87,14 @@ extension TuitionTableViewController {
         pickerView.show()
         barItem?.action = #selector(TuitionTableViewController.hideSemesters(_:))
         barItem?.image = UIImage(named: "collapse")
+        navigationController?.interactivePopGestureRecognizer?.isEnabled = false
     }
 
     func hideSemesters(_ send: AnyObject?) {
         pickerView.dismiss()
         barItem?.action = #selector(TuitionTableViewController.showSemesters(_:))
         barItem?.image = UIImage(named: "expand")
+        navigationController?.interactivePopGestureRecognizer?.isEnabled = true
     }
 
 }