From 3cbc0d94ffa8cd973750f47ebbe1d1de69ad9bd8 Mon Sep 17 00:00:00 2001 From: VladiMihaylenko Date: Thu, 21 Jan 2016 12:53:12 +0300 Subject: [PATCH] [ios] Review fixes. (night mode) --- iphone/Maps/Categories/UIKitCategories.mm | 10 +++------- .../BottomMenu/MWMBottomMenuCollectionViewCell.mm | 2 +- .../MapViewControls/BottomMenu/MWMBottomMenuView.mm | 2 -- .../MapViewControls/MWMMapViewControlsManager.mm | 2 +- .../CustomViews/MapViewControls/MWMPageController.mm | 2 -- iphone/Maps/Classes/MWMPlacePageViewManager.h | 4 ++-- iphone/Maps/Classes/MWMPlacePageViewManager.mm | 7 ++++++- 7 files changed, 13 insertions(+), 16 deletions(-) diff --git a/iphone/Maps/Categories/UIKitCategories.mm b/iphone/Maps/Categories/UIKitCategories.mm index 9c3f984475..a4a527be37 100644 --- a/iphone/Maps/Categories/UIKitCategories.mm +++ b/iphone/Maps/Categories/UIKitCategories.mm @@ -197,14 +197,10 @@ for (UIView * v in self.subviews) { // There is workaroung for iOS7 only. - if (isIOSVersionLessThan(8)) + if ([v isKindOfClass:NSClassFromString(@"UITableViewCellScrollView")]) { - if ([v isKindOfClass:NSClassFromString(@"UITableViewCellScrollView")]) - { - for (UIView * subview in v.subviews) - [subview refresh]; - } - continue; + for (UIView * subview in v.subviews) + [subview refresh]; } if ([v respondsToSelector:@selector(refresh)]) diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuCollectionViewCell.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuCollectionViewCell.mm index 3fed6e2213..d1163fcd09 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuCollectionViewCell.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuCollectionViewCell.mm @@ -48,7 +48,7 @@ - (void)setSelected:(BOOL)selected { -// There is don't need to do something after cell was selected. +// There is no need to do something after cell has been selected. } @end diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuView.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuView.mm index cdd868ed5d..b1a6c64ca9 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuView.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuView.mm @@ -269,8 +269,6 @@ name = @"ic_menu_left"; break; } - if (!name) - return; UIImage * image = [UIImage imageNamed:name]; if (isIOSVersionLessThan(8)) image = [image imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate]; diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm index 347d37f3c1..626e3037f0 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm @@ -112,7 +112,7 @@ extern NSString * const kAlohalyticsTapEventKey; - (void)refreshHelperPanels:(BOOL)isLandscape { - if (!self.placePageManager.placePage) + if (!self.placePageManager.hasPlacePage) return; if (isLandscape) [self.navigationManager hideHelperPanels]; diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMPageController.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMPageController.mm index 6c28fdc461..51a83569cf 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMPageController.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMPageController.mm @@ -217,9 +217,7 @@ NS_CLASS_AVAILABLE_IOS(8_0) @interface MWMPageControllerDataSourceImpl : NSObjec [coordinator animateAlongsideTransition:^(id _Nonnull context) { if (IPAD) - { self.view.center = {size.width / 2, size.height / 2 }; - } else self.view.origin = {}; } completion:^(id _Nonnull context) {}]; diff --git a/iphone/Maps/Classes/MWMPlacePageViewManager.h b/iphone/Maps/Classes/MWMPlacePageViewManager.h index f42b133ba6..901d66844d 100644 --- a/iphone/Maps/Classes/MWMPlacePageViewManager.h +++ b/iphone/Maps/Classes/MWMPlacePageViewManager.h @@ -1,13 +1,12 @@ #include "Framework.h" -@class MWMPlacePageEntity, MWMPlacePageNavigationBar, MWMPlacePage; +@class MWMPlacePageEntity, MWMPlacePageNavigationBar; @protocol MWMPlacePageViewManagerProtocol; @interface MWMPlacePageViewManager : NSObject @property (weak, nonatomic, readonly) UIViewController * ownerViewController; @property (nonatomic, readonly) MWMPlacePageEntity * entity; -@property (nonatomic, readonly) MWMPlacePage * placePage; @property (nonatomic) MWMPlacePageNavigationBar * iPhoneNavigationBar; @property (nonatomic) CGFloat topBound; @property (nonatomic) CGFloat leftBound; @@ -19,6 +18,7 @@ - (void)showPlacePageWithUserMark:(unique_ptr)userMark; - (void)refreshPlacePage; - (void)refresh; +- (BOOL)hasPlacePage; - (void)dismissPlacePage; - (void)hidePlacePage; - (void)buildRoute; diff --git a/iphone/Maps/Classes/MWMPlacePageViewManager.mm b/iphone/Maps/Classes/MWMPlacePageViewManager.mm index 4889daea37..c89af38d97 100644 --- a/iphone/Maps/Classes/MWMPlacePageViewManager.mm +++ b/iphone/Maps/Classes/MWMPlacePageViewManager.mm @@ -37,7 +37,7 @@ typedef NS_ENUM(NSUInteger, MWMPlacePageManagerState) @property (weak, nonatomic) UIViewController * ownerViewController; @property (nonatomic, readwrite) MWMPlacePageEntity * entity; -@property (nonatomic, readwrite) MWMPlacePage * placePage; +@property (nonatomic) MWMPlacePage * placePage; @property (nonatomic) MWMPlacePageManagerState state; @property (nonatomic) MWMDirectionView * directionView; @@ -149,6 +149,11 @@ typedef NS_ENUM(NSUInteger, MWMPlacePageManagerState) [self.placePage.actionBar refresh]; } +- (BOOL)hasPlacePage +{ + return self.placePage != nil; +} + - (void)setPlacePageForiPad { [self.placePage dismiss];