pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[ios] search tabs refactoring

Browse source
This commit is contained in:
o.bolovintseva 2018-12-26 12:30:52 +03:00 • committed by Aleksey Belousov
parent 986dd8d6a8
commit 50d57aa2e4
48 changed files with 466 additions and 1374 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
iphone/Maps/Bridging-Header.h
View file

@ -58,6 +58,7 @@
#import "MWMRouterTransitStepInfo.h"
#import "MWMSearchItemType.h"
#import "MWMSearchNoResults.h"
#import "MWMSearchFrameworkHelper.h"
#import "MWMSettings.h"
#import "MWMSideButtons.h"
#import "MWMTableViewCell.h"

6
iphone/Maps/Images.xcassets/Search/Tabs/Contents.json
View file

@ -1,6 +0,0 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
}
}

26
iphone/Maps/Images.xcassets/Search/Tabs/ic_category_tab.imageset/Contents.json vendored
View file

@ -1,26 +0,0 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "ic_category_tab.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "ic_category_tab@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "ic_category_tab@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
},
"properties" : {
"template-rendering-intent" : "template"
}
}

BIN
iphone/Maps/Images.xcassets/Search/Tabs/ic_category_tab.imageset/ic_category_tab.png vendored
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 146 B

BIN
iphone/Maps/Images.xcassets/Search/Tabs/ic_category_tab.imageset/ic_category_tab@2x.png vendored
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 208 B

BIN
iphone/Maps/Images.xcassets/Search/Tabs/ic_category_tab.imageset/ic_category_tab@3x.png vendored
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 312 B

26
iphone/Maps/Images.xcassets/Search/Tabs/ic_history_tab.imageset/Contents.json vendored
View file

@ -1,26 +0,0 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "ic_history_tab.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "ic_history_tab@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "ic_history_tab@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
},
"properties" : {
"template-rendering-intent" : "template"
}
}

BIN
iphone/Maps/Images.xcassets/Search/Tabs/ic_history_tab.imageset/ic_history_tab.png vendored
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 545 B

BIN
iphone/Maps/Images.xcassets/Search/Tabs/ic_history_tab.imageset/ic_history_tab@2x.png vendored
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1 KiB

BIN
iphone/Maps/Images.xcassets/Search/Tabs/ic_history_tab.imageset/ic_history_tab@3x.png vendored
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.7 KiB

134
iphone/Maps/Maps.xcodeproj/project.pbxproj
View file

