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:
authorv.mikhaylenko <v.mikhaylenko@corp.mail.ru>2015-09-04 16:25:06 +0300
committerAlex Zolotarev <alex@maps.me>2015-09-23 03:03:48 +0300
commit98a51d6c07614eb6bc35c94a2bf87ea8ca9f8916 (patch)
treee9cf3eaa347d2d14b5975b94bf3e08aca3b5025e /iphone/Maps/Classes/CustomAlert
parent747cdb28dc393b779958eb5d5a16db149164742b (diff)
[ios] Replace all animation duration to default.
Diffstat (limited to 'iphone/Maps/Classes/CustomAlert')
-rw-r--r--iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm4
-rw-r--r--iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.mm4
-rw-r--r--iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloaderDialogHeader.mm3
3 files changed, 6 insertions, 5 deletions
diff --git a/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm b/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm
index 9334163968..8aed09fa94 100644
--- a/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm
+++ b/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm
@@ -129,7 +129,7 @@ static NSString * const kAlertControllerNibIdentifier = @"MWMAlertViewController
CGFloat const scale = 1.1;
alert.transform = CGAffineTransformMakeScale(scale, scale);
}
- [UIView animateWithDuration:.15 animations:^
+ [UIView animateWithDuration:kDefaultAnimationDuration animations:^
{
self.view.alpha = 1.;
alert.alpha = 1.;
@@ -141,7 +141,7 @@ static NSString * const kAlertControllerNibIdentifier = @"MWMAlertViewController
- (void)closeAlertWithCompletion:(nullable CloseAlertCompletion)completion
{
MWMAlert * alert = self.view.subviews.firstObject;
- [UIView animateWithDuration:.15 animations:^
+ [UIView animateWithDuration:kDefaultAnimationDuration animations:^
{
alert.alpha = 0.;
self.view.alpha = 0.;
diff --git a/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.mm b/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.mm
index ee95d889b4..de66c24575 100644
--- a/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.mm
+++ b/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.mm
@@ -218,7 +218,7 @@ static NSString * const kStatisticsEvent = @"Map download Alert";
}];
[self.dialogsTableView beginUpdates];
[self.dialogsTableView endUpdates];
- [UIView animateWithDuration:0.05 animations:^
+ [UIView animateWithDuration:.05 animations:^
{
[self layoutSubviews];
}];
@@ -239,7 +239,7 @@ static NSString * const kStatisticsEvent = @"Map download Alert";
}
completion:^(BOOL finished)
{
- [UIView animateWithDuration:.3 animations:^{
+ [UIView animateWithDuration:kDefaultAnimationDuration animations:^{
[self.dialogsTableView beginUpdates];
[self.dialogsTableView.visibleCells enumerateObjectsUsingBlock:^(MWMDownloaderDialogCell * obj, NSUInteger idx, BOOL *stop)
{
diff --git a/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloaderDialogHeader.mm b/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloaderDialogHeader.mm
index a29b4a5d84..b01f6672ec 100644
--- a/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloaderDialogHeader.mm
+++ b/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloaderDialogHeader.mm
@@ -6,6 +6,7 @@
// Copyright (c) 2015 MapsWithMe. All rights reserved.
//
+#import "Common.h"
#import "MWMDownloaderDialogHeader.h"
#import "MWMDownloadTransitMapAlert.h"
@@ -38,7 +39,7 @@ static NSString * const kDownloaderDialogHeaderNibName = @"MWMDownloaderDialogHe
BOOL const currentState = sender.selected;
sender.selected = !currentState;
self.dividerView.hidden = currentState;
- [UIView animateWithDuration:.15 animations:^
+ [UIView animateWithDuration:kDefaultAnimationDuration animations:^
{
self.expandImage.transform = sender.selected ? CGAffineTransformMakeRotation(M_PI) : CGAffineTransformIdentity;
}];