Feature/filter by animal type #90
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> | ||
| <plist version="1.0"> | ||
| <dict> | ||
| <key>IDEDidComputeMac32BitWarning</key> | ||
| <true/> | ||
| </dict> | ||
| </plist> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -57,10 +57,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate { | |
|
|
||
| navBar.barStyle = .black | ||
|
|
||
|
There was a problem hiding this comment. Had to comment this line out because it causes tableviewCell checkmark accessory views and button labels to be white on white (and therefore invisible). I tried to solve this by setting the tint color of the table view and its cells locally, but that didn't work, so for now I just commented this line out. There was a problem hiding this comment. I would say just go ahead and remove the line instead. I'm not sure why we had UIButton appearances set to white. UIBarButtonItem appearances is fine to be white, since the navigation bar is not white. There was a problem hiding this comment. Removed the UIButton tintColor appearance setting 4b6fb28 |
||
| UIBarButtonItem.appearance().tintColor = UIColor.themeTintColor() | ||
| UITabBar.appearance().tintColor = UIColor.themePrimaryColor() | ||
| UITabBarItem.appearance().setTitleTextAttributes([NSAttributedStringKey.font:UIFont.themeNormalFont(ofSize: 10.0)], for: UIControlState.normal) | ||
| } | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| { | ||
| "images" : [ | ||
| { | ||
| "idiom" : "universal", | ||
| "filename" : "filterIcon.png", | ||
| "scale" : "1x" | ||
| }, | ||
| { | ||
| "idiom" : "universal", | ||
| "filename" : "[email protected]", | ||
| "scale" : "2x" | ||
| }, | ||
| { | ||
| "idiom" : "universal", | ||
| "filename" : "[email protected]", | ||
| "scale" : "3x" | ||
| } | ||
| ], | ||
| "info" : { | ||
| "version" : 1, | ||
| "author" : "xcode" | ||
| } | ||
| } |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,142 @@ | ||
| // | ||
| // FilterViewController.swift | ||
| // PetAdoption-iOS | ||
| // | ||
| // Created by Amir Fleminger on 4/11/18. | ||
| // Copyright © 2018 Code For Orlando. All rights reserved. | ||
| // | ||
|
|
||
| import UIKit | ||
|
|
||
| class FilterViewController: UITableViewController { | ||
| var delegate: FilterSelectorDelegate? | ||
| enum RowIndex:Int { | ||
| case all = 0, dogs, cats, birds, smallFurry, horses, barnYard, reptiles, rabbits | ||
| } | ||
|
|
||
| var selectedAnimalTypes: Set<String> = [] | ||
|
|
||
| required init?(coder aDecoder: NSCoder) { | ||
| super.init(coder: aDecoder) | ||
| } | ||
|
|
||
| override func viewDidLoad() { | ||
| super.viewDidLoad() | ||
| // Adding a footer removes redundant cell dividers from the tableview | ||
| tableView.tableFooterView = UIView(frame: .zero) | ||
| } | ||
|
|
||
| override func viewDidAppear(_ animated: Bool) { | ||
| super.viewDidAppear(animated) | ||
| selectedAnimalTypes = FilterViewController.loadAnimalTypesSelected() | ||
| setAnimalTypeCheckmarks() | ||
| } | ||
|
|
||
| class func loadAnimalTypesSelected() -> Set<String>{ | ||
| let defaults = UserDefaults.standard | ||
|
|
||
| guard let data:Data = defaults.object(forKey: "selectedAnimalTypes") as? Data else { | ||
| print("Couldnt load animal type preferences! Default to all animal types") | ||
| return ["all"] | ||
| } | ||
| // convert the Data object to a Set<String> | ||
| return NSKeyedUnarchiver.unarchiveObject(with: data) as! Set<String> | ||
| } | ||
|
|
||
| class func saveAnimalTypesSelected(_ selectedAnimalTypes_: Set<String>){ | ||
| let defaults = UserDefaults.standard | ||
| let encodedData = NSKeyedArchiver.archivedData(withRootObject: selectedAnimalTypes_) | ||
| defaults.set(encodedData, forKey: "selectedAnimalTypes") | ||
| defaults.synchronize() | ||
| } | ||
|
|
||
| func setAnimalTypeCheckmarks() { | ||
| let section = 0 | ||
| for row in 0...self.tableView.numberOfRows(inSection: section) - 1{ | ||
| let indexPath = IndexPath(row: row, section: section) | ||
| let cell = tableView.cellForRow(at: indexPath) | ||
|
|
||
| if selectedAnimalTypes.contains("all"){ | ||
| // put a checkmark only on the 'All' cell | ||
| cell?.accessoryType = (indexPath.row == RowIndex.all.rawValue) ? .checkmark : .none | ||
| } else { | ||
| switch indexPath.row{ | ||
| case RowIndex.dogs.rawValue: | ||
| cell?.accessoryType = selectedAnimalTypes.contains("Dog") ? .checkmark : .none | ||
| case RowIndex.cats.rawValue: | ||
| cell?.accessoryType = selectedAnimalTypes.contains("Cat") ? .checkmark : .none | ||
| case RowIndex.birds.rawValue: | ||
| cell?.accessoryType = selectedAnimalTypes.contains("Bird") ? .checkmark : .none | ||
| case RowIndex.smallFurry.rawValue: | ||
| cell?.accessoryType = selectedAnimalTypes.contains("Small&Furry") ? .checkmark : .none | ||
| case RowIndex.horses.rawValue: | ||
| cell?.accessoryType = selectedAnimalTypes.contains("Horse") ? .checkmark : .none | ||
| case RowIndex.barnYard.rawValue: | ||
| cell?.accessoryType = selectedAnimalTypes.contains("BarnYard") ? .checkmark : .none | ||
| case RowIndex.reptiles.rawValue: | ||
| cell?.accessoryType = selectedAnimalTypes.contains("Reptile") ? .checkmark : .none | ||
| case RowIndex.rabbits.rawValue: | ||
| cell?.accessoryType = selectedAnimalTypes.contains("Rabbit") ? .checkmark : .none | ||
| default: | ||
| cell?.accessoryType = .none | ||
| } | ||
|
|
||
| } | ||
| } | ||
| } | ||
|
|
||
| func resetSelectedAnimalTypes(){ | ||
| selectedAnimalTypes = ["all"] | ||
| } | ||
|
|
||
| func toggleSelectedAnimalType(_ animalType:String){ | ||
| if animalType == "all" { | ||
| resetSelectedAnimalTypes() | ||
| return | ||
| } else { | ||
| selectedAnimalTypes.remove("all") | ||
| if selectedAnimalTypes.contains(animalType) { | ||
| selectedAnimalTypes.remove(animalType) | ||
| } else { | ||
| selectedAnimalTypes.insert(animalType) | ||
| } | ||
| } | ||
| if selectedAnimalTypes.count == 0 { | ||
| resetSelectedAnimalTypes() | ||
| } | ||
| } | ||
|
|
||
| override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { | ||
| switch indexPath.row { | ||
| case RowIndex.all.rawValue: | ||
| toggleSelectedAnimalType("all") | ||
| case RowIndex.dogs.rawValue: | ||
| toggleSelectedAnimalType("Dog") | ||
| case RowIndex.cats.rawValue: | ||
| toggleSelectedAnimalType("Cat") | ||
| case RowIndex.birds.rawValue: | ||
| toggleSelectedAnimalType("Bird") | ||
| case RowIndex.smallFurry.rawValue: | ||
| toggleSelectedAnimalType("Small&Furry") | ||
| case RowIndex.horses.rawValue: | ||
| toggleSelectedAnimalType("Horse") | ||
| case RowIndex.barnYard.rawValue: | ||
| toggleSelectedAnimalType("BarnYard") | ||
| case RowIndex.reptiles.rawValue: | ||
| toggleSelectedAnimalType("Reptile") | ||
| case RowIndex.rabbits.rawValue: | ||
| toggleSelectedAnimalType("Rabbit") | ||
| default: | ||
| print("no action") | ||
| } | ||
| setAnimalTypeCheckmarks() | ||
| tableView.deselectRow(at: indexPath, animated: true) | ||
| FilterViewController.saveAnimalTypesSelected(selectedAnimalTypes) | ||
| delegate?.didChangeAnimalTypeSelections() | ||
| } | ||
| } | ||
|
|
||
|
|
||
| protocol FilterSelectorDelegate { | ||
| func didChangeAnimalTypeSelections() | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Again, being nitpicky, but all the other groups are capitalized.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Addressed in 8b4feb5