@ -10,12 +10,19 @@
1DA7908820762CEB008BDD6B /* libopen_location_code.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DA7908920762CEB008BDD6B /* libopen_location_code.a */; };
1DFA2F6A20D3B57400FB2C66 /* UIColor+PartnerColor.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1DFA2F6920D3B57400FB2C66 /* UIColor+PartnerColor.mm */; };
33010DB321B7E14700925411 /* MWMPlaceDescriptionCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33010DB221B7E14700925411 /* MWMPlaceDescriptionCell.xib */; };
3304306D21D4EAFB00317CA3 /* SearchCategoryCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3304306C21D4EAFB00317CA3 /* SearchCategoryCell.swift */; };
33046832219C57180041F3A8 /* CategorySettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33046831219C57180041F3A8 /* CategorySettingsViewController.swift */; };
33046836219C5A4E0041F3A8 /* CategorySettings.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 33046835219C5A4E0041F3A8 /* CategorySettings.storyboard */; };
331630D12191D74B00BB91A9 /* TagSectionHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331630D02191D74B00BB91A9 /* TagSectionHeaderView.swift */; };
331922AF21BAD29900D4AAC5 /* MWMPlaceDescriptionCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 331922AE21BAD29900D4AAC5 /* MWMPlaceDescriptionCell.mm */; };
3358607E217632A2006D11F2 /* BookmarksSharingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3358607D217632A2006D11F2 /* BookmarksSharingViewController.swift */; };
33603C85219F0F6300B11FFE /* SharingPropertiesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33603C84219F0F6300B11FFE /* SharingPropertiesViewController.swift */; };
337F98A321D37B5800C8AC27 /* SearchHistoryViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 337F98A021D37B5700C8AC27 /* SearchHistoryViewController.xib */; };
337F98A621D37B7400C8AC27 /* SearchTabViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 337F98A521D37B7400C8AC27 /* SearchTabViewController.swift */; };
337F98B021D3B60600C8AC27 /* MWMSearchFrameworkHelper.mm in Sources */ = {isa = PBXBuildFile; fileRef = 337F98AF21D3B60600C8AC27 /* MWMSearchFrameworkHelper.mm */; };
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 */; };
33B19C65218B46C100B323A7 /* SharingTagsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33B19C64218B46C100B323A7 /* SharingTagsViewController.swift */; };
33B19C67218B481700B323A7 /* TagCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33B19C66218B481700B323A7 /* TagCollectionViewCell.swift */; };
33BCD61621777A7400CA30B4 /* BookmarksSharingFlow.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 33BCD61521777A7400CA30B4 /* BookmarksSharingFlow.storyboard */; };
@ -735,21 +742,9 @@
F6E2FEE81E097BA00083EBEC /* MWMSearchNoResults.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FCFE1E097B9F0083EBEC /* MWMSearchNoResults.xib */; };
F6E2FEEB1E097BA00083EBEC /* MWMSearchTextField.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FD001E097B9F0083EBEC /* MWMSearchTextField.mm */; };
F6E2FEEE1E097BA00083EBEC /* MWMSearchView.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FD011E097B9F0083EBEC /* MWMSearchView.xib */; };
F6E2FEFA1E097BA00083EBEC /* MWMSearchCategoriesManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FD0B1E097B9F0083EBEC /* MWMSearchCategoriesManager.mm */; };
F6E2FEFD1E097BA00083EBEC /* MWMSearchCategoryCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FD0D1E097B9F0083EBEC /* MWMSearchCategoryCell.mm */; };
F6E2FF001E097BA00083EBEC /* MWMSearchCategoryCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FD0E1E097B9F0083EBEC /* MWMSearchCategoryCell.xib */; };
F6E2FF031E097BA00083EBEC /* MWMSearchHistoryClearCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FD111E097B9F0083EBEC /* MWMSearchHistoryClearCell.mm */; };
F6E2FF061E097BA00083EBEC /* MWMSearchHistoryClearCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FD121E097B9F0083EBEC /* MWMSearchHistoryClearCell.xib */; };
F6E2FF091E097BA00083EBEC /* MWMSearchHistoryManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FD141E097B9F0083EBEC /* MWMSearchHistoryManager.mm */; };
F6E2FF121E097BA00083EBEC /* MWMSearchHistoryRequestCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FD191E097B9F0083EBEC /* MWMSearchHistoryRequestCell.mm */; };
F6E2FF151E097BA00083EBEC /* MWMSearchHistoryRequestCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FD1A1E097B9F0083EBEC /* MWMSearchHistoryRequestCell.xib */; };
F6E2FF181E097BA00083EBEC /* MWMSearchTabbedCollectionViewCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FD1C1E097B9F0083EBEC /* MWMSearchTabbedCollectionViewCell.mm */; };
F6E2FF1B1E097BA00083EBEC /* MWMSearchTabbedCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FD1D1E097B9F0083EBEC /* MWMSearchTabbedCollectionViewCell.xib */; };
F6E2FF1E1E097BA00083EBEC /* MWMSearchTabbedViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FD1F1E097B9F0083EBEC /* MWMSearchTabbedViewController.mm */; };
F6E2FF211E097BA00083EBEC /* MWMSearchTabbedViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FD201E097BA00083EBEC /* MWMSearchTabbedViewController.xib */; };
F6E2FF241E097BA00083EBEC /* MWMSearchTabbedViewLayout.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FD221E097BA00083EBEC /* MWMSearchTabbedViewLayout.mm */; };
F6E2FF271E097BA00083EBEC /* MWMSearchTabButtonsView.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FD261E097BA00083EBEC /* MWMSearchTabButtonsView.mm */; };
F6E2FF2A1E097BA00083EBEC /* MWMSearchTabButtonsView.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FD271E097BA00083EBEC /* MWMSearchTabButtonsView.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 */; };
@ -809,6 +804,7 @@
28A0AB4B0D9B1048005BE974 /* Maps_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = Maps_Prefix.pch; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
29B97316FDCFA39411CA2CEA /* main.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = main.mm; sourceTree = "<group>"; };
33010DB221B7E14700925411 /* MWMPlaceDescriptionCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MWMPlaceDescriptionCell.xib; sourceTree = "<group>"; };
3304306C21D4EAFB00317CA3 /* SearchCategoryCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchCategoryCell.swift; sourceTree = "<group>"; };
33046831219C57180041F3A8 /* CategorySettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CategorySettingsViewController.swift; sourceTree = "<group>"; };
33046835219C5A4E0041F3A8 /* CategorySettings.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = CategorySettings.storyboard; sourceTree = "<group>"; };
331630D02191D74B00BB91A9 /* TagSectionHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TagSectionHeaderView.swift; sourceTree = "<group>"; };
@ -816,6 +812,13 @@
331922AE21BAD29900D4AAC5 /* MWMPlaceDescriptionCell.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMPlaceDescriptionCell.mm; sourceTree = "<group>"; };
3358607D217632A2006D11F2 /* BookmarksSharingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksSharingViewController.swift; sourceTree = "<group>"; };
33603C84219F0F6300B11FFE /* SharingPropertiesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SharingPropertiesViewController.swift; sourceTree = "<group>"; };
337F98A021D37B5700C8AC27 /* SearchHistoryViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SearchHistoryViewController.xib; sourceTree = "<group>"; };
337F98A521D37B7400C8AC27 /* SearchTabViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchTabViewController.swift; sourceTree = "<group>"; };
337F98AE21D3B60600C8AC27 /* MWMSearchFrameworkHelper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMSearchFrameworkHelper.h; sourceTree = "<group>"; };
337F98AF21D3B60600C8AC27 /* MWMSearchFrameworkHelper.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSearchFrameworkHelper.mm; sourceTree = "<group>"; };
337F98B121D3BAE600C8AC27 /* SearchCategoriesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchCategoriesViewController.swift; sourceTree = "<group>"; };
337F98B321D3C9F200C8AC27 /* SearchHistoryViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchHistoryViewController.swift; sourceTree = "<group>"; };
337F98B721D3D67E00C8AC27 /* SearchHistoryQueryCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchHistoryQueryCell.swift; sourceTree = "<group>"; };
33B19C64218B46C100B323A7 /* SharingTagsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SharingTagsViewController.swift; sourceTree = "<group>"; };
33B19C66218B481700B323A7 /* TagCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TagCollectionViewCell.swift; sourceTree = "<group>"; };
33BCD61521777A7400CA30B4 /* BookmarksSharingFlow.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = BookmarksSharingFlow.storyboard; sourceTree = "<group>"; };
@ -1896,31 +1899,10 @@
F6E2FCFF1E097B9F0083EBEC /* MWMSearchTextField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchTextField.h; sourceTree = "<group>"; };
F6E2FD001E097B9F0083EBEC /* MWMSearchTextField.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSearchTextField.mm; sourceTree = "<group>"; };
F6E2FD011E097B9F0083EBEC /* MWMSearchView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMSearchView.xib; sourceTree = "<group>"; };
F6E2FD0A1E097B9F0083EBEC /* MWMSearchCategoriesManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchCategoriesManager.h; sourceTree = "<group>"; };
F6E2FD0B1E097B9F0083EBEC /* MWMSearchCategoriesManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSearchCategoriesManager.mm; sourceTree = "<group>"; };
F6E2FD0C1E097B9F0083EBEC /* MWMSearchCategoryCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchCategoryCell.h; sourceTree = "<group>"; };
F6E2FD0D1E097B9F0083EBEC /* MWMSearchCategoryCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSearchCategoryCell.mm; sourceTree = "<group>"; };
F6E2FD0E1E097B9F0083EBEC /* MWMSearchCategoryCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMSearchCategoryCell.xib; sourceTree = "<group>"; };
F6E2FD101E097B9F0083EBEC /* MWMSearchHistoryClearCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchHistoryClearCell.h; sourceTree = "<group>"; };
F6E2FD111E097B9F0083EBEC /* MWMSearchHistoryClearCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSearchHistoryClearCell.mm; sourceTree = "<group>"; };
F6E2FD121E097B9F0083EBEC /* MWMSearchHistoryClearCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMSearchHistoryClearCell.xib; sourceTree = "<group>"; };
F6E2FD131E097B9F0083EBEC /* MWMSearchHistoryManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchHistoryManager.h; sourceTree = "<group>"; };
F6E2FD141E097B9F0083EBEC /* MWMSearchHistoryManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MWMSearchHistoryManager.mm; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
F6E2FD181E097B9F0083EBEC /* MWMSearchHistoryRequestCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchHistoryRequestCell.h; sourceTree = "<group>"; };
F6E2FD191E097B9F0083EBEC /* MWMSearchHistoryRequestCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSearchHistoryRequestCell.mm; sourceTree = "<group>"; };
F6E2FD1A1E097B9F0083EBEC /* MWMSearchHistoryRequestCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMSearchHistoryRequestCell.xib; sourceTree = "<group>"; };
F6E2FD1B1E097B9F0083EBEC /* MWMSearchTabbedCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchTabbedCollectionViewCell.h; sourceTree = "<group>"; };
F6E2FD1C1E097B9F0083EBEC /* MWMSearchTabbedCollectionViewCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSearchTabbedCollectionViewCell.mm; sourceTree = "<group>"; };
F6E2FD1D1E097B9F0083EBEC /* MWMSearchTabbedCollectionViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMSearchTabbedCollectionViewCell.xib; sourceTree = "<group>"; };
F6E2FD1E1E097B9F0083EBEC /* MWMSearchTabbedViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchTabbedViewController.h; sourceTree = "<group>"; };
F6E2FD1F1E097B9F0083EBEC /* MWMSearchTabbedViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSearchTabbedViewController.mm; sourceTree = "<group>"; };
F6E2FD201E097BA00083EBEC /* MWMSearchTabbedViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMSearchTabbedViewController.xib; sourceTree = "<group>"; };
F6E2FD211E097BA00083EBEC /* MWMSearchTabbedViewLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchTabbedViewLayout.h; sourceTree = "<group>"; };
F6E2FD221E097BA00083EBEC /* MWMSearchTabbedViewLayout.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSearchTabbedViewLayout.mm; sourceTree = "<group>"; };
F6E2FD0E1E097B9F0083EBEC /* SearchCategoryCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SearchCategoryCell.xib; sourceTree = "<group>"; };
F6E2FD121E097B9F0083EBEC /* SearchHistoryClearCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SearchHistoryClearCell.xib; sourceTree = "<group>"; };
F6E2FD1A1E097B9F0083EBEC /* SearchHistoryQueryCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SearchHistoryQueryCell.xib; sourceTree = "<group>"; };
F6E2FD231E097BA00083EBEC /* MWMSearchTabbedViewProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchTabbedViewProtocol.h; sourceTree = "<group>"; };
F6E2FD251E097BA00083EBEC /* MWMSearchTabButtonsView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchTabButtonsView.h; sourceTree = "<group>"; };
F6E2FD261E097BA00083EBEC /* MWMSearchTabButtonsView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MWMSearchTabButtonsView.mm; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
F6E2FD271E097BA00083EBEC /* MWMSearchTabButtonsView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMSearchTabButtonsView.xib; sourceTree = "<group>"; };
F6E2FD291E097BA00083EBEC /* MWMSearchCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchCell.h; sourceTree = "<group>"; };
F6E2FD2A1E097BA00083EBEC /* MWMSearchCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSearchCell.mm; sourceTree = "<group>"; };
F6E2FD2B1E097BA00083EBEC /* MWMSearchCommonCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchCommonCell.h; sourceTree = "<group>"; };
@ -4198,8 +4180,7 @@
F6E2FCFF1E097B9F0083EBEC /* MWMSearchTextField.h */,
F6E2FD001E097B9F0083EBEC /* MWMSearchTextField.mm */,
F6E2FD011E097B9F0083EBEC /* MWMSearchView.xib */,
F6E2FD021E097B9F0083EBEC /* TabbedView */,
F6E2FD241E097BA00083EBEC /* TabButtons */,
F6E2FD021E097B9F0083EBEC /* Tabs */,
F6E2FD281E097BA00083EBEC /* TableView */,
34845DB11E165E24003D55B9 /* SearchNoResultsViewController.swift */,
349D1ABA1E2D05EF004A2006 /* SearchBar.swift */,
@ -4232,34 +4213,27 @@
path = Filters;
sourceTree = "<group>";
};
F6E2FD021E097B9F0083EBEC /* TabbedView */ = {
F6E2FD021E097B9F0083EBEC /* Tabs */ = {
isa = PBXGroup;
children = (
F6E2FD091E097B9F0083EBEC /* CategoriesTab */,
F6E2FD0F1E097B9F0083EBEC /* HistoryTab */,
F6E2FD1B1E097B9F0083EBEC /* MWMSearchTabbedCollectionViewCell.h */,
F6E2FD1C1E097B9F0083EBEC /* MWMSearchTabbedCollectionViewCell.mm */,
F6E2FD1D1E097B9F0083EBEC /* MWMSearchTabbedCollectionViewCell.xib */,
F6E2FD1E1E097B9F0083EBEC /* MWMSearchTabbedViewController.h */,
F6E2FD1F1E097B9F0083EBEC /* MWMSearchTabbedViewController.mm */,
F6E2FD201E097BA00083EBEC /* MWMSearchTabbedViewController.xib */,
F6E2FD211E097BA00083EBEC /* MWMSearchTabbedViewLayout.h */,
F6E2FD221E097BA00083EBEC /* MWMSearchTabbedViewLayout.mm */,
F6E2FD231E097BA00083EBEC /* MWMSearchTabbedViewProtocol.h */,
337F98A521D37B7400C8AC27 /* SearchTabViewController.swift */,
337F98AE21D3B60600C8AC27 /* MWMSearchFrameworkHelper.h */,
337F98AF21D3B60600C8AC27 /* MWMSearchFrameworkHelper.mm */,
);
path = TabbedView;
path = Tabs;
sourceTree = "<group>";
};
F6E2FD091E097B9F0083EBEC /* CategoriesTab */ = {
isa = PBXGroup;
children = (
F6E2FD0A1E097B9F0083EBEC /* MWMSearchCategoriesManager.h */,
F6E2FD0B1E097B9F0083EBEC /* MWMSearchCategoriesManager.mm */,
F6E2FD0C1E097B9F0083EBEC /* MWMSearchCategoryCell.h */,
F6E2FD0D1E097B9F0083EBEC /* MWMSearchCategoryCell.mm */,
F6E2FD0E1E097B9F0083EBEC /* MWMSearchCategoryCell.xib */,
47E6CB092178BA3600EA102B /* SearchBannerCell.swift */,
47E6CB0A2178BA3600EA102B /* SearchBannerCell.xib */,
337F98B121D3BAE600C8AC27 /* SearchCategoriesViewController.swift */,
3304306C21D4EAFB00317CA3 /* SearchCategoryCell.swift */,
F6E2FD0E1E097B9F0083EBEC /* SearchCategoryCell.xib */,
);
path = CategoriesTab;
sourceTree = "<group>";
@ -4267,28 +4241,15 @@
F6E2FD0F1E097B9F0083EBEC /* HistoryTab */ = {
isa = PBXGroup;
children = (
F6E2FD101E097B9F0083EBEC /* MWMSearchHistoryClearCell.h */,
F6E2FD111E097B9F0083EBEC /* MWMSearchHistoryClearCell.mm */,
F6E2FD121E097B9F0083EBEC /* MWMSearchHistoryClearCell.xib */,
F6E2FD131E097B9F0083EBEC /* MWMSearchHistoryManager.h */,
F6E2FD141E097B9F0083EBEC /* MWMSearchHistoryManager.mm */,
F6E2FD181E097B9F0083EBEC /* MWMSearchHistoryRequestCell.h */,
F6E2FD191E097B9F0083EBEC /* MWMSearchHistoryRequestCell.mm */,
F6E2FD1A1E097B9F0083EBEC /* MWMSearchHistoryRequestCell.xib */,
F6E2FD121E097B9F0083EBEC /* SearchHistoryClearCell.xib */,
337F98B721D3D67E00C8AC27 /* SearchHistoryQueryCell.swift */,
F6E2FD1A1E097B9F0083EBEC /* SearchHistoryQueryCell.xib */,
337F98B321D3C9F200C8AC27 /* SearchHistoryViewController.swift */,
337F98A021D37B5700C8AC27 /* SearchHistoryViewController.xib */,
);
path = HistoryTab;
sourceTree = "<group>";
};
F6E2FD241E097BA00083EBEC /* TabButtons */ = {
isa = PBXGroup;
children = (
F6E2FD251E097BA00083EBEC /* MWMSearchTabButtonsView.h */,
F6E2FD261E097BA00083EBEC /* MWMSearchTabButtonsView.mm */,
F6E2FD271E097BA00083EBEC /* MWMSearchTabButtonsView.xib */,
);
path = TabButtons;
sourceTree = "<group>";
};
F6E2FD281E097BA00083EBEC /* TableView */ = {
isa = PBXGroup;
children = (
@ -4714,6 +4675,7 @@
F6E2FDFB1E097BA00083EBEC /* MWMOpeningHoursAllDayTableViewCell.xib in Resources */,
342639361EA0E60A0025EB89 /* local_ads_symbols.txt in Resources */,
4554B6EC1E55F0EF0084017F /* drules_proto_vehicle_clear.bin in Resources */,
337F98A321D37B5800C8AC27 /* SearchHistoryViewController.xib in Resources */,
F6E2FE761E097BA00083EBEC /* MWMOpeningHoursCell.xib in Resources */,
34AB66351FC5AA330078E451 /* RouteManagerCell.xib in Resources */,
33BCD61621777A7400CA30B4 /* BookmarksSharingFlow.storyboard in Resources */,
@ -4743,23 +4705,20 @@
6741A9811BF340DE002C974C /* MWMRateAlert.xib in Resources */,
6741A9601BF340DE002C974C /* MWMRoutingDisclaimerAlert.xib in Resources */,
B3E3B4FD20D463B700DA8C13 /* BMCCategoriesHeader.xib in Resources */,
F6E2FF001E097BA00083EBEC /* MWMSearchCategoryCell.xib in Resources */,
F6E2FF001E097BA00083EBEC /* SearchCategoryCell.xib in Resources */,
F6E2FF331E097BA00083EBEC /* MWMSearchCommonCell.xib in Resources */,
F6E2FF061E097BA00083EBEC /* MWMSearchHistoryClearCell.xib in Resources */,
F6E2FF061E097BA00083EBEC /* SearchHistoryClearCell.xib in Resources */,
3488B0161E9D0AEC0068AFD8 /* AdBanner.xib in Resources */,
BB7626B61E85599C0031D71C /* icudt57l.dat in Resources */,
34AB665C1FC5AA330078E451 /* TransportTransitIntermediatePoint.xib in Resources */,
F6E2FF151E097BA00083EBEC /* MWMSearchHistoryRequestCell.xib in Resources */,
F6E2FF151E097BA00083EBEC /* SearchHistoryQueryCell.xib in Resources */,
F6E2FEE81E097BA00083EBEC /* MWMSearchNoResults.xib in Resources */,
346225921DDC5FBA001E8752 /* MWMSearchNoResultsAlert.xib in Resources */,
34AB660E1FC5AA320078E451 /* NavigationControlView.xib in Resources */,
408645FC21495EB1000A4A1D /* categories_cuisines.txt in Resources */,
F6E2FF391E097BA00083EBEC /* MWMSearchSuggestionCell.xib in Resources */,
F6E2FF1B1E097BA00083EBEC /* MWMSearchTabbedCollectionViewCell.xib in Resources */,
F6E2FF211E097BA00083EBEC /* MWMSearchTabbedViewController.xib in Resources */,
34AB66231FC5AA330078E451 /* MWMiPadRoutePreview.xib in Resources */,
F6664C051E6459DA00E703C2 /* PPReviewHeaderCell.xib in Resources */,
F6E2FF2A1E097BA00083EBEC /* MWMSearchTabButtonsView.xib in Resources */,
BB25B1A71FB32767007276FA /* transit_colors.txt in Resources */,
3404F4962028A1B80090E401 /* BMCPermissionsCell.xib in Resources */,
F6E2FF421E097BA00083EBEC /* MWMSearchTableViewController.xib in Resources */,
@ -4898,6 +4857,7 @@
349FC5481F680DAE00968C9F /* ExpandableTextView.swift in Sources */,
F6E2FF5A1E097BA00083EBEC /* MWMNightModeController.mm in Sources */,
47F86D0120C93D8D00FEE291 /* TabViewController.swift in Sources */,
337F98B021D3B60600C8AC27 /* MWMSearchFrameworkHelper.mm in Sources */,
6741A9A51BF340DE002C974C /* MWMShareActivityItem.mm in Sources */,
3408963F1F83CEDE00BC7117 /* MWMAuthorizationViewModel.mm in Sources */,
F6E2FE1F1E097BA00083EBEC /* MWMOpeningHoursCommon.mm in Sources */,
@ -4952,8 +4912,8 @@
34D3B01B1E389D05004100F9 /* MWMButtonCell.mm in Sources */,
3486B5161E27AD3B0069C126 /* Framework.cpp in Sources */,
34ABA6291C2D567B00FE1BEC /* MWMInputLoginValidator.mm in Sources */,
337F98B421D3C9F200C8AC27 /* SearchHistoryViewController.swift in Sources */,
3404F49D2028A2430090E401 /* BMCActionsCreateCell.swift in Sources */,
F6E2FF091E097BA00083EBEC /* MWMSearchHistoryManager.mm in Sources */,
F6E2FD8F1E097BA00083EBEC /* MWMNoMapsViewController.mm in Sources */,
F63AF50B1EA6213F00A1DB98 /* FilterRatingCell.swift in Sources */,
34D3B0421E389D05004100F9 /* MWMEditorTextTableViewCell.mm in Sources */,
@ -5032,7 +4992,6 @@
33F8BA4121998BEB00ECA8EE /* MWMTag.m in Sources */,
F6EBB26F1FD7E33300B69B6A /* DiscoveryNoResultsCell.swift in Sources */,
47D0026721999DA900F651A2 /* PendingTransactionsHandler.swift in Sources */,
F6E2FF121E097BA00083EBEC /* MWMSearchHistoryRequestCell.mm in Sources */,
F6FE3C391CC50FFD00A73196 /* MWMPlaceDoesntExistAlert.mm in Sources */,
F6E2FDFE1E097BA00083EBEC /* MWMOpeningHoursClosedSpanTableViewCell.mm in Sources */,
F6E2FEDC1E097BA00083EBEC /* MWMSearchManager+Filter.mm in Sources */,
@ -5042,7 +5001,6 @@
F6E2FD5F1E097BA00083EBEC /* MWMMapDownloaderLargeCountryTableViewCell.mm in Sources */,
34F4073B1E9E1AFF00E57AC0 /* MopubBanner.swift in Sources */,
F6E2FF481E097BA00083EBEC /* SettingsTableViewSelectableCell.swift in Sources */,
F6E2FF271E097BA00083EBEC /* MWMSearchTabButtonsView.mm in Sources */,
34BBD6581F826F810070CA50 /* AuthorizationTransitioningManager.swift in Sources */,
F6558DA21E642CC0002203AE /* MWMFacilitiesController.mm in Sources */,
33F7668F21A57CDF00A88B16 /* EditOnWebViewController.swift in Sources */,
@ -5082,7 +5040,6 @@
347BFA901F27909200E5531F /* MenuArea.swift in Sources */,
343E75981E5B1EE20041226A /* MWMCollectionViewController.mm in Sources */,
B3E3B50220D485FA00DA8C13 /* DownloadedBookmarksDataSource.swift in Sources */,
F6E2FEFA1E097BA00083EBEC /* MWMSearchCategoriesManager.mm in Sources */,
477D7AC7218F1515007EE2CB /* IPaidRoutePurchase.swift in Sources */,
34E776141F14B17F003040B3 /* AvailableArea.swift in Sources */,
34AB66081FC5AA320078E451 /* MWMNavigationDashboardManager.mm in Sources */,
@ -5137,6 +5094,7 @@
34F4072C1E9E1AFF00E57AC0 /* Banner.swift in Sources */,
F660DEE51EAF4F59004DC056 /* MWMLocationManager+SpeedAndAltitude.swift in Sources */,
F6E2FDF21E097BA00083EBEC /* MWMOpeningHoursAddScheduleTableViewCell.mm in Sources */,
3304306D21D4EAFB00317CA3 /* SearchCategoryCell.swift in Sources */,
F6E2FD831E097BA00083EBEC /* MWMMapDownloaderSearchDataSource.mm in Sources */,
34AB66111FC5AA320078E451 /* NavigationTurnsView.swift in Sources */,
348A8DF81F66775A00D83026 /* RatingViewDelegate.swift in Sources */,
@ -5186,6 +5144,7 @@
F6E2FE9D1E097BA00083EBEC /* MWMiPhonePlacePageLayoutImpl.mm in Sources */,
34AB668C1FC5AA330078E451 /* NavigationStreetNameView.swift in Sources */,
3454D7C81E07F045004AF2AD /* UIButton+RuntimeAttributes.mm in Sources */,
337F98A621D37B7400C8AC27 /* SearchTabViewController.swift in Sources */,
33F8BA4A2199AA1300ECA8EE /* MWMTagGroup+Convenience.mm in Sources */,
3488B0131E9D0AEC0068AFD8 /* AdBanner.swift in Sources */,
3404755F1E081A4600C92850 /* MWMLocationPredictor.mm in Sources */,
@ -5229,11 +5188,10 @@
34E50DF01F6FCC41008EED49 /* UGCYourReviewCell.swift in Sources */,
34AB66381FC5AA330078E451 /* RouteManagerCell.swift in Sources */,
3472B5D3200F501500DC6CD5 /* BackgroundFetchTaskFrameworkType.swift in Sources */,
F6E2FF241E097BA00083EBEC /* MWMSearchTabbedViewLayout.mm in Sources */,
F6E2FF1E1E097BA00083EBEC /* MWMSearchTabbedViewController.mm in Sources */,
F6E2FF301E097BA00083EBEC /* MWMSearchCommonCell.mm in Sources */,
F6E2FEA01E097BA00083EBEC /* MWMPlacePageLayout.mm in Sources */,
F655C027207278300048A241 /* DiscoveryMoreCell.swift in Sources */,
337F98B821D3D67E00C8AC27 /* SearchHistoryQueryCell.swift in Sources */,
F6E2FEC41E097BA00083EBEC /* MWMSearchFilterPresentationController.mm in Sources */,
34AB66621FC5AA330078E451 /* TransportTransitSeparator.swift in Sources */,
B32FE74020D2844600EF7446 /* DownloadedBookmarksViewController.swift in Sources */,
@ -5276,7 +5234,6 @@
34D4FA631E26572D003F53EF /* FirstLaunchController.swift in Sources */,
3404756E1E081A4600C92850 /* MWMSearch.mm in Sources */,
6741AA191BF340DE002C974C /* MWMDownloaderDialogCell.mm in Sources */,
F6E2FEFD1E097BA00083EBEC /* MWMSearchCategoryCell.mm in Sources */,
34AB66441FC5AA330078E451 /* RouteManagerViewModelProtocol.swift in Sources */,
3486B5081E27A4B50069C126 /* LocalNotificationManager.mm in Sources */,
3454D7BF1E07F045004AF2AD /* DateComponentsFormatter+ETA.swift in Sources */,
@ -5287,7 +5244,6 @@
6741AA1D1BF340DE002C974C /* MWMDownloadTransitMapAlert.mm in Sources */,
340475771E081A4600C92850 /* MWMTrafficManager.mm in Sources */,
346B42AC1DD5E3D20094EBEE /* MWMLocationNotFoundAlert.mm in Sources */,
F6E2FF031E097BA00083EBEC /* MWMSearchHistoryClearCell.mm in Sources */,
340475091E08199E00C92850 /* MWMMyTarget.mm in Sources */,
340416501E7C086000E2B6D6 /* PhotoViewController.swift in Sources */,
47800D1D20BEEE2E00072F42 /* TermsOfUseController.swift in Sources */,
@ -5312,7 +5268,6 @@
34EE259E1EFA682D00F870AB /* PPViatorCarouselCell.swift in Sources */,
34B924431DC8A29C0008D971 /* MWMMailViewController.mm in Sources */,
340475651E081A4600C92850 /* MWMRouter.mm in Sources */,
F6E2FF181E097BA00083EBEC /* MWMSearchTabbedCollectionViewCell.mm in Sources */,
47E3C72F2111F472008B3B27 /* CoverVerticalModalTransitioning.swift in Sources */,
346DB83D1E5C4F6700E3123E /* GalleryModel.swift in Sources */,
34E776101F14B165003040B3 /* VisibleArea.swift in Sources */,
@ -5339,6 +5294,7 @@
3467CEB6202C6FA900D3C670 /* BMCNotificationsCell.swift in Sources */,
34B846A32029DFEB0081ECCD /* BMCPermissionsHeader.swift in Sources */,
F6E2FD9E1E097BA00083EBEC /* MWMEditBookmarkController.mm in Sources */,
337F98B221D3BAE600C8AC27 /* SearchCategoriesViewController.swift in Sources */,
47B06DED21B696C20094CCAD /* GeoTracker.swift in Sources */,
349FC54B1F680DAE00968C9F /* ExpandableTextViewSettings.swift in Sources */,
F6E2FE0A1E097BA00083EBEC /* MWMOpeningHoursDeleteScheduleTableViewCell.mm in Sources */,

85
iphone/Maps/UI/Search/MWMSearchManager.mm
View file

@ -9,11 +9,10 @@
#import "MWMSearchFilterTransitioningManager.h"
#import "MWMSearchManager+Filter.h"
#import "MWMSearchManager+Layout.h"
#import "MWMSearchTabButtonsView.h"
#import "MWMSearchTabbedViewController.h"
#import "MWMSearchTableViewController.h"
#import "MapViewController.h"
#import "Statistics.h"
#import "SwiftBridge.h"
#import "3party/Alohalytics/src/alohalytics_objc.h"
extern NSString * const kAlohalyticsTapEventKey;
@ -37,9 +36,8 @@ using Observers = NSHashTable<Observer>;
@end
@interface MWMSearchManager ()<MWMSearchTableViewProtocol, MWMSearchTabbedViewProtocol,
MWMSearchTabButtonsViewProtocol, UITextFieldDelegate,
MWMFrameworkStorageObserver, MWMSearchObserver>
@interface MWMSearchManager ()<MWMSearchTableViewProtocol, MWMSearchTabViewControllerDelegate,
UITextFieldDelegate, MWMFrameworkStorageObserver, MWMSearchObserver>
@property(weak, nonatomic, readonly) UIViewController * ownerController;
@ -60,12 +58,7 @@ using Observers = NSHashTable<Observer>;
@property(nonatomic) NSLayoutConstraint * actionBarViewBottom;
@property(nonatomic) IBOutletCollection(MWMSearchTabButtonsView) NSArray * tabButtons;
@property(weak, nonatomic) IBOutlet NSLayoutConstraint * scrollIndicatorOffset;
@property(weak, nonatomic) IBOutlet UIView * scrollIndicator;
@property(nonatomic) UINavigationController * navigationController;
@property(nonatomic) MWMSearchTabbedViewController * tabbedController;
@property(nonatomic) MWMSearchTableViewController * tableViewController;
@property(nonatomic) MWMNoMapsViewController * noMapsController;
@ -95,7 +88,6 @@ using Observers = NSHashTable<Observer>;
{
[self.searchBarView mwm_refreshUI];
[self.actionBarView mwm_refreshUI];
[self.tabbedController mwm_refreshUI];
[self.tableViewController mwm_refreshUI];
[self.noMapsController mwm_refreshUI];
if ([MWMSearch hasFilter])
@ -146,12 +138,6 @@ using Observers = NSHashTable<Observer>;
self.state = MWMSearchManagerStateHidden;
}
- (void)tabButtonPressed:(MWMSearchTabButtonsView *)sender
{
[self.searchTextField resignFirstResponder];
[self.tabbedController tabButtonPressed:sender];
}
#pragma mark - Layout
- (void)viewWillTransitionToSize:(CGSize)size
@ -247,30 +233,19 @@ using Observers = NSHashTable<Observer>;
{
self.routingTooltipSearch = MWMSearchManagerRoutingTooltipSearchNone;
[self endSearch];
[self.tabbedController resetSelectedTab];
[self viewHidden:YES];
}
- (void)changeToDefaultState
{
[self.tabbedController resetCategories];
[self.navigationController popToRootViewControllerAnimated:NO];
[self animateConstraints:^{
self.actionBarViewBottom.priority = UILayoutPriorityDefaultLow;
}];
[self viewHidden:NO];
if (self.topController != self.noMapsController)
{
self.actionBarState = MWMSearchManagerActionBarStateTabBar;
[self.searchTextField becomeFirstResponder];
}
else
{
self.actionBarState = MWMSearchManagerActionBarStateHidden;
}
self.actionBarState = MWMSearchManagerActionBarStateHidden;
}
- (void)changeToTableSearchState
@ -308,7 +283,6 @@ using Observers = NSHashTable<Observer>;
if (navigationManagerState == MWMNavigationDashboardStateNavigation)
{
self.searchTextField.text = @"";
[self.tabbedController resetSelectedTab];
}
}
@ -409,30 +383,26 @@ using Observers = NSHashTable<Observer>;
self.noMapsController = nil;
switch (self.state)
{
case MWMSearchManagerStateHidden: return self.tabbedController;
case MWMSearchManagerStateDefault:
if (GetFramework().GetStorage().HaveDownloadedCountries())
return self.tabbedController;
self.noMapsController = [MWMNoMapsViewController controller];
[MWMFrameworkListener addObserver:self];
return self.noMapsController;
case MWMSearchManagerStateTableSearch:
return self.tableViewController;
case MWMSearchManagerStateMapSearch: return self.tableViewController;
case MWMSearchManagerStateHidden: return self.navigationController.topViewController;
case MWMSearchManagerStateDefault:
{
if (GetFramework().GetStorage().HaveDownloadedCountries()) {
MWMSearchTabViewController * tabViewController = [MWMSearchTabViewController new];
tabViewController.delegate = self;
return tabViewController;
}
self.noMapsController = [MWMNoMapsViewController controller];
[MWMFrameworkListener addObserver:self];
return self.noMapsController;
}
case MWMSearchManagerStateTableSearch: return self.tableViewController;
case MWMSearchManagerStateMapSearch: return self.tableViewController;
}
}
- (MWMSearchTabbedViewController *)tabbedController
- (void)searchTabController:(MWMSearchTabViewController *)viewController didSearch:(NSString *)didSearch
{
if (!_tabbedController)
{
_tabbedController = [[MWMSearchTabbedViewController alloc] init];
_tabbedController.scrollIndicatorOffset = self.scrollIndicatorOffset;
_tabbedController.scrollIndicator = self.scrollIndicator;
_tabbedController.tabButtons = self.tabButtons;
_tabbedController.delegate = self;
}
return _tabbedController;
[self searchText:didSearch forInputLocale:[[AppInfo sharedInfo] languageId]];
}
- (MWMSearchTableViewController *)tableViewController
@ -442,21 +412,6 @@ using Observers = NSHashTable<Observer>;
return _tableViewController;
}
- (void)setScrollIndicatorOffset:(NSLayoutConstraint *)scrollIndicatorOffset
{
_scrollIndicatorOffset = self.tabbedController.scrollIndicatorOffset = scrollIndicatorOffset;
}
- (void)setScrollIndicator:(UIView *)scrollIndicator
{
_scrollIndicator = self.tabbedController.scrollIndicator = scrollIndicator;
}
- (void)setTabButtons:(NSArray *)tabButtons
{
_tabButtons = self.tabbedController.tabButtons = tabButtons;
}
- (void)setState:(MWMSearchManagerState)state
{
if (_state == state)

78
iphone/Maps/UI/Search/MWMSearchView.xib
View file

@ -1,19 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
<capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<customFonts key="customFonts">
<array key="HelveticaNeue.ttc">
<string>HelveticaNeue</string>
</array>
</customFonts>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MWMSearchManager">
<connections>
@ -24,20 +18,16 @@
<outlet property="changeModeViewHeight" destination="RoV-rx-XeQ" id="CwN-02-N5r"/>
<outlet property="contentView" destination="u9y-bx-NGd" id="A03-AI-DbY"/>
<outlet property="filterButton" destination="hzG-6h-WLq" id="GuU-HC-7iC"/>
<outlet property="scrollIndicator" destination="G6M-wl-tUg" id="1Nv-0J-Oaa"/>
<outlet property="scrollIndicatorOffset" destination="pXP-hL-DL3" id="pKG-un-cWZ"/>
<outlet property="searchBarView" destination="HcT-Cg-vp3" id="2V7-yP-Zef"/>
<outlet property="searchTextField" destination="hna-zw-Zor" id="IK9-Wx-pk8"/>
<outlet property="tabBarView" destination="Smx-UL-Mcd" id="yDV-Kv-Lui"/>
<outlet property="tabBarViewHeight" destination="JxX-35-uQe" id="O94-IB-u3E"/>
<outletCollection property="tabButtons" destination="yHM-kd-o0T" id="UV5-50-cQR"/>
<outletCollection property="tabButtons" destination="YT7-kp-bFI" id="RY3-K3-Vim"/>
<outletCollection property="topViews" destination="HcT-Cg-vp3" id="d2H-tu-zIE"/>
<outletCollection property="topViews" destination="j3Y-13-kVB" id="s8E-zl-SfH"/>
<outletCollection property="topViews" destination="u9y-bx-NGd" id="mAw-CD-QQV"/>
</connections>
</placeholder>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HcT-Cg-vp3" customClass="SearchBar" customModule="maps_me" customModuleProvider="target" propertyAccessControl="all">
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HcT-Cg-vp3" customClass="SearchBar" customModule="maps_me" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8lb-Vi-0oJ" userLabel="StatusBarBackground">
@ -122,7 +112,7 @@
<point key="canvasLocation" x="236" y="-242"/>
</view>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="j3Y-13-kVB" userLabel="ActionBar" customClass="SolidTouchView" propertyAccessControl="all">
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="j3Y-13-kVB" userLabel="ActionBar" customClass="SolidTouchView">
<rect key="frame" x="0.0" y="0.0" width="320" height="48"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Smx-UL-Mcd" userLabel="TabBar">
@ -135,75 +125,19 @@
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
</userDefinedRuntimeAttributes>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7yu-ua-eqD">
<rect key="frame" x="0.0" y="60" width="320" height="1"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="GFH-AC-bsP"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/>
</userDefinedRuntimeAttributes>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="yHM-kd-o0T" userLabel="History" customClass="MWMSearchTabButtonsView">
<rect key="frame" x="0.0" y="0.0" width="160" height="60"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="image" keyPath="iconImage" value="ic_history_tab"/>
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="history"/>
</userDefinedRuntimeAttributes>
<connections>
<outlet property="delegate" destination="-1" id="Rfz-3u-nB0"/>
</connections>
</view>
<view tag="1" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="YT7-kp-bFI" userLabel="Categories" customClass="MWMSearchTabButtonsView">
<rect key="frame" x="160" y="0.0" width="160" height="60"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="categories"/>
<userDefinedRuntimeAttribute type="image" keyPath="iconImage" value="ic_category_tab"/>
</userDefinedRuntimeAttributes>
<connections>
<outlet property="delegate" destination="-1" id="HFa-nc-cL3"/>
</connections>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="G6M-wl-tUg" userLabel="ScrollIndicator">
<rect key="frame" x="0.0" y="60" width="160" height="4"/>
<color key="backgroundColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="4" id="k6i-ll-1hB"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="linkBlue"/>
</userDefinedRuntimeAttributes>
</view>
</subviews>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="yHM-kd-o0T" firstAttribute="top" secondItem="Smx-UL-Mcd" secondAttribute="top" id="3j1-jw-8LX"/>
<constraint firstItem="YT7-kp-bFI" firstAttribute="leading" secondItem="yHM-kd-o0T" secondAttribute="trailing" id="CPz-Zq-Upl"/>
<constraint firstItem="yHM-kd-o0T" firstAttribute="leading" secondItem="Smx-UL-Mcd" secondAttribute="leading" id="CiG-5j-NML"/>
<constraint firstItem="G6M-wl-tUg" firstAttribute="top" secondItem="yHM-kd-o0T" secondAttribute="bottom" id="F8A-7M-DZD"/>
<constraint firstAttribute="trailing" secondItem="YT7-kp-bFI" secondAttribute="trailing" id="FaM-kd-VGc"/>
<constraint firstItem="7yu-ua-eqD" firstAttribute="leading" secondItem="yHM-kd-o0T" secondAttribute="leading" id="GE0-Wi-8y1"/>
<constraint firstAttribute="height" priority="750" constant="64" id="JxX-35-uQe">
<variation key="heightClass=compact" constant="44"/>
</constraint>
<constraint firstItem="G6M-wl-tUg" firstAttribute="top" secondItem="YT7-kp-bFI" secondAttribute="bottom" id="PJH-Uk-AKu"/>
<constraint firstItem="yHM-kd-o0T" firstAttribute="width" secondItem="G6M-wl-tUg" secondAttribute="width" id="Sh9-x5-DW0"/>
<constraint firstItem="gPn-bf-cPr" firstAttribute="top" secondItem="Smx-UL-Mcd" secondAttribute="top" id="UER-Ty-xhx"/>
<constraint firstItem="YT7-kp-bFI" firstAttribute="width" secondItem="yHM-kd-o0T" secondAttribute="width" id="UIr-Jy-xTu"/>
<constraint firstItem="7yu-ua-eqD" firstAttribute="trailing" secondItem="YT7-kp-bFI" secondAttribute="trailing" id="YyU-3Q-pip"/>
<constraint firstItem="gPn-bf-cPr" firstAttribute="leading" secondItem="Smx-UL-Mcd" secondAttribute="leading" constant="-100" id="b86-tJ-SqB">
<variation key="heightClass=regular-widthClass=regular" constant="0.0"/>
</constraint>
<constraint firstItem="YT7-kp-bFI" firstAttribute="top" secondItem="Smx-UL-Mcd" secondAttribute="top" id="fBe-s6-zJz"/>
<constraint firstItem="7yu-ua-eqD" firstAttribute="top" secondItem="yHM-kd-o0T" secondAttribute="bottom" id="jhl-6C-8xD"/>
<constraint firstItem="G6M-wl-tUg" firstAttribute="leading" secondItem="Smx-UL-Mcd" secondAttribute="leading" id="pXP-hL-DL3"/>
<constraint firstAttribute="trailing" secondItem="gPn-bf-cPr" secondAttribute="trailing" constant="-100" id="pkz-a1-2QA">
<variation key="heightClass=regular-widthClass=regular" constant="0.0"/>
</constraint>
<constraint firstAttribute="bottom" secondItem="G6M-wl-tUg" secondAttribute="bottom" id="v8p-Lf-3HF"/>
<constraint firstAttribute="bottom" secondItem="gPn-bf-cPr" secondAttribute="bottom" constant="-100" id="y3i-4D-GKo">
<variation key="heightClass=regular-widthClass=regular" constant="0.0"/>
</constraint>
@ -347,7 +281,7 @@
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<point key="canvasLocation" x="236" y="-58"/>
</view>
<view contentMode="scaleToFill" id="u9y-bx-NGd" userLabel="Content" customClass="MWMSearchContentView" propertyAccessControl="all">
<view contentMode="scaleToFill" id="u9y-bx-NGd" userLabel="Content" customClass="MWMSearchContentView">
<rect key="frame" x="0.0" y="0.0" width="320" height="402"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
@ -381,8 +315,6 @@
</view>
</objects>
<resources>
<image name="ic_category_tab" width="28" height="28"/>
<image name="ic_clear_filters" width="36" height="36"/>
<image name="ic_history_tab" width="28" height="28"/>
</resources>
</document>

16
iphone/Maps/UI/Search/TabButtons/MWMSearchTabButtonsView.h
View file

@ -1,16 +0,0 @@
@class MWMSearchTabButtonsView;
@protocol MWMSearchTabButtonsViewProtocol <NSObject>
- (void)tabButtonPressed:(MWMSearchTabButtonsView *)sender;
@end
@interface MWMSearchTabButtonsView : UIView
@property (nonatomic) BOOL selected;
@property (nonatomic) UIImage * iconImage;
@property (copy, nonatomic) NSString * localizedText;
@end

102
iphone/Maps/UI/Search/TabButtons/MWMSearchTabButtonsView.mm
View file

@ -1,102 +0,0 @@
#import "MWMCommon.h"
#import "MWMSearchManager.h"
#import "MWMSearchTabButtonsView.h"
static CGFloat const kIconToLabelSpacing = 4.0;
@interface MWMSearchTabButtonsView ()
@property (nonatomic) IBOutlet UIView * rootView;
@property (weak, nonatomic) IBOutlet UIButton * icon;
@property (weak, nonatomic) IBOutlet UILabel * label;
@property (weak, nonatomic) IBOutlet NSLayoutConstraint * iconLeft;
@property (weak, nonatomic) IBOutlet NSLayoutConstraint * iconTop;
@property (weak, nonatomic) IBOutlet NSLayoutConstraint * labelLeft;
@property (weak, nonatomic) IBOutlet NSLayoutConstraint * labelTop;
@property (weak, nonatomic) IBOutlet id <MWMSearchTabButtonsViewProtocol> delegate;
@end
@implementation MWMSearchTabButtonsView
- (instancetype)initWithCoder:(NSCoder *)aDecoder
{
self = [super initWithCoder:aDecoder];
if (self)
{
_rootView =
[NSBundle.mainBundle loadNibNamed:self.class.className owner:self options:nil].firstObject;
[self addSubview:self.rootView];
CALayer * sl = self.layer;
sl.shouldRasterize = YES;
sl.rasterizationScale = UIScreen.mainScreen.scale;
}
return self;
}
- (IBAction)buttonTap
{
if (self.icon.selected)
return;
[self.delegate tabButtonPressed:self];
}
#pragma mark - Layout
- (void)layoutPortrait
{
CGFloat const contentHeight = self.icon.height + kIconToLabelSpacing + self.label.height;
CGFloat const topOffset = (self.height - contentHeight) / 2.0;
self.iconTop.constant = nearbyint(topOffset);
self.labelTop.constant = nearbyint(topOffset + self.icon.height + kIconToLabelSpacing);
self.iconLeft.constant = nearbyint((self.width - self.icon.width) / 2.0);
self.labelLeft.constant = nearbyint((self.width - self.label.width) / 2.0);
}
- (void)layoutLandscape
{
CGFloat const contentWidth = self.icon.width + kIconToLabelSpacing + self.label.width;
CGFloat const leftOffset = (self.width - contentWidth) / 2.0;
self.iconLeft.constant = nearbyint(leftOffset);
self.labelLeft.constant = nearbyint(leftOffset + self.icon.width + kIconToLabelSpacing);
self.iconTop.constant = nearbyint((self.height - self.icon.height) / 2.0);
self.labelTop.constant = nearbyint((self.height - self.label.height) / 2.0);
}
- (void)layoutSubviews
{
self.rootView.frame = self.bounds;
if (self.height < 60.0)
[self layoutLandscape];
else
[self layoutPortrait];
[super layoutSubviews];
}
#pragma mark - Properties
- (void)setSelected:(BOOL)selected
{
_selected = self.icon.selected = selected;
self.label.textColor = selected ? UIColor.linkBlue : UIColor.blackSecondaryText;
}
- (void)setIconImage:(UIImage *)iconImage
{
_iconImage = iconImage;
[self.icon setImage:iconImage forState:UIControlStateNormal];
}
- (void)setLocalizedText:(NSString *)localizedText
{
_localizedText = self.label.text = L(localizedText);
}
@end

86
iphone/Maps/UI/Search/TabButtons/MWMSearchTabButtonsView.xib
View file

@ -1,86 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<customFonts key="customFonts">
<array key="HelveticaNeue.ttc">
<string>HelveticaNeue</string>
</array>
</customFonts>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MWMSearchTabButtonsView">
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="image" keyPath="iconImage" value="ic_category_tab"/>
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="categories"/>
</userDefinedRuntimeAttributes>
<connections>
<outlet property="icon" destination="dWc-6u-iP3" id="jPr-Jj-agI"/>
<outlet property="iconLeft" destination="r0h-cS-OQL" id="oVG-DE-UGg"/>
<outlet property="iconTop" destination="hRq-8b-vbp" id="Vt6-o3-v9G"/>
<outlet property="label" destination="Lj2-rb-tLK" id="jnz-NA-V4x"/>
<outlet property="labelLeft" destination="oMw-ic-QBY" id="oiH-Gi-daA"/>
<outlet property="labelTop" destination="87u-mS-F8T" id="eTj-rP-YCr"/>
<outlet property="rootView" destination="B2L-gJ-zbV" id="Yd5-mY-RW5"/>
</connections>
</placeholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view contentMode="scaleToFill" id="B2L-gJ-zbV" propertyAccessControl="all">
<rect key="frame" x="0.0" y="0.0" width="160" height="60"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dWc-6u-iP3" customClass="MWMButton">
<rect key="frame" x="66" y="6" width="28" height="28"/>
<constraints>
<constraint firstAttribute="width" constant="28" id="oCp-7N-a4B"/>
<constraint firstAttribute="height" constant="28" id="rF4-5t-7Rr"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="coloringName" value="MWMBlack"/>
</userDefinedRuntimeAttributes>
<connections>
<action selector="buttonTap" destination="-1" eventType="touchUpInside" id="biG-Kb-U12"/>
</connections>
</button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="History" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Lj2-rb-tLK">
<rect key="frame" x="58" y="38" width="45" height="17"/>
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="14"/>
<color key="textColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/>
</userDefinedRuntimeAttributes>
</label>
</subviews>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<gestureRecognizers/>
<constraints>
<constraint firstItem="Lj2-rb-tLK" firstAttribute="top" secondItem="B2L-gJ-zbV" secondAttribute="top" constant="38" id="87u-mS-F8T"/>
<constraint firstItem="dWc-6u-iP3" firstAttribute="top" secondItem="B2L-gJ-zbV" secondAttribute="top" constant="6" id="hRq-8b-vbp"/>
<constraint firstItem="Lj2-rb-tLK" firstAttribute="leading" secondItem="B2L-gJ-zbV" secondAttribute="leading" constant="58" id="oMw-ic-QBY"/>
<constraint firstItem="dWc-6u-iP3" firstAttribute="leading" secondItem="B2L-gJ-zbV" secondAttribute="leading" constant="66" id="r0h-cS-OQL"/>
</constraints>
<nil key="simulatedStatusBarMetrics"/>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
</userDefinedRuntimeAttributes>
<connections>
<outletCollection property="gestureRecognizers" destination="xUD-KM-Vlt" appends="YES" id="64L-Yg-gtZ"/>
</connections>
</view>
<tapGestureRecognizer id="xUD-KM-Vlt">
<connections>
<action selector="buttonTap" destination="-1" id="TDJ-qi-J5d"/>
</connections>
</tapGestureRecognizer>
</objects>
<resources>
<image name="ic_category_tab" width="28" height="28"/>
</resources>
</document>

12
iphone/Maps/UI/Search/TabbedView/CategoriesTab/MWMSearchCategoriesManager.h
View file

@ -1,12 +0,0 @@
#import "MWMSearchTabbedCollectionViewCell.h"
#import "MWMSearchTabbedViewProtocol.h"
@interface MWMSearchCategoriesManager : NSObject <UITableViewDataSource, UITableViewDelegate>
@property (weak, nonatomic) id<MWMSearchTabbedViewProtocol> delegate;
- (void)attachCell:(MWMSearchTabbedCollectionViewCell *)cell;
- (void)resetCategories;
@end

114
iphone/Maps/UI/Search/TabbedView/CategoriesTab/MWMSearchCategoriesManager.mm
View file

@ -1,114 +0,0 @@
#import "MWMSearchCategoriesManager.h"
#import <MyTrackerSDK/MRMyTracker.h>
#import "MWMSearchCategoryCell.h"
#import "Statistics.h"
#import "SwiftBridge.h"
#include "Framework.h"
static NSInteger const kRutaxiIndex = 6;
@interface MWMSearchCategoriesManager () <MWMSearchBannerCellDelegate>
@end
@implementation MWMSearchCategoriesManager
{
vector<string> m_categories;
bool m_rutaxi;
}
- (void)attachCell:(MWMSearchTabbedCollectionViewCell *)cell
{
if (m_categories.empty())
{
m_categories = GetFramework().GetDisplayedCategories().GetKeys();
m_rutaxi = GetFramework().HasRuTaxiCategoryBanner();
}
[cell removeNoResultsView];
UITableView * tableView = cell.tableView;
tableView.estimatedRowHeight = 44.;
tableView.rowHeight = UITableViewAutomaticDimension;
tableView.alpha = 1.0;
tableView.hidden = NO;
tableView.delegate = self;
tableView.dataSource = self;
[tableView registerWithCellClass:[MWMSearchCategoryCell class]];
[tableView registerWithCellClass:[MWMSearchBannerCell class]];
[tableView reloadData];
}
- (void)resetCategories
{
m_categories.clear();
m_rutaxi = false;
}
#pragma mark - UITableViewDataSource
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
{
return m_categories.size() + (m_rutaxi ? 1 : 0);
}
- (UITableViewCell *)tableView:(UITableView *)tableView
cellForRowAtIndexPath:(NSIndexPath *)indexPath
{
if (m_rutaxi && indexPath.row == kRutaxiIndex)
{
auto cell = static_cast<MWMSearchBannerCell *>([tableView
dequeueReusableCellWithCellClass:[MWMSearchBannerCell class]
indexPath:indexPath]);
cell.delegate = self;
return cell;
}
auto tCell = static_cast<MWMSearchCategoryCell *>([tableView
dequeueReusableCellWithCellClass:[MWMSearchCategoryCell class]
indexPath:indexPath]);
[tCell setCategory:@(m_categories[[self adjustedIndex:indexPath.row]].c_str())];
return tCell;
}
- (NSInteger)adjustedIndex:(NSInteger)index {
if (m_rutaxi)
return index > kRutaxiIndex ? index - 1 : index;
else
return index;
}
#pragma mark - UITableViewDelegate
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
{
NSString * string = @(m_categories[[self adjustedIndex:indexPath.row]].c_str());
auto query = [L(string) stringByAppendingString:@" "];
[Statistics logEvent:kStatEventName(kStatSearch, kStatSelectResult)
withParameters:@{kStatValue : string, kStatScreen : kStatCategories}];
id<MWMSearchTabbedViewProtocol> delegate = self.delegate;
[delegate searchText:query forInputLocale:[[AppInfo sharedInfo] languageId]];
[delegate dismissKeyboard];
}
- (NSIndexPath *)tableView:(UITableView *)tableView willSelectRowAtIndexPath:(NSIndexPath *)indexPath {
if (m_rutaxi && indexPath.row == kRutaxiIndex)
return nil;
return indexPath;
}
#pragma mark - MWMSearchBannerCellDelegate
- (void)cellDidPressAction:(MWMSearchBannerCell *)cell
{
[[UIApplication sharedApplication] openURL:
[NSURL URLWithString:@"https://go.onelink.me/2944814706/86db6339"]];
}
- (void)cellDidPressClose:(MWMSearchBannerCell *)cell
{
[[MapViewController sharedController] showRemoveAds];
}
@end

7
iphone/Maps/UI/Search/TabbedView/CategoriesTab/MWMSearchCategoryCell.h
View file

@ -1,7 +0,0 @@
#import "MWMTableViewCell.h"
@interface MWMSearchCategoryCell : MWMTableViewCell
- (void)setCategory:(NSString *)category;
@end

32
iphone/Maps/UI/Search/TabbedView/CategoriesTab/MWMSearchCategoryCell.mm
View file

@ -1,32 +0,0 @@
#import "MWMSearchCategoryCell.h"
#import "MWMCommon.h"
#import "UIImageView+Coloring.h"
@interface MWMSearchCategoryCell ()
@property(weak, nonatomic) IBOutlet UIImageView * icon;
@property(weak, nonatomic) IBOutlet UILabel * label;
@end
@implementation MWMSearchCategoryCell
- (void)awakeFromNib
{
[super awakeFromNib];
if (IPAD)
self.contentView.backgroundColor = [UIColor white];
CALayer * sl = self.layer;
sl.shouldRasterize = YES;
sl.rasterizationScale = UIScreen.mainScreen.scale;
}
- (void)setCategory:(NSString *)category
{
UILabel * label = self.label;
label.textColor = [UIColor blackPrimaryText];
self.icon.mwm_name = [NSString stringWithFormat:@"ic_%@", category];
label.text = L(category);
}
@end

5
iphone/Maps/UI/Search/TabbedView/HistoryTab/MWMSearchHistoryClearCell.h
View file

@ -1,5 +0,0 @@
#import "MWMTableViewCell.h"
@interface MWMSearchHistoryClearCell : MWMTableViewCell
@end

21
iphone/Maps/UI/Search/TabbedView/HistoryTab/MWMSearchHistoryClearCell.mm
View file

@ -1,21 +0,0 @@
#import "MWMSearchHistoryClearCell.h"
@interface MWMSearchHistoryClearCell ()
@property (weak, nonatomic) IBOutlet UIImageView * icon;
@end
@implementation MWMSearchHistoryClearCell
- (void)awakeFromNib
{
[super awakeFromNib];
if (IPAD)
self.contentView.backgroundColor = [UIColor white];
CALayer * sl = self.layer;
sl.shouldRasterize = YES;
sl.rasterizationScale = UIScreen.mainScreen.scale;
}
@end

10
iphone/Maps/UI/Search/TabbedView/HistoryTab/MWMSearchHistoryManager.h
View file

@ -1,10 +0,0 @@
#import "MWMSearchTabbedCollectionViewCell.h"
#import "MWMSearchTabbedViewProtocol.h"
@interface MWMSearchHistoryManager : NSObject <UITableViewDataSource, UITableViewDelegate>
@property (weak, nonatomic) id<MWMSearchTabbedViewProtocol> delegate;
- (void)attachCell:(MWMSearchTabbedCollectionViewCell *)cell;
@end

128
iphone/Maps/UI/Search/TabbedView/HistoryTab/MWMSearchHistoryManager.mm
View file

@ -1,128 +0,0 @@
#import "MWMSearchHistoryManager.h"
#import "MWMSearchHistoryClearCell.h"
#import "MWMSearchHistoryRequestCell.h"
#import "Statistics.h"
#import "SwiftBridge.h"
#include "Framework.h"
@interface MWMSearchHistoryManager ()
@property(weak, nonatomic) MWMSearchTabbedCollectionViewCell * cell;
@property(nonatomic) MWMSearchNoResults * noResultsView;
@end
@implementation MWMSearchHistoryManager
- (void)attachCell:(MWMSearchTabbedCollectionViewCell *)cell
{
self.cell = cell;
UITableView * tableView = cell.tableView;
tableView.estimatedRowHeight = 44.;
tableView.rowHeight = UITableViewAutomaticDimension;
tableView.alpha = 1.0;
if (GetFramework().GetLastSearchQueries().empty())
{
tableView.hidden = YES;
[cell addNoResultsView:self.noResultsView];
}
else
{
[cell removeNoResultsView];
tableView.hidden = NO;
tableView.delegate = self;
tableView.dataSource = self;
[tableView registerWithCellClass:[MWMSearchHistoryRequestCell class]];
[tableView registerWithCellClass:[MWMSearchHistoryClearCell class]];
[tableView reloadData];
}
}
- (search::QuerySaver::TSearchRequest const &)queryAtIndex:(NSInteger)index
{
Framework & f = GetFramework();
NSAssert(index >= 0 && index < f.GetLastSearchQueries().size(), @"Invalid search history index");
auto it = f.GetLastSearchQueries().cbegin();
advance(it, index);
return *it;
}
- (NSString *)stringAtIndex:(NSInteger)index
{
return @([self queryAtIndex:index].second.c_str());
}
- (BOOL)isRequestCell:(NSIndexPath *)indexPath
{
NSUInteger const row = indexPath.row;
return row < GetFramework().GetLastSearchQueries().size();
}
#pragma mark - UITableViewDataSource
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
{
return GetFramework().GetLastSearchQueries().size() + 1;
}
- (UITableViewCell *)tableView:(UITableView *)tableView
cellForRowAtIndexPath:(NSIndexPath *)indexPath
{
if ([self isRequestCell:indexPath])
{
auto tCell = static_cast<MWMSearchHistoryRequestCell *>([tableView
dequeueReusableCellWithCellClass:[MWMSearchHistoryRequestCell class]
indexPath:indexPath]);
[tCell config:[self stringAtIndex:indexPath.row]];
return tCell;
}
Class cls = [MWMSearchHistoryClearCell class];
return [tableView dequeueReusableCellWithCellClass:cls indexPath:indexPath];
}
#pragma mark - UITableViewDelegate
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
{
id<MWMSearchTabbedViewProtocol> delegate = self.delegate;
if ([self isRequestCell:indexPath])
{
search::QuerySaver::TSearchRequest const & query = [self queryAtIndex:indexPath.row];
NSString * queryText = @(query.second.c_str());
[Statistics logEvent:kStatEventName(kStatSearch, kStatSelectResult)
withParameters:@{kStatValue : queryText, kStatScreen : kStatHistory}];
[delegate searchText:queryText forInputLocale:@(query.first.c_str())];
}
else
{
[Statistics logEvent:kStatEventName(kStatSearch, kStatSelectResult)
withParameters:@{kStatValue : kStatClear, kStatScreen : kStatHistory}];
GetFramework().ClearSearchHistory();
MWMSearchTabbedCollectionViewCell * cell = self.cell;
[UIView animateWithDuration:kDefaultAnimationDuration
animations:^{
cell.tableView.alpha = 0.0;
}
completion:^(BOOL finished) {
cell.tableView.hidden = YES;
[cell addNoResultsView:self.noResultsView];
}];
}
}
#pragma mark - Properties
- (MWMSearchNoResults *)noResultsView
{
if (!_noResultsView)
{
_noResultsView = [MWMSearchNoResults viewWithImage:[UIImage imageNamed:@"img_search_history"]
title:L(@"search_history_title")
text:L(@"search_history_text")];
}
return _noResultsView;
}
@end

7
iphone/Maps/UI/Search/TabbedView/HistoryTab/MWMSearchHistoryRequestCell.h
View file

@ -1,7 +0,0 @@
#import "MWMTableViewCell.h"
@interface MWMSearchHistoryRequestCell : MWMTableViewCell
- (void)config:(NSString *)title;
@end

29
iphone/Maps/UI/Search/TabbedView/HistoryTab/MWMSearchHistoryRequestCell.mm
View file

@ -1,29 +0,0 @@
#import "MWMCommon.h"
#import "MWMSearchHistoryRequestCell.h"
@interface MWMSearchHistoryRequestCell ()
@property(weak, nonatomic) IBOutlet UILabel * label;
@property(weak, nonatomic) IBOutlet UIImageView * icon;
@end
@implementation MWMSearchHistoryRequestCell
- (void)awakeFromNib
{
[super awakeFromNib];
if (IPAD)
self.contentView.backgroundColor = [UIColor white];
self.layer.shouldRasterize = YES;
self.layer.rasterizationScale = UIScreen.mainScreen.scale;
}
- (void)config:(NSString *)title
{
UILabel * label = self.label;
label.text = title;
label.textColor = [UIColor blackSecondaryText];
}
@end

10
iphone/Maps/UI/Search/TabbedView/MWMSearchTabbedCollectionViewCell.h
View file

@ -1,10 +0,0 @@
#import "MWMSearchNoResults.h"
@interface MWMSearchTabbedCollectionViewCell : UICollectionViewCell
@property(weak, nonatomic) IBOutlet UITableView * tableView;
- (void)addNoResultsView:(MWMSearchNoResults *)view;
- (void)removeNoResultsView;
@end

49
iphone/Maps/UI/Search/TabbedView/MWMSearchTabbedCollectionViewCell.mm
View file

@ -1,49 +0,0 @@
#import "MWMSearchTabbedCollectionViewCell.h"
#import "MWMKeyboard.h"
@interface MWMSearchTabbedCollectionViewCell ()<MWMKeyboardObserver>
@property(weak, nonatomic) IBOutlet NSLayoutConstraint * noResultsBottomOffset;
@property(weak, nonatomic) IBOutlet UIView * noResultsContainer;
@property(weak, nonatomic) IBOutlet UIView * noResultsWrapper;
@end
@implementation MWMSearchTabbedCollectionViewCell
- (void)awakeFromNib
{
[super awakeFromNib];
CALayer * sl = self.layer;
sl.shouldRasterize = YES;
sl.rasterizationScale = UIScreen.mainScreen.scale;
[MWMKeyboard addObserver:self];
}
- (void)addNoResultsView:(MWMSearchNoResults *)view
{
[self removeNoResultsView];
self.noResultsContainer.hidden = NO;
[self.noResultsWrapper addSubview:view];
}
- (void)removeNoResultsView
{
self.noResultsContainer.hidden = YES;
[self.noResultsWrapper.subviews makeObjectsPerformSelector:@selector(removeFromSuperview)];
}
#pragma mark - MWMKeyboard
- (void)onKeyboardAnimation
{
CGFloat const keyboardHeight = [MWMKeyboard keyboardHeight];
if (keyboardHeight >= self.height)
return;
self.noResultsBottomOffset.constant = keyboardHeight;
[self layoutIfNeeded];
}
- (void)onKeyboardWillAnimate { [self layoutIfNeeded]; }
@end

69
iphone/Maps/UI/Search/TabbedView/MWMSearchTabbedCollectionViewCell.xib
View file

@ -1,69 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
<capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<collectionViewCell clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="gTV-IL-0wX" userLabel="MWMSearchTabbedCollectionViewCell" customClass="MWMSearchTabbedCollectionViewCell" propertyAccessControl="all">
<rect key="frame" x="0.0" y="0.0" width="320" height="460"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
<rect key="frame" x="0.0" y="0.0" width="320" height="460"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bZi-Dr-fme" userLabel="NoResultsContainer">
<rect key="frame" x="0.0" y="0.0" width="320" height="460"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qnC-F0-3g1" userLabel="NoResultsWrapper">
<rect key="frame" x="0.0" y="70" width="320" height="320"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="width" secondItem="qnC-F0-3g1" secondAttribute="height" multiplier="1:1" priority="999" id="E3T-Nx-JJX"/>
<constraint firstAttribute="width" priority="997" constant="320" id="O0D-GD-xSK"/>
</constraints>
</view>
</subviews>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="qnC-F0-3g1" firstAttribute="centerY" secondItem="bZi-Dr-fme" secondAttribute="centerY" id="8cS-Pg-hYZ"/>
<constraint firstItem="qnC-F0-3g1" firstAttribute="height" relation="lessThanOrEqual" secondItem="bZi-Dr-fme" secondAttribute="height" priority="998" id="u2A-om-Upm"/>
<constraint firstItem="qnC-F0-3g1" firstAttribute="centerX" secondItem="bZi-Dr-fme" secondAttribute="centerX" id="zOu-k9-eSN"/>
</constraints>
</view>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" keyboardDismissMode="onDrag" style="plain" separatorStyle="none" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="YiJ-rH-z7n" userLabel="CellsTableView">
<rect key="frame" x="0.0" y="0.0" width="320" height="460"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
</tableView>
</subviews>
</view>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="YiJ-rH-z7n" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" id="45o-kh-87P"/>
<constraint firstAttribute="trailing" secondItem="YiJ-rH-z7n" secondAttribute="trailing" id="ak8-yj-yjX"/>
<constraint firstAttribute="trailing" secondItem="bZi-Dr-fme" secondAttribute="trailing" priority="999" id="eaC-cR-1Zf"/>
<constraint firstAttribute="bottom" secondItem="YiJ-rH-z7n" secondAttribute="bottom" id="fWe-9o-p8Q"/>
<constraint firstItem="bZi-Dr-fme" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" priority="999" id="iAx-ah-Ee9"/>
<constraint firstItem="bZi-Dr-fme" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" priority="999" id="ojS-uf-R8h"/>
<constraint firstAttribute="bottom" secondItem="bZi-Dr-fme" secondAttribute="bottom" priority="999" id="qTD-KA-5qs"/>
<constraint firstItem="YiJ-rH-z7n" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" id="tGS-fN-aa6"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
</userDefinedRuntimeAttributes>
<connections>
<outlet property="noResultsBottomOffset" destination="qTD-KA-5qs" id="0Rn-2l-l14"/>
<outlet property="noResultsContainer" destination="bZi-Dr-fme" id="OuH-Ln-8YE"/>
<outlet property="noResultsWrapper" destination="qnC-F0-3g1" id="6BX-hh-oBj"/>
<outlet property="tableView" destination="YiJ-rH-z7n" id="vpg-ar-l9Q"/>
</connections>
</collectionViewCell>
</objects>
</document>

16
iphone/Maps/UI/Search/TabbedView/MWMSearchTabbedViewController.h
View file

@ -1,16 +0,0 @@
#import "MWMSearchTabbedViewProtocol.h"
#import "MWMSearchTabButtonsView.h"
#import "MWMViewController.h"
@interface MWMSearchTabbedViewController : MWMViewController
@property (copy, nonatomic) NSArray * tabButtons;
@property (weak, nonatomic) NSLayoutConstraint * scrollIndicatorOffset;
@property (weak, nonatomic) UIView * scrollIndicator;
@property (weak, nonatomic) id<MWMSearchTabbedViewProtocol> delegate;
- (void)tabButtonPressed:(MWMSearchTabButtonsView *)sender;
- (void)resetSelectedTab;
- (void)resetCategories;
@end

242
iphone/Maps/UI/Search/TabbedView/MWMSearchTabbedViewController.mm
View file

@ -1,242 +0,0 @@
#import "MWMSearchTabbedViewController.h"
#import "MWMCommon.h"
#import "MWMSearchCategoriesManager.h"
#import "MWMSearchHistoryManager.h"
#import "MWMSearchTabbedViewLayout.h"
#import "SwiftBridge.h"
#include "Framework.h"
namespace
{
NSString * const kSelectedButtonTagKey = @"MWMSearchTabbedCollectionViewSelectedButtonTag";
} // namespace
typedef NS_ENUM(NSInteger, MWMSearchTabbedViewCell) {
MWMSearchTabbedViewCellHistory,
MWMSearchTabbedViewCellCategories,
MWMSearchTabbedViewCellCount
};
BOOL isOffsetInButton(CGFloat offset, MWMSearchTabButtonsView * button)
{
CGRect const frame = button.frame;
CGFloat const left = frame.origin.x;
CGFloat const right = left + frame.size.width;
return left <= offset && offset <= right;
}
@interface MWMSearchTabbedViewController ()<UICollectionViewDataSource, UIScrollViewDelegate>
@property(weak, nonatomic) IBOutlet UICollectionView * tablesCollectionView;
@property(weak, nonatomic) MWMSearchTabButtonsView * selectedButton;
@property(nonatomic) MWMSearchHistoryManager * historyManager;
@property(nonatomic) MWMSearchCategoriesManager * categoriesManager;
@property(nonatomic) BOOL isRotating;
@property(nonatomic) NSInteger selectedButtonTag;
@end
@implementation MWMSearchTabbedViewController
- (instancetype)init
{
self = [super init];
if (self)
[self setupDataSources];
return self;
}
- (void)viewDidLoad
{
[super viewDidLoad];
[self setupCollectionView];
[self resetSelectedTab];
}
- (void)mwm_refreshUI { [self.view mwm_refreshUI]; }
- (void)resetSelectedTab
{
if (GetFramework().GetLastSearchQueries().empty())
self.selectedButtonTag = 1;
else
self.selectedButtonTag =
[NSUserDefaults.standardUserDefaults integerForKey:kSelectedButtonTagKey];
}
- (void)resetCategories { [self.categoriesManager resetCategories]; }
- (void)viewWillAppear:(BOOL)animated
{
self.scrollIndicator.hidden = YES;
[self.tablesCollectionView reloadData];
[self resetSelectedTab];
[self refreshScrollPosition];
[super viewWillAppear:animated];
}
- (void)viewDidAppear:(BOOL)animated
{
self.scrollIndicator.hidden = NO;
[super viewDidAppear:animated];
}
#pragma mark - Layout
- (void)viewWillTransitionToSize:(CGSize)size
withTransitionCoordinator:(id<UIViewControllerTransitionCoordinator>)coordinator
{
[super viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
self.isRotating = YES;
[coordinator
animateAlongsideTransition:^(id<UIViewControllerTransitionCoordinatorContext> context) {
[self refreshScrollPosition];
}
completion:^(id<UIViewControllerTransitionCoordinatorContext> context) {
self.isRotating = NO;
}];
}
#pragma mark - Setup
- (void)setupCollectionView
{
[self.tablesCollectionView registerWithCellClass:[MWMSearchTabbedCollectionViewCell class]];
((MWMSearchTabbedViewLayout *)self.tablesCollectionView.collectionViewLayout).tablesCount =
MWMSearchTabbedViewCellCount;
}
- (void)setupDataSources
{
self.categoriesManager = [[MWMSearchCategoriesManager alloc] init];
self.historyManager = [[MWMSearchHistoryManager alloc] init];
}
- (void)tabButtonPressed:(MWMSearchTabButtonsView *)sender
{
dispatch_async(dispatch_get_main_queue(), ^{
[self.tablesCollectionView
scrollToItemAtIndexPath:[NSIndexPath indexPathForItem:sender.tag inSection:0]
atScrollPosition:UICollectionViewScrollPositionCenteredHorizontally
animated:YES];
});
}
- (void)updateScrollPosition:(CGFloat)position
{
CGFloat const scrollIndicatorWidth = self.scrollIndicator.width;
CGFloat const btnMid = position + 0.5 * scrollIndicatorWidth;
if (isInterfaceRightToLeft())
position = scrollIndicatorWidth - position;
dispatch_async(dispatch_get_main_queue(), ^{
self.scrollIndicatorOffset.constant = nearbyint(position);
});
MWMSearchTabButtonsView * selectedButton = self.selectedButton;
if (selectedButton && isOffsetInButton(btnMid, selectedButton))
return;
[self.tabButtons
enumerateObjectsUsingBlock:^(MWMSearchTabButtonsView * btn, NSUInteger idx, BOOL * stop) {
if (isOffsetInButton(btnMid, btn))
{
switch (btn.tag)
{
case MWMSearchTabbedViewCellHistory:
[Statistics logEvent:kStatEventName(kStatSearch, kStatSelectTab)
withParameters:@{kStatValue : kStatHistory}];
break;
case MWMSearchTabbedViewCellCategories:
[Statistics logEvent:kStatEventName(kStatSearch, kStatSelectTab)
withParameters:@{kStatValue : kStatCategories}];
break;
default: break;
}
self.selectedButton = btn;
*stop = YES;
}
}];
}
- (void)refreshScrollPosition
{
MWMSearchTabButtonsView * selectedButton = self.selectedButton;
self.scrollIndicatorOffset.constant = nearbyint(selectedButton.minX);
[self tabButtonPressed:selectedButton];
}
#pragma mark - UICollectionViewDataSource
- (NSInteger)collectionView:(nonnull UICollectionView *)collectionView
numberOfItemsInSection:(NSInteger)section
{
return MWMSearchTabbedViewCellCount;
}
- (nonnull UICollectionViewCell *)collectionView:(nonnull UICollectionView *)collectionView
cellForItemAtIndexPath:(nonnull NSIndexPath *)indexPath
{
auto cell = static_cast<MWMSearchTabbedCollectionViewCell *>([collectionView
dequeueReusableCellWithCellClass:[MWMSearchTabbedCollectionViewCell class]
indexPath:indexPath]);
MWMSearchTabbedViewCell cellType = static_cast<MWMSearchTabbedViewCell>(indexPath.item);
switch (cellType)
{
case MWMSearchTabbedViewCellHistory: [self.historyManager attachCell:cell]; break;
case MWMSearchTabbedViewCellCategories: [self.categoriesManager attachCell:cell]; break;
default: break;
}
return cell;
}
#pragma mark - UIScrollViewDelegate
- (void)scrollViewDidScroll:(nonnull UIScrollView *)scrollView
{
if (self.isRotating)
return;
CGFloat const scrollOffset = scrollView.contentOffset.x;
CGFloat const indWidth = self.scrollIndicator.width;
CGFloat const scrWidth = self.view.width;
[self updateScrollPosition:scrollOffset * indWidth / scrWidth];
}
#pragma mark - Properties
- (void)setSelectedButton:(MWMSearchTabButtonsView *)selectedButton
{
[self.tabButtons
enumerateObjectsUsingBlock:^(MWMSearchTabButtonsView * btn, NSUInteger idx, BOOL * stop) {
btn.selected = NO;
}];
_selectedButton = selectedButton;
selectedButton.selected = YES;
NSUserDefaults * ud = NSUserDefaults.standardUserDefaults;
[ud setInteger:selectedButton.tag forKey:kSelectedButtonTagKey];
[ud synchronize];
}
- (void)setDelegate:(id<MWMSearchTabbedViewProtocol>)delegate
{
_delegate = self.categoriesManager.delegate = self.historyManager.delegate = delegate;
}
- (void)setSelectedButtonTag:(NSInteger)selectedButtonTag
{
[self.tabButtons
enumerateObjectsUsingBlock:^(MWMSearchTabButtonsView * btn, NSUInteger idx, BOOL * stop) {
if (btn.tag == selectedButtonTag)
{
self.selectedButton = btn;
*stop = YES;
}
}];
[self updateScrollPosition:self.selectedButton.minX];
[self.tablesCollectionView
scrollToItemAtIndexPath:[NSIndexPath indexPathForItem:selectedButtonTag inSection:0]
atScrollPosition:UICollectionViewScrollPositionCenteredHorizontally
animated:NO];
}
- (NSInteger)selectedButtonTag { return self.selectedButton.tag; }
@end

46
iphone/Maps/UI/Search/TabbedView/MWMSearchTabbedViewController.xib
View file

@ -1,46 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MWMSearchTabbedViewController">
<connections>
<outlet property="tablesCollectionView" destination="8fs-wy-05c" id="ycC-Fg-Weg"/>
<outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
</connections>
</placeholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view contentMode="scaleToFill" id="i5M-Pr-FkT" propertyAccessControl="all">
<rect key="frame" x="0.0" y="0.0" width="320" height="504"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" bounces="NO" pagingEnabled="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" keyboardDismissMode="onDrag" dataMode="none" translatesAutoresizingMaskIntoConstraints="NO" id="8fs-wy-05c">
<rect key="frame" x="0.0" y="0.0" width="320" height="504"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<collectionViewLayout key="collectionViewLayout" id="8ub-DU-GR0" customClass="MWMSearchTabbedViewLayout"/>
<connections>
<outlet property="dataSource" destination="-1" id="M1V-Fk-ceD"/>
<outlet property="delegate" destination="-1" id="W44-TW-xd0"/>
</connections>
</collectionView>
</subviews>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="8fs-wy-05c" secondAttribute="trailing" id="6en-lL-YsF"/>
<constraint firstAttribute="bottom" secondItem="8fs-wy-05c" secondAttribute="bottom" id="V0V-yW-6Yp"/>
<constraint firstItem="8fs-wy-05c" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="aVC-AK-3SI"/>
<constraint firstItem="8fs-wy-05c" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" id="gub-1S-qGM"/>
</constraints>
<nil key="simulatedStatusBarMetrics"/>
<nil key="simulatedTopBarMetrics"/>
<nil key="simulatedBottomBarMetrics"/>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
</view>
</objects>
</document>

5
iphone/Maps/UI/Search/TabbedView/MWMSearchTabbedViewLayout.h
View file

@ -1,5 +0,0 @@
@interface MWMSearchTabbedViewLayout : UICollectionViewLayout
@property (nonatomic) NSInteger tablesCount;
@end

38
iphone/Maps/UI/Search/TabbedView/MWMSearchTabbedViewLayout.mm
View file

@ -1,38 +0,0 @@
#import "MWMSearchTabbedViewLayout.h"
#import "MWMCommon.h"
@implementation MWMSearchTabbedViewLayout
- (CGSize)collectionViewContentSize
{
CGSize size = self.collectionView.frame.size;
return CGSizeMake(self.tablesCount * size.width, size.height);
}
- (UICollectionViewLayoutAttributes *)layoutAttributesForItemAtIndexPath:(NSIndexPath *)indexPath
{
UICollectionViewLayoutAttributes * attr =
[UICollectionViewLayoutAttributes layoutAttributesForCellWithIndexPath:indexPath];
CGSize const size = self.collectionView.frame.size;
attr.size = size;
CGFloat x = (indexPath.item + 0.5) * size.width;
if (isInterfaceRightToLeft())
x = self.collectionViewContentSize.width - x;
attr.center = CGPointMake(x, 0.5 * size.height);
return attr;
}
- (NSArray *)layoutAttributesForElementsInRect:(CGRect)rect
{
NSMutableArray * attrs = [NSMutableArray array];
for (NSUInteger index = 0; index < self.tablesCount; index++)
{
NSIndexPath * indexPath = [NSIndexPath indexPathForItem:index inSection:0];
UICollectionViewLayoutAttributes * attr = [self layoutAttributesForItemAtIndexPath:indexPath];
[attrs addObject:attr];
}
return attrs.copy;
}
- (BOOL)shouldInvalidateLayoutForBoundsChange:(CGRect)newBounds { return YES; }
@end

5
iphone/Maps/UI/Search/TabbedView/CategoriesTab/SearchBannerCell.swift → iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchBannerCell.swift
View file

@ -1,14 +1,11 @@
@objc(MWMSearchBannerCellDelegate)
protocol SearchBannerCellDelegate: AnyObject {
func cellDidPressAction(_ cell: SearchBannerCell);
func cellDidPressClose(_ cell: SearchBannerCell);
}
@objc(MWMSearchBannerCell)
class SearchBannerCell: MWMTableViewCell {
@IBOutlet var taxiImageView: UIImageView!
@objc weak var delegate: SearchBannerCellDelegate?
weak var delegate: SearchBannerCellDelegate?
override func awakeFromNib() {
super.awakeFromNib()

8
iphone/Maps/UI/Search/TabbedView/CategoriesTab/SearchBannerCell.xib → iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchBannerCell.xib
View file

@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="44" id="KGk-i7-Jjw" customClass="MWMSearchBannerCell">
<tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="44" id="KGk-i7-Jjw" customClass="SearchBannerCell" customModule="maps_me" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
@ -114,7 +114,7 @@
</tableViewCellContentView>
<viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
<connections>
<outlet property="taxiImageView" destination="a9s-eh-L10" id="Lga-SX-Sev"/>
<outlet property="taxiImageView" destination="a9s-eh-L10" id="aS5-nJ-ZZW"/>
</connections>
<point key="canvasLocation" x="52.799999999999997" y="48.575712143928037"/>
</tableViewCell>

77
iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchCategoriesViewController.swift Normal file
View file

@ -0,0 +1,77 @@
protocol SearchCategoriesViewControllerDelegate: AnyObject {
func categoriesViewController(_ viewController: SearchCategoriesViewController,
didSelect category: String)
}
final class SearchCategoriesViewController: MWMTableViewController {
private weak var delegate: SearchCategoriesViewControllerDelegate?
private let categories: [String]
private let rutaxi: Bool
private static let rutaxiIndex = 6
init(frameworkHelper: MWMSearchFrameworkHelper, delegate: SearchCategoriesViewControllerDelegate?) {
self.delegate = delegate
self.categories = frameworkHelper.searchCategories()
self.rutaxi = frameworkHelper.hasRutaxiBanner()
super.init(nibName: nil, bundle: nil)
}
required init?(coder aDecoder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
override func viewDidLoad() {
super.viewDidLoad()
tableView.register(cellClass: SearchCategoryCell.self)
tableView.register(cellClass: SearchBannerCell.self)
tableView.separatorStyle = .none
}
override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
return categories.count + (rutaxi ? 1 : 0)
}
override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
if rutaxi && (indexPath.row == SearchCategoriesViewController.rutaxiIndex) {
let cell = tableView.dequeueReusableCell(cell: SearchBannerCell.self, indexPath: indexPath)
cell.delegate = self
return cell
}
let cell = tableView.dequeueReusableCell(cell: SearchCategoryCell.self, indexPath: indexPath)
cell.update(with: category(at: indexPath))
return cell
}
override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
let selectedCategory = category(at: indexPath)
delegate?.categoriesViewController(self, didSelect: selectedCategory)
Statistics.logEvent(kStatEventName(kStatSearch, kStatSelectResult),
withParameters: [kStatValue : selectedCategory, kStatScreen : kStatCategories])
}
func category(at indexPath: IndexPath) -> String {
let index = indexPath.row
if rutaxi && (index > SearchCategoriesViewController.rutaxiIndex) {
return categories[index - 1]
} else {
return categories[index]
}
}
}
extension SearchCategoriesViewController: SearchBannerCellDelegate {
func cellDidPressAction(_ cell: SearchBannerCell) {
guard let url = URL(string: "https://go.onelink.me/2944814706/86db6339") else {
assertionFailure()
return
}
UIApplication.shared.openURL(url)
}
func cellDidPressClose(_ cell: SearchBannerCell) {
MapViewController.shared().showRemoveAds()
}
}

9
iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchCategoryCell.swift Normal file
View file

@ -0,0 +1,9 @@
final class SearchCategoryCell: MWMTableViewCell {
@IBOutlet weak var iconImageView: UIImageView!
@IBOutlet weak var titleLabel: UILabel!
func update(with category: String) {
iconImageView.mwm_name = String(format: "ic_%@", category)
titleLabel.text = L(category)
}
}

13
iphone/Maps/UI/Search/TabbedView/CategoriesTab/MWMSearchCategoryCell.xib → iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchCategoryCell.xib
View file

@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="MWMSearchCategoryCell" id="KGk-i7-Jjw" customClass="MWMSearchCategoryCell">
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="44" id="KGk-i7-Jjw" userLabel="SearchCategoryCell" customClass="SearchCategoryCell" customModule="maps_me" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
@ -58,12 +58,9 @@
<constraint firstItem="ACg-C3-HtA" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="12" id="yKg-DY-edk"/>
</constraints>
</tableViewCellContentView>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
</userDefinedRuntimeAttributes>
<connections>
<outlet property="icon" destination="Enr-Zg-Z5s" id="FFC-HZ-10q"/>
<outlet property="label" destination="ACg-C3-HtA" id="VP8-Tk-lNV"/>
<outlet property="iconImageView" destination="Enr-Zg-Z5s" id="hN6-KJ-cc5"/>
<outlet property="titleLabel" destination="ACg-C3-HtA" id="Wug-sf-nZZ"/>
</connections>
</tableViewCell>
</objects>

18
iphone/Maps/UI/Search/TabbedView/HistoryTab/MWMSearchHistoryClearCell.xib → iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryClearCell.xib
View file

@ -1,22 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<customFonts key="customFonts">
<array key="HelveticaNeue.ttc">
<string>HelveticaNeue</string>
</array>
</customFonts>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="MWMSearchHistoryClearCell" propertyAccessControl="all">
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="MWMTableViewCell">
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
@ -34,7 +29,7 @@
</userDefinedRuntimeAttributes>
</imageView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6x5-bn-Z1n" userLabel="Separator">
<rect key="frame" x="60" y="42" width="260" height="1"/>
<rect key="frame" x="60" y="42.5" width="260" height="1"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="fa3-ZJ-pk5"/>
@ -44,7 +39,7 @@
</userDefinedRuntimeAttributes>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Clear History" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uUE-gB-cha" userLabel="Clear label">
<rect key="frame" x="60" y="12" width="244" height="20"/>
<rect key="frame" x="60" y="12" width="244" height="20.5"/>
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
@ -67,9 +62,6 @@
<constraint firstAttribute="trailing" secondItem="6x5-bn-Z1n" secondAttribute="trailing" id="zbS-mM-SJH"/>
</constraints>
</tableViewCellContentView>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
</userDefinedRuntimeAttributes>
</tableViewCell>
</objects>
<resources>

7
iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryQueryCell.swift Normal file
View file

@ -0,0 +1,7 @@
final class SearchHistoryQueryCell: MWMTableViewCell {
@IBOutlet weak var queryLabel: UILabel!
func update(with query: String) {
queryLabel.text = query
}
}

23
iphone/Maps/UI/Search/TabbedView/HistoryTab/MWMSearchHistoryRequestCell.xib → iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryQueryCell.xib
View file

@ -1,22 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<customFonts key="customFonts">
<array key="HelveticaNeue.ttc">
<string>HelveticaNeue</string>
</array>
</customFonts>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="MWMSearchHistoryRequestCell" id="KGk-i7-Jjw" customClass="MWMSearchHistoryRequestCell" propertyAccessControl="all">
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" userLabel="SearchHistoryQueryCell" customClass="SearchHistoryQueryCell" customModule="maps_me" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
@ -34,7 +29,7 @@
</userDefinedRuntimeAttributes>
</imageView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="L0x-sD-vTW" userLabel="Separator">
<rect key="frame" x="60" y="42" width="260" height="1"/>
<rect key="frame" x="60" y="42.5" width="260" height="1"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="bSd-Nh-svm"/>
@ -43,8 +38,8 @@
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/>
</userDefinedRuntimeAttributes>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="t8W-bQ-Jgd" userLabel="Request label">
<rect key="frame" x="60" y="12" width="244" height="19"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="t8W-bQ-Jgd">
<rect key="frame" x="60" y="12" width="244" height="19.5"/>
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
<color key="textColor" red="0.12941176470588234" green="0.12941176470588234" blue="0.12941176470588234" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
@ -66,12 +61,8 @@
<constraint firstAttribute="trailing" secondItem="t8W-bQ-Jgd" secondAttribute="trailing" constant="16" id="w0g-Q7-D2m"/>
</constraints>
</tableViewCellContentView>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
</userDefinedRuntimeAttributes>
<connections>
<outlet property="icon" destination="k5o-Xw-buz" id="RKY-vZ-6lM"/>
<outlet property="label" destination="t8W-bQ-Jgd" id="agp-cJ-gh1"/>
<outlet property="queryLabel" destination="t8W-bQ-Jgd" id="bF0-gL-81j"/>
</connections>
</tableViewCell>
</objects>

93
iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryViewController.swift Normal file
View file

@ -0,0 +1,93 @@
protocol SearchHistoryViewControllerDelegate: AnyObject {
func searchHistoryViewController(_ viewController: SearchHistoryViewController,
didSelect query: String)
}
final class SearchHistoryViewController: MWMViewController {
private weak var delegate: SearchHistoryViewControllerDelegate?
private var lastQueries: [String]
private let frameworkHelper: MWMSearchFrameworkHelper
private static let clearCellIdentifier = "SearchHistoryViewController_clearCellIdentifier"
@IBOutlet private var tableView: UITableView!
@IBOutlet private weak var noResultsViewContainer: UIView!
init(frameworkHelper: MWMSearchFrameworkHelper, delegate: SearchHistoryViewControllerDelegate?) {
self.delegate = delegate
self.lastQueries = frameworkHelper.lastSearchQueries()
self.frameworkHelper = frameworkHelper
super.init(nibName: nil, bundle: nil)
}
required init?(coder aDecoder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
override func viewDidLoad() {
super.viewDidLoad()
if frameworkHelper.isSearchHistoryEmpty() {
showNoResultsView()
} else {
tableView.register(cellClass: SearchHistoryQueryCell.self)
let nib = UINib(nibName: "SearchHistoryClearCell", bundle: nil)
tableView.register(nib, forCellReuseIdentifier: SearchHistoryViewController.clearCellIdentifier)
}
}
func showNoResultsView() {
guard let noResultsView = MWMSearchNoResults.view(with: UIImage(named: "img_search_history"),
title: L("search_history_title"),
text: L("search_history_text")) else {
assertionFailure()
return
}
noResultsViewContainer.addSubview(noResultsView)
tableView.isHidden = true
}
func clearSearchHistory() {
frameworkHelper.clearSearchHistory()
lastQueries = []
}
}
extension SearchHistoryViewController: UITableViewDataSource {
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
return frameworkHelper.isSearchHistoryEmpty() ? 0 : lastQueries.count + 1
}
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
if indexPath.row == lastQueries.count {
let cell = tableView.dequeueReusableCell(withIdentifier: SearchHistoryViewController.clearCellIdentifier,
for: indexPath)
return cell
}
let cell = tableView.dequeueReusableCell(cell: SearchHistoryQueryCell.self, indexPath: indexPath)
cell.update(with: lastQueries[indexPath.row])
return cell
}
}
extension SearchHistoryViewController: UITableViewDelegate {
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
if indexPath.row == lastQueries.count {
clearSearchHistory()
UIView.animate(withDuration: kDefaultAnimationDuration,
animations: {
tableView.alpha = 0.0
}) { _ in
self.showNoResultsView()
}
Statistics.logEvent(kStatEventName(kStatSearch, kStatSelectResult),
withParameters: [ kStatValue : kStatClear, kStatScreen : kStatHistory ])
} else {
let query = lastQueries[indexPath.row]
delegate?.searchHistoryViewController(self, didSelect: query)
Statistics.logEvent(kStatEventName(kStatSearch, kStatSelectResult),
withParameters: [ kStatValue : query, kStatScreen : kStatHistory ])
}
}
}

58
iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryViewController.xib Normal file
View file

@ -0,0 +1,58 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="SearchHistoryViewController" customModule="maps_me" customModuleProvider="target">
<connections>
<outlet property="noResultsViewContainer" destination="bcr-zs-NMw" id="zpc-sP-fbF"/>
<outlet property="tableView" destination="cDq-G7-5cR" id="Qo8-a6-Q6V"/>
<outlet property="view" destination="iN0-l3-epB" id="Ybt-gX-7O4"/>
</connections>
</placeholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view contentMode="scaleToFill" id="iN0-l3-epB">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="cDq-G7-5cR">
<rect key="frame" x="0.0" y="20" width="375" height="647"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<connections>
<outlet property="dataSource" destination="-1" id="XhM-2x-4kQ"/>
<outlet property="delegate" destination="-1" id="sDX-YJ-iGy"/>
</connections>
</tableView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bcr-zs-NMw">
<rect key="frame" x="27.5" y="183.5" width="320" height="320"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="height" constant="320" id="07E-Xc-KMw"/>
<constraint firstAttribute="width" constant="320" id="sCQ-Q9-Pdw"/>
</constraints>
</view>
</subviews>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="vUN-kp-3ea" firstAttribute="bottom" secondItem="cDq-G7-5cR" secondAttribute="bottom" id="9QA-Kd-FQb"/>
<constraint firstItem="vUN-kp-3ea" firstAttribute="trailing" secondItem="cDq-G7-5cR" secondAttribute="trailing" id="T3b-23-qG6"/>
<constraint firstItem="bcr-zs-NMw" firstAttribute="centerY" secondItem="vUN-kp-3ea" secondAttribute="centerY" id="Y7z-3L-jl5"/>
<constraint firstItem="cDq-G7-5cR" firstAttribute="top" secondItem="vUN-kp-3ea" secondAttribute="top" id="ezl-g4-mlD"/>
<constraint firstItem="cDq-G7-5cR" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" id="ot8-FU-S6n"/>
<constraint firstItem="bcr-zs-NMw" firstAttribute="centerX" secondItem="vUN-kp-3ea" secondAttribute="centerX" id="uMb-A3-NrS"/>
</constraints>
<viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
</userDefinedRuntimeAttributes>
<point key="canvasLocation" x="53.600000000000001" y="48.125937031484263"/>
</view>
</objects>
</document>

14
iphone/Maps/UI/Search/Tabs/MWMSearchFrameworkHelper.h Normal file
View file

@ -0,0 +1,14 @@
NS_ASSUME_NONNULL_BEGIN
@interface MWMSearchFrameworkHelper : NSObject
- (NSArray<NSString *> *)searchCategories;
- (BOOL)hasRutaxiBanner;
- (BOOL)isSearchHistoryEmpty;
- (NSArray<NSString *> *)lastSearchQueries;
- (void)clearSearchHistory;
@end
NS_ASSUME_NONNULL_END

44
iphone/Maps/UI/Search/Tabs/MWMSearchFrameworkHelper.mm Normal file
View file

@ -0,0 +1,44 @@
#import "MWMSearchFrameworkHelper.h"
#include "Framework.h"
@implementation MWMSearchFrameworkHelper
- (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)hasRutaxiBanner
{
return GetFramework().HasRuTaxiCategoryBanner();
}
- (BOOL)isSearchHistoryEmpty
{
return GetFramework().GetLastSearchQueries().empty();
}
- (NSArray<NSString *> *)lastSearchQueries
{
NSMutableArray * result = [NSMutableArray array];
auto const & queries = GetFramework().GetLastSearchQueries();
for (auto const & item : queries)
{
[result addObject:@(item.second.c_str())];
}
return [result copy];
}
- (void)clearSearchHistory
{
GetFramework().ClearSearchHistory();
}
@end

0
iphone/Maps/UI/Search/TabbedView/MWMSearchTabbedViewProtocol.h → iphone/Maps/UI/Search/Tabs/MWMSearchTabbedViewProtocol.h
View file

71
iphone/Maps/UI/Search/Tabs/SearchTabViewController.swift Normal file
View file

@ -0,0 +1,71 @@
@objc(MWMSearchTabViewControllerDelegate)
protocol SearchTabViewControllerDelegate: class {
func searchTabController(_ viewContoller: SearchTabViewController, didSearch: String)
}
@objc(MWMSearchTabViewController)
final class SearchTabViewController: TabViewController {
private enum SearchActiveTab: Int {
case history = 0
case categories
}
private static let selectedIndexKey = "SearchTabViewController_selectedIndexKey"
@objc weak var delegate: SearchTabViewControllerDelegate?
private lazy var frameworkHelper: MWMSearchFrameworkHelper = {
return MWMSearchFrameworkHelper()
}()
private var activeTab: SearchActiveTab = SearchActiveTab.init(rawValue:
UserDefaults.standard.integer(forKey: SearchTabViewController.selectedIndexKey)) ?? .categories {
didSet {
UserDefaults.standard.set(activeTab.rawValue, forKey: SearchTabViewController.selectedIndexKey)
}
}
override func viewDidLoad() {
super.viewDidLoad()
let history = SearchHistoryViewController(frameworkHelper: frameworkHelper,
delegate: self)
history.title = L("history")
let categories = SearchCategoriesViewController(frameworkHelper: frameworkHelper,
delegate: self)
categories.title = L("categories")
viewControllers = [history, categories]
if frameworkHelper.isSearchHistoryEmpty() {
tabView.selectedIndex = SearchActiveTab.categories.rawValue
} else {
tabView.selectedIndex = activeTab.rawValue
}
tabView.backgroundColor = .pressBackground()
tabView.barTintColor = .primary()
tabView.tintColor = .white()
tabView.headerTextAttributes = [.foregroundColor: UIColor.whitePrimaryText(),
.font: UIFont.medium14()]
}
override func viewDidDisappear(_ animated: Bool) {
super.viewDidDisappear(animated)
activeTab = SearchActiveTab.init(rawValue: tabView.selectedIndex ?? 0) ?? .categories
}
}
extension SearchTabViewController: SearchCategoriesViewControllerDelegate {
func categoriesViewController(_ viewController: SearchCategoriesViewController,
didSelect category: String) {
let query = category + " "
delegate?.searchTabController(self, didSearch: query)
}
}
extension SearchTabViewController: SearchHistoryViewControllerDelegate {
func searchHistoryViewController(_ viewController: SearchHistoryViewController,
didSelect query: String) {
delegate?.searchTabController(self, didSearch: query)
}
}