From 6d9c7250fc74be6013a530c63b0ffb79c15b3ee7 Mon Sep 17 00:00:00 2001 From: Vladimir Byko-Ianko Date: Thu, 18 Feb 2016 15:52:09 +0300 Subject: [PATCH] [new downloader] iOS build fixes. --- .../MapDownloader/Cells/MWMMapDownloaderTableViewCell.mm | 5 +---- iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/iphone/Maps/Classes/MapDownloader/Cells/MWMMapDownloaderTableViewCell.mm b/iphone/Maps/Classes/MapDownloader/Cells/MWMMapDownloaderTableViewCell.mm index d6511cd1c1..cf884ab7dd 100644 --- a/iphone/Maps/Classes/MapDownloader/Cells/MWMMapDownloaderTableViewCell.mm +++ b/iphone/Maps/Classes/MapDownloader/Cells/MWMMapDownloaderTableViewCell.mm @@ -73,7 +73,7 @@ self.progressView.state = MWMCircularProgressStateNormal; break; case NodeStatus::Downloading: - self.progressView.progress = static_cast(nodeAttrs.m_downloadingProgress) / 100.0; + self.progressView.progress = static_cast(nodeAttrs.m_downloadingProgress.first) / 100.0; break; case NodeStatus::InQueue: self.progressView.state = MWMCircularProgressStateSpinner; @@ -88,8 +88,6 @@ case NodeStatus::OnDiskOutOfDate: self.progressView.state = MWMCircularProgressStateSelected; break; - case NodeStatus::Mixed: - break; } } @@ -144,7 +142,6 @@ [self.delegate cancelNode:m_countryId]; break; case NodeStatus::OnDisk: - case NodeStatus::Mixed: break; } } diff --git a/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm b/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm index 57dde80405..f02c48b388 100644 --- a/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm +++ b/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm @@ -98,7 +98,7 @@ using namespace storage; break; } case NodeStatus::Downloading: - [self showDownloading:static_cast(nodeAttrs.m_downloadingProgress) / 100.0]; + [self showDownloading:static_cast(nodeAttrs.m_downloadingProgress.first) / nodeAttrs.m_downloadingProgress.second]; addSubview(); break; case NodeStatus::InQueue: @@ -112,7 +112,6 @@ using namespace storage; break; case NodeStatus::OnDisk: case NodeStatus::OnDiskOutOfDate: - case NodeStatus::Mixed: removeSubview(); break; }