mirror of
https://codeberg.org/comaps/comaps
synced 2025-12-22 14:13:45 +00:00
[ios] make MWMSearchFrameworkHelper methods class instead of instance
Because there is no any stored property in this manager so there is no reason to create it's instance. Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>
This commit is contained in:
committed by
Konstantin Pastbin
parent
8a331c4c67
commit
648fb55130
@@ -4,11 +4,11 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@interface MWMSearchFrameworkHelper : NSObject
|
||||
|
||||
- (NSArray<NSString *> *)searchCategories;
|
||||
+ (NSArray<NSString *> *)searchCategories;
|
||||
|
||||
- (BOOL)isSearchHistoryEmpty;
|
||||
- (NSArray<NSString *> *)lastSearchQueries;
|
||||
- (void)clearSearchHistory;
|
||||
+ (BOOL)isSearchHistoryEmpty;
|
||||
+ (NSArray<NSString *> *)lastSearchQueries;
|
||||
+ (void)clearSearchHistory;
|
||||
|
||||
@end
|
||||
|
||||
|
||||
@@ -6,34 +6,30 @@
|
||||
|
||||
@implementation MWMSearchFrameworkHelper
|
||||
|
||||
- (NSArray<NSString *> *)searchCategories
|
||||
+ (NSArray<NSString *> *)searchCategories
|
||||
{
|
||||
NSMutableArray * result = [NSMutableArray array];
|
||||
auto const & categories = GetFramework().GetDisplayedCategories().GetKeys();
|
||||
for (auto const & item : categories)
|
||||
{
|
||||
[result addObject:@(item.c_str())];
|
||||
}
|
||||
return [result copy];
|
||||
}
|
||||
|
||||
- (BOOL)isSearchHistoryEmpty
|
||||
+ (BOOL)isSearchHistoryEmpty
|
||||
{
|
||||
return GetFramework().GetSearchAPI().GetLastSearchQueries().empty();
|
||||
}
|
||||
|
||||
- (NSArray<NSString *> *)lastSearchQueries
|
||||
+ (NSArray<NSString *> *)lastSearchQueries
|
||||
{
|
||||
NSMutableArray * result = [NSMutableArray array];
|
||||
auto const & queries = GetFramework().GetSearchAPI().GetLastSearchQueries();
|
||||
for (auto const & item : queries)
|
||||
{
|
||||
[result addObject:@(item.second.c_str())];
|
||||
}
|
||||
return [result copy];
|
||||
}
|
||||
|
||||
- (void)clearSearchHistory
|
||||
+ (void)clearSearchHistory
|
||||
{
|
||||
GetFramework().GetSearchAPI().ClearSearchHistory();
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@ final class SearchCategoriesViewController: MWMTableViewController {
|
||||
private weak var delegate: SearchCategoriesViewControllerDelegate?
|
||||
private let categories: [String]
|
||||
|
||||
init(frameworkHelper: MWMSearchFrameworkHelper, delegate: SearchCategoriesViewControllerDelegate?) {
|
||||
init(frameworkHelper: MWMSearchFrameworkHelper.Type, delegate: SearchCategoriesViewControllerDelegate?) {
|
||||
self.delegate = delegate
|
||||
categories = frameworkHelper.searchCategories()
|
||||
super.init(nibName: nil, bundle: nil)
|
||||
|
||||
@@ -6,14 +6,14 @@ protocol SearchHistoryViewControllerDelegate: SearchOnMapScrollViewDelegate {
|
||||
final class SearchHistoryViewController: MWMViewController {
|
||||
private weak var delegate: SearchHistoryViewControllerDelegate?
|
||||
private var lastQueries: [String] = []
|
||||
private let frameworkHelper: MWMSearchFrameworkHelper
|
||||
private let frameworkHelper: MWMSearchFrameworkHelper.Type
|
||||
private let emptyHistoryView = PlaceholderView(title: L("search_history_title"),
|
||||
subtitle: L("search_history_text"))
|
||||
|
||||
private let tableView = UITableView()
|
||||
|
||||
// MARK: - Init
|
||||
init(frameworkHelper: MWMSearchFrameworkHelper, delegate: SearchHistoryViewControllerDelegate?) {
|
||||
init(frameworkHelper: MWMSearchFrameworkHelper.Type, delegate: SearchHistoryViewControllerDelegate?) {
|
||||
self.delegate = delegate
|
||||
self.frameworkHelper = frameworkHelper
|
||||
super.init(nibName: nil, bundle: nil)
|
||||
|
||||
@@ -13,9 +13,7 @@ final class SearchTabViewController: TabViewController {
|
||||
private static let selectedIndexKey = "SearchTabViewController_selectedIndexKey"
|
||||
@objc weak var delegate: SearchTabViewControllerDelegate?
|
||||
|
||||
private lazy var frameworkHelper: MWMSearchFrameworkHelper = {
|
||||
return MWMSearchFrameworkHelper()
|
||||
}()
|
||||
private var frameworkHelper = MWMSearchFrameworkHelper.self
|
||||
|
||||
private var activeTab: SearchActiveTab = SearchActiveTab.init(rawValue:
|
||||
UserDefaults.standard.integer(forKey: SearchTabViewController.selectedIndexKey)) ?? .categories {
|
||||
|
||||
Reference in New Issue
Block a user