diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h index 28d7963528..b57d9bef95 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h @@ -1,7 +1,6 @@ #import "MWMBottomMenuState.h" #import "MWMMapDownloaderMode.h" #import "MWMNavigationDashboardManager.h" -#import "MWMSearchManager.h" @class MapViewController; @class BottomTabBarViewController; diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index bfc090f5f6..1023b1e8e8 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -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 = ""; }; 34763EEA1F2F3AD700F4D2D3 /* MWMTextToSpeechObserver.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMTextToSpeechObserver.h; sourceTree = ""; }; 34763F0B1F30CCAC00F4D2D3 /* MWMEditorCellType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMEditorCellType.h; sourceTree = ""; }; - 347AD8081F28B4E6007ACB68 /* MWMSearchManagerObserver.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMSearchManagerObserver.h; sourceTree = ""; }; 34845DAD1E1649F6003D55B9 /* DownloaderNoResultsEmbedViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DownloaderNoResultsEmbedViewController.swift; sourceTree = ""; }; 34845DB11E165E24003D55B9 /* SearchNoResultsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchNoResultsViewController.swift; sourceTree = ""; }; 34845DB51E166084003D55B9 /* Common.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Common.swift; sourceTree = ""; }; @@ -945,7 +934,6 @@ 349A35771B53D4C9009677EE /* MWMCircularProgress.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMCircularProgress.xib; sourceTree = ""; }; 349A35781B53D4C9009677EE /* MWMCircularProgressView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMCircularProgressView.h; sourceTree = ""; }; 349A35791B53D4C9009677EE /* MWMCircularProgressView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMCircularProgressView.m; sourceTree = ""; }; - 349D1ABA1E2D05EF004A2006 /* SearchBar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchBar.swift; sourceTree = ""; }; 349D1AC61E2E325B004A2006 /* BottomMenuItemCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = BottomMenuItemCell.xib; sourceTree = ""; }; 349D1ACD1E2E325B004A2006 /* BottomTabBarViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = BottomTabBarViewController.xib; sourceTree = ""; }; 349D1CE21E3F836900A878FD /* UIViewController+Hierarchy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIViewController+Hierarchy.swift"; sourceTree = ""; }; @@ -1007,7 +995,6 @@ 34B127E61FBDD358008713D9 /* MWMRouterTransitType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMRouterTransitType.h; sourceTree = ""; }; 34B127E71FBDD410008713D9 /* MWMRouterTransitStepInfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMRouterTransitStepInfo.h; sourceTree = ""; }; 34B127E81FBDD410008713D9 /* MWMRouterTransitStepInfo.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMRouterTransitStepInfo.mm; sourceTree = ""; }; - 34B3806B1F1E46E20087D65B /* MWMSearchManagerState.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMSearchManagerState.h; sourceTree = ""; }; 34B846A02029DCC10081ECCD /* BMCCategoriesHeader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BMCCategoriesHeader.swift; sourceTree = ""; }; 34B846A72029E8110081ECCD /* BMCDefaultViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BMCDefaultViewModel.swift; sourceTree = ""; }; 34B924401DC8A29C0008D971 /* MWMMailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMMailViewController.h; sourceTree = ""; }; @@ -1265,7 +1252,6 @@ 9901284C244732DB00C72B10 /* BottomTabBarBuilder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomTabBarBuilder.swift; sourceTree = ""; }; 9901284D244732DB00C72B10 /* BottomTabBarInteractor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomTabBarInteractor.swift; sourceTree = ""; }; 990128552449A82400C72B10 /* BottomTabBarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomTabBarView.swift; sourceTree = ""; }; - 990F33B524BC915200D0F426 /* SearchActionBarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchActionBarView.swift; sourceTree = ""; }; 9917D17E2397B1D600A7E06E /* IPadModalPresentationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IPadModalPresentationController.swift; sourceTree = ""; }; 991FCA2323B11E61009AD684 /* BookmarksStyleSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksStyleSheet.swift; sourceTree = ""; }; 993DF0B423F6B2EF00AC231A /* PlacePageTrackLayout.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlacePageTrackLayout.swift; sourceTree = ""; }; @@ -1331,7 +1317,6 @@ 995F1611244F0AA40060631D /* BottomMenuLayersCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomMenuLayersCell.swift; sourceTree = ""; }; 995F1612244F0AA40060631D /* BottomMenuLayersCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BottomMenuLayersCell.xib; sourceTree = ""; }; 996D108924E3DBF2002DD0E2 /* BookmarksCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksCoordinator.swift; sourceTree = ""; }; - 9977E69B247BFB510073780C /* SearchTextField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchTextField.swift; sourceTree = ""; }; 9977E6A02480E1EE0073780C /* BottomMenuLayerButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomMenuLayerButton.swift; sourceTree = ""; }; 9977E6A22480F9BF0073780C /* BottomMenuLayerButtonRenderer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomMenuLayerButtonRenderer.swift; sourceTree = ""; }; 9989272F2449DE1500260CE2 /* TabBarArea.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabBarArea.swift; sourceTree = ""; }; @@ -1690,17 +1675,9 @@ F6E2FCBE1E097B9F0083EBEC /* MWMPlacePageOpeningHoursDayView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMPlacePageOpeningHoursDayView.h; sourceTree = ""; }; F6E2FCBF1E097B9F0083EBEC /* MWMPlacePageOpeningHoursDayView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMPlacePageOpeningHoursDayView.m; sourceTree = ""; }; F6E2FCC01E097B9F0083EBEC /* MWMPlacePageOpeningHoursWeekDayView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMPlacePageOpeningHoursWeekDayView.xib; sourceTree = ""; }; - F6E2FCF41E097B9F0083EBEC /* MWMSearchContentView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchContentView.h; sourceTree = ""; }; - F6E2FCF51E097B9F0083EBEC /* MWMSearchContentView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMSearchContentView.m; sourceTree = ""; }; - F6E2FCF81E097B9F0083EBEC /* MWMSearchManager+Layout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MWMSearchManager+Layout.h"; sourceTree = ""; }; - F6E2FCF91E097B9F0083EBEC /* MWMSearchManager+Layout.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "MWMSearchManager+Layout.m"; sourceTree = ""; }; - F6E2FCFA1E097B9F0083EBEC /* MWMSearchManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchManager.h; sourceTree = ""; }; - F6E2FCFB1E097B9F0083EBEC /* MWMSearchManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSearchManager.mm; sourceTree = ""; }; F6E2FCFC1E097B9F0083EBEC /* MWMSearchNoResults.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchNoResults.h; sourceTree = ""; }; F6E2FCFD1E097B9F0083EBEC /* MWMSearchNoResults.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = MWMSearchNoResults.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; F6E2FCFE1E097B9F0083EBEC /* MWMSearchNoResults.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMSearchNoResults.xib; sourceTree = ""; }; - F6E2FD011E097B9F0083EBEC /* MWMSearchView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMSearchView.xib; sourceTree = ""; }; - F6E2FD231E097BA00083EBEC /* MWMSearchTabbedViewProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchTabbedViewProtocol.h; sourceTree = ""; }; F6E2FD291E097BA00083EBEC /* MWMSearchCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchCell.h; sourceTree = ""; }; F6E2FD2A1E097BA00083EBEC /* MWMSearchCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSearchCell.mm; sourceTree = ""; }; F6E2FD2B1E097BA00083EBEC /* MWMSearchCommonCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchCommonCell.h; sourceTree = ""; }; @@ -1709,11 +1686,6 @@ F6E2FD2E1E097BA00083EBEC /* MWMSearchSuggestionCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchSuggestionCell.h; sourceTree = ""; }; F6E2FD2F1E097BA00083EBEC /* MWMSearchSuggestionCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSearchSuggestionCell.mm; sourceTree = ""; }; F6E2FD301E097BA00083EBEC /* MWMSearchSuggestionCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMSearchSuggestionCell.xib; sourceTree = ""; }; - F6E2FD311E097BA00083EBEC /* MWMSearchTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchTableView.h; sourceTree = ""; }; - F6E2FD321E097BA00083EBEC /* MWMSearchTableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMSearchTableView.m; sourceTree = ""; }; - F6E2FD331E097BA00083EBEC /* MWMSearchTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchTableViewController.h; sourceTree = ""; }; - F6E2FD341E097BA00083EBEC /* MWMSearchTableViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MWMSearchTableViewController.mm; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; - F6E2FD351E097BA00083EBEC /* MWMSearchTableViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMSearchTableViewController.xib; sourceTree = ""; }; F6E2FD381E097BA00083EBEC /* SettingsTableViewLinkCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsTableViewLinkCell.swift; sourceTree = ""; }; F6E2FD391E097BA00083EBEC /* SettingsTableViewSelectableCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsTableViewSelectableCell.swift; sourceTree = ""; }; F6E2FD3A1E097BA00083EBEC /* SettingsTableViewSwitchCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsTableViewSwitchCell.swift; sourceTree = ""; }; @@ -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 = ""; @@ -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 */, diff --git a/iphone/Maps/UI/Search/MWMSearchContentView.h b/iphone/Maps/UI/Search/MWMSearchContentView.h deleted file mode 100644 index 5a28e7be6e..0000000000 --- a/iphone/Maps/UI/Search/MWMSearchContentView.h +++ /dev/null @@ -1,3 +0,0 @@ -@interface MWMSearchContentView : SolidTouchView - -@end diff --git a/iphone/Maps/UI/Search/MWMSearchContentView.m b/iphone/Maps/UI/Search/MWMSearchContentView.m deleted file mode 100644 index 6f9cb7c566..0000000000 --- a/iphone/Maps/UI/Search/MWMSearchContentView.m +++ /dev/null @@ -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 diff --git a/iphone/Maps/UI/Search/MWMSearchManager+Layout.h b/iphone/Maps/UI/Search/MWMSearchManager+Layout.h deleted file mode 100644 index c39e4c5980..0000000000 --- a/iphone/Maps/UI/Search/MWMSearchManager+Layout.h +++ /dev/null @@ -1,8 +0,0 @@ -#import "MWMSearchManager.h" - -@interface MWMSearchManager (Layout) - -- (void)layoutTopViews; -- (void)removeKeyboardObservers; - -@end diff --git a/iphone/Maps/UI/Search/MWMSearchManager+Layout.m b/iphone/Maps/UI/Search/MWMSearchManager+Layout.m deleted file mode 100644 index 2220e61943..0000000000 --- a/iphone/Maps/UI/Search/MWMSearchManager+Layout.m +++ /dev/null @@ -1,120 +0,0 @@ -#import -#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 diff --git a/iphone/Maps/UI/Search/MWMSearchManager.h b/iphone/Maps/UI/Search/MWMSearchManager.h deleted file mode 100644 index 8c3309dd73..0000000000 --- a/iphone/Maps/UI/Search/MWMSearchManager.h +++ /dev/null @@ -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)observer; -+ (void)removeObserver:(nonnull id)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)coordinator; - -@end diff --git a/iphone/Maps/UI/Search/MWMSearchManager.mm b/iphone/Maps/UI/Search/MWMSearchManager.mm deleted file mode 100644 index 29cd6c6e24..0000000000 --- a/iphone/Maps/UI/Search/MWMSearchManager.mm +++ /dev/null @@ -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; -using Observers = NSHashTable; -} // namespace - -const CGFloat kWidthForiPad = 320; - -@interface MWMMapViewControlsManager () - -@property(nonatomic) MWMSearchManager *searchManager; - -@end - -@interface MWMSearchManager () - -@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)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)observer { - [[MWMSearchManager manager].observers addObject:observer]; -} - -+ (void)removeObserver:(id)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 diff --git a/iphone/Maps/UI/Search/MWMSearchManagerObserver.h b/iphone/Maps/UI/Search/MWMSearchManagerObserver.h deleted file mode 100644 index e1ef8ab95c..0000000000 --- a/iphone/Maps/UI/Search/MWMSearchManagerObserver.h +++ /dev/null @@ -1,5 +0,0 @@ -@protocol MWMSearchManagerObserver - -- (void)onSearchManagerStateChanged; - -@end diff --git a/iphone/Maps/UI/Search/MWMSearchManagerState.h b/iphone/Maps/UI/Search/MWMSearchManagerState.h deleted file mode 100644 index 8ef6214263..0000000000 --- a/iphone/Maps/UI/Search/MWMSearchManagerState.h +++ /dev/null @@ -1,8 +0,0 @@ -typedef NS_ENUM(NSUInteger, MWMSearchManagerState) -{ - MWMSearchManagerStateHidden, - MWMSearchManagerStateDefault, - MWMSearchManagerStateTableSearch, - MWMSearchManagerStateMapSearch, - MWMSearchManagerStateResult -}; diff --git a/iphone/Maps/UI/Search/MWMSearchView.xib b/iphone/Maps/UI/Search/MWMSearchView.xib deleted file mode 100644 index 336dffe9a4..0000000000 --- a/iphone/Maps/UI/Search/MWMSearchView.xib +++ /dev/null @@ -1,266 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/iphone/Maps/UI/Search/SearchActionBarView.swift b/iphone/Maps/UI/Search/SearchActionBarView.swift deleted file mode 100644 index 184304f5ca..0000000000 --- a/iphone/Maps/UI/Search/SearchActionBarView.swift +++ /dev/null @@ -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 - } - } -} diff --git a/iphone/Maps/UI/Search/SearchBar.swift b/iphone/Maps/UI/Search/SearchBar.swift deleted file mode 100644 index 7bc4033471..0000000000 --- a/iphone/Maps/UI/Search/SearchBar.swift +++ /dev/null @@ -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 - } - } -} diff --git a/iphone/Maps/UI/Search/SearchTextField.swift b/iphone/Maps/UI/Search/SearchTextField.swift deleted file mode 100644 index 2f623249fd..0000000000 --- a/iphone/Maps/UI/Search/SearchTextField.swift +++ /dev/null @@ -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 - } - } - } -} diff --git a/iphone/Maps/UI/Search/TableView/MWMSearchTableView.h b/iphone/Maps/UI/Search/TableView/MWMSearchTableView.h deleted file mode 100644 index 253cb150c8..0000000000 --- a/iphone/Maps/UI/Search/TableView/MWMSearchTableView.h +++ /dev/null @@ -1,5 +0,0 @@ -@interface MWMSearchTableView : UIView - -- (void)hideNoResultsView:(BOOL)hide; - -@end diff --git a/iphone/Maps/UI/Search/TableView/MWMSearchTableView.m b/iphone/Maps/UI/Search/TableView/MWMSearchTableView.m deleted file mode 100644 index 40608e3a2a..0000000000 --- a/iphone/Maps/UI/Search/TableView/MWMSearchTableView.m +++ /dev/null @@ -1,71 +0,0 @@ -#import "MWMSearchTableView.h" -#import "MWMKeyboard.h" -#import "MWMSearchNoResults.h" - -@interface MWMSearchTableView () - -@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 diff --git a/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.h b/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.h deleted file mode 100644 index 470e7eadb8..0000000000 --- a/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.h +++ /dev/null @@ -1,27 +0,0 @@ -#import "MWMSearch.h" -#import "MWMSearchManager.h" -#import "MWMSearchTabbedViewProtocol.h" -#import "MWMViewController.h" - -#include - -@class SearchTextField; - -@protocol MWMSearchTableViewProtocol - -@property(nullable, weak, nonatomic) SearchTextField * searchTextField; - -@property(nonatomic) MWMSearchManagerState state; - -- (void)processSearchResultAtIndex:(NSInteger)index; - -@end - -@interface MWMSearchTableViewController : MWMViewController - -- (nonnull instancetype)init __attribute__((unavailable("init is not available"))); -- (nonnull instancetype)initWithDelegate:(nonnull id)delegate; - -- (void)reloadData; - -@end diff --git a/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.mm b/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.mm deleted file mode 100644 index eff7961360..0000000000 --- a/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.mm +++ /dev/null @@ -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 () - -@property(weak, nonatomic) IBOutlet UITableView *tableView; - -@property(weak, nonatomic) id delegate; - -@end - -@implementation MWMSearchTableViewController - -- (nonnull instancetype)initWithDelegate:(id)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)coordinator { - [super viewWillTransitionToSize:size withTransitionCoordinator:coordinator]; - [coordinator - animateAlongsideTransition:^(id 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( - [tableView dequeueReusableCellWithCellClass:[MWMSearchCommonCell class] indexPath:indexPath]); - [cell configureWith:result isPartialMatching:YES]; - return cell; - } - case SearchItemTypeSuggestion: - { - auto cell = static_cast( - [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 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 diff --git a/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.xib b/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.xib deleted file mode 100644 index 5de7e20d67..0000000000 --- a/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.xib +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/iphone/Maps/UI/Search/Tabs/MWMSearchTabbedViewProtocol.h b/iphone/Maps/UI/Search/Tabs/MWMSearchTabbedViewProtocol.h deleted file mode 100644 index 98147899b9..0000000000 --- a/iphone/Maps/UI/Search/Tabs/MWMSearchTabbedViewProtocol.h +++ /dev/null @@ -1,12 +0,0 @@ -#import "MWMSearchManagerState.h" - -@protocol MWMSearchTabbedViewProtocol - -@required - -@property(nonatomic) MWMSearchManagerState state; - -- (void)searchText:(NSString *)text forInputLocale:(NSString *)locale withCategory:(BOOL)isCategory; -- (void)dismissKeyboard; - -@end