kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[iOS][bookmarks] Show description section for all categories.

Browse source
This commit is contained in:
Daria Volvenkova 2019-08-27 18:33:35 +03:00 • committed by Aleksey Belousov
parent beda15e0a3
commit 6278c26d31
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
iphone/Maps/Bookmarks/BookmarksVC.mm
View file

@ -82,6 +82,12 @@ using namespace std;
return [[MWMBookmarksManager sharedManager] isCategoryEditable:self.categoryId];
}
- (BOOL)hasInfo {
auto const &categoryData = GetFramework().GetBookmarkManager().GetCategoryData(_categoryId);
return !GetPreferredBookmarkStr(categoryData.m_description).empty() ||
!GetPreferredBookmarkStr(categoryData.m_annotation).empty();
}
- (InfoSection *)cachedInfoSection
{
if (self.infoSection == nil)
@ -105,9 +111,8 @@ using namespace std;
else
[self.defaultSections removeAllObjects];
if ([[MWMBookmarksManager sharedManager] isCategoryFromCatalog:self.categoryId]) {
if ([self hasInfo])
[self.defaultSections addObject:[self cachedInfoSection]];
}
MWMTrackIDCollection trackIds = [[MWMBookmarksManager sharedManager] trackIdsForCategory:self.categoryId];
if (trackIds.count > 0) {
@ -131,6 +136,9 @@ using namespace std;
else
[self.defaultSections removeAllObjects];
if ([self hasInfo])
[self.defaultSections addObject:[self cachedInfoSection]];
for (auto const &block : sortResults) {
if (!block.m_markIds.empty()) {
[self.defaultSections addObject:[[BookmarksSection alloc] initWithTitle:@(block.m_blockName.c_str())
@ -791,6 +799,9 @@ using namespace std;
didEndEditing:(MWMMarkGroupID)categoryId {
[self.navigationController popViewControllerAnimated:YES];
[self.delegate bookmarksVCdidUpdateCategory:self];
self.infoSection = nil;
self.defaultSections = nil;
[self refreshDefaultSections];
[self.tableView reloadData];
}