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

[new downloader][ios] Fixed build.

Browse source
This commit is contained in:
Ilya Grechuhin 2016-02-17 12:57:07 +03:00 • committed by Sergey Yershov
parent 4e1f349b7d
commit 46105c0a12
4 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuView.mm
View file

@ -311,7 +311,7 @@
{
auto & s = GetFramework().Storage();
storage::Storage::UpdateInfo updateInfo{};
s.GetUpdateInfo(s.GetRootId(), updateInfo);
s.GetUpdateInfo(updateInfo);
self.downloadBadge.hidden = (updateInfo.m_numberOfMwmFilesToUpdate == 0);
}

2
iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.mm
View file

@ -280,7 +280,7 @@ typedef NS_ENUM(NSUInteger, MWMBottomMenuViewCell)
{
auto & s = GetFramework().Storage();
storage::Storage::UpdateInfo updateInfo{};
s.GetUpdateInfo(s.GetRootId(), updateInfo);
s.GetUpdateInfo(updateInfo);
[cell configureWithImageName:@"ic_menu_download"
label:L(@"download_maps")
badgeCount:updateInfo.m_numberOfMwmFilesToUpdate];

7
iphone/Maps/Classes/MapDownloader/MWMMapDownloaderViewController.mm
View file

@ -59,9 +59,12 @@ using namespace storage;
self.showAllMapsView = NO;
auto const & s = GetFramework().Storage();
Storage::UpdateInfo updateInfo{};
if (!s.GetUpdateInfo(s.GetRootId(), updateInfo) || updateInfo.m_numberOfMwmFilesToUpdate == 0)
if (!s.GetUpdateInfo(updateInfo) || updateInfo.m_numberOfMwmFilesToUpdate == 0)
return;
self.allMapsLabel.text = [NSString stringWithFormat:@"%@: %@ (%@)", L(@"downloader_outdated_maps"), @(updateInfo.m_numberOfMwmFilesToUpdate), formattedSize(updateInfo.m_totalUpdateSizeInBytes)];
self.allMapsLabel.text =
[NSString stringWithFormat:@"%@: %@ (%@)", L(@"downloader_outdated_maps"),
@(updateInfo.m_numberOfMwmFilesToUpdate),
formattedSize(updateInfo.m_totalUpdateSizeInBytes)];
self.showAllMapsView = YES;
}

2
iphone/Maps/Classes/MapsAppDelegate.mm
View file

@ -794,7 +794,7 @@ using namespace osm_auth_ios;
{
auto & s = GetFramework().Storage();
storage::Storage::UpdateInfo updateInfo{};
s.GetUpdateInfo(s.GetRootId(), updateInfo);
s.GetUpdateInfo(updateInfo);
[UIApplication sharedApplication].applicationIconBadgeNumber = updateInfo.m_numberOfMwmFilesToUpdate;
}