selim/AutoCat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable unfinished new filters screen

Browse Source
This commit is contained in:
Selim Mustafaev 2024-10-26 17:52:16 +03:00
parent 9b37f46e33
commit 8718042f1d
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AutoCat.xcodeproj/project.pbxproj
View File

@ -1653,7 +1653,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = AutoCat/AutoCat.entitlements; CODE_SIGN_ENTITLEMENTS = AutoCat/AutoCat.entitlements;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 137; CURRENT_PROJECT_VERSION = 138;
DEVELOPMENT_TEAM = 46DTTB8X4S; DEVELOPMENT_TEAM = 46DTTB8X4S;
INFOPLIST_FILE = AutoCat/Info.plist; INFOPLIST_FILE = AutoCat/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = AutoCat; INFOPLIST_KEY_CFBundleDisplayName = AutoCat;
@ -1680,7 +1680,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = AutoCat/AutoCat.entitlements; CODE_SIGN_ENTITLEMENTS = AutoCat/AutoCat.entitlements;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 137; CURRENT_PROJECT_VERSION = 138;
DEVELOPMENT_TEAM = 46DTTB8X4S; DEVELOPMENT_TEAM = 46DTTB8X4S;
INFOPLIST_FILE = AutoCat/Info.plist; INFOPLIST_FILE = AutoCat/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = AutoCat; INFOPLIST_KEY_CFBundleDisplayName = AutoCat;

38
AutoCat/Controllers/SearchController.swift
View File

@ -184,26 +184,26 @@ class SearchController: UIViewController, UISearchResultsUpdating, UITableViewDe
} }
func showFilter() async throws { func showFilter() async throws {
// let sb = UIStoryboard(name: "Main", bundle: nil) let sb = UIStoryboard(name: "Main", bundle: nil)
// let controller = sb.instantiateViewController(identifier: "FiltersController") as FiltersController let controller = sb.instantiateViewController(identifier: "FiltersController") as FiltersController
// controller.filter = self.filter controller.filter = self.filter
// controller.onDone = { controller.onDone = {
// self.filter = controller.filter self.filter = controller.filter
// self.datasource.setSortParameter(self.filter.sortBy ?? .updatedDate) self.datasource.setSortParameter(self.filter.sortBy ?? .updatedDate)
// self.filter.needReset = true self.filter.needReset = true
// self.filter.scope = SearchScope(rawValue: self.searchController.searchBar.selectedScopeButtonIndex) ?? .plateNumber self.filter.scope = SearchScope(rawValue: self.searchController.searchBar.selectedScopeButtonIndex) ?? .plateNumber
// self.updateSearchResults(with: self.filter) self.updateSearchResults(with: self.filter)
// }
// self.navigationController?.pushViewController(controller, animated: true)
if let navigationController = self.navigationController {
let coordinator = FiltersCoordinator(navController: navigationController, filter: filter)
filter = try await coordinator.start()
datasource.setSortParameter(self.filter.sortBy ?? .updatedDate)
filter.needReset = true
filter.scope = SearchScope(rawValue: self.searchController.searchBar.selectedScopeButtonIndex) ?? .plateNumber
updateSearchResults(with: self.filter)
} }
self.navigationController?.pushViewController(controller, animated: true)
// if let navigationController = self.navigationController {
// let coordinator = FiltersCoordinator(navController: navigationController, filter: filter)
// filter = try await coordinator.start()
// datasource.setSortParameter(self.filter.sortBy ?? .updatedDate)
// filter.needReset = true
// filter.scope = SearchScope(rawValue: self.searchController.searchBar.selectedScopeButtonIndex) ?? .plateNumber
// updateSearchResults(with: self.filter)
// }
} }
func showOnMap() { func showOnMap() {