Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Search goals also in title #632

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Search goals also in title #632

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
08f25b2
gallery searches in slug and title
krugerk Feb 21, 2025
53f0bec
replace back-of-house term
krugerk Feb 21, 2025
8b393cb
Merge branch 'master' into feature/search-also-title
krugerk Feb 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions BeeSwift/Gallery/GalleryViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ class GalleryViewController: UIViewController {
let searchBar = UISearchBar()
searchBar.accessibilityIdentifier = "searchBar"
searchBar.delegate = self
searchBar.placeholder = "Filter goals by slug"
searchBar.placeholder = "Search goals"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: on the Goals page, search is nice and snappy but the “Filter goals by slug” copy is really a back-of-house term, would recommend just “Search goals” instead.

https://forum.beeminder.com/t/ios-ux-comments/12243

searchBar.isHidden = true
searchBar.showsCancelButton = true
return searchBar
Expand Down Expand Up @@ -381,7 +381,11 @@ class GalleryViewController: UIViewController {

func updateFilteredGoals() {
if let searchText = searchBar.text, !searchText.isEmpty {
self.fetchedResultsController.fetchRequest.predicate = NSPredicate(format: "slug contains[cd] %@", searchText)
self.fetchedResultsController.fetchRequest.predicate = NSCompoundPredicate(orPredicateWithSubpredicates:
[
NSPredicate(format: "slug contains[cd] %@", searchText),
NSPredicate(format: "title contains[cd] %@", searchText)
])
} else {
self.fetchedResultsController.fetchRequest.predicate = nil
}
Expand Down
Loading