forked from organicmaps/organicmaps
[ios] remove outdated code related to the search
the old MWMSearch... screen is not used anymore Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>
This commit is contained in:
parent
f9fb0e8d7f
commit
377d10de8c
20 changed files with 0 additions and 1540 deletions
|
|
@ -1,7 +1,6 @@
|
|||
#import "MWMBottomMenuState.h"
|
||||
#import "MWMMapDownloaderMode.h"
|
||||
#import "MWMNavigationDashboardManager.h"
|
||||
#import "MWMSearchManager.h"
|
||||
|
||||
@class MapViewController;
|
||||
@class BottomTabBarViewController;
|
||||
|
|
|
|||
|
|
@ -86,7 +86,6 @@
|
|||
3490D2E31CE9DD2500D0B838 /* MWMSideButtonsView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3490D2DD1CE9DD2500D0B838 /* MWMSideButtonsView.xib */; };
|
||||
349A13831DEC138C00C7DB60 /* MWMMobileInternetAlert.m in Sources */ = {isa = PBXBuildFile; fileRef = 349A13801DEC138C00C7DB60 /* MWMMobileInternetAlert.m */; };
|
||||
349A13851DEC138C00C7DB60 /* MWMMobileInternetAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = 349A13811DEC138C00C7DB60 /* MWMMobileInternetAlert.xib */; };
|
||||
349D1ABC1E2D05EF004A2006 /* SearchBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 349D1ABA1E2D05EF004A2006 /* SearchBar.swift */; };
|
||||
349D1AD51E2E325B004A2006 /* BottomMenuItemCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 349D1AC61E2E325B004A2006 /* BottomMenuItemCell.xib */; };
|
||||
349D1AE11E2E325C004A2006 /* BottomTabBarViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 349D1ACD1E2E325B004A2006 /* BottomTabBarViewController.xib */; };
|
||||
349D1CE41E3F836900A878FD /* UIViewController+Hierarchy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 349D1CE21E3F836900A878FD /* UIViewController+Hierarchy.swift */; };
|
||||
|
|
@ -334,7 +333,6 @@
|
|||
99012852244732DB00C72B10 /* BottomTabBarBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9901284C244732DB00C72B10 /* BottomTabBarBuilder.swift */; };
|
||||
99012853244732DB00C72B10 /* BottomTabBarInteractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9901284D244732DB00C72B10 /* BottomTabBarInteractor.swift */; };
|
||||
990128562449A82500C72B10 /* BottomTabBarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 990128552449A82400C72B10 /* BottomTabBarView.swift */; };
|
||||
990F33B624BC915200D0F426 /* SearchActionBarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 990F33B524BC915200D0F426 /* SearchActionBarView.swift */; };
|
||||
9917D17F2397B1D600A7E06E /* IPadModalPresentationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9917D17E2397B1D600A7E06E /* IPadModalPresentationController.swift */; };
|
||||
991FCA2423B11E61009AD684 /* BookmarksStyleSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 991FCA2323B11E61009AD684 /* BookmarksStyleSheet.swift */; };
|
||||
993DF0B523F6B2EF00AC231A /* PlacePageTrackLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 993DF0B423F6B2EF00AC231A /* PlacePageTrackLayout.swift */; };
|
||||
|
|
@ -396,7 +394,6 @@
|
|||
995F1613244F0AA50060631D /* BottomMenuLayersCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 995F1611244F0AA40060631D /* BottomMenuLayersCell.swift */; };
|
||||
995F1614244F0AA50060631D /* BottomMenuLayersCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 995F1612244F0AA40060631D /* BottomMenuLayersCell.xib */; };
|
||||
996D108A24E3DBF2002DD0E2 /* BookmarksCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 996D108924E3DBF2002DD0E2 /* BookmarksCoordinator.swift */; };
|
||||
9977E69C247BFB510073780C /* SearchTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9977E69B247BFB510073780C /* SearchTextField.swift */; };
|
||||
9977E6A12480E1EE0073780C /* BottomMenuLayerButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9977E6A02480E1EE0073780C /* BottomMenuLayerButton.swift */; };
|
||||
9977E6A32480F9BF0073780C /* BottomMenuLayerButtonRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9977E6A22480F9BF0073780C /* BottomMenuLayerButtonRenderer.swift */; };
|
||||
998927302449DE1500260CE2 /* TabBarArea.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9989272F2449DE1500260CE2 /* TabBarArea.swift */; };
|
||||
|
|
@ -630,20 +627,13 @@
|
|||
F6E2FE7F1E097BA00083EBEC /* MWMPlacePageOpeningHoursCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FCBD1E097B9F0083EBEC /* MWMPlacePageOpeningHoursCell.xib */; };
|
||||
F6E2FE821E097BA00083EBEC /* MWMPlacePageOpeningHoursDayView.m in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCBF1E097B9F0083EBEC /* MWMPlacePageOpeningHoursDayView.m */; };
|
||||
F6E2FE851E097BA00083EBEC /* MWMPlacePageOpeningHoursWeekDayView.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FCC01E097B9F0083EBEC /* MWMPlacePageOpeningHoursWeekDayView.xib */; };
|
||||
F6E2FED91E097BA00083EBEC /* MWMSearchContentView.m in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCF51E097B9F0083EBEC /* MWMSearchContentView.m */; };
|
||||
F6E2FEDF1E097BA00083EBEC /* MWMSearchManager+Layout.m in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCF91E097B9F0083EBEC /* MWMSearchManager+Layout.m */; };
|
||||
F6E2FEE21E097BA00083EBEC /* MWMSearchManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCFB1E097B9F0083EBEC /* MWMSearchManager.mm */; };
|
||||
F6E2FEE51E097BA00083EBEC /* MWMSearchNoResults.m in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCFD1E097B9F0083EBEC /* MWMSearchNoResults.m */; };
|
||||
F6E2FEE81E097BA00083EBEC /* MWMSearchNoResults.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FCFE1E097B9F0083EBEC /* MWMSearchNoResults.xib */; };
|
||||
F6E2FEEE1E097BA00083EBEC /* MWMSearchView.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FD011E097B9F0083EBEC /* MWMSearchView.xib */; };
|
||||
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 */; };
|
||||
F6E2FF361E097BA00083EBEC /* MWMSearchSuggestionCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FD2F1E097BA00083EBEC /* MWMSearchSuggestionCell.mm */; };
|
||||
F6E2FF391E097BA00083EBEC /* MWMSearchSuggestionCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FD301E097BA00083EBEC /* MWMSearchSuggestionCell.xib */; };
|
||||
F6E2FF3C1E097BA00083EBEC /* MWMSearchTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FD321E097BA00083EBEC /* MWMSearchTableView.m */; };
|
||||
F6E2FF3F1E097BA00083EBEC /* MWMSearchTableViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FD341E097BA00083EBEC /* MWMSearchTableViewController.mm */; };
|
||||
F6E2FF421E097BA00083EBEC /* MWMSearchTableViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FD351E097BA00083EBEC /* MWMSearchTableViewController.xib */; };
|
||||
F6E2FF451E097BA00083EBEC /* SettingsTableViewLinkCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FD381E097BA00083EBEC /* SettingsTableViewLinkCell.swift */; };
|
||||
F6E2FF481E097BA00083EBEC /* SettingsTableViewSelectableCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FD391E097BA00083EBEC /* SettingsTableViewSelectableCell.swift */; };
|
||||
F6E2FF4B1E097BA00083EBEC /* SettingsTableViewSwitchCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FD3A1E097BA00083EBEC /* SettingsTableViewSwitchCell.swift */; };
|
||||
|
|
@ -922,7 +912,6 @@
|
|||
34763EE91F2F394D00F4D2D3 /* MWMTextToSpeech+CPP.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MWMTextToSpeech+CPP.h"; sourceTree = "<group>"; };
|
||||
34763EEA1F2F3AD700F4D2D3 /* MWMTextToSpeechObserver.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMTextToSpeechObserver.h; sourceTree = "<group>"; };
|
||||
34763F0B1F30CCAC00F4D2D3 /* MWMEditorCellType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMEditorCellType.h; sourceTree = "<group>"; };
|
||||
347AD8081F28B4E6007ACB68 /* MWMSearchManagerObserver.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMSearchManagerObserver.h; sourceTree = "<group>"; };
|
||||
34845DAD1E1649F6003D55B9 /* DownloaderNoResultsEmbedViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DownloaderNoResultsEmbedViewController.swift; sourceTree = "<group>"; };
|
||||
34845DB11E165E24003D55B9 /* SearchNoResultsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchNoResultsViewController.swift; sourceTree = "<group>"; };
|
||||
34845DB51E166084003D55B9 /* Common.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Common.swift; sourceTree = "<group>"; };
|
||||
|
|
@ -945,7 +934,6 @@
|
|||
349A35771B53D4C9009677EE /* MWMCircularProgress.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMCircularProgress.xib; sourceTree = "<group>"; };
|
||||
349A35781B53D4C9009677EE /* MWMCircularProgressView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMCircularProgressView.h; sourceTree = "<group>"; };
|
||||
349A35791B53D4C9009677EE /* MWMCircularProgressView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMCircularProgressView.m; sourceTree = "<group>"; };
|
||||
349D1ABA1E2D05EF004A2006 /* SearchBar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchBar.swift; sourceTree = "<group>"; };
|
||||
349D1AC61E2E325B004A2006 /* BottomMenuItemCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = BottomMenuItemCell.xib; sourceTree = "<group>"; };
|
||||
349D1ACD1E2E325B004A2006 /* BottomTabBarViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = BottomTabBarViewController.xib; sourceTree = "<group>"; };
|
||||
349D1CE21E3F836900A878FD /* UIViewController+Hierarchy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIViewController+Hierarchy.swift"; sourceTree = "<group>"; };
|
||||
|
|
@ -1007,7 +995,6 @@
|
|||
34B127E61FBDD358008713D9 /* MWMRouterTransitType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMRouterTransitType.h; sourceTree = "<group>"; };
|
||||
34B127E71FBDD410008713D9 /* MWMRouterTransitStepInfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMRouterTransitStepInfo.h; sourceTree = "<group>"; };
|
||||
34B127E81FBDD410008713D9 /* MWMRouterTransitStepInfo.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMRouterTransitStepInfo.mm; sourceTree = "<group>"; };
|
||||
34B3806B1F1E46E20087D65B /* MWMSearchManagerState.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMSearchManagerState.h; sourceTree = "<group>"; };
|
||||
34B846A02029DCC10081ECCD /* BMCCategoriesHeader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BMCCategoriesHeader.swift; sourceTree = "<group>"; };
|
||||
34B846A72029E8110081ECCD /* BMCDefaultViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BMCDefaultViewModel.swift; sourceTree = "<group>"; };
|
||||
34B924401DC8A29C0008D971 /* MWMMailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMMailViewController.h; sourceTree = "<group>"; };
|
||||
|
|
@ -1265,7 +1252,6 @@
|
|||
9901284C244732DB00C72B10 /* BottomTabBarBuilder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomTabBarBuilder.swift; sourceTree = "<group>"; };
|
||||
9901284D244732DB00C72B10 /* BottomTabBarInteractor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomTabBarInteractor.swift; sourceTree = "<group>"; };
|
||||
990128552449A82400C72B10 /* BottomTabBarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomTabBarView.swift; sourceTree = "<group>"; };
|
||||
990F33B524BC915200D0F426 /* SearchActionBarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchActionBarView.swift; sourceTree = "<group>"; };
|
||||
9917D17E2397B1D600A7E06E /* IPadModalPresentationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IPadModalPresentationController.swift; sourceTree = "<group>"; };
|
||||
991FCA2323B11E61009AD684 /* BookmarksStyleSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksStyleSheet.swift; sourceTree = "<group>"; };
|
||||
993DF0B423F6B2EF00AC231A /* PlacePageTrackLayout.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlacePageTrackLayout.swift; sourceTree = "<group>"; };
|
||||
|
|
@ -1331,7 +1317,6 @@
|
|||
995F1611244F0AA40060631D /* BottomMenuLayersCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomMenuLayersCell.swift; sourceTree = "<group>"; };
|
||||
995F1612244F0AA40060631D /* BottomMenuLayersCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BottomMenuLayersCell.xib; sourceTree = "<group>"; };
|
||||
996D108924E3DBF2002DD0E2 /* BookmarksCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksCoordinator.swift; sourceTree = "<group>"; };
|
||||
9977E69B247BFB510073780C /* SearchTextField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchTextField.swift; sourceTree = "<group>"; };
|
||||
9977E6A02480E1EE0073780C /* BottomMenuLayerButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomMenuLayerButton.swift; sourceTree = "<group>"; };
|
||||
9977E6A22480F9BF0073780C /* BottomMenuLayerButtonRenderer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomMenuLayerButtonRenderer.swift; sourceTree = "<group>"; };
|
||||
9989272F2449DE1500260CE2 /* TabBarArea.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabBarArea.swift; sourceTree = "<group>"; };
|
||||
|
|
@ -1690,17 +1675,9 @@
|
|||
F6E2FCBE1E097B9F0083EBEC /* MWMPlacePageOpeningHoursDayView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMPlacePageOpeningHoursDayView.h; sourceTree = "<group>"; };
|
||||
F6E2FCBF1E097B9F0083EBEC /* MWMPlacePageOpeningHoursDayView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMPlacePageOpeningHoursDayView.m; sourceTree = "<group>"; };
|
||||
F6E2FCC01E097B9F0083EBEC /* MWMPlacePageOpeningHoursWeekDayView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMPlacePageOpeningHoursWeekDayView.xib; sourceTree = "<group>"; };
|
||||
F6E2FCF41E097B9F0083EBEC /* MWMSearchContentView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchContentView.h; sourceTree = "<group>"; };
|
||||
F6E2FCF51E097B9F0083EBEC /* MWMSearchContentView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMSearchContentView.m; sourceTree = "<group>"; };
|
||||
F6E2FCF81E097B9F0083EBEC /* MWMSearchManager+Layout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MWMSearchManager+Layout.h"; sourceTree = "<group>"; };
|
||||
F6E2FCF91E097B9F0083EBEC /* MWMSearchManager+Layout.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "MWMSearchManager+Layout.m"; sourceTree = "<group>"; };
|
||||
F6E2FCFA1E097B9F0083EBEC /* MWMSearchManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchManager.h; sourceTree = "<group>"; };
|
||||
F6E2FCFB1E097B9F0083EBEC /* MWMSearchManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSearchManager.mm; sourceTree = "<group>"; };
|
||||
F6E2FCFC1E097B9F0083EBEC /* MWMSearchNoResults.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchNoResults.h; sourceTree = "<group>"; };
|
||||
F6E2FCFD1E097B9F0083EBEC /* MWMSearchNoResults.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = MWMSearchNoResults.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
|
||||
F6E2FCFE1E097B9F0083EBEC /* MWMSearchNoResults.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMSearchNoResults.xib; sourceTree = "<group>"; };
|
||||
F6E2FD011E097B9F0083EBEC /* MWMSearchView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMSearchView.xib; sourceTree = "<group>"; };
|
||||
F6E2FD231E097BA00083EBEC /* MWMSearchTabbedViewProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchTabbedViewProtocol.h; 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>"; };
|
||||
|
|
@ -1709,11 +1686,6 @@
|
|||
F6E2FD2E1E097BA00083EBEC /* MWMSearchSuggestionCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchSuggestionCell.h; sourceTree = "<group>"; };
|
||||
F6E2FD2F1E097BA00083EBEC /* MWMSearchSuggestionCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSearchSuggestionCell.mm; sourceTree = "<group>"; };
|
||||
F6E2FD301E097BA00083EBEC /* MWMSearchSuggestionCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMSearchSuggestionCell.xib; sourceTree = "<group>"; };
|
||||
F6E2FD311E097BA00083EBEC /* MWMSearchTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchTableView.h; sourceTree = "<group>"; };
|
||||
F6E2FD321E097BA00083EBEC /* MWMSearchTableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMSearchTableView.m; sourceTree = "<group>"; };
|
||||
F6E2FD331E097BA00083EBEC /* MWMSearchTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchTableViewController.h; sourceTree = "<group>"; };
|
||||
F6E2FD341E097BA00083EBEC /* MWMSearchTableViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MWMSearchTableViewController.mm; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
|
||||
F6E2FD351E097BA00083EBEC /* MWMSearchTableViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMSearchTableViewController.xib; sourceTree = "<group>"; };
|
||||
F6E2FD381E097BA00083EBEC /* SettingsTableViewLinkCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsTableViewLinkCell.swift; sourceTree = "<group>"; };
|
||||
F6E2FD391E097BA00083EBEC /* SettingsTableViewSelectableCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsTableViewSelectableCell.swift; sourceTree = "<group>"; };
|
||||
F6E2FD3A1E097BA00083EBEC /* SettingsTableViewSwitchCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsTableViewSwitchCell.swift; sourceTree = "<group>"; };
|
||||
|
|
@ -3894,24 +3866,12 @@
|
|||
isa = PBXGroup;
|
||||
children = (
|
||||
ED70D5882D539A2500738C1E /* SearchOnMap */,
|
||||
F6E2FCF41E097B9F0083EBEC /* MWMSearchContentView.h */,
|
||||
F6E2FCF51E097B9F0083EBEC /* MWMSearchContentView.m */,
|
||||
F6E2FCF81E097B9F0083EBEC /* MWMSearchManager+Layout.h */,
|
||||
F6E2FCF91E097B9F0083EBEC /* MWMSearchManager+Layout.m */,
|
||||
F6E2FCFA1E097B9F0083EBEC /* MWMSearchManager.h */,
|
||||
F6E2FCFB1E097B9F0083EBEC /* MWMSearchManager.mm */,
|
||||
F6E2FCFC1E097B9F0083EBEC /* MWMSearchNoResults.h */,
|
||||
F6E2FCFD1E097B9F0083EBEC /* MWMSearchNoResults.m */,
|
||||
F6E2FCFE1E097B9F0083EBEC /* MWMSearchNoResults.xib */,
|
||||
9977E69B247BFB510073780C /* SearchTextField.swift */,
|
||||
F6E2FD011E097B9F0083EBEC /* MWMSearchView.xib */,
|
||||
F6E2FD021E097B9F0083EBEC /* Tabs */,
|
||||
F6E2FD281E097BA00083EBEC /* TableView */,
|
||||
34845DB11E165E24003D55B9 /* SearchNoResultsViewController.swift */,
|
||||
349D1ABA1E2D05EF004A2006 /* SearchBar.swift */,
|
||||
34B3806B1F1E46E20087D65B /* MWMSearchManagerState.h */,
|
||||
347AD8081F28B4E6007ACB68 /* MWMSearchManagerObserver.h */,
|
||||
990F33B524BC915200D0F426 /* SearchActionBarView.swift */,
|
||||
475ED78724C7D0F30063ADC7 /* ValueStepperView.swift */,
|
||||
);
|
||||
path = Search;
|
||||
|
|
@ -3922,7 +3882,6 @@
|
|||
children = (
|
||||
F6E2FD091E097B9F0083EBEC /* CategoriesTab */,
|
||||
F6E2FD0F1E097B9F0083EBEC /* HistoryTab */,
|
||||
F6E2FD231E097BA00083EBEC /* MWMSearchTabbedViewProtocol.h */,
|
||||
337F98A521D37B7400C8AC27 /* SearchTabViewController.swift */,
|
||||
);
|
||||
path = Tabs;
|
||||
|
|
@ -3957,11 +3916,6 @@
|
|||
F6E2FD2E1E097BA00083EBEC /* MWMSearchSuggestionCell.h */,
|
||||
F6E2FD2F1E097BA00083EBEC /* MWMSearchSuggestionCell.mm */,
|
||||
F6E2FD301E097BA00083EBEC /* MWMSearchSuggestionCell.xib */,
|
||||
F6E2FD311E097BA00083EBEC /* MWMSearchTableView.h */,
|
||||
F6E2FD321E097BA00083EBEC /* MWMSearchTableView.m */,
|
||||
F6E2FD331E097BA00083EBEC /* MWMSearchTableViewController.h */,
|
||||
F6E2FD341E097BA00083EBEC /* MWMSearchTableViewController.mm */,
|
||||
F6E2FD351E097BA00083EBEC /* MWMSearchTableViewController.xib */,
|
||||
);
|
||||
path = TableView;
|
||||
sourceTree = "<group>";
|
||||
|
|
@ -4408,9 +4362,7 @@
|
|||
F6E2FF391E097BA00083EBEC /* MWMSearchSuggestionCell.xib in Resources */,
|
||||
34AB66231FC5AA330078E451 /* MWMiPadRoutePreview.xib in Resources */,
|
||||
BB25B1A71FB32767007276FA /* transit_colors.txt in Resources */,
|
||||
F6E2FF421E097BA00083EBEC /* MWMSearchTableViewController.xib in Resources */,
|
||||
34AB66681FC5AA330078E451 /* TransportTransitPedestrian.xib in Resources */,
|
||||
F6E2FEEE1E097BA00083EBEC /* MWMSearchView.xib in Resources */,
|
||||
4501B1952077C35A001B9173 /* resources-xxxhdpi_dark in Resources */,
|
||||
F6D67CDE2062BBA60032FD38 /* MWMBCCreateCategoryAlert.xib in Resources */,
|
||||
3490D2E31CE9DD2500D0B838 /* MWMSideButtonsView.xib in Resources */,
|
||||
|
|
@ -4501,7 +4453,6 @@
|
|||
34D3AFF61E37A36A004100F9 /* UICollectionView+Cells.swift in Sources */,
|
||||
4767CDA420AAF66B00BD8166 /* NSAttributedString+HTML.swift in Sources */,
|
||||
6741A9A91BF340DE002C974C /* MWMDefaultAlert.mm in Sources */,
|
||||
990F33B624BC915200D0F426 /* SearchActionBarView.swift in Sources */,
|
||||
99514BBA23E82B450085D3A7 /* ElevationProfileViewController.swift in Sources */,
|
||||
340708781F2B5D6C00029ECC /* DimBackground.swift in Sources */,
|
||||
3490D2DF1CE9DD2500D0B838 /* MWMSideButtons.mm in Sources */,
|
||||
|
|
@ -4553,8 +4504,6 @@
|
|||
6741A9B81BF340DE002C974C /* MapViewController.mm in Sources */,
|
||||
34AB662C1FC5AA330078E451 /* RouteManagerViewModel.swift in Sources */,
|
||||
3404F48B202894EA0090E401 /* BMCViewController.swift in Sources */,
|
||||
349D1ABC1E2D05EF004A2006 /* SearchBar.swift in Sources */,
|
||||
F6E2FF3F1E097BA00083EBEC /* MWMSearchTableViewController.mm in Sources */,
|
||||
F6E2FDE01E097BA00083EBEC /* MWMEditorViewController.mm in Sources */,
|
||||
6741A9C01BF340DE002C974C /* MWMTextView.m in Sources */,
|
||||
F6E2FDB61E097BA00083EBEC /* MWMEditorAdditionalNamesHeader.m in Sources */,
|
||||
|
|
@ -4592,7 +4541,6 @@
|
|||
F6791B141C43DF0B007A8A6E /* MWMStartButton.m in Sources */,
|
||||
9977E6A12480E1EE0073780C /* BottomMenuLayerButton.swift in Sources */,
|
||||
471527372491C20500E91BBA /* SelectBookmarkGroupViewController.swift in Sources */,
|
||||
F6E2FEDF1E097BA00083EBEC /* MWMSearchManager+Layout.m in Sources */,
|
||||
F64D9CA01C899C350063FA30 /* MWMEditorViralAlert.mm in Sources */,
|
||||
34AC8FD11EFC02C000E7F910 /* MWMRoutePoint.mm in Sources */,
|
||||
CDB4D5012231412900104869 /* ListTemplateBuilder.swift in Sources */,
|
||||
|
|
@ -4754,7 +4702,6 @@
|
|||
3472B5CF200F4A2B00DC6CD5 /* BackgroundFetchTask.swift in Sources */,
|
||||
477219052243E79500E5B227 /* DrivingOptionsViewController.swift in Sources */,
|
||||
CDB4D4E4222E8FF600104869 /* CarPlayService.swift in Sources */,
|
||||
F6E2FF3C1E097BA00083EBEC /* MWMSearchTableView.m in Sources */,
|
||||
F6E2FF661E097BA00083EBEC /* MWMTTSSettingsViewController.mm in Sources */,
|
||||
3454D7C21E07F045004AF2AD /* NSString+Categories.m in Sources */,
|
||||
ED2D74662D1435A600660FBF /* LiveActivityManager.swift in Sources */,
|
||||
|
|
@ -4823,7 +4770,6 @@
|
|||
CDCA27812243F59800167D87 /* CarPlayRouter.swift in Sources */,
|
||||
34F5E0D41E3F254800B1C415 /* UIView+Hierarchy.swift in Sources */,
|
||||
6741AA0B1BF340DE002C974C /* MWMMapViewControlsManager.mm in Sources */,
|
||||
F6E2FED91E097BA00083EBEC /* MWMSearchContentView.m in Sources */,
|
||||
EDFDFB4C2B722C9C0013A44C /* InfoTableViewCell.swift in Sources */,
|
||||
47CA68F8250F8AB700671019 /* BookmarksListSectionHeader.swift in Sources */,
|
||||
F6BD1D211CA412920047B8E8 /* MWMOsmAuthAlert.mm in Sources */,
|
||||
|
|
@ -4850,7 +4796,6 @@
|
|||
4767CDA820AB401000BD8166 /* LinkTextView.swift in Sources */,
|
||||
34763EE71F2F392300F4D2D3 /* MWMTextToSpeech.mm in Sources */,
|
||||
998927402449ECC200260CE2 /* BottomMenuItemCell.swift in Sources */,
|
||||
F6E2FEE21E097BA00083EBEC /* MWMSearchManager.mm in Sources */,
|
||||
F6E2FE221E097BA00083EBEC /* MWMOpeningHoursEditorViewController.mm in Sources */,
|
||||
ED79A5D72BDF8D6100952D1F /* SynchronizationStateResolver.swift in Sources */,
|
||||
999FC12B23ABB4B800B0E6F9 /* FontStyleSheet.swift in Sources */,
|
||||
|
|
@ -4877,7 +4822,6 @@
|
|||
34B127EA1FBDD410008713D9 /* MWMRouterTransitStepInfo.mm in Sources */,
|
||||
34D3B02A1E389D05004100F9 /* MWMEditorAdditionalNameTableViewCell.m in Sources */,
|
||||
993DF10523F6BDB100AC231A /* UINavigationItem+StyleStyle.swift in Sources */,
|
||||
9977E69C247BFB510073780C /* SearchTextField.swift in Sources */,
|
||||
4726254921C27D4B00C7BAAD /* PlacePageDescriptionViewController.swift in Sources */,
|
||||
039371B62C5B68CD00708377 /* UIFont+monospaced.swift in Sources */,
|
||||
447DB4BC2BA78282000DF4C2 /* MWMOsmReauthAlert.mm in Sources */,
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
@interface MWMSearchContentView : SolidTouchView
|
||||
|
||||
@end
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
#import "MWMSearchContentView.h"
|
||||
|
||||
@implementation MWMSearchContentView
|
||||
|
||||
- (void)layoutSubviews
|
||||
{
|
||||
[self.subviews enumerateObjectsUsingBlock:^(UIView * view, NSUInteger idx, BOOL * stop)
|
||||
{
|
||||
view.frame = self.bounds;
|
||||
}];
|
||||
[super layoutSubviews];
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
#import "MWMSearchManager.h"
|
||||
|
||||
@interface MWMSearchManager (Layout)
|
||||
|
||||
- (void)layoutTopViews;
|
||||
- (void)removeKeyboardObservers;
|
||||
|
||||
@end
|
||||
|
|
@ -1,120 +0,0 @@
|
|||
#import <CoreApi/MWMCommon.h>
|
||||
#import "MWMSearchManager+Layout.h"
|
||||
#import "MapViewController.h"
|
||||
|
||||
static CGFloat const changeModeViewOffsetNormal = -24;
|
||||
static CGFloat const changeModeViewOffsetKeyboard = -12;
|
||||
|
||||
@interface MWMSearchManager ()
|
||||
|
||||
@property(nonatomic) IBOutlet UIView *searchBarView;
|
||||
@property(nonatomic) IBOutlet UIView *actionBarView;
|
||||
@property(nonatomic) IBOutlet UIView *contentView;
|
||||
|
||||
@property(nonatomic) NSLayoutConstraint *contentViewTopHidden;
|
||||
@property(nonatomic) NSLayoutConstraint *contentViewBottomHidden;
|
||||
@property(nonatomic) NSLayoutConstraint *actionBarViewBottomKeyboard;
|
||||
@property(nonatomic) NSLayoutConstraint *actionBarViewBottomNormal;
|
||||
|
||||
@property(weak, nonatomic, readonly) UIView *searchViewContainer;
|
||||
|
||||
@end
|
||||
|
||||
@implementation MWMSearchManager (Layout)
|
||||
|
||||
- (void)layoutTopViews {
|
||||
UIView *searchBarView = self.searchBarView;
|
||||
UIView *changeModeView = self.actionBarView;
|
||||
UIView *contentView = self.contentView;
|
||||
UIView *parentView = self.searchViewContainer;
|
||||
|
||||
searchBarView.translatesAutoresizingMaskIntoConstraints = NO;
|
||||
changeModeView.translatesAutoresizingMaskIntoConstraints = NO;
|
||||
contentView.translatesAutoresizingMaskIntoConstraints = NO;
|
||||
|
||||
NSLayoutXAxisAnchor *leadingAnchor = parentView.leadingAnchor;
|
||||
NSLayoutXAxisAnchor *trailingAnchor = parentView.trailingAnchor;
|
||||
NSLayoutYAxisAnchor *topAnchor = parentView.safeAreaLayoutGuide.topAnchor;
|
||||
NSLayoutYAxisAnchor *bottomAnchor = parentView.safeAreaLayoutGuide.bottomAnchor;
|
||||
|
||||
[searchBarView.topAnchor constraintEqualToAnchor:topAnchor].active = YES;
|
||||
[searchBarView.leadingAnchor constraintEqualToAnchor:leadingAnchor].active = YES;
|
||||
if (IPAD)
|
||||
[searchBarView.widthAnchor constraintEqualToConstant:kWidthForiPad].active = YES;
|
||||
else
|
||||
[searchBarView.trailingAnchor constraintEqualToAnchor:trailingAnchor].active = YES;
|
||||
|
||||
[changeModeView.centerXAnchor constraintEqualToAnchor:parentView.centerXAnchor].active = YES;
|
||||
self.actionBarViewBottomNormal = [changeModeView.bottomAnchor constraintEqualToAnchor:bottomAnchor
|
||||
constant:changeModeViewOffsetNormal];
|
||||
self.actionBarViewBottomNormal.priority = UILayoutPriorityDefaultLow + 10;
|
||||
self.actionBarViewBottomNormal.active = YES;
|
||||
|
||||
self.actionBarViewBottomKeyboard = [changeModeView.bottomAnchor constraintEqualToAnchor:parentView.bottomAnchor
|
||||
constant:changeModeViewOffsetKeyboard];
|
||||
self.actionBarViewBottomKeyboard.priority = UILayoutPriorityDefaultLow;
|
||||
self.actionBarViewBottomKeyboard.active = YES;
|
||||
|
||||
NSLayoutConstraint *contentViewTop = [contentView.topAnchor constraintEqualToAnchor:searchBarView.bottomAnchor];
|
||||
contentViewTop.priority = UILayoutPriorityDefaultLow + 10;
|
||||
contentViewTop.active = YES;
|
||||
|
||||
NSLayoutConstraint *contentViewBottom = [contentView.bottomAnchor constraintEqualToAnchor:parentView.bottomAnchor];
|
||||
contentViewBottom.priority = UILayoutPriorityDefaultLow + 10;
|
||||
contentViewBottom.active = YES;
|
||||
|
||||
self.contentViewTopHidden = [contentView.topAnchor constraintEqualToAnchor:parentView.bottomAnchor];
|
||||
self.contentViewTopHidden.priority = UILayoutPriorityDefaultLow;
|
||||
self.contentViewTopHidden.active = YES;
|
||||
|
||||
self.contentViewBottomHidden = [contentView.heightAnchor constraintEqualToAnchor:parentView.heightAnchor];
|
||||
self.contentViewBottomHidden.priority = UILayoutPriorityDefaultLow;
|
||||
self.contentViewBottomHidden.active = YES;
|
||||
|
||||
[contentView.leadingAnchor constraintEqualToAnchor:searchBarView.leadingAnchor].active = YES;
|
||||
[contentView.trailingAnchor constraintEqualToAnchor:searchBarView.trailingAnchor].active = YES;
|
||||
|
||||
[[NSNotificationCenter defaultCenter] addObserver:self
|
||||
selector:@selector(keyboardWillShow:)
|
||||
name:UIKeyboardWillShowNotification
|
||||
object:nil];
|
||||
[[NSNotificationCenter defaultCenter] addObserver:self
|
||||
selector:@selector(keyboardWillHide:)
|
||||
name:UIKeyboardWillHideNotification
|
||||
object:nil];
|
||||
}
|
||||
|
||||
- (void)removeKeyboardObservers {
|
||||
[[NSNotificationCenter defaultCenter] removeObserver:self];
|
||||
}
|
||||
|
||||
#pragma mark - keyboard movements
|
||||
- (void)keyboardWillShow:(NSNotification *)notification {
|
||||
CGSize keyboardSize = [[[notification userInfo] objectForKey:UIKeyboardFrameEndUserInfoKey] CGRectValue].size;
|
||||
CGFloat offset = IPAD ? changeModeViewOffsetNormal : changeModeViewOffsetKeyboard;
|
||||
if (self.actionBarView.isHidden) {
|
||||
self.actionBarViewBottomKeyboard.constant = -keyboardSize.height + offset;
|
||||
self.actionBarViewBottomKeyboard.priority = UILayoutPriorityDefaultHigh;
|
||||
} else {
|
||||
[UIView animateWithDuration:kDefaultAnimationDuration
|
||||
animations:^{
|
||||
self.actionBarViewBottomKeyboard.constant = -keyboardSize.height + offset;
|
||||
self.actionBarViewBottomKeyboard.priority = UILayoutPriorityDefaultHigh;
|
||||
[self.actionBarView.superview layoutIfNeeded];
|
||||
}];
|
||||
}
|
||||
}
|
||||
|
||||
- (void)keyboardWillHide:(NSNotification *)notification {
|
||||
if (self.actionBarView.isHidden) {
|
||||
self.actionBarViewBottomKeyboard.priority = UILayoutPriorityDefaultLow;
|
||||
} else {
|
||||
[UIView animateWithDuration:kDefaultAnimationDuration
|
||||
animations:^{
|
||||
self.actionBarViewBottomKeyboard.priority = UILayoutPriorityDefaultLow;
|
||||
[self.actionBarView.superview layoutIfNeeded];
|
||||
}];
|
||||
}
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
#import "MWMAlertViewController.h"
|
||||
#import "MWMSearchManagerObserver.h"
|
||||
#import "MWMSearchManagerState.h"
|
||||
|
||||
typedef NS_ENUM(NSInteger, MWMSearchManagerRoutingTooltipSearch) {
|
||||
MWMSearchManagerRoutingTooltipSearchNone,
|
||||
MWMSearchManagerRoutingTooltipSearchStart,
|
||||
MWMSearchManagerRoutingTooltipSearchFinish
|
||||
};
|
||||
@class SearchTextField;
|
||||
|
||||
@interface MWMSearchManager : NSObject
|
||||
|
||||
extern const CGFloat kWidthForiPad;
|
||||
|
||||
+ (nonnull MWMSearchManager *)manager NS_SWIFT_NAME(manager());
|
||||
+ (void)addObserver:(nonnull id<MWMSearchManagerObserver>)observer;
|
||||
+ (void)removeObserver:(nonnull id<MWMSearchManagerObserver>)observer;
|
||||
|
||||
@property(nullable, weak, nonatomic) IBOutlet SearchTextField *searchTextField;
|
||||
|
||||
@property(nonatomic) MWMSearchManagerState state;
|
||||
@property(nonatomic) MWMSearchManagerRoutingTooltipSearch routingTooltipSearch;
|
||||
|
||||
@property(nonnull, nonatomic) IBOutletCollection(UIView) NSArray *topViews;
|
||||
|
||||
- (void)searchText:(nonnull NSString *)text forInputLocale:(nullable NSString *)locale withCategory:(BOOL)isCategory;
|
||||
|
||||
#pragma mark - Layout
|
||||
|
||||
- (void)viewWillTransitionToSize:(CGSize)size
|
||||
withTransitionCoordinator:(nonnull id<UIViewControllerTransitionCoordinator>)coordinator;
|
||||
|
||||
@end
|
||||
|
|
@ -1,544 +0,0 @@
|
|||
#import "MWMSearchManager.h"
|
||||
#import "MWMFrameworkListener.h"
|
||||
#import "MWMMapViewControlsManager.h"
|
||||
#import "MWMNoMapsViewController.h"
|
||||
#import "MWMRoutePoint+CPP.h"
|
||||
#import "MWMRouter.h"
|
||||
#import "MWMSearchManager+Layout.h"
|
||||
#import "MWMSearchTableViewController.h"
|
||||
#import "MapViewController.h"
|
||||
#import "SearchResult.h"
|
||||
#import "SwiftBridge.h"
|
||||
|
||||
namespace {
|
||||
typedef NS_ENUM(NSUInteger, MWMSearchManagerActionBarState) {
|
||||
MWMSearchManagerActionBarStateHidden,
|
||||
MWMSearchManagerActionBarStateTabBar,
|
||||
MWMSearchManagerActionBarStateModeFilter
|
||||
};
|
||||
|
||||
using Observer = id<MWMSearchManagerObserver>;
|
||||
using Observers = NSHashTable<Observer>;
|
||||
} // namespace
|
||||
|
||||
const CGFloat kWidthForiPad = 320;
|
||||
|
||||
@interface MWMMapViewControlsManager ()
|
||||
|
||||
@property(nonatomic) MWMSearchManager *searchManager;
|
||||
|
||||
@end
|
||||
|
||||
@interface MWMSearchManager () <MWMSearchTableViewProtocol,
|
||||
MWMSearchTabViewControllerDelegate,
|
||||
UITextFieldDelegate,
|
||||
MWMStorageObserver,
|
||||
MWMSearchObserver>
|
||||
|
||||
@property(weak, nonatomic, readonly) UIViewController *ownerController;
|
||||
@property(weak, nonatomic, readonly) UIView *searchViewContainer;
|
||||
@property(weak, nonatomic, readonly) UIView *actionBarContainer;
|
||||
@property(weak, nonatomic, readonly) MWMMapViewControlsManager *controlsManager;
|
||||
|
||||
@property(nonatomic) IBOutlet SearchBar *searchBarView;
|
||||
@property(weak, nonatomic) IBOutlet SearchActionBarView *actionBarView;
|
||||
@property(nonatomic) IBOutlet UIView *contentView;
|
||||
@property(strong, nonatomic) IBOutlet UIView *tableViewContainer;
|
||||
|
||||
@property(nonatomic) NSLayoutConstraint *contentViewTopHidden;
|
||||
@property(nonatomic) NSLayoutConstraint *contentViewBottomHidden;
|
||||
@property(nonatomic) NSLayoutConstraint *actionBarViewBottomKeyboard;
|
||||
@property(nonatomic) NSLayoutConstraint *actionBarViewBottomNormal;
|
||||
|
||||
@property(nonatomic) UINavigationController *navigationController;
|
||||
@property(nonatomic) MWMSearchTableViewController *tableViewController;
|
||||
@property(nonatomic) MWMNoMapsViewController *noMapsController;
|
||||
|
||||
@property(nonatomic) Observers *observers;
|
||||
|
||||
@end
|
||||
|
||||
@implementation MWMSearchManager
|
||||
|
||||
+ (MWMSearchManager *)manager {
|
||||
static MWMSearchManager * manager;
|
||||
static dispatch_once_t onceToken;
|
||||
dispatch_once(&onceToken, ^{
|
||||
manager = [[MWMSearchManager alloc] init];
|
||||
});
|
||||
return manager;
|
||||
}
|
||||
|
||||
- (nullable instancetype)init {
|
||||
self = [super init];
|
||||
if (self) {
|
||||
[NSBundle.mainBundle loadNibNamed:@"MWMSearchView" owner:self options:nil];
|
||||
self.state = MWMSearchManagerStateHidden;
|
||||
[MWMSearch addObserver:self];
|
||||
_observers = [Observers weakObjectsHashTable];
|
||||
}
|
||||
return self;
|
||||
}
|
||||
|
||||
- (void)beginSearch {
|
||||
if (self.state != MWMSearchManagerStateHidden)
|
||||
self.state = MWMSearchManagerStateTableSearch;
|
||||
}
|
||||
|
||||
- (void)endSearch {
|
||||
if (self.state != MWMSearchManagerStateHidden)
|
||||
self.state = MWMSearchManagerStateDefault;
|
||||
self.searchTextField.text = @"";
|
||||
[MWMSearch clear];
|
||||
}
|
||||
|
||||
- (void)closeSearch {
|
||||
[self.searchTextField endEditing:YES];
|
||||
[self endSearch];
|
||||
}
|
||||
|
||||
#pragma mark - Actions
|
||||
|
||||
- (IBAction)textFieldDidEndEditing:(UITextField *)textField {
|
||||
if (textField.text.length == 0)
|
||||
[self endSearch];
|
||||
}
|
||||
|
||||
- (IBAction)textFieldTextDidChange:(UITextField *)textField {
|
||||
NSString *text = textField.text;
|
||||
if (text.length > 0) {
|
||||
[self beginSearch];
|
||||
[MWMSearch searchQuery:text forInputLocale:textField.textInputMode.primaryLanguage withCategory:NO];
|
||||
} else {
|
||||
[self endSearch];
|
||||
}
|
||||
}
|
||||
|
||||
- (IBAction)cancelButtonPressed {
|
||||
self.state = MWMSearchManagerStateHidden;
|
||||
}
|
||||
|
||||
- (IBAction)backButtonPressed {
|
||||
self.state = MWMSearchManagerStateTableSearch;
|
||||
}
|
||||
|
||||
#pragma mark - Layout
|
||||
|
||||
- (void)viewWillTransitionToSize:(CGSize)size
|
||||
withTransitionCoordinator:(id<UIViewControllerTransitionCoordinator>)coordinator {
|
||||
[self.navigationController viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
|
||||
}
|
||||
|
||||
#pragma mark - UITextFieldDelegate
|
||||
|
||||
- (void)textFieldDidBeginEditing:(UITextField *)textField {
|
||||
BOOL const isEmpty = (textField.text.length == 0);
|
||||
self.state = isEmpty ? MWMSearchManagerStateDefault : MWMSearchManagerStateTableSearch;
|
||||
}
|
||||
|
||||
- (BOOL)textFieldShouldReturn:(UITextField *)textField {
|
||||
textField.text = [[textField.text stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceCharacterSet]
|
||||
stringByAppendingString:@" "];
|
||||
[self textFieldTextDidChange:textField];
|
||||
[textField resignFirstResponder];
|
||||
return YES;
|
||||
}
|
||||
|
||||
#pragma mark - MWMSearchTabbedViewProtocol
|
||||
|
||||
- (void)searchText:(NSString *)text forInputLocale:(NSString *)locale withCategory:(BOOL)isCategory {
|
||||
[self beginSearch];
|
||||
self.searchTextField.text = text;
|
||||
NSString *inputLocale = locale ?: self.searchTextField.textInputMode.primaryLanguage;
|
||||
[MWMSearch searchQuery:text forInputLocale:inputLocale withCategory:isCategory];
|
||||
}
|
||||
|
||||
- (void)dismissKeyboard {
|
||||
[self.searchTextField resignFirstResponder];
|
||||
}
|
||||
- (void)processSearchResultAtIndex:(NSInteger)index {
|
||||
if (self.routingTooltipSearch == MWMSearchManagerRoutingTooltipSearchNone) {
|
||||
[MWMSearch showResultAtIndex:index];
|
||||
} else {
|
||||
BOOL const isStart = self.routingTooltipSearch == MWMSearchManagerRoutingTooltipSearchStart;
|
||||
SearchResult * result = [MWMSearch resultWithContainerIndex:index];
|
||||
auto point = [[MWMRoutePoint alloc] initWithCGPoint:result.point
|
||||
title:result.titleText
|
||||
subtitle:result.addressText
|
||||
type:isStart ? MWMRoutePointTypeStart : MWMRoutePointTypeFinish
|
||||
intermediateIndex:0];
|
||||
if (isStart)
|
||||
[MWMRouter buildFromPoint:point bestRouter:NO];
|
||||
else
|
||||
[MWMRouter buildToPoint:point bestRouter:NO];
|
||||
}
|
||||
if (!IPAD || [MWMNavigationDashboardManager sharedManager].state != MWMNavigationDashboardStateHidden)
|
||||
self.state = MWMSearchManagerStateResult;
|
||||
}
|
||||
|
||||
#pragma mark - MWMStorageObserver
|
||||
|
||||
- (void)processCountryEvent:(NSString *)countryId {
|
||||
using namespace storage;
|
||||
NodeStatuses nodeStatuses{};
|
||||
GetFramework().GetStorage().GetNodeStatuses(countryId.UTF8String, nodeStatuses);
|
||||
if (nodeStatuses.m_status != NodeStatus::OnDisk)
|
||||
return;
|
||||
[self updateTopController];
|
||||
if (self.state == MWMSearchManagerStateTableSearch || self.state == MWMSearchManagerStateMapSearch) {
|
||||
NSString *text = self.searchTextField.text;
|
||||
if (text.length != 0)
|
||||
[MWMSearch searchQuery:text forInputLocale:self.searchTextField.textInputMode.primaryLanguage withCategory:NO];
|
||||
}
|
||||
}
|
||||
|
||||
#pragma mark - State changes
|
||||
|
||||
- (void)updateTopController {
|
||||
UIViewController *selfTopVC = self.topController;
|
||||
if (!selfTopVC || [selfTopVC isEqual:self.navigationController.topViewController])
|
||||
return;
|
||||
NSMutableArray *viewControllers = [self.navigationController.viewControllers mutableCopy];
|
||||
viewControllers[0] = selfTopVC;
|
||||
[self.navigationController setViewControllers:viewControllers animated:NO];
|
||||
}
|
||||
|
||||
- (void)changeToHiddenState {
|
||||
self.routingTooltipSearch = MWMSearchManagerRoutingTooltipSearchNone;
|
||||
[self closeSearch];
|
||||
|
||||
MWMMapViewControlsManager *controlsManager = self.controlsManager;
|
||||
auto const navigationManagerState = [MWMNavigationDashboardManager sharedManager].state;
|
||||
if (navigationManagerState == MWMNavigationDashboardStateHidden) {
|
||||
controlsManager.menuState = controlsManager.menuRestoreState;
|
||||
}
|
||||
[self viewHidden:YES];
|
||||
}
|
||||
|
||||
- (void)changeToDefaultState {
|
||||
MWMMapViewControlsManager *controlsManager = self.controlsManager;
|
||||
|
||||
[self.navigationController popToRootViewControllerAnimated:NO];
|
||||
|
||||
self.searchBarView.state = SearchBarStateReady;
|
||||
GetFramework().DeactivateMapSelection();
|
||||
[self animateConstraints:^{
|
||||
self.contentViewTopHidden.priority = UILayoutPriorityDefaultLow;
|
||||
self.contentViewBottomHidden.priority = UILayoutPriorityDefaultLow;
|
||||
}];
|
||||
auto const navigationManagerState = [MWMNavigationDashboardManager sharedManager].state;
|
||||
if (navigationManagerState == MWMNavigationDashboardStateHidden) {
|
||||
controlsManager.menuState = controlsManager.menuRestoreState;
|
||||
}
|
||||
[self viewHidden:NO];
|
||||
self.actionBarState = MWMSearchManagerActionBarStateHidden;
|
||||
[self.searchTextField becomeFirstResponder];
|
||||
[self.searchBarView applyTheme];
|
||||
}
|
||||
|
||||
- (void)changeToTableSearchState {
|
||||
MWMMapViewControlsManager *controlsManager = self.controlsManager;
|
||||
|
||||
[self.navigationController popToRootViewControllerAnimated:NO];
|
||||
|
||||
self.searchBarView.state = SearchBarStateReady;
|
||||
GetFramework().DeactivateMapSelection();
|
||||
[self updateTableSearchActionBar];
|
||||
auto const navigationManagerState = [MWMNavigationDashboardManager sharedManager].state;
|
||||
if (navigationManagerState == MWMNavigationDashboardStateHidden) {
|
||||
controlsManager.menuState = controlsManager.menuRestoreState;
|
||||
}
|
||||
[self viewHidden:NO];
|
||||
[self.tableViewController reloadData];
|
||||
|
||||
if (![self.navigationController.viewControllers containsObject:self.tableViewController])
|
||||
[self.navigationController pushViewController:self.tableViewController animated:NO];
|
||||
}
|
||||
|
||||
- (void)changeToMapSearchState {
|
||||
[self.navigationController popToRootViewControllerAnimated:NO];
|
||||
|
||||
self.searchBarView.state = SearchBarStateBack;
|
||||
self.actionBarState = MWMSearchManagerActionBarStateModeFilter;
|
||||
if (!IPAD) {
|
||||
[self animateConstraints:^{
|
||||
self.contentViewTopHidden.priority = UILayoutPriorityDefaultHigh;
|
||||
self.contentViewBottomHidden.priority = UILayoutPriorityDefaultHigh;
|
||||
}];
|
||||
}
|
||||
auto const navigationManagerState = [MWMNavigationDashboardManager sharedManager].state;
|
||||
[self viewHidden:navigationManagerState != MWMNavigationDashboardStateHidden];
|
||||
self.controlsManager.menuState = MWMBottomMenuStateHidden;
|
||||
GetFramework().DeactivateMapSelection();
|
||||
[self.tableViewController reloadData];
|
||||
|
||||
[self.searchTextField resignFirstResponder];
|
||||
|
||||
if (navigationManagerState == MWMNavigationDashboardStateNavigation) {
|
||||
self.searchTextField.text = @"";
|
||||
}
|
||||
}
|
||||
|
||||
- (void)changeToResultSearchState {
|
||||
[self.navigationController popToRootViewControllerAnimated:NO];
|
||||
|
||||
self.searchBarView.state = SearchBarStateBack;
|
||||
self.actionBarState = MWMSearchManagerActionBarStateModeFilter;
|
||||
if (!IPAD) {
|
||||
[self animateConstraints:^{
|
||||
self.contentViewTopHidden.priority = UILayoutPriorityDefaultHigh;
|
||||
self.contentViewBottomHidden.priority = UILayoutPriorityDefaultHigh;
|
||||
|
||||
}];
|
||||
}
|
||||
auto const navigationManagerState = [MWMNavigationDashboardManager sharedManager].state;
|
||||
[self viewHidden:navigationManagerState != MWMNavigationDashboardStateHidden];
|
||||
[self.tableViewController reloadData];
|
||||
|
||||
[self.searchTextField resignFirstResponder];
|
||||
|
||||
if (navigationManagerState == MWMNavigationDashboardStateNavigation) {
|
||||
self.searchTextField.text = @"";
|
||||
}
|
||||
}
|
||||
|
||||
- (void)animateConstraints:(MWMVoidBlock)block {
|
||||
UIView *parentView = self.searchViewContainer;
|
||||
[parentView layoutIfNeeded];
|
||||
block();
|
||||
[UIView animateWithDuration:kDefaultAnimationDuration
|
||||
animations:^{
|
||||
[parentView layoutIfNeeded];
|
||||
}];
|
||||
}
|
||||
|
||||
#pragma mark - MWMSearchObserver
|
||||
|
||||
- (void)onSearchCompleted {
|
||||
if (self.state == MWMSearchManagerStateMapSearch || self.state == MWMSearchManagerStateResult) {
|
||||
self.searchBarView.state = SearchBarStateBack;
|
||||
} else {
|
||||
self.searchBarView.state = SearchBarStateReady;
|
||||
}
|
||||
|
||||
if (self.state != MWMSearchManagerStateTableSearch)
|
||||
return;
|
||||
[self.tableViewController onSearchCompleted];
|
||||
[self updateTableSearchActionBar];
|
||||
}
|
||||
|
||||
- (void)onSearchStarted {
|
||||
self.searchBarView.state = SearchBarStateSearching;
|
||||
if (self.state != MWMSearchManagerStateTableSearch)
|
||||
return;
|
||||
self.actionBarState = MWMSearchManagerActionBarStateModeFilter;
|
||||
}
|
||||
|
||||
- (void)onSearchResultsUpdated {
|
||||
[self.tableViewController reloadData];
|
||||
}
|
||||
|
||||
- (void)updateTableSearchActionBar {
|
||||
if (self.state != MWMSearchManagerStateTableSearch)
|
||||
return;
|
||||
[self animateConstraints:^{
|
||||
BOOL hideActionBar = NO;
|
||||
if ([MWMSearch resultsCount] == 0)
|
||||
hideActionBar = YES;
|
||||
else if (IPAD)
|
||||
hideActionBar = YES;
|
||||
self.actionBarState =
|
||||
hideActionBar ? MWMSearchManagerActionBarStateHidden : MWMSearchManagerActionBarStateModeFilter;
|
||||
|
||||
self.contentViewTopHidden.priority = UILayoutPriorityDefaultLow;
|
||||
self.contentViewBottomHidden.priority = UILayoutPriorityDefaultLow;
|
||||
}];
|
||||
}
|
||||
|
||||
#pragma mark - Add/Remove Observers
|
||||
|
||||
+ (void)addObserver:(id<MWMSearchManagerObserver>)observer {
|
||||
[[MWMSearchManager manager].observers addObject:observer];
|
||||
}
|
||||
|
||||
+ (void)removeObserver:(id<MWMSearchManagerObserver>)observer {
|
||||
[[MWMSearchManager manager].observers removeObject:observer];
|
||||
}
|
||||
|
||||
#pragma mark - MWMSearchManagerObserver
|
||||
|
||||
- (void)onSearchManagerStateChanged {
|
||||
for (Observer observer in self.observers)
|
||||
[observer onSearchManagerStateChanged];
|
||||
}
|
||||
|
||||
#pragma mark - Filters
|
||||
|
||||
- (IBAction)changeMode {
|
||||
switch (self.state) {
|
||||
case MWMSearchManagerStateTableSearch:
|
||||
self.state = MWMSearchManagerStateMapSearch;
|
||||
break;
|
||||
case MWMSearchManagerStateMapSearch:
|
||||
self.state = MWMSearchManagerStateTableSearch;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
#pragma mark - Properties
|
||||
|
||||
- (UINavigationController *)navigationController {
|
||||
if (!_navigationController) {
|
||||
_navigationController = [[UINavigationController alloc] init];
|
||||
[self.contentView addSubview:_navigationController.view];
|
||||
_navigationController.navigationBarHidden = YES;
|
||||
}
|
||||
return _navigationController;
|
||||
}
|
||||
|
||||
- (UIViewController *)topController {
|
||||
[[MWMStorage sharedStorage] removeObserver:self];
|
||||
self.noMapsController = nil;
|
||||
switch (self.state) {
|
||||
case MWMSearchManagerStateHidden:
|
||||
return nil;
|
||||
case MWMSearchManagerStateDefault: {
|
||||
if (GetFramework().GetStorage().HaveDownloadedCountries()) {
|
||||
MWMSearchTabViewController *tabViewController = [MWMSearchTabViewController new];
|
||||
tabViewController.delegate = self;
|
||||
return tabViewController;
|
||||
}
|
||||
self.noMapsController = [MWMNoMapsViewController controller];
|
||||
[[MWMStorage sharedStorage] addObserver:self];
|
||||
return self.noMapsController;
|
||||
}
|
||||
case MWMSearchManagerStateTableSearch:
|
||||
return self.tableViewController;
|
||||
case MWMSearchManagerStateMapSearch:
|
||||
return self.tableViewController;
|
||||
case MWMSearchManagerStateResult:
|
||||
return self.tableViewController;
|
||||
}
|
||||
}
|
||||
|
||||
- (void)searchTabController:(MWMSearchTabViewController *)viewController
|
||||
didSearch:(NSString *)didSearch
|
||||
withCategory:(BOOL)isCategory
|
||||
{
|
||||
[self searchText:didSearch forInputLocale:[[AppInfo sharedInfo] languageId] withCategory:isCategory];
|
||||
}
|
||||
|
||||
- (MWMSearchTableViewController *)tableViewController {
|
||||
if (!_tableViewController)
|
||||
_tableViewController = [[MWMSearchTableViewController alloc] initWithDelegate:self];
|
||||
return _tableViewController;
|
||||
}
|
||||
|
||||
- (void)setState:(MWMSearchManagerState)state {
|
||||
if (_state == state)
|
||||
return;
|
||||
|
||||
_state = state;
|
||||
[self updateTopController];
|
||||
switch (state) {
|
||||
case MWMSearchManagerStateHidden:
|
||||
[self changeToHiddenState];
|
||||
break;
|
||||
case MWMSearchManagerStateDefault:
|
||||
[self changeToDefaultState];
|
||||
break;
|
||||
case MWMSearchManagerStateTableSearch:
|
||||
[self changeToTableSearchState];
|
||||
break;
|
||||
case MWMSearchManagerStateMapSearch:
|
||||
[self changeToMapSearchState];
|
||||
break;
|
||||
case MWMSearchManagerStateResult:
|
||||
[self changeToResultSearchState];
|
||||
break;
|
||||
}
|
||||
[self onSearchManagerStateChanged];
|
||||
[self.actionBarView updateForState:state];
|
||||
[[MapViewController sharedController] updateStatusBarStyle];
|
||||
}
|
||||
|
||||
- (void)viewHidden:(BOOL)hidden {
|
||||
UIView *searchBarView = self.searchBarView;
|
||||
UIView *actionBarView = self.actionBarView;
|
||||
UIView *contentView = self.contentView;
|
||||
UIView *parentView = self.searchViewContainer;
|
||||
|
||||
if (!hidden) {
|
||||
if (searchBarView.superview) {
|
||||
[parentView bringSubviewToFront:searchBarView];
|
||||
[parentView bringSubviewToFront:contentView];
|
||||
[parentView bringSubviewToFront:actionBarView];
|
||||
return;
|
||||
}
|
||||
[parentView addSubview:searchBarView];
|
||||
[parentView addSubview:contentView];
|
||||
[parentView addSubview:actionBarView];
|
||||
[self layoutTopViews];
|
||||
// Set Search controller default hidden state for iPad before it will be shown.
|
||||
if (IPAD) {
|
||||
self.searchViewContainerLeadingConstraint.constant = -kWidthForiPad;
|
||||
[parentView.superview layoutIfNeeded];
|
||||
}
|
||||
}
|
||||
[UIView animateWithDuration:kDefaultAnimationDuration
|
||||
animations:^{
|
||||
if (IPAD) {
|
||||
self.searchViewContainerLeadingConstraint.constant = hidden ? -kWidthForiPad : 0;
|
||||
[parentView.superview layoutIfNeeded];
|
||||
} else {
|
||||
CGFloat const alpha = hidden ? 0 : 1;
|
||||
contentView.alpha = alpha;
|
||||
actionBarView.alpha = alpha;
|
||||
searchBarView.alpha = alpha;
|
||||
}
|
||||
}
|
||||
completion:^(BOOL finished) {
|
||||
if (!hidden)
|
||||
return;
|
||||
[contentView removeFromSuperview];
|
||||
[actionBarView removeFromSuperview];
|
||||
[searchBarView removeFromSuperview];
|
||||
[self removeKeyboardObservers];
|
||||
}];
|
||||
}
|
||||
|
||||
- (void)setActionBarState:(MWMSearchManagerActionBarState)actionBarState {
|
||||
switch (actionBarState) {
|
||||
case MWMSearchManagerActionBarStateHidden:
|
||||
self.actionBarView.hidden = YES;
|
||||
break;
|
||||
case MWMSearchManagerActionBarStateTabBar:
|
||||
self.actionBarView.hidden = YES;
|
||||
break;
|
||||
case MWMSearchManagerActionBarStateModeFilter:
|
||||
self.actionBarView.hidden = NO;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
- (UIViewController *)ownerController {
|
||||
return [MapViewController sharedController];
|
||||
}
|
||||
- (UIView *)searchViewContainer {
|
||||
// return [MapViewController sharedController].searchViewContainer;
|
||||
return nil;
|
||||
}
|
||||
- (NSLayoutConstraint *)searchViewContainerLeadingConstraint {
|
||||
// return [MapViewController sharedController].searchViewContainerLeadingConstraint;
|
||||
return nil;
|
||||
}
|
||||
- (UIView *)actionBarContainer {
|
||||
return [MapViewController sharedController].controlsView;
|
||||
}
|
||||
|
||||
- (MWMMapViewControlsManager *)controlsManager {
|
||||
return [MWMMapViewControlsManager manager];
|
||||
}
|
||||
@end
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
@protocol MWMSearchManagerObserver<NSObject>
|
||||
|
||||
- (void)onSearchManagerStateChanged;
|
||||
|
||||
@end
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
typedef NS_ENUM(NSUInteger, MWMSearchManagerState)
|
||||
{
|
||||
MWMSearchManagerStateHidden,
|
||||
MWMSearchManagerStateDefault,
|
||||
MWMSearchManagerStateTableSearch,
|
||||
MWMSearchManagerStateMapSearch,
|
||||
MWMSearchManagerStateResult
|
||||
};
|
||||
|
|
@ -1,266 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22155" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
|
||||
<device id="retina6_1" orientation="portrait" appearance="light"/>
|
||||
<dependencies>
|
||||
<deployment identifier="iOS"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22131"/>
|
||||
<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="MWMSearchManager">
|
||||
<connections>
|
||||
<outlet property="actionBarView" destination="d2A-Id-T62" id="UKk-U2-Mwl"/>
|
||||
<outlet property="contentView" destination="u9y-bx-NGd" id="A03-AI-DbY"/>
|
||||
<outlet property="searchBarView" destination="g9f-m8-RFv" id="opS-Ll-3Fn"/>
|
||||
<outlet property="searchTextField" destination="ySb-oA-ZeW" id="Awu-Z4-EdK"/>
|
||||
<outlet property="tableViewContainer" destination="QQn-4W-Y0s" id="5hb-b3-y8Q"/>
|
||||
<outletCollection property="topViews" destination="u9y-bx-NGd" id="mAw-CD-QQV"/>
|
||||
<outletCollection property="topViews" destination="d2A-Id-T62" id="Q0C-Eb-VyX"/>
|
||||
</connections>
|
||||
</placeholder>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="g9f-m8-RFv" customClass="SearchBar" customModule="Organic_Maps" customModuleProvider="target">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="88"/>
|
||||
<subviews>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="C73-2V-To8" userLabel="StatusBarBackground">
|
||||
<rect key="frame" x="0.0" y="-100" width="320" height="188"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="SearchBarView"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
<stackView opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="DrM-QJ-TCl">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="88"/>
|
||||
<subviews>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ghc-B6-erG">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="88"/>
|
||||
<subviews>
|
||||
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="fill" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" adjustsFontSizeToFit="NO" minimumFontSize="17" clearButtonMode="always" translatesAutoresizingMaskIntoConstraints="NO" id="ySb-oA-ZeW" userLabel="Search" customClass="SearchTextField" customModule="Organic_Maps" customModuleProvider="target">
|
||||
<rect key="frame" x="16" y="8" width="232" height="72"/>
|
||||
<accessibility key="accessibilityConfiguration" identifier="queryField"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
||||
<textInputTraits key="textInputTraits" autocorrectionType="no" returnKeyType="search"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="SearchSearchTextField"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="localizedPlaceholder" value="search"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<connections>
|
||||
<action selector="textFieldDidEndEditing:" destination="-1" eventType="editingDidEnd" id="CuD-rP-0bT"/>
|
||||
<action selector="textFieldTextDidChange:" destination="-1" eventType="editingChanged" id="NU4-jh-Dd4"/>
|
||||
<outlet property="delegate" destination="-1" id="U2Z-lL-bo1"/>
|
||||
</connections>
|
||||
</textField>
|
||||
<button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="wordWrap" translatesAutoresizingMaskIntoConstraints="NO" id="qkR-cN-NI4">
|
||||
<rect key="frame" x="248" y="4" width="72" height="80"/>
|
||||
<accessibility key="accessibilityConfiguration" identifier="cancelButton"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="72" id="8mI-K9-qAu"/>
|
||||
</constraints>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
||||
<inset key="contentEdgeInsets" minX="4" minY="0.0" maxX="4" maxY="0.0"/>
|
||||
<state key="normal" title="Cancel">
|
||||
<color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</state>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="cancel"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="whitePrimaryText"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<connections>
|
||||
<action selector="cancelButtonPressed" destination="-1" eventType="touchUpInside" id="cx8-zT-fgZ"/>
|
||||
</connections>
|
||||
</button>
|
||||
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_search" translatesAutoresizingMaskIntoConstraints="NO" id="ebE-7b-E9f">
|
||||
<rect key="frame" x="16" y="8" width="36" height="72"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="36" id="8Ta-mE-6dI"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="SearchSearchTextFieldIcon"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</imageView>
|
||||
<activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" style="medium" translatesAutoresizingMaskIntoConstraints="NO" id="pnj-0S-fkE">
|
||||
<rect key="frame" x="16" y="8" width="36" height="72"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="36" id="v0W-Aw-eSV"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="SearchSearchTextFieldIcon"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</activityIndicatorView>
|
||||
<button opaque="NO" contentMode="center" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="CrZ-Cz-xyW">
|
||||
<rect key="frame" x="16" y="8" width="36" height="72"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="36" id="gfO-3m-OFv"/>
|
||||
</constraints>
|
||||
<state key="normal" image="ic_search_back"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="SearchSearchTextFieldIcon"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<connections>
|
||||
<action selector="backButtonPressed" destination="-1" eventType="touchUpInside" id="xyJ-fc-ged"/>
|
||||
</connections>
|
||||
</button>
|
||||
</subviews>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<constraints>
|
||||
<constraint firstItem="pnj-0S-fkE" firstAttribute="top" secondItem="ySb-oA-ZeW" secondAttribute="top" id="4oA-1o-TMf"/>
|
||||
<constraint firstItem="qkR-cN-NI4" firstAttribute="top" secondItem="ghc-B6-erG" secondAttribute="top" constant="4" id="FlS-h1-5Su"/>
|
||||
<constraint firstItem="qkR-cN-NI4" firstAttribute="leading" secondItem="ySb-oA-ZeW" secondAttribute="trailing" id="HJ2-r6-yVw"/>
|
||||
<constraint firstItem="ebE-7b-E9f" firstAttribute="bottom" secondItem="ySb-oA-ZeW" secondAttribute="bottom" id="R45-81-QPe"/>
|
||||
<constraint firstItem="ebE-7b-E9f" firstAttribute="leading" secondItem="ySb-oA-ZeW" secondAttribute="leading" id="THA-Pu-i5t"/>
|
||||
<constraint firstItem="CrZ-Cz-xyW" firstAttribute="top" secondItem="ySb-oA-ZeW" secondAttribute="top" id="WxT-Hy-CL1"/>
|
||||
<constraint firstItem="CrZ-Cz-xyW" firstAttribute="bottom" secondItem="ySb-oA-ZeW" secondAttribute="bottom" id="XIJ-EQ-sfC"/>
|
||||
<constraint firstAttribute="height" constant="52" id="evQ-q0-G3V"/>
|
||||
<constraint firstAttribute="bottom" secondItem="qkR-cN-NI4" secondAttribute="bottom" constant="8" id="exK-0S-ML2"/>
|
||||
<constraint firstAttribute="bottom" secondItem="ySb-oA-ZeW" secondAttribute="bottom" constant="8" id="kc1-xj-dnr"/>
|
||||
<constraint firstItem="ySb-oA-ZeW" firstAttribute="leading" secondItem="ghc-B6-erG" secondAttribute="leading" constant="16" id="kch-1z-rhZ"/>
|
||||
<constraint firstItem="CrZ-Cz-xyW" firstAttribute="leading" secondItem="ySb-oA-ZeW" secondAttribute="leading" id="m7Z-jP-Upg"/>
|
||||
<constraint firstAttribute="trailing" secondItem="qkR-cN-NI4" secondAttribute="trailing" id="ngR-ML-Cnj"/>
|
||||
<constraint firstItem="pnj-0S-fkE" firstAttribute="leading" secondItem="ySb-oA-ZeW" secondAttribute="leading" id="ove-r5-YFo"/>
|
||||
<constraint firstItem="qkR-cN-NI4" firstAttribute="centerY" secondItem="ySb-oA-ZeW" secondAttribute="centerY" id="rPK-s8-GJi"/>
|
||||
<constraint firstItem="pnj-0S-fkE" firstAttribute="bottom" secondItem="ySb-oA-ZeW" secondAttribute="bottom" id="udX-a7-hOd"/>
|
||||
<constraint firstItem="ySb-oA-ZeW" firstAttribute="top" secondItem="ghc-B6-erG" secondAttribute="top" constant="8" id="yet-nD-qWN"/>
|
||||
<constraint firstItem="ebE-7b-E9f" firstAttribute="top" secondItem="ySb-oA-ZeW" secondAttribute="top" id="zqb-O1-mO9"/>
|
||||
</constraints>
|
||||
</view>
|
||||
</subviews>
|
||||
</stackView>
|
||||
</subviews>
|
||||
<viewLayoutGuide key="safeArea" id="VX9-29-j2Z"/>
|
||||
<color key="backgroundColor" red="0.12549019610000001" green="0.59607843140000005" blue="0.32156862749999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<constraints>
|
||||
<constraint firstItem="C73-2V-To8" firstAttribute="top" secondItem="g9f-m8-RFv" secondAttribute="top" constant="-100" id="Alh-jk-902"/>
|
||||
<constraint firstItem="DrM-QJ-TCl" firstAttribute="leading" secondItem="g9f-m8-RFv" secondAttribute="leading" id="Fqj-iv-GAo"/>
|
||||
<constraint firstAttribute="bottom" secondItem="DrM-QJ-TCl" secondAttribute="bottom" id="Wtv-8F-BmX"/>
|
||||
<constraint firstAttribute="bottom" secondItem="C73-2V-To8" secondAttribute="bottom" id="e6z-lu-FFZ"/>
|
||||
<constraint firstAttribute="trailing" secondItem="DrM-QJ-TCl" secondAttribute="trailing" id="eSZ-Cp-LJl"/>
|
||||
<constraint firstAttribute="width" secondItem="DrM-QJ-TCl" secondAttribute="width" id="he4-ZG-kIs"/>
|
||||
<constraint firstItem="C73-2V-To8" firstAttribute="leading" secondItem="g9f-m8-RFv" secondAttribute="leading" id="qhr-if-gM8">
|
||||
<variation key="heightClass=regular-widthClass=regular" constant="0.0"/>
|
||||
</constraint>
|
||||
<constraint firstAttribute="trailing" secondItem="C73-2V-To8" secondAttribute="trailing" id="xV9-by-bNe">
|
||||
<variation key="heightClass=regular-widthClass=regular" constant="0.0"/>
|
||||
</constraint>
|
||||
<constraint firstItem="DrM-QJ-TCl" firstAttribute="top" secondItem="g9f-m8-RFv" secondAttribute="top" id="zwx-cA-Bru"/>
|
||||
</constraints>
|
||||
<nil key="simulatedStatusBarMetrics"/>
|
||||
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="SearchBar"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<connections>
|
||||
<outlet property="activityIndicator" destination="pnj-0S-fkE" id="fLT-4I-s5b"/>
|
||||
<outlet property="backButton" destination="CrZ-Cz-xyW" id="fIz-hG-JFM"/>
|
||||
<outlet property="searchIcon" destination="ebE-7b-E9f" id="sCN-KI-2a1"/>
|
||||
<outlet property="searchTextField" destination="ySb-oA-ZeW" id="xHR-vF-csP"/>
|
||||
<outlet property="stackView" destination="DrM-QJ-TCl" id="Fzm-8G-JnZ"/>
|
||||
</connections>
|
||||
<point key="canvasLocation" x="225.59999999999999" y="-211.39430284857573"/>
|
||||
</view>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
|
||||
<view contentMode="scaleToFill" id="d2A-Id-T62" customClass="SearchActionBarView" customModule="Organic_Maps" customModuleProvider="target" propertyAccessControl="none">
|
||||
<rect key="frame" x="0.0" y="0.0" width="361" height="36"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<subviews>
|
||||
<stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2gF-Kc-0a7">
|
||||
<rect key="frame" x="0.0" y="0.0" width="361" height="36"/>
|
||||
<subviews>
|
||||
<button opaque="NO" contentMode="scaleToFill" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="a8x-P8-Y8p" customClass="MWMButton">
|
||||
<rect key="frame" x="0.0" y="0.0" width="296" height="36"/>
|
||||
<accessibility key="accessibilityConfiguration" identifier="viewOnMapButton"/>
|
||||
<inset key="contentEdgeInsets" minX="10" minY="0.0" maxX="10" maxY="0.0"/>
|
||||
<state key="normal" title="Map" image="ic_search_mode_map"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="SearchActionBarButton"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="search_show_on_map"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<connections>
|
||||
<action selector="changeMode" destination="-1" eventType="touchUpInside" id="uAW-Mp-BVp"/>
|
||||
</connections>
|
||||
</button>
|
||||
<button opaque="NO" contentMode="scaleToFill" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Enq-yv-2XZ" customClass="MWMButton">
|
||||
<rect key="frame" x="296" y="0.0" width="65" height="36"/>
|
||||
<accessibility key="accessibilityConfiguration" identifier="viewOnMapButton"/>
|
||||
<inset key="contentEdgeInsets" minX="10" minY="0.0" maxX="10" maxY="0.0"/>
|
||||
<state key="normal" title="List" image="ic_search_mode_list"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="SearchActionBarButton"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="search_in_table"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<connections>
|
||||
<action selector="changeMode" destination="-1" eventType="touchUpInside" id="yqV-vF-c3I"/>
|
||||
</connections>
|
||||
</button>
|
||||
</subviews>
|
||||
</stackView>
|
||||
</subviews>
|
||||
<viewLayoutGuide key="safeArea" id="Bgt-hj-RpB"/>
|
||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="trailing" secondItem="2gF-Kc-0a7" secondAttribute="trailing" id="Fdx-hX-coi"/>
|
||||
<constraint firstItem="2gF-Kc-0a7" firstAttribute="top" secondItem="d2A-Id-T62" secondAttribute="top" id="Y62-Rf-LAh"/>
|
||||
<constraint firstAttribute="height" constant="40" id="eLk-al-10m"/>
|
||||
<constraint firstItem="2gF-Kc-0a7" firstAttribute="leading" secondItem="d2A-Id-T62" secondAttribute="leading" id="itE-d4-hzw"/>
|
||||
<constraint firstAttribute="bottom" secondItem="2gF-Kc-0a7" secondAttribute="bottom" id="s4H-Jq-xk9"/>
|
||||
</constraints>
|
||||
<nil key="simulatedStatusBarMetrics"/>
|
||||
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="SearchActionBarView"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<connections>
|
||||
<outlet property="listButton" destination="Enq-yv-2XZ" id="DUY-wh-ohq"/>
|
||||
<outlet property="mapButton" destination="a8x-P8-Y8p" id="Rtu-DA-x6c"/>
|
||||
<outlet property="stackView" destination="2gF-Kc-0a7" id="08D-2t-Cpt"/>
|
||||
</connections>
|
||||
<point key="canvasLocation" x="193" y="-58"/>
|
||||
</view>
|
||||
<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>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jHn-5d-yXG" customClass="SolidTouchView">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="402"/>
|
||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="QQn-4W-Y0s">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="368"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
</view>
|
||||
</subviews>
|
||||
<viewLayoutGuide key="safeArea" id="wvK-7O-o3d"/>
|
||||
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<constraints>
|
||||
<constraint firstItem="jHn-5d-yXG" firstAttribute="leading" secondItem="u9y-bx-NGd" secondAttribute="leading" id="1Qk-kN-iT5">
|
||||
<variation key="heightClass=regular-widthClass=regular" constant="0.0"/>
|
||||
</constraint>
|
||||
<constraint firstItem="wvK-7O-o3d" firstAttribute="bottom" secondItem="QQn-4W-Y0s" secondAttribute="bottom" id="5UL-RM-PTF"/>
|
||||
<constraint firstItem="jHn-5d-yXG" firstAttribute="top" secondItem="u9y-bx-NGd" secondAttribute="top" id="Bgm-2G-pSD"/>
|
||||
<constraint firstItem="QQn-4W-Y0s" firstAttribute="leading" secondItem="u9y-bx-NGd" secondAttribute="leading" id="CFW-pd-Qj7"/>
|
||||
<constraint firstItem="QQn-4W-Y0s" firstAttribute="top" secondItem="u9y-bx-NGd" secondAttribute="top" id="T8W-hj-ces"/>
|
||||
<constraint firstAttribute="trailing" secondItem="jHn-5d-yXG" secondAttribute="trailing" id="aKt-MM-Csi">
|
||||
<variation key="heightClass=regular-widthClass=regular" constant="0.0"/>
|
||||
</constraint>
|
||||
<constraint firstAttribute="bottom" secondItem="jHn-5d-yXG" secondAttribute="bottom" id="hm3-xK-oys">
|
||||
<variation key="heightClass=regular-widthClass=regular" constant="0.0"/>
|
||||
</constraint>
|
||||
<constraint firstAttribute="trailing" secondItem="QQn-4W-Y0s" secondAttribute="trailing" id="pBX-G3-gBz"/>
|
||||
</constraints>
|
||||
<nil key="simulatedStatusBarMetrics"/>
|
||||
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<point key="canvasLocation" x="236" y="229"/>
|
||||
</view>
|
||||
</objects>
|
||||
<resources>
|
||||
<image name="ic_search" width="28" height="28"/>
|
||||
<image name="ic_search_back" width="24" height="24"/>
|
||||
<image name="ic_search_mode_list" width="20" height="20"/>
|
||||
<image name="ic_search_mode_map" width="20" height="20"/>
|
||||
</resources>
|
||||
</document>
|
||||
|
|
@ -1,56 +0,0 @@
|
|||
@objc class SearchActionBarView: SolidTouchView {
|
||||
@IBOutlet private var mapButton: MWMButton!
|
||||
@IBOutlet private var listButton: MWMButton!
|
||||
|
||||
@IBOutlet private var stackView: UIStackView!
|
||||
|
||||
override func awakeFromNib() {
|
||||
super.awakeFromNib()
|
||||
|
||||
hideView(mapButton, isHidden: true, animated: false)
|
||||
hideView(listButton, isHidden: true, animated: false)
|
||||
}
|
||||
|
||||
@objc func updateForState(_ state: MWMSearchManagerState) {
|
||||
hideView(mapButton, isHidden: true, animated: false)
|
||||
hideView(listButton, isHidden: true, animated: false)
|
||||
|
||||
iPhoneSpecific {
|
||||
switch state {
|
||||
case .tableSearch:
|
||||
hideView(mapButton, isHidden: false, animated: true)
|
||||
case .mapSearch:
|
||||
hideView(listButton, isHidden: false, animated: true)
|
||||
case .default:
|
||||
break
|
||||
case .hidden: fallthrough
|
||||
case .result: fallthrough
|
||||
@unknown default:
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private func hideView(_ view: UIView, isHidden: Bool, animated: Bool) {
|
||||
view.isHidden = isHidden
|
||||
if animated {
|
||||
UIView.animate(withDuration: kDefaultAnimationDuration / 2,
|
||||
delay: 0,
|
||||
options: [.beginFromCurrentState],
|
||||
animations: {
|
||||
self.layoutIfNeeded()
|
||||
}, completion: { complete in
|
||||
if complete {
|
||||
UIView.animate(withDuration: kDefaultAnimationDuration / 2,
|
||||
delay: 0, options: [.beginFromCurrentState],
|
||||
animations: {
|
||||
view.alpha = isHidden ? 0 : 1
|
||||
}, completion: nil)
|
||||
}
|
||||
})
|
||||
} else {
|
||||
view.alpha = isHidden ? 0 : 1
|
||||
view.isHidden = isHidden
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,57 +0,0 @@
|
|||
@objc enum SearchBarState: Int {
|
||||
case ready
|
||||
case searching
|
||||
case back
|
||||
}
|
||||
|
||||
final class SearchBar: SolidTouchView {
|
||||
@IBOutlet private var searchIcon: UIImageView!
|
||||
@IBOutlet private var activityIndicator: UIActivityIndicatorView!
|
||||
@IBOutlet private var backButton: UIButton!
|
||||
@IBOutlet private var searchTextField: SearchTextField!
|
||||
@IBOutlet private var stackView: UIStackView!
|
||||
|
||||
override var visibleAreaAffectDirections: MWMAvailableAreaAffectDirections { return alternative(iPhone: .top, iPad: .left) }
|
||||
|
||||
override var placePageAreaAffectDirections: MWMAvailableAreaAffectDirections { return alternative(iPhone: [], iPad: .left) }
|
||||
|
||||
override var widgetsAreaAffectDirections: MWMAvailableAreaAffectDirections { return alternative(iPhone: [], iPad: .left) }
|
||||
|
||||
override var trafficButtonAreaAffectDirections: MWMAvailableAreaAffectDirections { return alternative(iPhone: .top, iPad: .left) }
|
||||
|
||||
override var tabBarAreaAffectDirections: MWMAvailableAreaAffectDirections { return alternative(iPhone: [], iPad: .left) }
|
||||
|
||||
override var trackRecordingButtonAreaAffectDirections: MWMAvailableAreaAffectDirections { return alternative(iPhone: .top, iPad: .left) }
|
||||
|
||||
@objc var state: SearchBarState = .ready {
|
||||
didSet {
|
||||
if state != oldValue {
|
||||
updateLeftView()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
override func awakeFromNib() {
|
||||
super.awakeFromNib()
|
||||
updateLeftView()
|
||||
searchTextField.leftViewMode = UITextField.ViewMode.always
|
||||
searchTextField.leftView = UIView(frame: CGRect(x: 0, y: 0, width: 32, height: 32))
|
||||
searchTextField.applyTheme()
|
||||
}
|
||||
|
||||
private func updateLeftView() {
|
||||
searchIcon.isHidden = true
|
||||
activityIndicator.isHidden = true
|
||||
backButton.isHidden = true
|
||||
|
||||
switch state {
|
||||
case .ready:
|
||||
searchIcon.isHidden = false
|
||||
case .searching:
|
||||
activityIndicator.isHidden = false
|
||||
activityIndicator.startAnimating()
|
||||
case .back:
|
||||
backButton.isHidden = false
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
class SearchTextField: UITextField {
|
||||
override func drawPlaceholder(in rect: CGRect) {
|
||||
guard let font = font, let tint = tintColor else {
|
||||
super.drawPlaceholder(in: rect);
|
||||
return
|
||||
}
|
||||
placeholder?.draw(
|
||||
in: rect,
|
||||
withAttributes: [
|
||||
NSAttributedString.Key.font: font,
|
||||
NSAttributedString.Key.foregroundColor: tint
|
||||
])
|
||||
}
|
||||
|
||||
override func layoutSubviews() {
|
||||
super.layoutSubviews()
|
||||
for view in subviews {
|
||||
if (view is UIButton) {
|
||||
let button = view as? UIButton
|
||||
let clearButtonImage: UIImage?
|
||||
if #available(iOS 13.0, *) {
|
||||
clearButtonImage = UIImage(named: "ic_clear")?.withRenderingMode(.alwaysTemplate).withTintColor(tintColor)
|
||||
} else {
|
||||
clearButtonImage = UIImage(named: "ic_search_clear_14")
|
||||
}
|
||||
button?.setImage(clearButtonImage, for: .normal)
|
||||
button?.tintColor = tintColor
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
@interface MWMSearchTableView : UIView
|
||||
|
||||
- (void)hideNoResultsView:(BOOL)hide;
|
||||
|
||||
@end
|
||||
|
|
@ -1,71 +0,0 @@
|
|||
#import "MWMSearchTableView.h"
|
||||
#import "MWMKeyboard.h"
|
||||
#import "MWMSearchNoResults.h"
|
||||
|
||||
@interface MWMSearchTableView ()<MWMKeyboardObserver>
|
||||
|
||||
@property(weak, nonatomic) IBOutlet NSLayoutConstraint * noResultsBottomOffset;
|
||||
|
||||
@property(weak, nonatomic) IBOutlet UIView * noResultsContainer;
|
||||
@property(weak, nonatomic) IBOutlet UIView * noResultsWrapper;
|
||||
@property(nonatomic) MWMSearchNoResults * noResultsView;
|
||||
|
||||
@end
|
||||
|
||||
@implementation MWMSearchTableView
|
||||
|
||||
- (void)awakeFromNib
|
||||
{
|
||||
[super awakeFromNib];
|
||||
CALayer * sl = self.layer;
|
||||
sl.shouldRasterize = YES;
|
||||
sl.rasterizationScale = UIScreen.mainScreen.scale;
|
||||
[MWMKeyboard addObserver:self];
|
||||
}
|
||||
|
||||
- (void)hideNoResultsView:(BOOL)hide
|
||||
{
|
||||
if (hide)
|
||||
{
|
||||
self.noResultsContainer.hidden = YES;
|
||||
[self.noResultsView removeFromSuperview];
|
||||
}
|
||||
else
|
||||
{
|
||||
self.noResultsContainer.hidden = NO;
|
||||
[self.noResultsWrapper addSubview:self.noResultsView];
|
||||
[self onKeyboardAnimation];
|
||||
}
|
||||
}
|
||||
|
||||
#pragma mark - MWMKeyboard
|
||||
|
||||
- (void)onKeyboardAnimation
|
||||
{
|
||||
CGFloat const keyboardHeight = [MWMKeyboard keyboardHeight];
|
||||
if (keyboardHeight >= self.height)
|
||||
return;
|
||||
|
||||
self.noResultsBottomOffset.constant = keyboardHeight;
|
||||
if (self.superview)
|
||||
[self layoutIfNeeded];
|
||||
}
|
||||
|
||||
- (void)onKeyboardWillAnimate
|
||||
{
|
||||
if (self.superview)
|
||||
[self layoutIfNeeded];
|
||||
}
|
||||
|
||||
- (MWMSearchNoResults *)noResultsView
|
||||
{
|
||||
if (!_noResultsView)
|
||||
{
|
||||
_noResultsView = [MWMSearchNoResults viewWithImage:nil
|
||||
title:L(@"search_not_found")
|
||||
text:L(@"search_not_found_query")];
|
||||
}
|
||||
return _noResultsView;
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
#import "MWMSearch.h"
|
||||
#import "MWMSearchManager.h"
|
||||
#import "MWMSearchTabbedViewProtocol.h"
|
||||
#import "MWMViewController.h"
|
||||
|
||||
#include <CoreApi/Framework.h>
|
||||
|
||||
@class SearchTextField;
|
||||
|
||||
@protocol MWMSearchTableViewProtocol<MWMSearchTabbedViewProtocol>
|
||||
|
||||
@property(nullable, weak, nonatomic) SearchTextField * searchTextField;
|
||||
|
||||
@property(nonatomic) MWMSearchManagerState state;
|
||||
|
||||
- (void)processSearchResultAtIndex:(NSInteger)index;
|
||||
|
||||
@end
|
||||
|
||||
@interface MWMSearchTableViewController : MWMViewController<MWMSearchObserver>
|
||||
|
||||
- (nonnull instancetype)init __attribute__((unavailable("init is not available")));
|
||||
- (nonnull instancetype)initWithDelegate:(nonnull id<MWMSearchTableViewProtocol>)delegate;
|
||||
|
||||
- (void)reloadData;
|
||||
|
||||
@end
|
||||
|
|
@ -1,143 +0,0 @@
|
|||
#import "MWMSearchTableViewController.h"
|
||||
#import "MWMSearchCommonCell.h"
|
||||
#import "MWMSearchSuggestionCell.h"
|
||||
#import "MWMSearchTableView.h"
|
||||
#import "SearchResult.h"
|
||||
#import "SwiftBridge.h"
|
||||
|
||||
#include "platform/localization.hpp"
|
||||
|
||||
#include "search/result.hpp"
|
||||
|
||||
namespace {
|
||||
NSString *GetLocalizedTypeName(search::Result const &result) {
|
||||
return @(result.GetLocalizedFeatureType().c_str());
|
||||
}
|
||||
}
|
||||
|
||||
@interface MWMSearchTableViewController () <UITableViewDataSource, UITableViewDelegate>
|
||||
|
||||
@property(weak, nonatomic) IBOutlet UITableView *tableView;
|
||||
|
||||
@property(weak, nonatomic) id<MWMSearchTableViewProtocol> delegate;
|
||||
|
||||
@end
|
||||
|
||||
@implementation MWMSearchTableViewController
|
||||
|
||||
- (nonnull instancetype)initWithDelegate:(id<MWMSearchTableViewProtocol>)delegate {
|
||||
self = [super init];
|
||||
if (self)
|
||||
_delegate = delegate;
|
||||
return self;
|
||||
}
|
||||
|
||||
- (void)viewDidLoad {
|
||||
[super viewDidLoad];
|
||||
[self setupTableView];
|
||||
}
|
||||
|
||||
- (void)viewWillAppear:(BOOL)animated {
|
||||
[super viewWillAppear:animated];
|
||||
self.tableView.hidden = NO;
|
||||
self.tableView.insetsContentViewsToSafeArea = YES;
|
||||
[(MWMSearchTableView *)self.view hideNoResultsView:YES];
|
||||
[self reloadData];
|
||||
}
|
||||
|
||||
- (void)setupTableView {
|
||||
UITableView *tableView = self.tableView;
|
||||
tableView.estimatedRowHeight = 80.;
|
||||
tableView.rowHeight = UITableViewAutomaticDimension;
|
||||
[tableView registerNibWithCellClass:[MWMSearchSuggestionCell class]];
|
||||
[tableView registerNibWithCellClass:[MWMSearchCommonCell class]];
|
||||
}
|
||||
|
||||
- (void)reloadData {
|
||||
[self.tableView reloadData];
|
||||
}
|
||||
#pragma mark - Layout
|
||||
|
||||
- (void)viewWillTransitionToSize:(CGSize)size
|
||||
withTransitionCoordinator:(id<UIViewControllerTransitionCoordinator>)coordinator {
|
||||
[super viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
|
||||
[coordinator
|
||||
animateAlongsideTransition:^(id<UIViewControllerTransitionCoordinatorContext> context) {
|
||||
[self reloadData];
|
||||
}
|
||||
completion:nil];
|
||||
}
|
||||
|
||||
#pragma mark - UITableViewDataSource
|
||||
|
||||
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
|
||||
return [MWMSearch resultsCount];
|
||||
}
|
||||
|
||||
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
|
||||
if ([MWMSearch resultsCount] == 0) {
|
||||
NSAssert(false, @"Invalid reload with outdated SearchIndex");
|
||||
return [tableView dequeueReusableCellWithCellClass:[MWMSearchCommonCell class] indexPath:indexPath];
|
||||
}
|
||||
|
||||
auto const row = indexPath.row;
|
||||
auto const containerIndex = [MWMSearch containerIndexWithRow:row];
|
||||
auto const & result = [MWMSearch resultWithContainerIndex:containerIndex];
|
||||
|
||||
switch ([MWMSearch resultTypeWithRow:row])
|
||||
{
|
||||
case SearchItemTypeRegular:
|
||||
{
|
||||
auto cell = static_cast<MWMSearchCommonCell *>(
|
||||
[tableView dequeueReusableCellWithCellClass:[MWMSearchCommonCell class] indexPath:indexPath]);
|
||||
[cell configureWith:result isPartialMatching:YES];
|
||||
return cell;
|
||||
}
|
||||
case SearchItemTypeSuggestion:
|
||||
{
|
||||
auto cell = static_cast<MWMSearchSuggestionCell *>(
|
||||
[tableView dequeueReusableCellWithCellClass:[MWMSearchSuggestionCell class] indexPath:indexPath]);
|
||||
[cell configureWith:result isPartialMatching:YES];
|
||||
cell.isLastCell = row == [MWMSearch suggestionsCount] - 1;
|
||||
return cell;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#pragma mark - UITableViewDelegate
|
||||
|
||||
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
|
||||
id<MWMSearchTableViewProtocol> delegate = self.delegate;
|
||||
auto const row = indexPath.row;
|
||||
auto const containerIndex = [MWMSearch containerIndexWithRow:row];
|
||||
auto const & result = [MWMSearch resultWithContainerIndex:containerIndex];
|
||||
|
||||
switch ([MWMSearch resultTypeWithRow:row])
|
||||
{
|
||||
case SearchItemTypeRegular:
|
||||
{
|
||||
SearchTextField const * textField = delegate.searchTextField;
|
||||
[MWMSearch saveQuery:textField.text forInputLocale:textField.textInputMode.primaryLanguage];
|
||||
[delegate processSearchResultAtIndex:indexPath.row];
|
||||
break;
|
||||
}
|
||||
case SearchItemTypeSuggestion:
|
||||
{
|
||||
[delegate searchText:result.suggestion
|
||||
forInputLocale:nil
|
||||
withCategory:result.isPureSuggest];
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#pragma mark - MWMSearchObserver
|
||||
|
||||
- (void)onSearchCompleted {
|
||||
[self reloadData];
|
||||
BOOL const noResults = [MWMSearch resultsCount] == 0;
|
||||
self.tableView.hidden = noResults;
|
||||
[(MWMSearchTableView *)self.view hideNoResultsView:!noResults];
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
@ -1,79 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
|
||||
<device id="retina4_7" orientation="portrait" appearance="light"/>
|
||||
<dependencies>
|
||||
<deployment identifier="iOS"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
|
||||
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
||||
</dependencies>
|
||||
<objects>
|
||||
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MWMSearchTableViewController">
|
||||
<connections>
|
||||
<outlet property="tableView" destination="oZD-Er-6fn" id="Ayl-9n-mV7"/>
|
||||
<outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
|
||||
</connections>
|
||||
</placeholder>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
|
||||
<view clipsSubviews="YES" contentMode="scaleToFill" id="i5M-Pr-FkT" customClass="MWMSearchTableView" propertyAccessControl="none">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="460"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
<subviews>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NsS-9j-1hr">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="460"/>
|
||||
<subviews>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="0ed-oS-Uw6">
|
||||
<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" constant="320" id="iu3-jC-BuA"/>
|
||||
<constraint firstAttribute="width" secondItem="0ed-oS-Uw6" secondAttribute="height" multiplier="1:1" priority="999" id="rBn-RY-c74"/>
|
||||
</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="0ed-oS-Uw6" firstAttribute="centerY" secondItem="NsS-9j-1hr" secondAttribute="centerY" id="3os-g7-XiN"/>
|
||||
<constraint firstItem="0ed-oS-Uw6" firstAttribute="centerX" secondItem="NsS-9j-1hr" secondAttribute="centerX" id="N4N-MH-XVw"/>
|
||||
<constraint firstItem="0ed-oS-Uw6" firstAttribute="height" relation="lessThanOrEqual" secondItem="NsS-9j-1hr" secondAttribute="height" id="aad-2C-r3O"/>
|
||||
</constraints>
|
||||
</view>
|
||||
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" keyboardDismissMode="onDrag" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="oZD-Er-6fn">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="460"/>
|
||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
||||
<inset key="separatorInset" minX="15" minY="0.0" maxX="0.0" maxY="0.0"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<connections>
|
||||
<outlet property="dataSource" destination="-1" id="T9n-AG-sHf"/>
|
||||
<outlet property="delegate" destination="-1" id="Syl-wX-U5b"/>
|
||||
</connections>
|
||||
</tableView>
|
||||
</subviews>
|
||||
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<constraints>
|
||||
<constraint firstItem="oZD-Er-6fn" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" id="9cU-AY-lQv"/>
|
||||
<constraint firstItem="NsS-9j-1hr" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="C7g-sy-qp4"/>
|
||||
<constraint firstAttribute="trailing" secondItem="oZD-Er-6fn" secondAttribute="trailing" id="DoP-hv-QXb"/>
|
||||
<constraint firstAttribute="bottom" secondItem="NsS-9j-1hr" secondAttribute="bottom" priority="750" id="P9i-5E-bpw"/>
|
||||
<constraint firstItem="NsS-9j-1hr" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" id="csW-fl-Sp0"/>
|
||||
<constraint firstAttribute="trailing" secondItem="NsS-9j-1hr" secondAttribute="trailing" id="dIC-Mf-12H"/>
|
||||
<constraint firstItem="oZD-Er-6fn" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="iKy-dd-6Jt"/>
|
||||
<constraint firstAttribute="bottom" secondItem="oZD-Er-6fn" secondAttribute="bottom" priority="750" id="rgu-oY-7XC"/>
|
||||
</constraints>
|
||||
<nil key="simulatedStatusBarMetrics"/>
|
||||
<nil key="simulatedTopBarMetrics"/>
|
||||
<nil key="simulatedBottomBarMetrics"/>
|
||||
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<connections>
|
||||
<outlet property="noResultsBottomOffset" destination="P9i-5E-bpw" id="qTI-X5-KzS"/>
|
||||
<outlet property="noResultsContainer" destination="NsS-9j-1hr" id="BfV-Wz-ztf"/>
|
||||
<outlet property="noResultsWrapper" destination="0ed-oS-Uw6" id="RbW-yn-sl8"/>
|
||||
</connections>
|
||||
<point key="canvasLocation" x="139" y="154"/>
|
||||
</view>
|
||||
</objects>
|
||||
</document>
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
#import "MWMSearchManagerState.h"
|
||||
|
||||
@protocol MWMSearchTabbedViewProtocol <NSObject>
|
||||
|
||||
@required
|
||||
|
||||
@property(nonatomic) MWMSearchManagerState state;
|
||||
|
||||
- (void)searchText:(NSString *)text forInputLocale:(NSString *)locale withCategory:(BOOL)isCategory;
|
||||
- (void)dismissKeyboard;
|
||||
|
||||
@end
|
||||
Loading…
Add table
Reference in a new issue