RedAuburn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[ios] Rename refresh method to mwm_refreshUI.

Browse source
This commit is contained in:
VladiMihaylenko 2016-02-08 15:28:52 +03:00 • committed by Sergey Yershov
parent 4334d01b17
commit 773908413e
28 changed files with 79 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
iphone/Maps/Categories/UIKitCategories.h
View file

@ -57,7 +57,7 @@ static inline CGFloat LengthCGPoint(CGPoint point)
@interface UIView (Refresh)
- (void)refresh;
- (void)mwm_refreshUI;
@end

36
iphone/Maps/Categories/UIKitCategories.mm
View file

@ -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];
}

4
iphone/Maps/Classes/Components/MWMButton.mm
View file

@ -16,10 +16,10 @@ namespace
[self setDefaultImages];
}
- (void)refresh
- (void)mwm_refreshUI
{
[self changeColoringToOpposite];
[super refresh];
[super mwm_refreshUI];
}
- (void)setColoring:(MWMButtonColoring)coloring

4
iphone/Maps/Classes/Components/MWMStartButton.mm
View file

@ -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];
}

2
iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.mm
View file

@ -60,7 +60,7 @@ static inline CGFloat angleWithProgress(CGFloat progress)
[self setColor:clearColor forState:MWMCircularProgressStateCompleted];
}
- (void)refresh
- (void)mwm_refreshUI
{
[self setupColors];
}

2
iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.h
View file

@ -27,7 +27,7 @@
- (void)setGo;
- (void)refreshLayout;
- (void)refresh;
- (void)mwm_refreshUI;
- (void)onLocationStateModeChanged:(location::EMyPositionMode)state;

4
iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.mm
View file

@ -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

2
iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h
View file

@ -22,7 +22,7 @@
#pragma mark - Layout
- (void)refreshLayout;
- (void)refresh;
- (void)mwm_refreshUI;
- (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation
duration:(NSTimeInterval)duration;

12
iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm
View file

@ -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

4
iphone/Maps/Classes/CustomViews/MapViewControls/Search/DownloadView/MWMSearchDownloadViewController.mm
View file

@ -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

2
iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager.h
View file

@ -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

8
iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager.mm
View file

@ -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

6
iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchView.mm
View file

@ -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

4
iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabbedView/MWMSearchTabbedViewController.mm
View file

@ -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

4
iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchTableViewController.mm
View file

@ -76,9 +76,9 @@ LocationObserver>
[self setupTableView];
}
- (void)refresh
- (void)mwm_refreshUI
{
[self.view refresh];
[self.view mwm_refreshUI];
}
- (void)setupTableView

2
iphone/Maps/Classes/CustomViews/MapViewControls/ZoomButtons/MWMZoomButtons.h
View file

@ -8,6 +8,6 @@
- (instancetype)initWithParentView:(UIView *)view;
- (void)setTopBound:(CGFloat)bound;
- (void)setBottomBound:(CGFloat)bound;
- (void)refresh;
- (void)mwm_refreshUI;
@end

4
iphone/Maps/Classes/CustomViews/MapViewControls/ZoomButtons/MWMZoomButtons.mm
View file

@ -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

2
iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.h
View file

@ -50,6 +50,6 @@ typedef NS_ENUM(NSUInteger, MWMNavigationDashboardState)
- (void)showHelperPanels;
- (void)hideHelperPanels;
- (void)setupActualRoute;
- (void)refresh;
- (void)mwm_refreshUI;
@end

8
iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm
View file

@ -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

2
iphone/Maps/Classes/MWMPlacePageViewManager.h
View file

@ -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;

6
iphone/Maps/Classes/MWMPlacePageViewManager.mm
View file

@ -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

6
iphone/Maps/Classes/MapViewController.mm
View file

@ -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

6
iphone/Maps/Classes/MapsAppDelegate.mm
View file

@ -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;
}

6
iphone/Maps/MWMNightModeController.mm
View file

@ -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;
}

2
iphone/Maps/TableViewController.h
View file

@ -2,6 +2,6 @@
@interface TableViewController : UITableViewController
- (void)refresh;
- (void)mwm_refreshUI;
@end

8
iphone/Maps/TableViewController.mm
View file

@ -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

2
iphone/Maps/ViewController.h
View file

@ -1,6 +1,6 @@
@interface ViewController : UIViewController
- (void)refresh;
- (void)mwm_refreshUI;
- (void)showAlert:(NSString *)alert withButtonTitle:(NSString *)buttonTitle;
@end

8
iphone/Maps/ViewController.mm
View file

@ -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