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

[ios] Code cleanup.

Browse source
This commit is contained in:
Ilya Grechuhin 2016-03-04 15:45:01 +03:00 • committed by Sergey Yershov
parent ee3ed9149f
commit 09473177b0
2 changed files with 11 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
iphone/Maps/Classes/CustomViews/DownloadMapRequest/MWMDownloadMapRequest.mm
View file

@ -20,7 +20,7 @@
@property (nonatomic) IBOutlet UIButton * downloadMapButton;
@property (nonatomic) IBOutlet UIView * progressViewWrapper;
@property (nonatomic) MWMCircularProgress * progressView;
@property (nonatomic) MWMCircularProgress * progress;
@property (copy, nonatomic) NSString * mapAndRouteSize;
@ -93,12 +93,12 @@
- (void)downloadProgress:(CGFloat)progress
{
[self showRequest];
self.progressView.progress = progress;
self.progress.progress = progress;
}
- (void)setDownloadFailed
{
self.progressView.state = MWMCircularProgressStateFailed;
self.progress.state = MWMCircularProgressStateFailed;
}
#pragma mark - MWMCircularProgressDelegate
@ -115,7 +115,7 @@
kStatScenario : kStatDownload
}];
[MWMStorage retryDownloadNode:m_countryId];
self.progressView.state = MWMCircularProgressStateSpinner;
self.progress.state = MWMCircularProgressStateSpinner;
}
else
{
@ -140,7 +140,7 @@
[MWMStorage downloadNode:m_countryId alertController:self.delegate.alertController onSuccess:^
{
[self showRequest];
self.progressView.state = MWMCircularProgressStateSpinner;
self.progress.state = MWMCircularProgressStateSpinner;
}];
}
@ -156,20 +156,14 @@
[self.delegate stateUpdated:state];
}
- (MWMCircularProgress *)progressView
- (MWMCircularProgress *)progress
{
if (!_progressView)
if (!_progress)
{
_progressView = [[MWMCircularProgress alloc] initWithParentView:self.progressViewWrapper];
_progressView.delegate = self;
[_progressView setImage:[UIImage imageNamed:@"ic_download"] forState:MWMCircularProgressStateNormal];
[_progressView setImage:[UIImage imageNamed:@"ic_download"] forState:MWMCircularProgressStateSelected];
[_progressView setImage:[UIImage imageNamed:@"ic_close_spinner"] forState:MWMCircularProgressStateProgress];
[_progressView setImage:[UIImage imageNamed:@"ic_close_spinner"] forState:MWMCircularProgressStateSpinner];
[_progressView setImage:[UIImage imageNamed:@"ic_download_error"] forState:MWMCircularProgressStateFailed];
[_progressView setImage:[UIImage imageNamed:@"ic_check"] forState:MWMCircularProgressStateCompleted];
_progress = [MWMCircularProgress downloaderProgressForParentView:self.progressViewWrapper];
_progress.delegate = self;
}
return _progressView;
return _progress;
}
@end

8
iphone/Maps/Classes/Migration/MWMMigrationView.mm
View file

@ -69,14 +69,8 @@
- (void)startSpinner
{
self.spinnerView.hidden = NO;
self.spinner = [[MWMCircularProgress alloc] initWithParentView:self.spinnerView];
self.spinner = [MWMCircularProgress downloaderProgressForParentView:self.spinnerView];
self.spinner.delegate = self.delegate;
[self.spinner setImage:[UIImage imageNamed:@"ic_download"] forState:MWMCircularProgressStateNormal];
[self.spinner setImage:[UIImage imageNamed:@"ic_download"] forState:MWMCircularProgressStateSelected];
[self.spinner setImage:[UIImage imageNamed:@"ic_close_spinner"] forState:MWMCircularProgressStateProgress];
[self.spinner setImage:[UIImage imageNamed:@"ic_close_spinner"] forState:MWMCircularProgressStateSpinner];
[self.spinner setImage:[UIImage imageNamed:@"ic_download_error"] forState:MWMCircularProgressStateFailed];
[self.spinner setImage:[UIImage imageNamed:@"ic_check"] forState:MWMCircularProgressStateCompleted];
[self.spinner setInvertColor:YES];
self.spinner.state = MWMCircularProgressStateSpinner;
}