diff --git a/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePagePreviewData.h b/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePagePreviewData.h index bce6766ee4..d75b4fd11f 100644 --- a/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePagePreviewData.h +++ b/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePagePreviewData.h @@ -1,7 +1,6 @@ #import @class PlacePageScheduleData; -@class UgcSummaryRating; typedef NS_ENUM(NSInteger, PlacePageDataHotelType) { PlacePageDataHotelTypeHotel, diff --git a/iphone/Maps/Categories/UIColor+MapsMeColor.m b/iphone/Maps/Categories/UIColor+MapsMeColor.m index 22e7fff093..48b8fd0036 100644 --- a/iphone/Maps/Categories/UIColor+MapsMeColor.m +++ b/iphone/Maps/Categories/UIColor+MapsMeColor.m @@ -55,11 +55,6 @@ static NSDictionary *night; @"toastBackground" : [UIColor colorWithWhite:1. alpha:alpha87], @"statusBarBackground" : [UIColor colorWithWhite:1. alpha:alpha36], @"border" : [UIColor colorWithWhite:0. alpha:alpha04], - @"discountBackground" : [UIColor colorWithRed:scaled(240) green:scaled(100) blue:scaled(60) alpha:alpha100], - @"discountText" : [UIColor colorWithRed:scaled(60) green:scaled(64) blue:scaled(68) alpha:alpha100], - @"bookmarkSubscriptionBackground" : [UIColor colorWithRed:scaled(240) green:scaled(252) blue:scaled(255) alpha:alpha100], - @"bookmarkSubscriptionScrollBackground" : [UIColor colorWithRed:scaled(137) green:scaled(217) blue:scaled(255) alpha:alpha100], - @"bookmarkSubscriptionFooterBackground" : [UIColor colorWithRed:scaled(47) green:scaled(58) blue:scaled(73) alpha:alpha100], }; night = @{ @@ -109,11 +104,6 @@ static NSDictionary *night; @"toastBackground": [UIColor colorWithWhite:0. alpha:alpha87], @"statusBarBackground": [UIColor colorWithWhite:0. alpha:alpha32], @"border" : [UIColor colorWithWhite:1. alpha:alpha04], - @"discountBackground" : [UIColor colorWithRed:scaled(240) green:scaled(100) blue:scaled(60) alpha:alpha100], - @"discountText" : [UIColor colorWithRed:scaled(60) green:scaled(64) blue:scaled(68) alpha:alpha100], - @"bookmarkSubscriptionBackground" : [UIColor colorWithRed:scaled(60.) green:scaled(64.) blue:scaled(68.) alpha:alpha100], - @"bookmarkSubscriptionScrollBackground" : [UIColor colorWithRed:scaled(137) green:scaled(217) blue:scaled(255) alpha:alpha100], - @"bookmarkSubscriptionFooterBackground" : [UIColor colorWithRed:scaled(47) green:scaled(58) blue:scaled(73) alpha:alpha100], }; } diff --git a/iphone/Maps/Classes/Components/MWMViewController.h b/iphone/Maps/Classes/Components/MWMViewController.h index 18a0ad5c9b..186eed9ac3 100644 --- a/iphone/Maps/Classes/Components/MWMViewController.h +++ b/iphone/Maps/Classes/Components/MWMViewController.h @@ -1,7 +1,4 @@ #import "MWMController.h" @interface MWMViewController : UIViewController - -@property(nonatomic) IBInspectable NSString * localizedTitle; - @end diff --git a/iphone/Maps/Classes/Components/MWMViewController.m b/iphone/Maps/Classes/Components/MWMViewController.m index 17f8760316..b20e1a188f 100644 --- a/iphone/Maps/Classes/Components/MWMViewController.m +++ b/iphone/Maps/Classes/Components/MWMViewController.m @@ -12,16 +12,6 @@ @implementation MWMViewController -- (NSString *)localizedTitle -{ - return L(self.title); -} - -- (void)setLocalizedTitle:(NSString *)localizedTitle -{ - self.title = L(localizedTitle); -} - - (BOOL)prefersStatusBarHidden { return NO; diff --git a/iphone/Maps/Classes/Share/MWMShareActivityItem.h b/iphone/Maps/Classes/Share/MWMShareActivityItem.h index 13bb863b08..2a4e5a16a5 100644 --- a/iphone/Maps/Classes/Share/MWMShareActivityItem.h +++ b/iphone/Maps/Classes/Share/MWMShareActivityItem.h @@ -6,7 +6,6 @@ class LatLon; @protocol MWMPlacePageObject - (BOOL)isMyPosition; -- (BOOL)isBooking; - (NSString *)title; - (NSString *)subtitle; - (NSString *)address; diff --git a/iphone/Maps/Common/WebViewController.m b/iphone/Maps/Common/WebViewController.m index fd4bf7e1c4..d2572b78d6 100644 --- a/iphone/Maps/Common/WebViewController.m +++ b/iphone/Maps/Common/WebViewController.m @@ -59,7 +59,7 @@ self.webView = [[WKWebView alloc] initWithFrame:CGRectZero]; self.webView.backgroundColor = UIColor.clearColor; - self.webView.opaque = false; + self.webView.opaque = NO; self.webView.navigationDelegate = self; [view addSubview:self.webView]; diff --git a/iphone/Maps/Core/Theme/Colors.swift b/iphone/Maps/Core/Theme/Colors.swift index 1c1cc6d6c2..407d466897 100644 --- a/iphone/Maps/Core/Theme/Colors.swift +++ b/iphone/Maps/Core/Theme/Colors.swift @@ -37,11 +37,6 @@ class DayColors: IColors { var statusBarBackground = UIColor(255, 255, 255, alpha36) var searchPromoBackground = UIColor(249, 251, 231, alpha100) var border = UIColor(0, 0, 0, alpha04) - var discountBackground = UIColor(240, 100, 60, alpha100) - var discountText = UIColor(60, 64, 68, alpha100) - var bookmarkSubscriptionBackground = UIColor(240, 252, 255, alpha100) - var bookmarkSubscriptionScrollBackground = UIColor(137, 217, 255, alpha100) - var bookmarkSubscriptionFooterBackground = UIColor(47, 58, 73, alpha100) var bookingBackground = UIColor(25, 69, 125, alpha100) var opentableBackground = UIColor(218, 55, 67, alpha100) var transparentGreen = UIColor(233, 244, 233, alpha26) @@ -52,14 +47,6 @@ class DayColors: IColors { var ratingGreen = UIColor(67, 160, 71, alpha100) var facebookButtonBackground = UIColor(59, 89, 152, alpha100); var facebookButtonBackgroundDisabled = UIColor(59, 89, 152, alpha70); - var allPassSubscriptionTitle = UIColor(0, 0, 0, alpha100) - var allPassSubscriptionSubTitle = UIColor(0, 0, 0, alpha87) - var allPassSubscriptionDescription = UIColor(255, 255, 255, alpha100) - var allPassSubscriptionMonthlyBackground = UIColor(224, 224, 224, alpha80) - var allPassSubscriptionYearlyBackground = UIColor(30, 150, 240, alpha100) - var allPassSubscriptionMonthlyTitle = UIColor(255, 255, 255, alpha100) - var allPassSubscriptionDiscountBackground = UIColor(245, 210, 12, alpha100) - var allPassSubscriptionTermsTitle = UIColor(255, 255, 255, alpha70) var fadeBackground = UIColor(0, 0, 0, alpha80) var blackStatusBarBackground = UIColor(0, 0, 0, alpha80) var elevationPreviewTint = UIColor(193, 209, 224, alpha30) @@ -111,11 +98,6 @@ class NightColors: IColors { var statusBarBackground = UIColor(0, 0, 0, alpha32) var searchPromoBackground = UIColor(71, 75, 79, alpha100) var border = UIColor(255, 255, 255, alpha04) - var discountBackground = UIColor(240, 100, 60, alpha100) - var discountText = UIColor(60, 64, 68, alpha100) - var bookmarkSubscriptionBackground = UIColor(60, 64, 68, alpha100) - var bookmarkSubscriptionScrollBackground = UIColor(137, 217, 255, alpha100) - var bookmarkSubscriptionFooterBackground = UIColor(47, 58, 73, alpha100) var bookingBackground = UIColor(25, 69, 125, alpha100) var opentableBackground = UIColor(218, 55, 67, alpha100) var transparentGreen = UIColor(233, 244, 233, alpha26) @@ -126,14 +108,6 @@ class NightColors: IColors { var ratingGreen = UIColor(67, 160, 71, alpha100) var facebookButtonBackground = UIColor(59, 89, 152, alpha100); var facebookButtonBackgroundDisabled = UIColor(59, 89, 152, alpha70); - var allPassSubscriptionTitle = UIColor(0, 0, 0, alpha100) - var allPassSubscriptionSubTitle = UIColor(0, 0, 0, alpha87) - var allPassSubscriptionDescription = UIColor(255, 255, 255, alpha100) - var allPassSubscriptionMonthlyBackground = UIColor(224, 224, 224, alpha80) - var allPassSubscriptionYearlyBackground = UIColor(30, 150, 240, alpha100) - var allPassSubscriptionMonthlyTitle = UIColor(255, 255, 255, alpha100) - var allPassSubscriptionDiscountBackground = UIColor(245, 210, 12, alpha100) - var allPassSubscriptionTermsTitle = UIColor(255, 255, 255, alpha70) var fadeBackground = UIColor(0, 0, 0, alpha80) var blackStatusBarBackground = UIColor(0, 0, 0, alpha80) var elevationPreviewTint = UIColor(0, 0, 0, alpha54) diff --git a/iphone/Maps/Core/Theme/Components/IColors.swift b/iphone/Maps/Core/Theme/Components/IColors.swift index 75699334a8..0af99364c2 100644 --- a/iphone/Maps/Core/Theme/Components/IColors.swift +++ b/iphone/Maps/Core/Theme/Components/IColors.swift @@ -47,11 +47,6 @@ let alpha100: CGFloat = 1.0 var statusBarBackground: UIColor { get } var searchPromoBackground: UIColor { get } var border: UIColor { get } - var discountBackground: UIColor { get } - var discountText: UIColor { get } - var bookmarkSubscriptionBackground: UIColor { get } - var bookmarkSubscriptionScrollBackground: UIColor { get } - var bookmarkSubscriptionFooterBackground: UIColor { get } var bookingBackground: UIColor { get } var opentableBackground: UIColor { get } var transparentGreen: UIColor { get } @@ -62,14 +57,6 @@ let alpha100: CGFloat = 1.0 var ratingGreen: UIColor { get } var facebookButtonBackground: UIColor { get } var facebookButtonBackgroundDisabled: UIColor { get } - var allPassSubscriptionTitle: UIColor { get } - var allPassSubscriptionSubTitle: UIColor { get } - var allPassSubscriptionDescription: UIColor { get } - var allPassSubscriptionMonthlyBackground: UIColor { get } - var allPassSubscriptionYearlyBackground: UIColor { get } - var allPassSubscriptionMonthlyTitle: UIColor { get } - var allPassSubscriptionDiscountBackground: UIColor { get } - var allPassSubscriptionTermsTitle: UIColor { get } var fadeBackground: UIColor { get } var blackStatusBarBackground: UIColor { get } var elevationPreviewSelector: UIColor { get } diff --git a/iphone/Maps/Core/Theme/PlacePageStyleSheet.swift b/iphone/Maps/Core/Theme/PlacePageStyleSheet.swift index ad12606ecd..30f569ddff 100644 --- a/iphone/Maps/Core/Theme/PlacePageStyleSheet.swift +++ b/iphone/Maps/Core/Theme/PlacePageStyleSheet.swift @@ -1,10 +1,5 @@ class PlacePageStyleSheet: IStyleSheet { static func register(theme: Theme, colors: IColors, fonts: IFonts) { - theme.add(styleName: "PPReviewDiscountView") { (s) -> (Void) in - s.backgroundColor = colors.linkBlue - s.round = true - } - theme.add(styleName: "PPTitlePopularView") { (s) -> (Void) in s.backgroundColor = colors.linkBlueHighlighted s.cornerRadius = 10 diff --git a/iphone/Maps/UI/BottomMenu/TabBar/BottomTabBarInteractor.swift b/iphone/Maps/UI/BottomMenu/TabBar/BottomTabBarInteractor.swift index 8a1f76c730..2ee7230b05 100644 --- a/iphone/Maps/UI/BottomMenu/TabBar/BottomTabBarInteractor.swift +++ b/iphone/Maps/UI/BottomMenu/TabBar/BottomTabBarInteractor.swift @@ -11,16 +11,11 @@ class BottomTabBarInteractor { private weak var viewController: UIViewController? private weak var mapViewController: MapViewController? private weak var controlsManager: MWMMapViewControlsManager? - private weak var searchManager = MWMSearchManager.manager() private var isPoint2PointSelected = false - - - - init(viewController: UIViewController, - mapViewController: MapViewController, - controlsManager: MWMMapViewControlsManager) { + + init(viewController: UIViewController, mapViewController: MapViewController, controlsManager: MWMMapViewControlsManager) { self.viewController = viewController self.mapViewController = mapViewController self.controlsManager = controlsManager @@ -35,7 +30,7 @@ extension BottomTabBarInteractor: BottomTabBarInteractorProtocol { searchManager?.state = .hidden } } - + func openPoint2Point() { isPoint2PointSelected.toggle() MWMRouter.enableAutoAddLastLocation(false) diff --git a/iphone/Maps/UI/PlacePage/Components/ActionBarViewController.swift b/iphone/Maps/UI/PlacePage/Components/ActionBarViewController.swift index b5a1d768b3..35c8843e3f 100644 --- a/iphone/Maps/UI/PlacePage/Components/ActionBarViewController.swift +++ b/iphone/Maps/UI/PlacePage/Components/ActionBarViewController.swift @@ -104,15 +104,6 @@ class ActionBarViewController: UIViewController { if isRoutePlanning { buttons.append(.routeFrom) } -// if placePageData.previewData.isBookingPlace { -// buttons.append(.booking) -// } -// if placePageData.isPartner { -// buttons.append(.partner) -// } -// if placePageData.bookingSearchUrl != nil { -// buttons.append(.bookingSearch) -// } if placePageData.infoData?.phone != nil, AppInfo.shared().canMakeCalls { buttons.append(.call) } diff --git a/iphone/Maps/UI/PlacePage/Components/PlacePagePreviewViewController.swift b/iphone/Maps/UI/PlacePage/Components/PlacePagePreviewViewController.swift index 79b53da542..5c974087c9 100644 --- a/iphone/Maps/UI/PlacePage/Components/PlacePagePreviewViewController.swift +++ b/iphone/Maps/UI/PlacePage/Components/PlacePagePreviewViewController.swift @@ -20,10 +20,6 @@ final class PlacePagePreviewViewController: UIViewController { addReviewButton.setTitle("+ \(L("leave_a_review"))", for: .normal) } } - @IBOutlet var priceLabel: UILabel! - @IBOutlet var discountView: UIView! - @IBOutlet var discountLabel: UILabel! - @IBOutlet var ugcContainerView: UIStackView! @IBOutlet var addressLabel: UILabel! @IBOutlet var addressContainerView: UIStackView! @IBOutlet var scheduleContainerView: UIStackView! diff --git a/iphone/Maps/UI/Storyboard/Main.storyboard b/iphone/Maps/UI/Storyboard/Main.storyboard index 0d87cad03a..3c43224842 100644 --- a/iphone/Maps/UI/Storyboard/Main.storyboard +++ b/iphone/Maps/UI/Storyboard/Main.storyboard @@ -68,10 +68,6 @@ -