From 751a2edab11e3dc14391ca455f551a5ac1c1851e Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Thu, 24 Mar 2016 15:20:36 +0300 Subject: [PATCH 1/2] [ios] Updated map downloader widget string. --- iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm b/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm index 026228c568..ecab016394 100644 --- a/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm +++ b/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm @@ -225,7 +225,7 @@ using namespace storage; - (void)showDownloading:(CGFloat)progress { self.nodeSize.textColor = [UIColor blackSecondaryText]; - self.nodeSize.text = [@(static_cast(progress * 100)).stringValue stringByAppendingString:@"%"]; + self.nodeSize.text = [NSString stringWithFormat:@"%@ %@%%", L(@"downloader_downloading"), @(static_cast(progress * 100))]; self.downloadButton.hidden = YES; self.progressWrapper.hidden = NO; self.progress.progress = progress; From 6d41010cf964ac72b39d348b3dadf011ce0ca257 Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Thu, 24 Mar 2016 15:21:04 +0300 Subject: [PATCH 2/2] [ios] Updated migration download first map string. --- iphone/Maps/Classes/Migration/MWMMigrationView.h | 1 + iphone/Maps/Classes/Migration/MWMMigrationView.mm | 2 +- .../Migration/MWMMigrationViewController.mm | 15 +++++++++++++-- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/iphone/Maps/Classes/Migration/MWMMigrationView.h b/iphone/Maps/Classes/Migration/MWMMigrationView.h index 1cbd23cd5b..7576ca0656 100644 --- a/iphone/Maps/Classes/Migration/MWMMigrationView.h +++ b/iphone/Maps/Classes/Migration/MWMMigrationView.h @@ -11,6 +11,7 @@ enum class MWMMigrationViewState @interface MWMMigrationView : UIView @property (nonatomic) MWMMigrationViewState state; +@property (copy, nonatomic) NSString * nodeLocalName; @property (weak, nonatomic) id delegate; - (void)setProgress:(CGFloat)progress; diff --git a/iphone/Maps/Classes/Migration/MWMMigrationView.mm b/iphone/Maps/Classes/Migration/MWMMigrationView.mm index 771c0ef8fb..dab27ec53b 100644 --- a/iphone/Maps/Classes/Migration/MWMMigrationView.mm +++ b/iphone/Maps/Classes/Migration/MWMMigrationView.mm @@ -118,7 +118,7 @@ break; case MWMMigrationViewState::Processing: self.info.hidden = NO; - self.info.text = L(@"migration_prefetch_status"); + self.info.text = [NSString stringWithFormat:@"%@ %@", L(@"downloader_downloading"), self.nodeLocalName]; [self startSpinner]; self.primaryButton.enabled = NO; self.primaryButton.hidden = YES; diff --git a/iphone/Maps/Classes/Migration/MWMMigrationViewController.mm b/iphone/Maps/Classes/Migration/MWMMigrationViewController.mm index d79438cfaa..cf2b869b50 100644 --- a/iphone/Maps/Classes/Migration/MWMMigrationViewController.mm +++ b/iphone/Maps/Classes/Migration/MWMMigrationViewController.mm @@ -139,8 +139,19 @@ using namespace storage; - (void)setState:(MWMMigrationViewState)state { - static_cast(self.view).state = state; - self.navigationItem.leftBarButtonItem.enabled = (state != MWMMigrationViewState::Processing); + MWMMigrationView * migrationView = static_cast(self.view); + if (state == MWMMigrationViewState::Processing) + { + NodeAttrs nodeAttrs; + GetFramework().Storage().GetPrefetchStorage()->GetNodeAttrs(m_countryId, nodeAttrs); + migrationView.nodeLocalName = @(nodeAttrs.m_nodeLocalName.c_str()); + self.navigationItem.leftBarButtonItem.enabled = NO; + } + else + { + self.navigationItem.leftBarButtonItem.enabled = YES; + } + migrationView.state = state; } #pragma mark - MWMCircularProgressProtocol