diff --git a/Kiwix-iOS/Controller/Main/MainControllerDelegates.swift b/Kiwix-iOS/Controller/Main/MainControllerDelegates.swift index 5543a711..d1573f9e 100644 --- a/Kiwix-iOS/Controller/Main/MainControllerDelegates.swift +++ b/Kiwix-iOS/Controller/Main/MainControllerDelegates.swift @@ -136,7 +136,7 @@ extension MainController: UIWebViewDelegate, SFSafariViewControllerDelegate, LPT } func searchBarSearchButtonClicked(searchBar: UISearchBar) { - ControllerRetainer.search.searchResultTBVC?.selectFirstResultIfPossible() + ControllerRetainer.search.searchResultController?.selectFirstResultIfPossible() } // MARK: - UIPopoverPresentationControllerDelegate diff --git a/Kiwix-iOS/Controller/Search/RecentSearchCVC.swift b/Kiwix-iOS/Controller/Search/RecentSearchController.swift similarity index 95% rename from Kiwix-iOS/Controller/Search/RecentSearchCVC.swift rename to Kiwix-iOS/Controller/Search/RecentSearchController.swift index edf62aa8..edf32692 100644 --- a/Kiwix-iOS/Controller/Search/RecentSearchCVC.swift +++ b/Kiwix-iOS/Controller/Search/RecentSearchController.swift @@ -1,5 +1,5 @@ // -// RecentSearchCVC.swift +// RecentSearchController.swift // Kiwix // // Created by Chris Li on 6/19/16. @@ -9,7 +9,7 @@ import UIKit import CoreData -class RecentSearchCVC: UIViewController, UICollectionViewDataSource, UICollectionViewDelegate, UICollectionViewDelegateFlowLayout, NSFetchedResultsControllerDelegate { +class RecentSearchController: UIViewController, UICollectionViewDataSource, UICollectionViewDelegate, UICollectionViewDelegateFlowLayout, NSFetchedResultsControllerDelegate { @IBOutlet weak var collectionView: UICollectionView! diff --git a/Kiwix-iOS/Controller/Search/SearchBooksController.swift b/Kiwix-iOS/Controller/Search/SearchBooksController.swift index bdab9554..9af7c71b 100644 --- a/Kiwix-iOS/Controller/Search/SearchBooksController.swift +++ b/Kiwix-iOS/Controller/Search/SearchBooksController.swift @@ -76,7 +76,7 @@ class SearchBooksController: UIViewController, UITableViewDelegate, UITableViewD let titleDescriptor = NSSortDescriptor(key: "title", ascending: true) fetchRequest.sortDescriptors = [langDescriptor, titleDescriptor] fetchRequest.predicate = NSPredicate(format: "stateRaw == 2") - let fetchedResultsController = NSFetchedResultsController(fetchRequest: fetchRequest, managedObjectContext: self.managedObjectContext, sectionNameKeyPath: "language.name", cacheName: "ScopeFRC") + let fetchedResultsController = NSFetchedResultsController(fetchRequest: fetchRequest, managedObjectContext: self.managedObjectContext, sectionNameKeyPath: nil, cacheName: "ScopeFRC" + NSBundle.buildVersion) fetchedResultsController.delegate = self fetchedResultsController.performFetch(deleteCache: false) return fetchedResultsController diff --git a/Kiwix-iOS/Controller/Search/SearchController.swift b/Kiwix-iOS/Controller/Search/SearchController.swift index 8333e81b..51d36d55 100644 --- a/Kiwix-iOS/Controller/Search/SearchController.swift +++ b/Kiwix-iOS/Controller/Search/SearchController.swift @@ -13,7 +13,7 @@ class SearchController: UIViewController, UISearchBarDelegate, UIGestureRecogniz @IBOutlet weak var tabControllerContainer: UIView! @IBOutlet weak var searchResultTBVCContainer: UIView! @IBOutlet var tapGestureRecognizer: UITapGestureRecognizer! - var searchResultTBVC: SearchResultTBVC? + var searchResultController: SearchResultController? private var searchText = "" { didSet { @@ -40,9 +40,9 @@ class SearchController: UIViewController, UISearchBarDelegate, UIGestureRecogniz } override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) { - if segue.identifier == "EmbeddedSearchResultTBVC" { - guard let destinationViewController = segue.destinationViewController as? SearchResultTBVC else {return} - searchResultTBVC = destinationViewController + if segue.identifier == "EmbeddedSearchResultController" { + guard let destinationViewController = segue.destinationViewController as? SearchResultController else {return} + searchResultController = destinationViewController } } @@ -64,10 +64,10 @@ class SearchController: UIViewController, UISearchBarDelegate, UIGestureRecogniz let previousSearchText = searchText dispatch_after(dispatch_time(DISPATCH_TIME_NOW, Int64(275 * USEC_PER_SEC)), dispatch_get_main_queue()) { guard previousSearchText == self.searchText else {return} - self.searchResultTBVC?.startSearch(self.searchText) + self.searchResultController?.startSearch(self.searchText) } } else { - searchResultTBVC?.startSearch(searchText) + searchResultController?.startSearch(searchText) } } diff --git a/Kiwix-iOS/Controller/Search/SearchResultTBVC.swift b/Kiwix-iOS/Controller/Search/SearchResultController.swift similarity index 94% rename from Kiwix-iOS/Controller/Search/SearchResultTBVC.swift rename to Kiwix-iOS/Controller/Search/SearchResultController.swift index 225d8f04..53c40ab3 100644 --- a/Kiwix-iOS/Controller/Search/SearchResultTBVC.swift +++ b/Kiwix-iOS/Controller/Search/SearchResultController.swift @@ -1,5 +1,5 @@ // -// SearchResultTBVC.swift +// SearchResultController.swift // Kiwix // // Created by Chris Li on 8/13/15. @@ -9,7 +9,7 @@ import UIKit import Operations -class SearchResultTBVC: UIViewController, UITableViewDataSource, UITableViewDelegate { +class SearchResultController: UIViewController, UITableViewDataSource, UITableViewDelegate { @IBOutlet weak var tableView: UITableView! var searchResults = [SearchResult]() @@ -35,8 +35,8 @@ class SearchResultTBVC: UIViewController, UITableViewDataSource, UITableViewDele override func viewWillAppear(animated: Bool) { super.viewWillAppear(animated) tableView.reloadData() - NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(SearchResultTBVC.keyboardDidShow(_:)), name: UIKeyboardDidShowNotification, object: nil) - NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(SearchResultTBVC.keyboardWillHide(_:)), name: UIKeyboardWillHideNotification, object: nil) + NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(SearchResultController.keyboardDidShow(_:)), name: UIKeyboardDidShowNotification, object: nil) + NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(SearchResultController.keyboardWillHide(_:)), name: UIKeyboardWillHideNotification, object: nil) } override func viewWillDisappear(animated: Bool) { diff --git a/Kiwix-iOS/Info.plist b/Kiwix-iOS/Info.plist index ee5bf197..b89d7159 100644 --- a/Kiwix-iOS/Info.plist +++ b/Kiwix-iOS/Info.plist @@ -49,7 +49,7 @@ CFBundleVersion - 1.8.1265 + 1.8.1275 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/Kiwix-iOS/Storyboard/Search.storyboard b/Kiwix-iOS/Storyboard/Search.storyboard index 859772d4..261fc30f 100644 --- a/Kiwix-iOS/Storyboard/Search.storyboard +++ b/Kiwix-iOS/Storyboard/Search.storyboard @@ -29,7 +29,7 @@ - + @@ -160,7 +160,7 @@ - +