diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.h b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.h index 091cd85188..026b329f46 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.h +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.h @@ -22,10 +22,6 @@ typedef NS_ENUM(NSUInteger, MWMNavigationInfoViewState) { @property(nonatomic) CGFloat topBound; @property(nonatomic) CGFloat leftBound; -@property(nonatomic, readonly) CGFloat leftHeight; -@property(nonatomic, readonly) CGFloat rightHeight; -@property(nonatomic, readonly) CGFloat bottom; -@property(nonatomic, readonly) CGFloat left; @property(nonatomic, readonly) NavigationSearchState searchState; @property(nonatomic) MWMNavigationInfoViewState state; @property(weak, nonatomic) UIView * ownerView; diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.mm index 8b4174bdb2..ac6d12508a 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.mm +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.mm @@ -110,16 +110,6 @@ BOOL defaultOrientation(CGSize const & size) } } -- (CGFloat)leftHeight { return self.turnsView.maxY; } -- (CGFloat)rightHeight { return self.streetNameView.hidden ? 0 : self.streetNameView.maxY; } -- (CGFloat)bottom { return self.toastView.minY; } -- (CGFloat)left -{ - auto sv = self.superview; - BOOL const isLandscape = sv.width > sv.height; - return isLandscape ? self.searchMainButton.maxX : 0; -} - - (void)setMapSearch { [self setSearchState:NavigationSearchState::MinimizedSearch animated:YES]; } - (void)updateToastView { diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationView.h b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationView.h index d2a9503c87..4de53b4bc7 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationView.h +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationView.h @@ -4,7 +4,6 @@ @property (nonatomic) CGFloat topBound; @property (nonatomic) CGFloat leftBound; -@property (nonatomic, readonly) CGFloat visibleHeight; @property (nonatomic) CGFloat defaultHeight; @property (nonatomic, readonly) BOOL isVisible; @property (nonatomic) UIView * statusbarBackground; diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationView.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationView.mm index f5356104bc..305e1f2a98 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationView.mm +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationView.mm @@ -84,12 +84,4 @@ [self setNeedsLayout]; } -- (CGFloat)visibleHeight -{ - CGFloat height = self.contentView.height; - if ([self.statusbarBackground.superview isEqual:self]) - height += self.statusbarBackground.height; - return height; -} - @end diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 26cbbc394a..7b5ddf9f95 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -231,9 +231,6 @@ 34574A661E3B85F80061E839 /* ThemeManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34574A651E3B85F80061E839 /* ThemeManager.swift */; }; 34574A671E3B85F80061E839 /* ThemeManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34574A651E3B85F80061E839 /* ThemeManager.swift */; }; 34574A681E3B85F80061E839 /* ThemeManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34574A651E3B85F80061E839 /* ThemeManager.swift */; }; - 345D661D1F0665880069E925 /* MAPSME.plist in Resources */ = {isa = PBXBuildFile; fileRef = 8D1107310486CEB800E47090 /* MAPSME.plist */; }; - 345D661E1F0665890069E925 /* MAPSME.plist in Resources */ = {isa = PBXBuildFile; fileRef = 8D1107310486CEB800E47090 /* MAPSME.plist */; }; - 345D661F1F0665890069E925 /* MAPSME.plist in Resources */ = {isa = PBXBuildFile; fileRef = 8D1107310486CEB800E47090 /* MAPSME.plist */; }; 3462258E1DDC5DBA001E8752 /* MWMSearchNoResultsAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3462258D1DDC5DBA001E8752 /* MWMSearchNoResultsAlert.mm */; }; 3462258F1DDC5DBA001E8752 /* MWMSearchNoResultsAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3462258D1DDC5DBA001E8752 /* MWMSearchNoResultsAlert.mm */; }; 346225911DDC5FBA001E8752 /* MWMSearchNoResultsAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = 346225901DDC5FBA001E8752 /* MWMSearchNoResultsAlert.xib */; }; @@ -4724,7 +4721,6 @@ 349A13841DEC138C00C7DB60 /* MWMMobileInternetAlert.xib in Resources */, 34D3B04A1E389D05004100F9 /* MWMNoteCell.xib in Resources */, F6E2FDEE1E097BA00083EBEC /* MWMOpeningHoursAddClosedTableViewCell.xib in Resources */, - 345D661D1F0665880069E925 /* MAPSME.plist in Resources */, F6E2FDF41E097BA00083EBEC /* MWMOpeningHoursAddScheduleTableViewCell.xib in Resources */, F6E2FDFA1E097BA00083EBEC /* MWMOpeningHoursAllDayTableViewCell.xib in Resources */, F6E2FE751E097BA00083EBEC /* MWMOpeningHoursCell.xib in Resources */, @@ -4903,7 +4899,6 @@ F6E2FDEF1E097BA00083EBEC /* MWMOpeningHoursAddClosedTableViewCell.xib in Resources */, F6E2FDF51E097BA00083EBEC /* MWMOpeningHoursAddScheduleTableViewCell.xib in Resources */, F6E2FDFB1E097BA00083EBEC /* MWMOpeningHoursAllDayTableViewCell.xib in Resources */, - 345D661E1F0665890069E925 /* MAPSME.plist in Resources */, 342639361EA0E60A0025EB89 /* local_ads_symbols.txt in Resources */, 4554B6EC1E55F0EF0084017F /* drules_proto_vehicle_clear.bin in Resources */, F6E2FE761E097BA00083EBEC /* MWMOpeningHoursCell.xib in Resources */, @@ -5082,7 +5077,6 @@ F6E2FDF01E097BA00083EBEC /* MWMOpeningHoursAddClosedTableViewCell.xib in Resources */, F6E2FDF61E097BA00083EBEC /* MWMOpeningHoursAddScheduleTableViewCell.xib in Resources */, F6E2FDFC1E097BA00083EBEC /* MWMOpeningHoursAllDayTableViewCell.xib in Resources */, - 345D661F1F0665890069E925 /* MAPSME.plist in Resources */, 342639381EA0E60B0025EB89 /* local_ads_symbols.txt in Resources */, F6E2FE771E097BA00083EBEC /* MWMOpeningHoursCell.xib in Resources */, 4554B6ED1E55F0F00084017F /* drules_proto_vehicle_clear.bin in Resources */, diff --git a/iphone/Maps/UI/PlacePage/MWMPlacePageProtocol.h b/iphone/Maps/UI/PlacePage/MWMPlacePageProtocol.h index ddfc7199d7..3bab234dea 100644 --- a/iphone/Maps/UI/PlacePage/MWMPlacePageProtocol.h +++ b/iphone/Maps/UI/PlacePage/MWMPlacePageProtocol.h @@ -51,7 +51,5 @@ struct HotelFacility; - (void)show:(place_page::Info const &)info; - (void)close; - (void)mwm_refreshUI; -- (void)viewWillTransitionToSize:(CGSize)size - withTransitionCoordinator:(id)coordinator; @end