Commit 00756a75 authored by Zac Wood's avatar Zac Wood
Browse files

Fixes filters on iPad

parent 61c04940
......@@ -812,6 +812,7 @@ class FacilitiesListViewController: UIViewController, UICollectionViewDelegate,
let filterView = destination.topViewController as! FiltersTableViewController
filterView.facilities = self.facilitiesArray
filterView.filters = self.filters
filterView.updateFacilities = reloadWithFilters
}
// Pass the selected object to the new view controller.
......
......@@ -14,6 +14,7 @@ class FilterSelectionTableViewController: UITableViewController {
var getFunc: (() -> [String: Bool])!
var selectFunc: ((String, Bool) -> Bool)!
var selectAllFunc: (() -> Bool)!
var updateFacilities: (() -> Void)!
override func viewDidLoad() {
super.viewDidLoad()
......@@ -96,6 +97,7 @@ class FilterSelectionTableViewController: UITableViewController {
_ = selectFunc((tableCell?.textLabel?.text)!.lowercased(), res)
tableView.reloadData()
}
updateFacilities()
}
......
......@@ -11,6 +11,8 @@ import RealmSwift
class FiltersTableViewController: UITableViewController {
var updateFacilities: (() -> Void)!
override var preferredStatusBarStyle: UIStatusBarStyle {
return .default
}
......@@ -35,6 +37,7 @@ class FiltersTableViewController: UITableViewController {
filters.onlyFromCategories = c
filters.onlyFromLocations = l
tableView.reloadData()
updateFacilities()
}
var filters: Filters!
var facilities: List<Facility>!
......@@ -71,7 +74,11 @@ class FiltersTableViewController: UITableViewController {
// Uncomment the following line to display an Edit button in the navigation bar for this view controller.
// self.navigationItem.rightBarButtonItem = self.editButtonItem()
}
override func viewWillDisappear(_ animated: Bool) {
super.viewWillDisappear(animated)
updateFacilities?()
}
override func didReceiveMemoryWarning() {
super.didReceiveMemoryWarning()
// Dispose of any resources that can be recreated.
......@@ -242,6 +249,7 @@ class FiltersTableViewController: UITableViewController {
let cell = tableView.cellForRow(at: indexPath)
cell?.isSelected = false
updateFacilities()
//nothing is selected forever
}
......@@ -307,11 +315,12 @@ class FiltersTableViewController: UITableViewController {
if(segue.identifier == "toFilters") {
let destination = segue.destination as! FacilitiesListViewController
destination.filters = self.filters
updateFacilities()
}
else if(segue.identifier == "toSelection") {
let destination = segue.destination as! FilterSelectionTableViewController
destination.navigationItem.title = (sender as! UITableViewCell).textLabel?.text!
destination.updateFacilities = updateFacilities
func get() -> [String: Bool] {
if((sender as! UITableViewCell).textLabel?.text! == "Categories") {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment