diff --git a/iphone/Maps/Classes/MapViewController.h b/iphone/Maps/Classes/MapViewController.h index a6ad1d1adc..b07986b47f 100644 --- a/iphone/Maps/Classes/MapViewController.h +++ b/iphone/Maps/Classes/MapViewController.h @@ -29,7 +29,6 @@ - (void)searchText:(NSString *_Nonnull)text; - (void)openDrivingOptions; -- (void)showRemoveAds; - (void)setPlacePageTopBound:(CGFloat)bound duration:(double)duration; + (void)setViewport:(double)lat lon:(double)lon zoomLevel:(int)zoomlevel; diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm index df63a5a231..0786437b9c 100644 --- a/iphone/Maps/Classes/MapViewController.mm +++ b/iphone/Maps/Classes/MapViewController.mm @@ -481,9 +481,6 @@ NSString *const kPP2BookmarkEditingSegue = @"PP2BookmarkEditing"; [self.navigationController pushViewController:vc animated:YES]; } -- (void)showRemoveAds { -} - - (void)processMyPositionStateModeEvent:(MWMMyPositionMode)mode { self.currentPositionMode = mode; [MWMLocationManager setMyPositionMode:mode]; @@ -524,8 +521,6 @@ NSString *const kPP2BookmarkEditingSegue = @"PP2BookmarkEditing"; } } -#pragma mark - MWMRemoveAdsViewControllerDelegate - #pragma mark - MWMFrameworkDrapeObserver - (void)processViewportCountryEvent:(CountryId const &)countryId { diff --git a/iphone/Maps/Core/Theme/SearchStyleSheet.swift b/iphone/Maps/Core/Theme/SearchStyleSheet.swift index 553b244300..ab2fabe407 100644 --- a/iphone/Maps/Core/Theme/SearchStyleSheet.swift +++ b/iphone/Maps/Core/Theme/SearchStyleSheet.swift @@ -97,10 +97,6 @@ class SearchStyleSheet: IStyleSheet { s.textAlignment = .natural } - theme.add(styleName: "SearchCellAds", from: "TableCell") { (s) -> Void in - s.backgroundColor = colors.searchPromoBackground - } - theme.add(styleName: "SearchCellAvaliable", from: "TableCell") { (s) -> Void in s.backgroundColor = colors.transparentGreen } diff --git a/iphone/Maps/UI/PlacePage/Components/PlacePagePreviewViewController.swift b/iphone/Maps/UI/PlacePage/Components/PlacePagePreviewViewController.swift index b3d6e56e13..79b53da542 100644 --- a/iphone/Maps/UI/PlacePage/Components/PlacePagePreviewViewController.swift +++ b/iphone/Maps/UI/PlacePage/Components/PlacePagePreviewViewController.swift @@ -3,10 +3,6 @@ final class PlacePageDirectionView: UIView { @IBOutlet var label: UILabel! } -protocol PlacePagePreviewViewControllerDelegate: AnyObject { - func previewDidPressRemoveAds() -} - final class PlacePagePreviewViewController: UIViewController { @IBOutlet var stackView: UIStackView! @IBOutlet var popularView: UIView! @@ -48,8 +44,6 @@ final class PlacePagePreviewViewController: UIViewController { } } - weak var delegate: PlacePagePreviewViewControllerDelegate? - private var distance: String? = nil private var speedAndAltitude: String? = nil private var heading: CGFloat? = nil diff --git a/iphone/Maps/UI/PlacePage/PlacePageInteractor.swift b/iphone/Maps/UI/PlacePage/PlacePageInteractor.swift index d4510849e2..22c75979de 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageInteractor.swift +++ b/iphone/Maps/UI/PlacePage/PlacePageInteractor.swift @@ -22,14 +22,6 @@ extension PlacePageInteractor: PlacePageInteractorProtocol { } } -// MARK: - PlacePagePreviewViewControllerDelegate - -extension PlacePageInteractor: PlacePagePreviewViewControllerDelegate { - func previewDidPressRemoveAds() { - MWMPlacePageManagerHelper.showRemoveAds() - } -} - // MARK: - PlacePageInfoViewControllerDelegate extension PlacePageInteractor: PlacePageInfoViewControllerDelegate { diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageCommonLayout.swift b/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageCommonLayout.swift index db4d738bb5..752bc3f49a 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageCommonLayout.swift +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageCommonLayout.swift @@ -34,7 +34,6 @@ class PlacePageCommonLayout: NSObject, IPlacePageLayout { lazy var previewViewController: PlacePagePreviewViewController = { let vc = storyboard.instantiateViewController(ofType: PlacePagePreviewViewController.self) vc.placePagePreviewData = placePageData.previewData - vc.delegate = interactor return vc } () diff --git a/iphone/Maps/UI/PlacePage/PlacePageManager/MWMPlacePageManagerHelper.h b/iphone/Maps/UI/PlacePage/PlacePageManager/MWMPlacePageManagerHelper.h index b8b5cf8a59..ed2248d302 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageManager/MWMPlacePageManagerHelper.h +++ b/iphone/Maps/UI/PlacePage/PlacePageManager/MWMPlacePageManagerHelper.h @@ -29,7 +29,6 @@ + (void)avoidDirty; + (void)avoidFerry; + (void)avoidToll; -+ (void)showRemoveAds; + (void)openElevationDifficultPopup:(PlacePageData *)data; @end diff --git a/iphone/Maps/UI/PlacePage/PlacePageManager/MWMPlacePageManagerHelper.mm b/iphone/Maps/UI/PlacePage/PlacePageManager/MWMPlacePageManagerHelper.mm index a8a3fa7c50..9b6db752ad 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageManager/MWMPlacePageManagerHelper.mm +++ b/iphone/Maps/UI/PlacePage/PlacePageManager/MWMPlacePageManagerHelper.mm @@ -36,7 +36,6 @@ - (void)avoidDirty; - (void)avoidFerry; - (void)avoidToll; -- (void)showRemoveAds; - (void)openElevationDifficultPopup:(PlacePageData *)data; @end @@ -148,10 +147,6 @@ [[MWMMapViewControlsManager manager].placePageManager avoidToll]; } -+ (void)showRemoveAds { - [[MWMMapViewControlsManager manager].placePageManager showRemoveAds]; -} - + (void)openElevationDifficultPopup:(PlacePageData *)data { [[MWMMapViewControlsManager manager].placePageManager openElevationDifficultPopup:data]; }