Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladiMihaylenko <vxmihaylenko@gmail.com>2016-02-08 15:28:52 +0300
committerSergey Yershov <yershov@corp.mail.ru>2016-03-23 16:16:57 +0300
commit773908413e52449f1d5d4b3eb6098dd891141653 (patch)
treea0dcf8e700d461d4feb434a892b8fa26d67dbd4d
parent4334d01b177b13c7aa77f7a9df6b9d8228d62bef (diff)
[ios] Rename refresh method to mwm_refreshUI.
-rw-r--r--iphone/Maps/Categories/UIKitCategories.h2
-rw-r--r--iphone/Maps/Categories/UIKitCategories.mm36
-rw-r--r--iphone/Maps/Classes/Components/MWMButton.mm4
-rw-r--r--iphone/Maps/Classes/Components/MWMStartButton.mm4
-rw-r--r--iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.mm2
-rw-r--r--iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.h2
-rw-r--r--iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.mm4
-rw-r--r--iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h2
-rw-r--r--iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm12
-rw-r--r--iphone/Maps/Classes/CustomViews/MapViewControls/Search/DownloadView/MWMSearchDownloadViewController.mm4
-rw-r--r--iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager.h2
-rw-r--r--iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager.mm8
-rw-r--r--iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchView.mm6
-rw-r--r--iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabbedView/MWMSearchTabbedViewController.mm4
-rw-r--r--iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchTableViewController.mm4
-rw-r--r--iphone/Maps/Classes/CustomViews/MapViewControls/ZoomButtons/MWMZoomButtons.h2
-rw-r--r--iphone/Maps/Classes/CustomViews/MapViewControls/ZoomButtons/MWMZoomButtons.mm4
-rw-r--r--iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.h2
-rw-r--r--iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm8
-rw-r--r--iphone/Maps/Classes/MWMPlacePageViewManager.h2
-rw-r--r--iphone/Maps/Classes/MWMPlacePageViewManager.mm6
-rw-r--r--iphone/Maps/Classes/MapViewController.mm6
-rw-r--r--iphone/Maps/Classes/MapsAppDelegate.mm6
-rw-r--r--iphone/Maps/MWMNightModeController.mm6
-rw-r--r--iphone/Maps/TableViewController.h2
-rw-r--r--iphone/Maps/TableViewController.mm8
-rw-r--r--iphone/Maps/ViewController.h2
-rw-r--r--iphone/Maps/ViewController.mm8
28 files changed, 79 insertions, 79 deletions
diff --git a/iphone/Maps/Categories/UIKitCategories.h b/iphone/Maps/Categories/UIKitCategories.h
index 27b2f82194..5c758b6c84 100644
--- a/iphone/Maps/Categories/UIKitCategories.h
+++ b/iphone/Maps/Categories/UIKitCategories.h
@@ -57,7 +57,7 @@ static inline CGFloat LengthCGPoint(CGPoint point)
@interface UIView (Refresh)
-- (void)refresh;
+- (void)mwm_refreshUI;
@end
diff --git a/iphone/Maps/Categories/UIKitCategories.mm b/iphone/Maps/Categories/UIKitCategories.mm
index 0cca579ba9..59e9da8001 100644
--- a/iphone/Maps/Categories/UIKitCategories.mm
+++ b/iphone/Maps/Categories/UIKitCategories.mm
@@ -167,7 +167,7 @@
@implementation UIView (Refresh)
-- (void)refresh
+- (void)mwm_refreshUI
{
UIColor * opposite = self.backgroundColor.opposite;
if (opposite)
@@ -175,8 +175,8 @@
for (UIView * v in self.subviews)
{
- if ([v respondsToSelector:@selector(refresh)])
- [v refresh];
+ if ([v respondsToSelector:@selector(mwm_refreshUI)])
+ [v mwm_refreshUI];
}
[self setNeedsDisplay];
}
@@ -185,17 +185,17 @@
@implementation UITableViewCell (Refresh)
-- (void)refresh
+- (void)mwm_refreshUI
{
- [super refresh];
- [self.selectedBackgroundView refresh];
+ [super mwm_refreshUI];
+ [self.selectedBackgroundView mwm_refreshUI];
}
@end
@implementation UINavigationBar (Refresh)
-- (void)refresh
+- (void)mwm_refreshUI
{
UIColor * oppositeTint = self.tintColor.opposite;
UIColor * oppositeBar = self.barTintColor.opposite;
@@ -209,9 +209,9 @@
@implementation UILabel (Refresh)
-- (void)refresh
+- (void)mwm_refreshUI
{
- [super refresh];
+ [super mwm_refreshUI];
UIColor * oppositeText = self.textColor.opposite;
if (oppositeText)
self.textColor = oppositeText;
@@ -221,7 +221,7 @@
@implementation UISlider (Refresh)
-- (void)refresh
+- (void)mwm_refreshUI
{
UIColor * opposite = self.minimumTrackTintColor.opposite;
if (opposite)
@@ -232,7 +232,7 @@
@implementation UISwitch (Refresh)
-- (void)refresh
+- (void)mwm_refreshUI
{
UIColor * opposite = self.onTintColor.opposite;
if (opposite)
@@ -243,7 +243,7 @@
@implementation UIButton (Refresh)
-- (void)refresh
+- (void)mwm_refreshUI
{
UIColor * oppositeNormal = [self titleColorForState:UIControlStateNormal].opposite;
UIColor * oppositeSelected = [self titleColorForState:UIControlStateSelected].opposite;
@@ -263,9 +263,9 @@
@implementation UITextView (Refresh)
-- (void)refresh
+- (void)mwm_refreshUI
{
- [super refresh];
+ [super mwm_refreshUI];
UIColor * oppositeText = self.textColor.opposite;
UIColor * oppositeTint = self.tintColor.opposite;
if (oppositeText)
@@ -278,9 +278,9 @@
@implementation UITextField (Refresh)
-- (void)refresh
+- (void)mwm_refreshUI
{
- [super refresh];
+ [super mwm_refreshUI];
UIColor * oppositeText = self.textColor.opposite;
UILabel * placeholder = [self valueForKey:@"_placeholderLabel"];
UIColor * oppositePlaceholder = placeholder.textColor.opposite;
@@ -294,9 +294,9 @@
@implementation UIImageView (Refresh)
-- (void)refresh
+- (void)mwm_refreshUI
{
- [super refresh];
+ [super mwm_refreshUI];
[self changeColoringToOpposite];
}
diff --git a/iphone/Maps/Classes/Components/MWMButton.mm b/iphone/Maps/Classes/Components/MWMButton.mm
index c71e65d396..79cc3079af 100644
--- a/iphone/Maps/Classes/Components/MWMButton.mm
+++ b/iphone/Maps/Classes/Components/MWMButton.mm
@@ -16,10 +16,10 @@ namespace
[self setDefaultImages];
}
-- (void)refresh
+- (void)mwm_refreshUI
{
[self changeColoringToOpposite];
- [super refresh];
+ [super mwm_refreshUI];
}
- (void)setColoring:(MWMButtonColoring)coloring
diff --git a/iphone/Maps/Classes/Components/MWMStartButton.mm b/iphone/Maps/Classes/Components/MWMStartButton.mm
index b49d3fc43f..190cd441a1 100644
--- a/iphone/Maps/Classes/Components/MWMStartButton.mm
+++ b/iphone/Maps/Classes/Components/MWMStartButton.mm
@@ -3,9 +3,9 @@
@implementation MWMStartButton
-- (void)refresh
+- (void)mwm_refreshUI
{
- [super refresh];
+ [super mwm_refreshUI];
[self setBackgroundImage:[UIImage imageWithColor:[UIColor linkBlue]] forState:UIControlStateNormal];
[self setBackgroundImage:[UIImage imageWithColor:[UIColor linkBlueDark]] forState:UIControlStateHighlighted];
}
diff --git a/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.mm b/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.mm
index 911edf07ac..365b1089ab 100644
--- a/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.mm
+++ b/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.mm
@@ -60,7 +60,7 @@ static inline CGFloat angleWithProgress(CGFloat progress)
[self setColor:clearColor forState:MWMCircularProgressStateCompleted];
}
-- (void)refresh
+- (void)mwm_refreshUI
{
[self setupColors];
}
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.h b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.h
index 29cb3356b9..f1b40d6a98 100644
--- a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.h
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.h
@@ -27,7 +27,7 @@
- (void)setGo;
- (void)refreshLayout;
-- (void)refresh;
+- (void)mwm_refreshUI;
- (void)onLocationStateModeChanged:(location::EMyPositionMode)state;
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.mm
index c2bf9add83..1ca06080b5 100644
--- a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.mm
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.mm
@@ -105,9 +105,9 @@ typedef NS_ENUM(NSUInteger, MWMBottomMenuViewCell)
[self refreshLayout];
}
-- (void)refresh
+- (void)mwm_refreshUI
{
- [self.view refresh];
+ [self.view mwm_refreshUI];
}
#pragma mark - Refresh Collection View layout
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h
index bab2bdc847..c08ec03a29 100644
--- a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h
@@ -22,7 +22,7 @@
#pragma mark - Layout
- (void)refreshLayout;
-- (void)refresh;
+- (void)mwm_refreshUI;
- (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation
duration:(NSTimeInterval)duration;
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm
index ae37cc98e1..09e54492cf 100644
--- a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm
@@ -81,13 +81,13 @@ extern NSString * const kAlohalyticsTapEventKey;
[self.menuController refreshLayout];
}
-- (void)refresh
+- (void)mwm_refreshUI
{
- [self.zoomButtons refresh];
- [self.navigationManager refresh];
- [self.searchManager refresh];
- [self.menuController refresh];
- [self.placePageManager refresh];
+ [self.zoomButtons mwm_refreshUI];
+ [self.navigationManager mwm_refreshUI];
+ [self.searchManager mwm_refreshUI];
+ [self.menuController mwm_refreshUI];
+ [self.placePageManager mwm_refreshUI];
}
- (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/DownloadView/MWMSearchDownloadViewController.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/DownloadView/MWMSearchDownloadViewController.mm
index 8d3df4530a..879c3fec51 100644
--- a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/DownloadView/MWMSearchDownloadViewController.mm
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/DownloadView/MWMSearchDownloadViewController.mm
@@ -30,9 +30,9 @@
[[MWMDownloadMapRequest alloc] initWithParentView:self.downloadRequestHolder delegate:self];
}
-- (void)refresh
+- (void)mwm_refreshUI
{
- [self.view refresh];
+ [self.view mwm_refreshUI];
}
- (void)viewDidAppear:(BOOL)animated
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager.h b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager.h
index edfcf84659..a47515718c 100644
--- a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager.h
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager.h
@@ -31,7 +31,7 @@ typedef NS_ENUM(NSUInteger, MWMSearchManagerState)
- (nullable instancetype)initWithParentView:(nonnull UIView *)view
delegate:(nonnull id<MWMSearchManagerProtocol, MWMSearchViewProtocol, MWMRoutingProtocol>)delegate;
-- (void)refresh;
+- (void)mwm_refreshUI;
#pragma mark - Layout
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager.mm
index 3e69ccbf85..652d6f61bc 100644
--- a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager.mm
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager.mm
@@ -59,13 +59,13 @@ extern NSString * const kSearchStateKey = @"SearchStateKey";
return self;
}
-- (void)refresh
+- (void)mwm_refreshUI
{
- [self.rootView refresh];
+ [self.rootView mwm_refreshUI];
if (self.state == MWMSearchManagerStateHidden)
return;
- [self.tabbedController refresh];
- [self.tableViewController refresh];
+ [self.tabbedController mwm_refreshUI];
+ [self.tableViewController mwm_refreshUI];
}
- (void)beginSearch
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchView.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchView.mm
index aa804d0a73..94b81b8759 100644
--- a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchView.mm
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchView.mm
@@ -32,10 +32,10 @@ static CGFloat const kWidthForiPad = 320.0;
sl.rasterizationScale = sbl.rasterizationScale = tbl.rasterizationScale = scale;
}
-- (void)refresh
+- (void)mwm_refreshUI
{
- [self.searchBar refresh];
- [self.infoWrapper refresh];
+ [self.searchBar mwm_refreshUI];
+ [self.infoWrapper mwm_refreshUI];
}
- (void)setFrame:(CGRect)frame
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabbedView/MWMSearchTabbedViewController.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabbedView/MWMSearchTabbedViewController.mm
index 4cf98c5f5c..60ca1ea8a2 100644
--- a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabbedView/MWMSearchTabbedViewController.mm
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabbedView/MWMSearchTabbedViewController.mm
@@ -56,9 +56,9 @@ BOOL isOffsetInButton(CGFloat offset, MWMSearchTabButtonsView * button)
[self resetSelectedTab];
}
-- (void)refresh
+- (void)mwm_refreshUI
{
- [self.view refresh];
+ [self.view mwm_refreshUI];
}
- (void)resetSelectedTab
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchTableViewController.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchTableViewController.mm
index 23264dc2a3..a4f345c4fd 100644
--- a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchTableViewController.mm
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchTableViewController.mm
@@ -76,9 +76,9 @@ LocationObserver>
[self setupTableView];
}
-- (void)refresh
+- (void)mwm_refreshUI
{
- [self.view refresh];
+ [self.view mwm_refreshUI];
}
- (void)setupTableView
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/ZoomButtons/MWMZoomButtons.h b/iphone/Maps/Classes/CustomViews/MapViewControls/ZoomButtons/MWMZoomButtons.h
index 4e3667ec93..b69fadf5a5 100644
--- a/iphone/Maps/Classes/CustomViews/MapViewControls/ZoomButtons/MWMZoomButtons.h
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/ZoomButtons/MWMZoomButtons.h
@@ -8,6 +8,6 @@
- (instancetype)initWithParentView:(UIView *)view;
- (void)setTopBound:(CGFloat)bound;
- (void)setBottomBound:(CGFloat)bound;
-- (void)refresh;
+- (void)mwm_refreshUI;
@end
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/ZoomButtons/MWMZoomButtons.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/ZoomButtons/MWMZoomButtons.mm
index b380888c9a..4d3fb86080 100644
--- a/iphone/Maps/Classes/CustomViews/MapViewControls/ZoomButtons/MWMZoomButtons.mm
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/ZoomButtons/MWMZoomButtons.mm
@@ -64,9 +64,9 @@ extern NSString * const kAlohalyticsTapEventKey;
GetFramework().Scale(Framework::SCALE_MIN, true);
}
-- (void)refresh
+- (void)mwm_refreshUI
{
- [self.zoomView refresh];
+ [self.zoomView mwm_refreshUI];
}
#pragma mark - Actions
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.h b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.h
index c2b59a56f7..d6a46e8ffd 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.h
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.h
@@ -50,6 +50,6 @@ typedef NS_ENUM(NSUInteger, MWMNavigationDashboardState)
- (void)showHelperPanels;
- (void)hideHelperPanels;
- (void)setupActualRoute;
-- (void)refresh;
+- (void)mwm_refreshUI;
@end
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm
index eb7be3dafa..be84ce0908 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm
@@ -374,11 +374,11 @@ extern NSString * const kTTSStatusWasChangedNotification;
[self.routePreview selectProgress:self.activeRouteTypeButton];
}
-- (void)refresh
+- (void)mwm_refreshUI
{
- [self.navigationDashboardLandscape refresh];
- [self.navigationDashboardPortrait refresh];
- [self.routePreview refresh];
+ [self.navigationDashboardLandscape mwm_refreshUI];
+ [self.navigationDashboardPortrait mwm_refreshUI];
+ [self.routePreview mwm_refreshUI];
}
#pragma mark - Properties
diff --git a/iphone/Maps/Classes/MWMPlacePageViewManager.h b/iphone/Maps/Classes/MWMPlacePageViewManager.h
index c9ed85c44b..d61e1103ac 100644
--- a/iphone/Maps/Classes/MWMPlacePageViewManager.h
+++ b/iphone/Maps/Classes/MWMPlacePageViewManager.h
@@ -18,7 +18,7 @@
- (void)showPlacePageWithUserMark:(unique_ptr<UserMarkCopy>)userMark;
- (void)reloadPlacePage;
- (void)refreshPlacePage;
-- (void)refresh;
+- (void)mwm_refreshUI;
- (BOOL)hasPlacePage;
- (void)dismissPlacePage;
- (void)hidePlacePage;
diff --git a/iphone/Maps/Classes/MWMPlacePageViewManager.mm b/iphone/Maps/Classes/MWMPlacePageViewManager.mm
index a9723bb256..66258da77b 100644
--- a/iphone/Maps/Classes/MWMPlacePageViewManager.mm
+++ b/iphone/Maps/Classes/MWMPlacePageViewManager.mm
@@ -157,10 +157,10 @@ typedef NS_ENUM(NSUInteger, MWMPlacePageManagerState)
[self updateDistance];
}
-- (void)refresh
+- (void)mwm_refreshUI
{
- [self.placePage.extendedPlacePageView refresh];
- [self.placePage.actionBar refresh];
+ [self.placePage.extendedPlacePageView mwm_refreshUI];
+ [self.placePage.actionBar mwm_refreshUI];
}
- (BOOL)hasPlacePage
diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm
index f3d3470d31..69bdf74479 100644
--- a/iphone/Maps/Classes/MapViewController.mm
+++ b/iphone/Maps/Classes/MapViewController.mm
@@ -430,11 +430,11 @@ NSString * const kAuthorizationSegue = @"Map2AuthorizationSegue";
self.controlsManager = [[MWMMapViewControlsManager alloc] initWithParentController:self];
}
-- (void)refresh
+- (void)mwm_refreshUI
{
[MapsAppDelegate customizeAppearance];
- [self.navigationController.navigationBar refresh];
- [self.controlsManager refresh];
+ [self.navigationController.navigationBar mwm_refreshUI];
+ [self.controlsManager mwm_refreshUI];
}
- (void)showWhatsNewIfNeeded
diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm
index e9d19a0732..a2528a1a10 100644
--- a/iphone/Maps/Classes/MapsAppDelegate.mm
+++ b/iphone/Maps/Classes/MapsAppDelegate.mm
@@ -303,7 +303,7 @@ using namespace osm_auth_ios;
return;
f.SetMapStyle(MapStyleClear);
[UIColor setNightMode:NO];
- [static_cast<ViewController *>(app.mapViewController.navigationController.topViewController) refresh];
+ [static_cast<ViewController *>(app.mapViewController.navigationController.topViewController) mwm_refreshUI];
[app stopMapStyleChecker];
}
@@ -328,7 +328,7 @@ using namespace osm_auth_ios;
{
f.SetMapStyle(MapStyleClear);
[UIColor setNightMode:NO];
- [vc refresh];
+ [vc mwm_refreshUI];
}
break;
case DayTimeType::Night:
@@ -337,7 +337,7 @@ using namespace osm_auth_ios;
{
f.SetMapStyle(MapStyleDark);
[UIColor setNightMode:YES];
- [vc refresh];
+ [vc mwm_refreshUI];
}
break;
}
diff --git a/iphone/Maps/MWMNightModeController.mm b/iphone/Maps/MWMNightModeController.mm
index 9a23d45bc7..a0fdc8d8e8 100644
--- a/iphone/Maps/MWMNightModeController.mm
+++ b/iphone/Maps/MWMNightModeController.mm
@@ -61,7 +61,7 @@
return;
f.SetMapStyle(MapStyleDark);
[UIColor setNightMode:YES];
- [self refresh];
+ [self mwm_refreshUI];
statValue = kStatOn;
}
else if ([cell isEqual:self.off])
@@ -71,7 +71,7 @@
return;
f.SetMapStyle(MapStyleClear);
[UIColor setNightMode:NO];
- [self refresh];
+ [self mwm_refreshUI];
statValue = kStatOff;
}
else if ([cell isEqual:self.autoSwitch])
@@ -82,7 +82,7 @@
return;
[UIColor setNightMode:NO];
f.SetMapStyle(MapStyleClear);
- [self refresh];
+ [self mwm_refreshUI];
statValue = kStatValue;
}
diff --git a/iphone/Maps/TableViewController.h b/iphone/Maps/TableViewController.h
index 3088e55e47..da12987fbc 100644
--- a/iphone/Maps/TableViewController.h
+++ b/iphone/Maps/TableViewController.h
@@ -2,6 +2,6 @@
@interface TableViewController : UITableViewController
-- (void)refresh;
+- (void)mwm_refreshUI;
@end
diff --git a/iphone/Maps/TableViewController.mm b/iphone/Maps/TableViewController.mm
index af03126e01..a801b8173e 100644
--- a/iphone/Maps/TableViewController.mm
+++ b/iphone/Maps/TableViewController.mm
@@ -13,16 +13,16 @@
return NO;
}
-- (void)refresh
+- (void)mwm_refreshUI
{
- [self.navigationController.navigationBar refresh];
+ [self.navigationController.navigationBar mwm_refreshUI];
MapViewController * mapViewController = [MapsAppDelegate theApp].mapViewController;
for (UIViewController * vc in self.navigationController.viewControllers.reverseObjectEnumerator)
{
if (![vc isEqual:mapViewController])
- [vc.view refresh];
+ [vc.view mwm_refreshUI];
}
- [mapViewController refresh];
+ [mapViewController mwm_refreshUI];
}
- (void)viewDidLoad
diff --git a/iphone/Maps/ViewController.h b/iphone/Maps/ViewController.h
index 9c10e3dff9..a5e8d82318 100644
--- a/iphone/Maps/ViewController.h
+++ b/iphone/Maps/ViewController.h
@@ -1,6 +1,6 @@
@interface ViewController : UIViewController
-- (void)refresh;
+- (void)mwm_refreshUI;
- (void)showAlert:(NSString *)alert withButtonTitle:(NSString *)buttonTitle;
@end
diff --git a/iphone/Maps/ViewController.mm b/iphone/Maps/ViewController.mm
index a14c6c9cab..6a71c20ddd 100644
--- a/iphone/Maps/ViewController.mm
+++ b/iphone/Maps/ViewController.mm
@@ -11,12 +11,12 @@
return NO;
}
-- (void)refresh
+- (void)mwm_refreshUI
{
- [self.navigationController.navigationBar refresh];
- [self.view refresh];
+ [self.navigationController.navigationBar mwm_refreshUI];
+ [self.view mwm_refreshUI];
if (![self isKindOfClass:[MapViewController class]])
- [[MapsAppDelegate theApp].mapViewController refresh];
+ [[MapsAppDelegate theApp].mapViewController mwm_refreshUI];
}
- (void)viewDidLoad