diff --git a/iphone/Maps/Categories/UIImage+FilledWithColor.swift b/iphone/Maps/Categories/UIImage+FilledWithColor.swift new file mode 100644 index 0000000000..7973ff3c03 --- /dev/null +++ b/iphone/Maps/Categories/UIImage+FilledWithColor.swift @@ -0,0 +1,9 @@ +extension UIImage { + static func filled(with color: UIColor, size: CGSize = CGSize(width: 1, height: 1)) -> UIImage { + let renderer = UIGraphicsImageRenderer(size: size) + return renderer.image { context in + color.setFill() + context.fill(CGRect(origin: .zero, size: size)) + } + } +} diff --git a/iphone/Maps/Classes/MWMTableViewCell.m b/iphone/Maps/Classes/MWMTableViewCell.m index 2072f19369..279c208c4c 100644 --- a/iphone/Maps/Classes/MWMTableViewCell.m +++ b/iphone/Maps/Classes/MWMTableViewCell.m @@ -23,8 +23,7 @@ - (void)setIsSeparatorHidden:(BOOL)isSeparatorHidden { _isSeparatorHidden = isSeparatorHidden; - if (isSeparatorHidden) - [self hideSeparators]; + isSeparatorHidden ? [self hideSeparators] : [self showSeparators]; } - (void)hideSeparators @@ -33,6 +32,12 @@ view.hidden = [[[view class] className] isEqualToString:@"_UITableViewCellSeparatorView"]; } +- (void)showSeparators +{ + for (UIView * view in self.subviews) + view.hidden = NO; +} + - (void)layoutSubviews { [super layoutSubviews]; diff --git a/iphone/Maps/Core/Search/SearchResult.h b/iphone/Maps/Core/Search/SearchResult.h index 64a717c02b..c06eaa695a 100644 --- a/iphone/Maps/Core/Search/SearchResult.h +++ b/iphone/Maps/Core/Search/SearchResult.h @@ -8,6 +8,7 @@ NS_ASSUME_NONNULL_BEGIN @interface SearchResult : NSObject @property (nonatomic, readonly) NSString * titleText; +@property (nonatomic, readonly) NSString * iconImageName; @property (nonatomic, readonly) NSString * addressText; @property (nonatomic, readonly) NSString * infoText; @property (nonatomic, readonly) CLLocationCoordinate2D coordinate; @@ -21,6 +22,9 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic, readonly) NSArray * highlightRanges; @property (nonatomic, readonly) SearchItemType itemType; +/// This initializer is intended only for testing purposes. +- (instancetype)initWithTitleText:(NSString *)titleText type:(SearchItemType)type suggestion:(NSString *)suggestion; + @end NS_ASSUME_NONNULL_END diff --git a/iphone/Maps/Core/Search/SearchResult.mm b/iphone/Maps/Core/Search/SearchResult.mm index c176652c2c..0cd9373cc6 100644 --- a/iphone/Maps/Core/Search/SearchResult.mm +++ b/iphone/Maps/Core/Search/SearchResult.mm @@ -6,9 +6,22 @@ #import "platform/localization.hpp" #import "platform/distance.hpp" +#include "map/bookmark_helpers.hpp" + #import "geometry/mercator.hpp" @implementation SearchResult + +- (instancetype)initWithTitleText:(NSString *)titleText type:(SearchItemType)type suggestion:(NSString *)suggestion { + self = [super init]; + if (self) { + _titleText = titleText; + _itemType = type; + _suggestion = suggestion; + }; + return self; +} + @end @implementation SearchResult(Core) @@ -80,6 +93,14 @@ _highlightRanges = [ranges copy]; _itemType = itemType; + + if (result.GetResultType() == search::Result::Type::Feature) { + auto const featureType = result.GetFeatureType(); + auto const bookmarkImage = GetBookmarkIconByFeatureType(featureType); + _iconImageName = [NSString stringWithFormat:@"%@%@", + @"ic_bm_", + [@(kml::ToString(bookmarkImage).c_str()) lowercaseString]]; + } } return self; } diff --git a/iphone/Maps/Core/Theme/Components/IFonts.swift b/iphone/Maps/Core/Theme/Components/IFonts.swift index c82c4a1359..6bcdadef66 100644 --- a/iphone/Maps/Core/Theme/Components/IFonts.swift +++ b/iphone/Maps/Core/Theme/Components/IFonts.swift @@ -17,6 +17,7 @@ var medium9: UIFont { get } var medium10: UIFont { get } var medium12: UIFont { get } + var medium13: UIFont { get } var medium14: UIFont { get } var medium16: UIFont { get } var medium17: UIFont { get } diff --git a/iphone/Maps/Core/Theme/FontStyleSheet.swift b/iphone/Maps/Core/Theme/FontStyleSheet.swift index b687482d2d..fc7da2766b 100644 --- a/iphone/Maps/Core/Theme/FontStyleSheet.swift +++ b/iphone/Maps/Core/Theme/FontStyleSheet.swift @@ -17,6 +17,7 @@ enum FontStyleSheet: String, CaseIterable { case medium9 case medium10 case medium12 + case medium13 case medium14 case medium16 case medium17 @@ -83,6 +84,7 @@ extension FontStyleSheet: IStyleSheet { case .medium9: return fonts.medium9 case .medium10: return fonts.medium10 case .medium12: return fonts.medium12 + case .medium13: return fonts.medium13 case .medium14: return fonts.medium14 case .medium16: return fonts.medium16 case .medium17: return fonts.medium17 diff --git a/iphone/Maps/Core/Theme/Fonts.swift b/iphone/Maps/Core/Theme/Fonts.swift index 40eae432d7..718b0d7b70 100644 --- a/iphone/Maps/Core/Theme/Fonts.swift +++ b/iphone/Maps/Core/Theme/Fonts.swift @@ -16,6 +16,7 @@ class Fonts: IFonts { var medium9 = UIFont.systemFont(ofSize: 9, weight:UIFont.Weight.medium) var medium10 = UIFont.systemFont(ofSize: 10, weight:UIFont.Weight.medium) var medium12 = UIFont.systemFont(ofSize: 12, weight:UIFont.Weight.medium) + var medium13 = UIFont.systemFont(ofSize: 13, weight:UIFont.Weight.medium) var medium14 = UIFont.systemFont(ofSize: 14, weight:UIFont.Weight.medium) var medium16 = UIFont.systemFont(ofSize: 16, weight:UIFont.Weight.medium) var medium17 = UIFont.systemFont(ofSize: 17, weight:UIFont.Weight.medium) diff --git a/iphone/Maps/Core/Theme/GlobalStyleSheet.swift b/iphone/Maps/Core/Theme/GlobalStyleSheet.swift index d609df62cd..60590d985b 100644 --- a/iphone/Maps/Core/Theme/GlobalStyleSheet.swift +++ b/iphone/Maps/Core/Theme/GlobalStyleSheet.swift @@ -2,6 +2,7 @@ enum GlobalStyleSheet: String, CaseIterable { case tableView = "TableView" case tableCell = "TableCell" case tableViewCell = "MWMTableViewCell" + case defaultTableViewCell case tableViewHeaderFooterView = "TableViewHeaderFooterView" case searchBar = "SearchBar" case navigationBar = "NavigationBar" @@ -81,6 +82,10 @@ extension GlobalStyleSheet: IStyleSheet { case .tableViewCell: return .addFrom(Self.tableCell) { s in } + case .defaultTableViewCell: + return .add { s in + s.backgroundColor = colors.white + } case .tableViewHeaderFooterView: return .add { s in s.font = fonts.medium14 diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 95869c9cc6..ec78d74d37 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -11,11 +11,10 @@ 1DFA2F6A20D3B57400FB2C66 /* UIColor+PartnerColor.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DFA2F6920D3B57400FB2C66 /* UIColor+PartnerColor.m */; }; 3304306D21D4EAFB00317CA3 /* SearchCategoryCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3304306C21D4EAFB00317CA3 /* SearchCategoryCell.swift */; }; 33046832219C57180041F3A8 /* CategorySettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33046831219C57180041F3A8 /* CategorySettingsViewController.swift */; }; - 337F98A321D37B5800C8AC27 /* SearchHistoryViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 337F98A021D37B5700C8AC27 /* SearchHistoryViewController.xib */; }; 337F98A621D37B7400C8AC27 /* SearchTabViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 337F98A521D37B7400C8AC27 /* SearchTabViewController.swift */; }; 337F98B221D3BAE600C8AC27 /* SearchCategoriesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 337F98B121D3BAE600C8AC27 /* SearchCategoriesViewController.swift */; }; 337F98B421D3C9F200C8AC27 /* SearchHistoryViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 337F98B321D3C9F200C8AC27 /* SearchHistoryViewController.swift */; }; - 337F98B821D3D67E00C8AC27 /* SearchHistoryQueryCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 337F98B721D3D67E00C8AC27 /* SearchHistoryQueryCell.swift */; }; + 337F98B821D3D67E00C8AC27 /* SearchHistoryCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 337F98B721D3D67E00C8AC27 /* SearchHistoryCell.swift */; }; 340416481E7BF28E00E2B6D6 /* UIView+Snapshot.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340416461E7BF28E00E2B6D6 /* UIView+Snapshot.swift */; }; 3404164C1E7BF42E00E2B6D6 /* UIView+Coordinates.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3404164A1E7BF42D00E2B6D6 /* UIView+Coordinates.swift */; }; 3404754D1E081A4600C92850 /* MWMKeyboard.m in Sources */ = {isa = PBXBuildFile; fileRef = 340475191E081A4600C92850 /* MWMKeyboard.m */; }; @@ -508,6 +507,7 @@ ED7CCC4F2C1362E300E2A737 /* FileType.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED7CCC4E2C1362E300E2A737 /* FileType.swift */; }; ED808D0F2C38407800D52585 /* CircleImageButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED808D0E2C38407800D52585 /* CircleImageButton.swift */; }; ED8270F02C2071A3005966DA /* SettingsTableViewDetailedSwitchCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED8270EF2C2071A3005966DA /* SettingsTableViewDetailedSwitchCell.swift */; }; + ED83880F2D54DEB3002A0536 /* UIImage+FilledWithColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED83880E2D54DEA4002A0536 /* UIImage+FilledWithColor.swift */; }; ED914AB22D35063A00973C45 /* TextColorStyleSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED914AB12D35063A00973C45 /* TextColorStyleSheet.swift */; }; ED914AB82D351DF000973C45 /* StyleApplicable.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED914AB72D351DF000973C45 /* StyleApplicable.swift */; }; ED914ABE2D351FF800973C45 /* UILabel+SetFontStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED914ABD2D351FF800973C45 /* UILabel+SetFontStyle.swift */; }; @@ -523,6 +523,7 @@ EDC4E3612C5E2576009286A2 /* RecentlyDeletedCategoriesViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDC4E3412C5D1BD3009286A2 /* RecentlyDeletedCategoriesViewModelTests.swift */; }; EDC4E3692C5E6F5B009286A2 /* MockRecentlyDeletedCategoriesManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDC4E3402C5D1BD3009286A2 /* MockRecentlyDeletedCategoriesManager.swift */; }; EDCA7CDF2D317DF9003366CE /* StyleSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDCA7CDE2D317DF9003366CE /* StyleSheet.swift */; }; + EDDE060E2D6CAEAF000C328A /* SearchHistoryViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = EDDE060D2D6CAEAF000C328A /* SearchHistoryViewController.xib */; }; EDE243DD2B6D2E640057369B /* AboutController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDE243D52B6CF3980057369B /* AboutController.swift */; }; EDE243E52B6D3F400057369B /* OSMView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDE243E42B6D3F400057369B /* OSMView.swift */; }; EDE243E72B6D55610057369B /* InfoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDE243E02B6D3EA00057369B /* InfoView.swift */; }; @@ -622,9 +623,6 @@ F6E2FEE51E097BA00083EBEC /* MWMSearchNoResults.m in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCFD1E097B9F0083EBEC /* MWMSearchNoResults.m */; }; F6E2FEE81E097BA00083EBEC /* MWMSearchNoResults.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FCFE1E097B9F0083EBEC /* MWMSearchNoResults.xib */; }; F6E2FEEE1E097BA00083EBEC /* MWMSearchView.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FD011E097B9F0083EBEC /* MWMSearchView.xib */; }; - F6E2FF001E097BA00083EBEC /* SearchCategoryCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FD0E1E097B9F0083EBEC /* SearchCategoryCell.xib */; }; - F6E2FF061E097BA00083EBEC /* SearchHistoryClearCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FD121E097B9F0083EBEC /* SearchHistoryClearCell.xib */; }; - F6E2FF151E097BA00083EBEC /* SearchHistoryQueryCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FD1A1E097B9F0083EBEC /* SearchHistoryQueryCell.xib */; }; F6E2FF2D1E097BA00083EBEC /* MWMSearchCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FD2A1E097BA00083EBEC /* MWMSearchCell.mm */; }; F6E2FF301E097BA00083EBEC /* MWMSearchCommonCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FD2C1E097BA00083EBEC /* MWMSearchCommonCell.mm */; }; F6E2FF331E097BA00083EBEC /* MWMSearchCommonCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FD2D1E097BA00083EBEC /* MWMSearchCommonCell.xib */; }; @@ -797,11 +795,10 @@ 30034C602B3F0B8A005D961A /* az */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = az; path = az.lproj/InfoPlist.strings; sourceTree = ""; }; 3304306C21D4EAFB00317CA3 /* SearchCategoryCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchCategoryCell.swift; sourceTree = ""; }; 33046831219C57180041F3A8 /* CategorySettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CategorySettingsViewController.swift; sourceTree = ""; }; - 337F98A021D37B5700C8AC27 /* SearchHistoryViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SearchHistoryViewController.xib; sourceTree = ""; }; 337F98A521D37B7400C8AC27 /* SearchTabViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchTabViewController.swift; sourceTree = ""; }; 337F98B121D3BAE600C8AC27 /* SearchCategoriesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchCategoriesViewController.swift; sourceTree = ""; }; 337F98B321D3C9F200C8AC27 /* SearchHistoryViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchHistoryViewController.swift; sourceTree = ""; }; - 337F98B721D3D67E00C8AC27 /* SearchHistoryQueryCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchHistoryQueryCell.swift; sourceTree = ""; }; + 337F98B721D3D67E00C8AC27 /* SearchHistoryCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchHistoryCell.swift; sourceTree = ""; }; 340416461E7BF28E00E2B6D6 /* UIView+Snapshot.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIView+Snapshot.swift"; sourceTree = ""; }; 3404164A1E7BF42D00E2B6D6 /* UIView+Coordinates.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIView+Coordinates.swift"; sourceTree = ""; }; 340475181E081A4600C92850 /* MWMKeyboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMKeyboard.h; sourceTree = ""; }; @@ -1475,6 +1472,7 @@ ED7CCC4E2C1362E300E2A737 /* FileType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileType.swift; sourceTree = ""; }; ED808D0E2C38407800D52585 /* CircleImageButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CircleImageButton.swift; sourceTree = ""; }; ED8270EF2C2071A3005966DA /* SettingsTableViewDetailedSwitchCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsTableViewDetailedSwitchCell.swift; sourceTree = ""; }; + ED83880E2D54DEA4002A0536 /* UIImage+FilledWithColor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIImage+FilledWithColor.swift"; sourceTree = ""; }; ED914AB12D35063A00973C45 /* TextColorStyleSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextColorStyleSheet.swift; sourceTree = ""; }; ED914AB72D351DF000973C45 /* StyleApplicable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StyleApplicable.swift; sourceTree = ""; }; ED914ABD2D351FF800973C45 /* UILabel+SetFontStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UILabel+SetFontStyle.swift"; sourceTree = ""; }; @@ -1490,6 +1488,7 @@ EDC4E3482C5D1BEF009286A2 /* RecentlyDeletedCategoriesViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RecentlyDeletedCategoriesViewModel.swift; sourceTree = ""; }; EDC4E3492C5D1BEF009286A2 /* RecentlyDeletedTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RecentlyDeletedTableViewCell.swift; sourceTree = ""; }; EDCA7CDE2D317DF9003366CE /* StyleSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StyleSheet.swift; sourceTree = ""; }; + EDDE060D2D6CAEAF000C328A /* SearchHistoryViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SearchHistoryViewController.xib; sourceTree = ""; }; EDE243D52B6CF3980057369B /* AboutController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AboutController.swift; sourceTree = ""; }; EDE243E02B6D3EA00057369B /* InfoView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InfoView.swift; sourceTree = ""; }; EDE243E42B6D3F400057369B /* OSMView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OSMView.swift; sourceTree = ""; }; @@ -1675,9 +1674,6 @@ F6E2FCFD1E097B9F0083EBEC /* MWMSearchNoResults.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = MWMSearchNoResults.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; F6E2FCFE1E097B9F0083EBEC /* MWMSearchNoResults.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMSearchNoResults.xib; sourceTree = ""; }; F6E2FD011E097B9F0083EBEC /* MWMSearchView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMSearchView.xib; sourceTree = ""; }; - F6E2FD0E1E097B9F0083EBEC /* SearchCategoryCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SearchCategoryCell.xib; sourceTree = ""; }; - F6E2FD121E097B9F0083EBEC /* SearchHistoryClearCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SearchHistoryClearCell.xib; sourceTree = ""; }; - F6E2FD1A1E097B9F0083EBEC /* SearchHistoryQueryCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SearchHistoryQueryCell.xib; sourceTree = ""; }; F6E2FD231E097BA00083EBEC /* MWMSearchTabbedViewProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchTabbedViewProtocol.h; sourceTree = ""; }; F6E2FD291E097BA00083EBEC /* MWMSearchCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchCell.h; sourceTree = ""; }; F6E2FD2A1E097BA00083EBEC /* MWMSearchCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSearchCell.mm; sourceTree = ""; }; @@ -2240,6 +2236,7 @@ 3454D7981E07F045004AF2AD /* Categories */ = { isa = PBXGroup; children = ( + ED83880E2D54DEA4002A0536 /* UIImage+FilledWithColor.swift */, 99A614E223CDD1D900D8D8D0 /* UIButton+RuntimeAttributes.h */, 99A614E323CDD1D900D8D8D0 /* UIButton+RuntimeAttributes.m */, 34D3B04D1E38A20C004100F9 /* Bundle+Init.swift */, @@ -3864,7 +3861,6 @@ children = ( 337F98B121D3BAE600C8AC27 /* SearchCategoriesViewController.swift */, 3304306C21D4EAFB00317CA3 /* SearchCategoryCell.swift */, - F6E2FD0E1E097B9F0083EBEC /* SearchCategoryCell.xib */, ); path = CategoriesTab; sourceTree = ""; @@ -3872,11 +3868,9 @@ F6E2FD0F1E097B9F0083EBEC /* HistoryTab */ = { isa = PBXGroup; children = ( - F6E2FD121E097B9F0083EBEC /* SearchHistoryClearCell.xib */, - 337F98B721D3D67E00C8AC27 /* SearchHistoryQueryCell.swift */, - F6E2FD1A1E097B9F0083EBEC /* SearchHistoryQueryCell.xib */, + EDDE060D2D6CAEAF000C328A /* SearchHistoryViewController.xib */, + 337F98B721D3D67E00C8AC27 /* SearchHistoryCell.swift */, 337F98B321D3C9F200C8AC27 /* SearchHistoryViewController.swift */, - 337F98A021D37B5700C8AC27 /* SearchHistoryViewController.xib */, ); path = HistoryTab; sourceTree = ""; @@ -4272,6 +4266,7 @@ 6741A9991BF340DE002C974C /* MWMAlertViewController.xib in Resources */, 4501B1942077C35A001B9173 /* resources-xxxhdpi_light in Resources */, 3467CEB7202C6FA900D3C670 /* BMCNotificationsCell.xib in Resources */, + EDDE060E2D6CAEAF000C328A /* SearchHistoryViewController.xib in Resources */, 4761BE2B252D3DB900EE2DE4 /* SubgroupCell.xib in Resources */, 99F9A0E72462CA1700AE21E0 /* DownloadAllView.xib in Resources */, 349D1AD51E2E325B004A2006 /* BottomMenuItemCell.xib in Resources */, @@ -4318,7 +4313,6 @@ FA637ED529A500BE00D8921A /* drules_proto_outdoors_dark.bin in Resources */, 4554B6EC1E55F0EF0084017F /* drules_proto_vehicle_light.bin in Resources */, 47CA68F2250B54AF00671019 /* BookmarksListCell.xib in Resources */, - 337F98A321D37B5800C8AC27 /* SearchHistoryViewController.xib in Resources */, F6E2FE761E097BA00083EBEC /* MWMOpeningHoursCell.xib in Resources */, 34AB66351FC5AA330078E451 /* RouteManagerCell.xib in Resources */, F6E2FE011E097BA00083EBEC /* MWMOpeningHoursClosedSpanTableViewCell.xib in Resources */, @@ -4335,12 +4329,9 @@ F6E2FE851E097BA00083EBEC /* MWMPlacePageOpeningHoursWeekDayView.xib in Resources */, 6741A9601BF340DE002C974C /* MWMRoutingDisclaimerAlert.xib in Resources */, B3E3B4FD20D463B700DA8C13 /* BMCCategoriesHeader.xib in Resources */, - F6E2FF001E097BA00083EBEC /* SearchCategoryCell.xib in Resources */, F6E2FF331E097BA00083EBEC /* MWMSearchCommonCell.xib in Resources */, - F6E2FF061E097BA00083EBEC /* SearchHistoryClearCell.xib in Resources */, BB7626B61E85599C0031D71C /* icudt75l.dat in Resources */, 34AB665C1FC5AA330078E451 /* TransportTransitIntermediatePoint.xib in Resources */, - F6E2FF151E097BA00083EBEC /* SearchHistoryQueryCell.xib in Resources */, F6E2FEE81E097BA00083EBEC /* MWMSearchNoResults.xib in Resources */, 34AB660E1FC5AA320078E451 /* NavigationControlView.xib in Resources */, 408645FC21495EB1000A4A1D /* categories_cuisines.txt in Resources */, @@ -4679,6 +4670,7 @@ 99012852244732DB00C72B10 /* BottomTabBarBuilder.swift in Sources */, 99012847243F0D6900C72B10 /* UIViewController+alternative.swift in Sources */, 995739062355CAC40019AEE7 /* ImageViewCrossDisolve.swift in Sources */, + ED83880F2D54DEB3002A0536 /* UIImage+FilledWithColor.swift in Sources */, 47B9065221C7FA400079C85E /* MWMWebImage.m in Sources */, 47A13CAD24BE9AA500027D4F /* DatePickerViewRenderer.swift in Sources */, ED2E328E2D10500900807A08 /* TrackRecordingButtonArea.swift in Sources */, @@ -4767,7 +4759,7 @@ 47E460AD240D737D00385B45 /* OpeinigHoursLocalization.swift in Sources */, 99F9A0E52462CA0E00AE21E0 /* DownloadAllView.swift in Sources */, F6E2FF301E097BA00083EBEC /* MWMSearchCommonCell.mm in Sources */, - 337F98B821D3D67E00C8AC27 /* SearchHistoryQueryCell.swift in Sources */, + 337F98B821D3D67E00C8AC27 /* SearchHistoryCell.swift in Sources */, 34AB66621FC5AA330078E451 /* TransportTransitSeparator.swift in Sources */, CDCA2743223F8D1E00167D87 /* ListItemInfo.swift in Sources */, 993DF11F23F6BDB100AC231A /* UITableViewCellRenderer.swift in Sources */, diff --git a/iphone/Maps/UI/Search/TableView/MWMSearchCell.h b/iphone/Maps/UI/Search/TableView/MWMSearchCell.h index 97d873854c..cff502b8a3 100644 --- a/iphone/Maps/UI/Search/TableView/MWMSearchCell.h +++ b/iphone/Maps/UI/Search/TableView/MWMSearchCell.h @@ -2,8 +2,10 @@ @class SearchResult; +static CGFloat const kSearchCellSeparatorInset = 48; + @interface MWMSearchCell : MWMTableViewCell -- (void)configureWith:(SearchResult * _Nonnull)result; +- (void)configureWith:(SearchResult * _Nonnull)result isPartialMatching:(BOOL)isPartialMatching; @end diff --git a/iphone/Maps/UI/Search/TableView/MWMSearchCell.mm b/iphone/Maps/UI/Search/TableView/MWMSearchCell.mm index 8bb51f8bc2..e447d19f70 100644 --- a/iphone/Maps/UI/Search/TableView/MWMSearchCell.mm +++ b/iphone/Maps/UI/Search/TableView/MWMSearchCell.mm @@ -9,7 +9,7 @@ @implementation MWMSearchCell -- (void)configureWith:(SearchResult * _Nonnull)result { +- (void)configureWith:(SearchResult * _Nonnull)result isPartialMatching:(BOOL)isPartialMatching { NSString * title = result.titleText; if (title.length == 0) @@ -27,9 +27,10 @@ } NSMutableAttributedString * attributedTitle = [[NSMutableAttributedString alloc] initWithString:title]; - [attributedTitle addAttributes:unselectedTitleAttributes range:NSMakeRange(0, title.length)]; + NSDictionary * titleAttributes = isPartialMatching ? unselectedTitleAttributes : selectedTitleAttributes; NSArray *highlightRanges = result.highlightRanges; + [attributedTitle addAttributes:titleAttributes range:NSMakeRange(0, title.length)]; for (NSValue *rangeValue in highlightRanges) { NSRange range = [rangeValue rangeValue]; diff --git a/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.h b/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.h index 6ed78b127d..a66d784289 100644 --- a/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.h +++ b/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.h @@ -5,6 +5,6 @@ NS_SWIFT_NAME(SearchCommonCell) @interface MWMSearchCommonCell : MWMSearchCell -- (void)configureWith:(SearchResult * _Nonnull)result; +- (void)configureWith:(SearchResult * _Nonnull)result isPartialMatching:(BOOL)isPartialMatching; @end diff --git a/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.mm b/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.mm index 4e999303c8..15a60cdb51 100644 --- a/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.mm +++ b/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.mm @@ -4,13 +4,6 @@ #import "SwiftBridge.h" #import "SearchResult.h" -#include "map/place_page_info.hpp" - -#include "geometry/mercator.hpp" - -#include "platform/localization.hpp" -#include "platform/distance.hpp" - @interface MWMSearchCommonCell () @property(weak, nonatomic) IBOutlet UILabel * distanceLabel; @@ -18,35 +11,41 @@ @property(weak, nonatomic) IBOutlet UILabel * locationLabel; @property(weak, nonatomic) IBOutlet UILabel * openLabel; @property(weak, nonatomic) IBOutlet UIView * popularView; +@property(weak, nonatomic) IBOutlet UIImageView * iconImageView; @end @implementation MWMSearchCommonCell -- (void)configureWith:(SearchResult * _Nonnull)result { - [super configureWith:result]; +- (void)configureWith:(SearchResult * _Nonnull)result isPartialMatching:(BOOL)isPartialMatching { + [super configureWith:result isPartialMatching:isPartialMatching]; self.locationLabel.text = result.addressText; [self.locationLabel sizeToFit]; - self.infoLabel.text = result.infoText; self.distanceLabel.text = result.distanceText; self.popularView.hidden = YES; self.openLabel.text = result.openStatusText; self.openLabel.textColor = result.openStatusColor; [self.openLabel setHidden:result.openStatusText.length == 0]; - [self setStyleNameAndApply: @"Background"]; + [self setStyleNameAndApply:@"Background"]; + [self.iconImageView setStyleNameAndApply:@"BlueBackground"]; + self.iconImageView.image = [UIImage imageNamed:result.iconImageName]; + self.separatorInset = UIEdgeInsetsMake(0, kSearchCellSeparatorInset, 0, 0); } -- (NSDictionary *)selectedTitleAttributes -{ +- (void)layoutSubviews { + [super layoutSubviews]; + [self.iconImageView.layer setCornerRadius:self.iconImageView.height / 2]; +} + +- (NSDictionary *)selectedTitleAttributes { return @{ NSForegroundColorAttributeName : [UIColor blackPrimaryText], NSFontAttributeName : [UIFont bold17] }; } -- (NSDictionary *)unselectedTitleAttributes -{ +- (NSDictionary *)unselectedTitleAttributes { return @{ NSForegroundColorAttributeName : [UIColor blackPrimaryText], NSFontAttributeName : [UIFont regular17] diff --git a/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.xib b/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.xib index e951d0195f..073542c1e0 100644 --- a/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.xib +++ b/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.xib @@ -1,50 +1,41 @@ - + - + + - - + + - + - - - - - - - - - - - - - + + + + + - - + - - - + - @@ -132,13 +130,19 @@ + + - - + + + + + + diff --git a/iphone/Maps/UI/Search/TableView/MWMSearchSuggestionCell.mm b/iphone/Maps/UI/Search/TableView/MWMSearchSuggestionCell.mm index 26851843af..b8c5174702 100644 --- a/iphone/Maps/UI/Search/TableView/MWMSearchSuggestionCell.mm +++ b/iphone/Maps/UI/Search/TableView/MWMSearchSuggestionCell.mm @@ -3,7 +3,6 @@ @interface MWMSearchSuggestionCell () @property (weak, nonatomic) IBOutlet UIImageView * icon; -@property (weak, nonatomic) IBOutlet NSLayoutConstraint * separatorLeftOffset; @end @@ -31,7 +30,7 @@ - (void)setIsLastCell:(BOOL)isLastCell { _isLastCell = isLastCell; - self.separatorLeftOffset.constant = isLastCell ? 0.0 : 60.0; + self.separatorInset = UIEdgeInsetsMake(0, isLastCell ? 0 : kSearchCellSeparatorInset, 0, 0); } @end diff --git a/iphone/Maps/UI/Search/TableView/MWMSearchSuggestionCell.xib b/iphone/Maps/UI/Search/TableView/MWMSearchSuggestionCell.xib index 82bd5e4ee7..e269b2d272 100644 --- a/iphone/Maps/UI/Search/TableView/MWMSearchSuggestionCell.xib +++ b/iphone/Maps/UI/Search/TableView/MWMSearchSuggestionCell.xib @@ -1,9 +1,9 @@ - + - + @@ -12,44 +12,34 @@ - + - + - - + + - - - - - - - - - - - + - + - - + + @@ -57,7 +47,6 @@ - diff --git a/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.mm b/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.mm index 44f81b2b8d..eff7961360 100644 --- a/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.mm +++ b/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.mm @@ -90,14 +90,14 @@ NSString *GetLocalizedTypeName(search::Result const &result) { { auto cell = static_cast( [tableView dequeueReusableCellWithCellClass:[MWMSearchCommonCell class] indexPath:indexPath]); - [cell configureWith:result]; + [cell configureWith:result isPartialMatching:YES]; return cell; } case SearchItemTypeSuggestion: { auto cell = static_cast( [tableView dequeueReusableCellWithCellClass:[MWMSearchSuggestionCell class] indexPath:indexPath]); - [cell configureWith:result]; + [cell configureWith:result isPartialMatching:YES]; cell.isLastCell = row == [MWMSearch suggestionsCount] - 1; return cell; } diff --git a/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.xib b/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.xib index f9db80e653..5de7e20d67 100644 --- a/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.xib +++ b/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.xib @@ -1,9 +1,9 @@ - + - + @@ -37,7 +37,7 @@ - + diff --git a/iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchCategoriesViewController.swift b/iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchCategoriesViewController.swift index 830b9f5a06..e9ab1f5998 100644 --- a/iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchCategoriesViewController.swift +++ b/iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchCategoriesViewController.swift @@ -12,34 +12,35 @@ final class SearchCategoriesViewController: MWMTableViewController { categories = frameworkHelper.searchCategories() super.init(nibName: nil, bundle: nil) } - + + @available(*, unavailable) required init?(coder aDecoder: NSCoder) { fatalError("init(coder:) has not been implemented") } - + override func viewDidLoad() { super.viewDidLoad() - - tableView.registerNib(cellClass: SearchCategoryCell.self) - tableView.separatorStyle = .none + tableView.setStyle(.background) + tableView.register(cell: SearchCategoryCell.self) tableView.keyboardDismissMode = .onDrag } - + override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { return categories.count } override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { let cell = tableView.dequeueReusableCell(cell: SearchCategoryCell.self, indexPath: indexPath) - cell.update(with: category(at: indexPath)) + cell.configure(with: category(at: indexPath)) return cell } override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { let selectedCategory = category(at: indexPath) delegate?.categoriesViewController(self, didSelect: selectedCategory) + tableView.deselectRow(at: indexPath, animated: true) } - + func category(at indexPath: IndexPath) -> String { let index = indexPath.row return categories[index] diff --git a/iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchCategoryCell.swift b/iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchCategoryCell.swift index fb96f27922..b9ccf3ae9f 100644 --- a/iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchCategoryCell.swift +++ b/iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchCategoryCell.swift @@ -1,16 +1,25 @@ -final class SearchCategoryCell: MWMTableViewCell { - @IBOutlet weak var iconImageView: UIImageView! - @IBOutlet weak var titleLabel: UILabel! +final class SearchCategoryCell: UITableViewCell { - private var category: String = "" - func update(with category: String) { - self.category = category - iconImageView.mwm_name = String(format: "ic_%@", category) - titleLabel.text = L(category) + private var categoryName: String = "" + + override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) { + super.init(style: .default, reuseIdentifier: reuseIdentifier) + setStyle(.defaultTableViewCell) + } + + @available(*, unavailable) + required init?(coder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } + + func configure(with categoryName: String) { + self.categoryName = categoryName + textLabel?.text = L(categoryName) + imageView?.mwm_name = String(format: "ic_%@", categoryName) } override func applyTheme() { super.applyTheme() - iconImageView.mwm_name = String(format: "ic_%@", category) + imageView?.mwm_name = String(format: "ic_%@", categoryName) } } diff --git a/iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchCategoryCell.xib b/iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchCategoryCell.xib deleted file mode 100644 index fa090e4142..0000000000 --- a/iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchCategoryCell.xib +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryCell.swift b/iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryCell.swift new file mode 100644 index 0000000000..202edb2fe9 --- /dev/null +++ b/iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryCell.swift @@ -0,0 +1,34 @@ +final class SearchHistoryCell: MWMTableViewCell { + enum Content { + case query(String) + case clear + } + + static private let placeholderImage = UIImage.filled(with: .clear, size: CGSize(width: 28, height: 28)) + + override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) { + super.init(style: .default, reuseIdentifier: reuseIdentifier) + setStyle(.defaultTableViewCell) + } + + @available(*, unavailable) + required init?(coder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } + + func configure(for content: Content) { + switch content { + case .query(let query): + textLabel?.text = query + textLabel?.setFontStyleAndApply(.regular17, color: .blackSecondary) + imageView?.image = UIImage(resource: .icSearch) + imageView?.setStyleAndApply(.black) + isSeparatorHidden = false + case .clear: + textLabel?.text = L("clear_search") + textLabel?.setFontStyleAndApply(.regular14, color: .linkBlue) + imageView?.image = Self.placeholderImage + isSeparatorHidden = true + } + } +} diff --git a/iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryClearCell.xib b/iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryClearCell.xib deleted file mode 100644 index c22b6c3ab5..0000000000 --- a/iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryClearCell.xib +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryQueryCell.swift b/iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryQueryCell.swift deleted file mode 100644 index 83f7890318..0000000000 --- a/iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryQueryCell.swift +++ /dev/null @@ -1,7 +0,0 @@ -final class SearchHistoryQueryCell: MWMTableViewCell { - @IBOutlet weak var queryLabel: UILabel! - - func update(with query: String) { - queryLabel.text = query - } -} diff --git a/iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryQueryCell.xib b/iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryQueryCell.xib deleted file mode 100644 index 9873a4db20..0000000000 --- a/iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryQueryCell.xib +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryViewController.swift b/iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryViewController.swift index 3b504ee1d7..01eba9fcd2 100644 --- a/iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryViewController.swift +++ b/iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryViewController.swift @@ -29,9 +29,7 @@ final class SearchHistoryViewController: MWMViewController { if frameworkHelper.isSearchHistoryEmpty() { showNoResultsView() } else { - tableView.registerNib(cellClass: SearchHistoryQueryCell.self) - let nib = UINib(nibName: "SearchHistoryClearCell", bundle: nil) - tableView.register(nib, forCellReuseIdentifier: SearchHistoryViewController.clearCellIdentifier) + tableView.register(cell: SearchHistoryCell.self) } tableView.keyboardDismissMode = .onDrag } @@ -59,14 +57,12 @@ extension SearchHistoryViewController: UITableViewDataSource { } func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { + let cell = tableView.dequeueReusableCell(cell: SearchHistoryCell.self, indexPath: indexPath) if indexPath.row == lastQueries.count { - let cell = tableView.dequeueReusableCell(withIdentifier: SearchHistoryViewController.clearCellIdentifier, - for: indexPath) - return cell + cell.configure(for: .clear) + } else { + cell.configure(for: .query(lastQueries[indexPath.row])) } - - let cell = tableView.dequeueReusableCell(cell: SearchHistoryQueryCell.self, indexPath: indexPath) - cell.update(with: lastQueries[indexPath.row]) return cell } } @@ -85,5 +81,6 @@ extension SearchHistoryViewController: UITableViewDelegate { let query = lastQueries[indexPath.row] delegate?.searchHistoryViewController(self, didSelect: query) } + tableView.deselectRow(at: indexPath, animated: true) } } diff --git a/iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryViewController.xib b/iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryViewController.xib index 2d589dfac8..952a4e3cdb 100644 --- a/iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryViewController.xib +++ b/iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryViewController.xib @@ -1,14 +1,14 @@ - + - + - + @@ -20,8 +20,8 @@ - - + + @@ -29,7 +29,7 @@ - + @@ -37,6 +37,7 @@ + @@ -46,7 +47,6 @@ - diff --git a/iphone/Maps/UI/Search/Tabs/SearchTabViewController.swift b/iphone/Maps/UI/Search/Tabs/SearchTabViewController.swift index 5d60214d05..205d0a793a 100644 --- a/iphone/Maps/UI/Search/Tabs/SearchTabViewController.swift +++ b/iphone/Maps/UI/Search/Tabs/SearchTabViewController.swift @@ -1,7 +1,6 @@ -import CoreFoundation @objc(MWMSearchTabViewControllerDelegate) protocol SearchTabViewControllerDelegate: AnyObject { - func searchTabController(_ viewContoller: SearchTabViewController, didSearch: String, withCategory: Bool) + func searchTabController(_ viewController: SearchTabViewController, didSearch: String, withCategory: Bool) } @objc(MWMSearchTabViewController)