drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-23 06:33:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ios] make MWMSearchFrameworkHelper methods class instead of instance

Browse Source 
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:
Kiryl Kaveryn
2025-05-26 17:50:18 +04:00
committed by Konstantin Pastbin
parent 8a331c4c67
commit 648fb55130
5 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
iphone/CoreApi/CoreApi/Search/MWMSearchFrameworkHelper.h
View File

@@ -4,11 +4,11 @@ NS_ASSUME_NONNULL_BEGIN
@interface MWMSearchFrameworkHelper : NSObject @interface MWMSearchFrameworkHelper : NSObject
- (NSArray<NSString *> *)searchCategories; + (NSArray<NSString *> *)searchCategories;
- (BOOL)isSearchHistoryEmpty; + (BOOL)isSearchHistoryEmpty;
- (NSArray<NSString *> *)lastSearchQueries; + (NSArray<NSString *> *)lastSearchQueries;
- (void)clearSearchHistory; + (void)clearSearchHistory;
@end @end

12
iphone/CoreApi/CoreApi/Search/MWMSearchFrameworkHelper.mm
View File

@@ -6,34 +6,30 @@
@implementation MWMSearchFrameworkHelper @implementation MWMSearchFrameworkHelper
- (NSArray<NSString *> *)searchCategories + (NSArray<NSString *> *)searchCategories
{ {
NSMutableArray * result = [NSMutableArray array]; NSMutableArray * result = [NSMutableArray array];
auto const & categories = GetFramework().GetDisplayedCategories().GetKeys(); auto const & categories = GetFramework().GetDisplayedCategories().GetKeys();
for (auto const & item : categories) for (auto const & item : categories)
{
[result addObject:@(item.c_str())]; [result addObject:@(item.c_str())];
}
return [result copy]; return [result copy];
} }
- (BOOL)isSearchHistoryEmpty + (BOOL)isSearchHistoryEmpty
{ {
return GetFramework().GetSearchAPI().GetLastSearchQueries().empty(); return GetFramework().GetSearchAPI().GetLastSearchQueries().empty();
} }
- (NSArray<NSString *> *)lastSearchQueries + (NSArray<NSString *> *)lastSearchQueries
{ {
NSMutableArray * result = [NSMutableArray array]; NSMutableArray * result = [NSMutableArray array];
auto const & queries = GetFramework().GetSearchAPI().GetLastSearchQueries(); auto const & queries = GetFramework().GetSearchAPI().GetLastSearchQueries();
for (auto const & item : queries) for (auto const & item : queries)
{
[result addObject:@(item.second.c_str())]; [result addObject:@(item.second.c_str())];
}
return [result copy]; return [result copy];
} }
- (void)clearSearchHistory + (void)clearSearchHistory
{ {
GetFramework().GetSearchAPI().ClearSearchHistory(); GetFramework().GetSearchAPI().ClearSearchHistory();
} }

2
iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchCategoriesViewController.swift
View File

@@ -7,7 +7,7 @@ final class SearchCategoriesViewController: MWMTableViewController {
private weak var delegate: SearchCategoriesViewControllerDelegate? private weak var delegate: SearchCategoriesViewControllerDelegate?
private let categories: [String] private let categories: [String]
init(frameworkHelper: MWMSearchFrameworkHelper, delegate: SearchCategoriesViewControllerDelegate?) { init(frameworkHelper: MWMSearchFrameworkHelper.Type, delegate: SearchCategoriesViewControllerDelegate?) {
self.delegate = delegate self.delegate = delegate
categories = frameworkHelper.searchCategories() categories = frameworkHelper.searchCategories()
super.init(nibName: nil, bundle: nil) super.init(nibName: nil, bundle: nil)

4
iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryViewController.swift
View File

@@ -6,14 +6,14 @@ protocol SearchHistoryViewControllerDelegate: SearchOnMapScrollViewDelegate {
final class SearchHistoryViewController: MWMViewController { final class SearchHistoryViewController: MWMViewController {
private weak var delegate: SearchHistoryViewControllerDelegate? private weak var delegate: SearchHistoryViewControllerDelegate?
private var lastQueries: [String] = [] private var lastQueries: [String] = []
private let frameworkHelper: MWMSearchFrameworkHelper private let frameworkHelper: MWMSearchFrameworkHelper.Type
private let emptyHistoryView = PlaceholderView(title: L("search_history_title"), private let emptyHistoryView = PlaceholderView(title: L("search_history_title"),
subtitle: L("search_history_text")) subtitle: L("search_history_text"))
private let tableView = UITableView() private let tableView = UITableView()
// MARK: - Init // MARK: - Init
init(frameworkHelper: MWMSearchFrameworkHelper, delegate: SearchHistoryViewControllerDelegate?) { init(frameworkHelper: MWMSearchFrameworkHelper.Type, delegate: SearchHistoryViewControllerDelegate?) {
self.delegate = delegate self.delegate = delegate
self.frameworkHelper = frameworkHelper self.frameworkHelper = frameworkHelper
super.init(nibName: nil, bundle: nil) super.init(nibName: nil, bundle: nil)

4
iphone/Maps/UI/Search/Tabs/SearchTabViewController.swift
View File

@@ -13,9 +13,7 @@ final class SearchTabViewController: TabViewController {
private static let selectedIndexKey = "SearchTabViewController_selectedIndexKey" private static let selectedIndexKey = "SearchTabViewController_selectedIndexKey"
@objc weak var delegate: SearchTabViewControllerDelegate? @objc weak var delegate: SearchTabViewControllerDelegate?
private lazy var frameworkHelper: MWMSearchFrameworkHelper = { private var frameworkHelper = MWMSearchFrameworkHelper.self
return MWMSearchFrameworkHelper()
}()
private var activeTab: SearchActiveTab = SearchActiveTab.init(rawValue: private var activeTab: SearchActiveTab = SearchActiveTab.init(rawValue:
UserDefaults.standard.integer(forKey: SearchTabViewController.selectedIndexKey)) ?? .categories { UserDefaults.standard.integer(forKey: SearchTabViewController.selectedIndexKey)) ?? .categories {