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:
authorIlya Grechuhin <i.grechuhin@gmail.com>2016-03-01 14:22:23 +0300
committerSergey Yershov <yershov@corp.mail.ru>2016-03-23 16:50:43 +0300
commit1d0ffa2b31d55be43219b88bda2f566cdb5959ca (patch)
treeb55fc9e478eca7e74d51e4aba9d591e8946247f0 /iphone/Maps/Classes/Widgets
parent6e58697a8b4ea98fa841b43d28c9163612ec0bda (diff)
[ios] Updated downloader UI.
Diffstat (limited to 'iphone/Maps/Classes/Widgets')
-rw-r--r--iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm12
1 files changed, 11 insertions, 1 deletions
diff --git a/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm b/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm
index 95f24f2746..da28556c89 100644
--- a/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm
+++ b/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm
@@ -6,6 +6,7 @@
#import "MWMFrameworkObservers.h"
#import "MWMMapDownloadDialog.h"
#import "MWMStorage.h"
+#import "UIColor+MapsMeColor.h"
#include "Framework.h"
@@ -66,6 +67,7 @@ using namespace storage;
if (!hideParent)
self.parentNode.text = @(nodeAttrs.m_parentInfo[0].m_localName.c_str());
self.node.text = @(nodeAttrs.m_nodeLocalName.c_str());
+ self.nodeSize.textColor = [UIColor blackSecondaryText];
self.nodeSize.text = formattedSize(nodeAttrs.m_mwmSize);
auto addSubview = ^
{
@@ -110,7 +112,6 @@ using namespace storage;
case NodeStatus::Undefined:
case NodeStatus::Error:
[self showError:nodeAttrs.m_error];
- removeSubview();
break;
case NodeStatus::OnDisk:
case NodeStatus::OnDiskOutOfDate:
@@ -121,6 +122,11 @@ using namespace storage;
- (void)showError:(NodeErrorCode)errorCode
{
+ if (errorCode == NodeErrorCode::NoError)
+ return;
+ self.nodeSize.textColor = [UIColor red];
+ self.nodeSize.text = L(@"country_status_download_failed");
+ self.progressView.state = MWMCircularProgressStateFailed;
MWMAlertViewController * avc = self.controller.alertController;
switch (errorCode)
{
@@ -149,6 +155,8 @@ using namespace storage;
- (void)showDownloading:(CGFloat)progress
{
+ self.nodeSize.textColor = [UIColor blackSecondaryText];
+ self.nodeSize.text = [@(static_cast<NSUInteger>(progress * 100)).stringValue stringByAppendingString:@"%"];
self.downloadButton.hidden = YES;
self.progressWrapper.hidden = NO;
self.progressView.progress = progress;
@@ -156,6 +164,8 @@ using namespace storage;
- (void)showInQueue
{
+ self.nodeSize.textColor = [UIColor blackSecondaryText];
+ self.nodeSize.text = L(@"downloader_queued");
self.downloadButton.hidden = YES;
self.progressWrapper.hidden = NO;
self.progressView.state = MWMCircularProgressStateSpinner;