From 4f9919326355ede757bf236219b2c023999cf066 Mon Sep 17 00:00:00 2001 From: Daria Volvenkova Date: Fri, 23 Aug 2019 06:02:21 +0300 Subject: [PATCH] [bookmarks][iOS] Review fixes. --- iphone/Maps/Bookmarks/BookmarksSection.mm | 43 +++-- iphone/Maps/Bookmarks/BookmarksVC.h | 4 +- iphone/Maps/Bookmarks/BookmarksVC.mm | 167 +++++++++--------- .../BMCView/BMCViewController.swift | 4 +- iphone/Maps/Bookmarks/InfoSection.h | 6 +- iphone/Maps/Bookmarks/InfoSection.mm | 34 ++-- iphone/Maps/Bookmarks/TracksSection.mm | 39 ++-- iphone/Maps/Classes/CircleView.mm | 4 - .../Core/Bookmarks/MWMBookmarksManager.mm | 4 +- kml/types.hpp | 7 +- 10 files changed, 155 insertions(+), 157 deletions(-) diff --git a/iphone/Maps/Bookmarks/BookmarksSection.mm b/iphone/Maps/Bookmarks/BookmarksSection.mm index 93cbf12a0a..57468e688e 100644 --- a/iphone/Maps/Bookmarks/BookmarksSection.mm +++ b/iphone/Maps/Bookmarks/BookmarksSection.mm @@ -4,21 +4,20 @@ #import "MWMBookmarksManager.h" #import "MWMLocationHelpers.h" #import "MWMSearchManager.h" + #include "Framework.h" #include "geometry/distance_on_sphere.hpp" -NS_ASSUME_NONNULL_BEGIN - namespace { CGFloat const kPinDiameter = 22.0f; } // namespace -@interface BookmarksSection () { - NSString *m_title; - NSMutableArray *m_markIds; - BOOL m_isEditable; -} +@interface BookmarksSection () + +@property(copy, nonatomic, nullable) NSString *sectionTitle; +@property(strong, nonatomic) NSMutableArray *markIds; +@property(nonatomic) BOOL isEditable; @end @@ -29,27 +28,27 @@ CGFloat const kPinDiameter = 22.0f; isEditable:(BOOL)isEditable { self = [super init]; if (self) { - m_title = title; - m_markIds = markIds.mutableCopy; - m_isEditable = isEditable; + _sectionTitle = [title copy]; + _markIds = [markIds mutableCopy]; + _isEditable = isEditable; } return self; } -- (kml::MarkId)getMarkIdForRow:(NSInteger)row { - return static_cast(m_markIds[row].unsignedLongLongValue); +- (kml::MarkId)markIdForRow:(NSInteger)row { + return static_cast(self.markIds[row].unsignedLongLongValue); } - (NSInteger)numberOfRows { - return [m_markIds count]; + return [self.markIds count]; } - (nullable NSString *)title { - return m_title; + return self.sectionTitle; } - (BOOL)canEdit { - return m_isEditable; + return self.isEditable; } - (void)fillCell:(UITableViewCell *)cell @@ -82,13 +81,13 @@ CGFloat const kPinDiameter = 22.0f; reuseIdentifier:@"BookmarksVCBookmarkItemCell"]; } - auto const bmId = [self getMarkIdForRow:row]; + auto const bmId = [self markIdForRow:row]; auto const &bm = GetFramework().GetBookmarkManager(); Bookmark const *bookmark = bm.GetBookmark(bmId); cell.textLabel.text = @(bookmark->GetPreferredName().c_str()); cell.imageView.image = [CircleView createCircleImageWith:kPinDiameter andColor:[ColorPickerView getUIColor:bookmark->GetColor()] - andImageName:@(DebugPrint(bookmark->GetData().m_icon).c_str())]; + andImageName:@(ToString(bookmark->GetData().m_icon).c_str())]; CLLocation *lastLocation = [MWMLocationManager lastLocation]; @@ -97,7 +96,7 @@ CGFloat const kPinDiameter = 22.0f; } - (void)updateCell:(UITableViewCell *)cell forRow:(NSInteger)row withNewLocation:(CLLocation *)location { - auto const bmId = [self getMarkIdForRow:row]; + auto const bmId = [self markIdForRow:row]; auto const &bm = GetFramework().GetBookmarkManager(); Bookmark const *bookmark = bm.GetBookmark(bmId); if (!bookmark) @@ -106,7 +105,7 @@ CGFloat const kPinDiameter = 22.0f; } - (BOOL)didSelectRow:(NSInteger)row { - auto const bmId = [self getMarkIdForRow:row]; + auto const bmId = [self markIdForRow:row]; [Statistics logEvent:kStatEventName(kStatBookmarks, kStatShowOnMap)]; // Same as "Close". [MWMSearchManager manager].state = MWMSearchManagerStateHidden; @@ -115,11 +114,9 @@ CGFloat const kPinDiameter = 22.0f; } - (void)deleteRow:(NSInteger)row { - auto const bmId = [self getMarkIdForRow:row]; + auto const bmId = [self markIdForRow:row]; [[MWMBookmarksManager sharedManager] deleteBookmark:bmId]; - [m_markIds removeObjectAtIndex:row]; + [self.markIds removeObjectAtIndex:row]; } @end - -NS_ASSUME_NONNULL_END diff --git a/iphone/Maps/Bookmarks/BookmarksVC.h b/iphone/Maps/Bookmarks/BookmarksVC.h index be03b77e57..b3e2142aca 100644 --- a/iphone/Maps/Bookmarks/BookmarksVC.h +++ b/iphone/Maps/Bookmarks/BookmarksVC.h @@ -13,10 +13,8 @@ NS_ASSUME_NONNULL_BEGIN @end @interface BookmarksVC : MWMViewController -{ - MWMMarkGroupID m_categoryId; -} +@property (nonatomic) MWMMarkGroupID categoryId; @property (weak, nonatomic) id delegate; - (instancetype)initWithCategory:(MWMMarkGroupID)categoryId; diff --git a/iphone/Maps/Bookmarks/BookmarksVC.mm b/iphone/Maps/Bookmarks/BookmarksVC.mm index fa60a8c460..c8d97efb32 100644 --- a/iphone/Maps/Bookmarks/BookmarksVC.mm +++ b/iphone/Maps/Bookmarks/BookmarksVC.mm @@ -23,8 +23,6 @@ #include #include -NS_ASSUME_NONNULL_BEGIN - using namespace std; @interface BookmarksVC () { - NSMutableArray> *m_defaultSections; - NSMutableArray> *m_searchSections; -} + CategorySettingsViewControllerDelegate> + +@property(strong, nonatomic) NSMutableArray> *defaultSections; +@property(strong, nonatomic) NSMutableArray> *searchSections; +@property(strong, nonatomic) InfoSection *infoSection; @property(nonatomic) NSUInteger lastSearchId; @property(nonatomic) NSUInteger lastSortId; -@property(nonatomic) BOOL infoExpanded; - @property(weak, nonatomic) IBOutlet UIView *statusBarBackground; @property(weak, nonatomic) IBOutlet UISearchBar *searchBar; @property(weak, nonatomic) IBOutlet UIView *noResultsContainer; @@ -76,82 +73,91 @@ using namespace std; self = [super init]; if (self) { - m_categoryId = categoryId; + _categoryId = categoryId; } return self; } - (BOOL)isEditable { - return [[MWMBookmarksManager sharedManager] isCategoryEditable:m_categoryId]; + return [[MWMBookmarksManager sharedManager] isCategoryEditable:self.categoryId]; +} + +- (InfoSection *)cachedInfoSection +{ + if (self.infoSection == nil) + { + self.infoSection = [[InfoSection alloc] initWithCategoryId:self.categoryId + expanded:NO + observer:self]; + } + return self.infoSection; } - (NSMutableArray> *)currentSections { - if (m_searchSections != nil) - return m_searchSections; - return m_defaultSections; + if (self.searchSections != nil) + return self.searchSections; + return self.defaultSections; } - (void)setCategorySections { - if (m_defaultSections == nil) - m_defaultSections = [[NSMutableArray alloc] init]; + if (self.defaultSections == nil) + self.defaultSections = [[NSMutableArray alloc] init]; else - [m_defaultSections removeAllObjects]; + [self.defaultSections removeAllObjects]; - auto const &bm = GetFramework().GetBookmarkManager(); - if (bm.IsCategoryFromCatalog(m_categoryId)) { - [m_defaultSections addObject:[[InfoSection alloc] initWithCategoryId:m_categoryId - expanded:self.infoExpanded - observer:self]]; + if ([[MWMBookmarksManager sharedManager] isCategoryFromCatalog:self.categoryId]) { + [self.defaultSections addObject:[self cachedInfoSection]]; } - if (bm.GetTrackIds(m_categoryId).size() > 0) { - [m_defaultSections addObject:[[TracksSection alloc] - initWithTitle:L(@"tracks_title") - trackIds:[[MWMBookmarksManager sharedManager] trackIdsForCategory:m_categoryId] - isEditable:[self isEditable]]]; + MWMTrackIDCollection trackIds = [[MWMBookmarksManager sharedManager] trackIdsForCategory:self.categoryId]; + if (trackIds.count > 0) { + [self.defaultSections addObject:[[TracksSection alloc] + initWithTitle:L(@"tracks_title") + trackIds:trackIds + isEditable:[self isEditable]]]; } - if (bm.GetUserMarkIds(m_categoryId).size() > 0) { - [m_defaultSections addObject:[[BookmarksSection alloc] initWithTitle:L(@"bookmarks") - markIds:[[MWMBookmarksManager sharedManager] - bookmarkIdsForCategory:m_categoryId] - isEditable:[self isEditable]]]; + MWMMarkIDCollection markIds = [[MWMBookmarksManager sharedManager] bookmarkIdsForCategory:self.categoryId]; + if (markIds.count > 0) { + [self.defaultSections addObject:[[BookmarksSection alloc] initWithTitle:L(@"bookmarks") + markIds:markIds + isEditable:[self isEditable]]]; } } - (void)setSortedSections:(BookmarkManager::SortedBlocksCollection const &)sortResults { - if (m_defaultSections == nil) - m_defaultSections = [[NSMutableArray alloc] init]; + if (self.defaultSections == nil) + self.defaultSections = [[NSMutableArray alloc] init]; else - [m_defaultSections removeAllObjects]; + [self.defaultSections removeAllObjects]; for (auto const &block : sortResults) { if (!block.m_markIds.empty()) { - [m_defaultSections addObject:[[BookmarksSection alloc] initWithTitle:@(block.m_blockName.c_str()) - markIds:[BookmarksVC bookmarkIds:block.m_markIds] - isEditable:[self isEditable]]]; + [self.defaultSections addObject:[[BookmarksSection alloc] initWithTitle:@(block.m_blockName.c_str()) + markIds:[BookmarksVC bookmarkIds:block.m_markIds] + isEditable:[self isEditable]]]; } else if (!block.m_trackIds.empty()) { - [m_defaultSections addObject:[[TracksSection alloc] initWithTitle:@(block.m_blockName.c_str()) - trackIds:[BookmarksVC trackIds:block.m_trackIds] - isEditable:[self isEditable]]]; + [self.defaultSections addObject:[[TracksSection alloc] initWithTitle:@(block.m_blockName.c_str()) + trackIds:[BookmarksVC trackIds:block.m_trackIds] + isEditable:[self isEditable]]]; } } } -- (void)setSearchSections:(search::BookmarksSearchParams::Results const &)searchResults { - if (m_searchSections == nil) { - m_searchSections = [[NSMutableArray alloc] init]; +- (void)setSearchSection:(search::BookmarksSearchParams::Results const &)searchResults { + if (self.searchSections == nil) { + self.searchSections = [[NSMutableArray alloc] init]; } else { - [m_searchSections removeAllObjects]; + [self.searchSections removeAllObjects]; } - [m_searchSections addObject:[[BookmarksSection alloc] initWithTitle:nil - markIds:[BookmarksVC bookmarkIds:searchResults] - isEditable:[self isEditable]]]; + [self.searchSections addObject:[[BookmarksSection alloc] initWithTitle:nil + markIds:[BookmarksVC bookmarkIds:searchResults] + isEditable:[self isEditable]]]; } - (void)refreshDefaultSections { - if (m_defaultSections != nil) + if (self.defaultSections != nil) return; [self setCategorySections]; @@ -159,8 +165,8 @@ using namespace std; auto const &bm = GetFramework().GetBookmarkManager(); BookmarkManager::SortingType lastSortingType; - if (bm.GetLastSortingType(m_categoryId, lastSortingType)) { - auto const availableSortingTypes = [self getAvailableSortingTypes]; + if (bm.GetLastSortingType(self.categoryId, lastSortingType)) { + auto const availableSortingTypes = [self availableSortingTypes]; for (auto availableType : availableSortingTypes) { if (availableType == lastSortingType) { [self sort:lastSortingType]; @@ -171,7 +177,7 @@ using namespace std; } - (void)updateControlsVisibility { - if ([self isEditable] && [[MWMBookmarksManager sharedManager] isCategoryNotEmpty:m_categoryId]) { + if ([self isEditable] && [[MWMBookmarksManager sharedManager] isCategoryNotEmpty:self.categoryId]) { self.navigationItem.rightBarButtonItem = self.editButtonItem; self.sortItem.enabled = YES; } else { @@ -220,10 +226,10 @@ using namespace std; - (void)viewWillAppear:(BOOL)animated { [MWMLocationManager addObserver:self]; - bool searchAllowed = false; + BOOL searchAllowed = NO; if ([self isEditable]) { - if ([[MWMBookmarksManager sharedManager] isCategoryNotEmpty:m_categoryId]) - searchAllowed = true; + if ([[MWMBookmarksManager sharedManager] isCategoryNotEmpty:self.categoryId]) + searchAllowed = YES; self.myCategoryToolbar.hidden = NO; self.downloadedCategoryToolbar.hidden = YES; } else { @@ -236,7 +242,7 @@ using namespace std; [super viewWillAppear:animated]; auto const &bm = GetFramework().GetBookmarkManager(); - self.title = @(bm.GetCategoryName(m_categoryId).c_str()); + self.title = @(bm.GetCategoryName(self.categoryId).c_str()); } - (void)viewWillDisappear:(BOOL)animated { @@ -303,7 +309,7 @@ using namespace std; style:UIAlertActionStyleDestructive handler:^(UIAlertAction * _Nonnull action) { - [[MWMBookmarksManager sharedManager] deleteCategory:self->m_categoryId]; + [[MWMBookmarksManager sharedManager] deleteCategory:self.categoryId]; [self.delegate bookmarksVCdidDeleteCategory:self]; [Statistics logEvent:kStatBookmarksListItemMoreClick withParameters:@{kStatOption : kStatDelete}]; }]; @@ -329,26 +335,26 @@ using namespace std; auto storyboard = [UIStoryboard instance:MWMStoryboardCategorySettings]; auto settingsController = (CategorySettingsViewController *)[storyboard instantiateInitialViewController]; settingsController.delegate = self; - settingsController.category = [[MWMBookmarksManager sharedManager] categoryWithId:m_categoryId]; + settingsController.category = [[MWMBookmarksManager sharedManager] categoryWithId:self.categoryId]; [self.navigationController pushViewController:settingsController animated:YES]; } - (void)exportFile { [[MWMBookmarksManager sharedManager] addObserver:self]; - [[MWMBookmarksManager sharedManager] shareCategory:m_categoryId]; + [[MWMBookmarksManager sharedManager] shareCategory:self.categoryId]; } - (void)shareCategory { auto storyboard = [UIStoryboard instance:MWMStoryboardSharing]; auto shareController = (BookmarksSharingViewController *)[storyboard instantiateInitialViewController]; shareController.delegate = self; - shareController.category = [[MWMBookmarksManager sharedManager] categoryWithId:m_categoryId]; + shareController.category = [[MWMBookmarksManager sharedManager] categoryWithId:self.categoryId]; [self.navigationController pushViewController:shareController animated:YES]; } - (void)viewOnMap { [self.navigationController popToRootViewControllerAnimated:YES]; - GetFramework().ShowBookmarkCategory(m_categoryId); + GetFramework().ShowBookmarkCategory(self.categoryId); } - (IBAction)onSort:(UIBarButtonItem *)sender { @@ -356,14 +362,14 @@ using namespace std; message:nil preferredStyle:UIAlertControllerStyleActionSheet]; - auto const sortingTypes = [self getAvailableSortingTypes]; + auto const sortingTypes = [self availableSortingTypes]; for (auto type : sortingTypes) { - [actionSheet addAction:[UIAlertAction actionWithTitle:[BookmarksVC getLocalizedSortingType:type] + [actionSheet addAction:[UIAlertAction actionWithTitle:[BookmarksVC localizedSortingType:type] style:UIAlertActionStyleDefault handler:^(UIAlertAction *_Nonnull action) { auto &bm = GetFramework().GetBookmarkManager(); - bm.SetLastSortingType(self->m_categoryId, type); + bm.SetLastSortingType(self.categoryId, type); [self sort:type]; }]]; } @@ -384,17 +390,17 @@ using namespace std; }]; } -- (std::vector)getAvailableSortingTypes { +- (std::vector)availableSortingTypes { CLLocation *lastLocation = [MWMLocationManager lastLocation]; bool const hasMyPosition = lastLocation != nil; auto const &bm = GetFramework().GetBookmarkManager(); - auto const sortingTypes = bm.GetAvailableSortingTypes(m_categoryId, hasMyPosition); + auto const sortingTypes = bm.GetAvailableSortingTypes(self.categoryId, hasMyPosition); return sortingTypes; } - (void)sortDefault { auto &bm = GetFramework().GetBookmarkManager(); - bm.ResetLastSortingType(self->m_categoryId); + bm.ResetLastSortingType(self.categoryId); [self setCategorySections]; [self.tableView reloadData]; } @@ -416,7 +422,7 @@ using namespace std; auto &bm = GetFramework().GetBookmarkManager(); BookmarkManager::SortParams sortParams; - sortParams.m_groupId = m_categoryId; + sortParams.m_groupId = self.categoryId; sortParams.m_sortingType = type; sortParams.m_hasMyPosition = hasMyPosition; sortParams.m_myPosition = myPosition; @@ -462,7 +468,7 @@ using namespace std; [self showNoResultsView:NO]; [self showSpinner:NO]; - m_searchSections = nil; + self.searchSections = nil; [self refreshDefaultSections]; [self.tableView reloadData]; } @@ -526,7 +532,7 @@ using namespace std; } - (NSString *)categoryFileName { - return @(GetFramework().GetBookmarkManager().GetCategoryFileName(m_categoryId).c_str()); + return @(GetFramework().GetBookmarkManager().GetCategoryFileName(self.categoryId).c_str()); } - (UIStatusBarStyle)preferredStatusBarStyle { @@ -557,7 +563,7 @@ using namespace std; return collection.copy; } -+ (NSString *)getLocalizedSortingType:(BookmarkManager::SortingType)type { ++ (NSString *)localizedSortingType:(BookmarkManager::SortingType)type { switch (type) { case BookmarkManager::SortingType::ByTime: return L(@"sort_date"); @@ -607,7 +613,7 @@ using namespace std; search::BookmarksSearchParams searchParams; searchParams.m_query = searchText.UTF8String; - searchParams.m_groupId = m_categoryId; + searchParams.m_groupId = self.categoryId; auto const searchId = ++self.lastSearchId; __weak auto weakSelf = self; @@ -621,7 +627,7 @@ using namespace std; auto const &bm = GetFramework().GetBookmarkManager(); auto filteredResults = results; bm.FilterInvalidBookmarks(filteredResults); - [self setSearchSections:filteredResults]; + [self setSearchSection:filteredResults]; if (status == search::BookmarksSearchParams::Status::Cancelled) { [self showSpinner:NO]; @@ -693,9 +699,9 @@ using namespace std; if (editingStyle == UITableViewCellEditingStyleDelete) { [[self currentSections][indexPath.section] deleteRow:indexPath.row]; - // In the case of search sections editing reset cached default sections. - if (m_searchSections != nil) - m_defaultSections = nil; + // In the case of search section editing reset cached default sections. + if (self.searchSections != nil) + self.defaultSections = nil; [self updateControlsVisibility]; } @@ -708,7 +714,7 @@ using namespace std; } auto const &bm = GetFramework().GetBookmarkManager(); - if (bm.GetUserMarkIds(m_categoryId).size() + bm.GetTrackIds(m_categoryId).size() == 0) { + if (bm.GetUserMarkIds(self.categoryId).size() + bm.GetTrackIds(self.categoryId).size() == 0) { self.navigationItem.rightBarButtonItem = nil; [self setEditing:NO animated:YES]; } @@ -720,11 +726,10 @@ using namespace std; header.textLabel.font = [UIFont medium14]; } -#pragma mark - InfoSectionObserver +#pragma mark - InfoSectionDelegate -- (void)infoSectionUpdates:(void (^_Nullable)(void))updates expanded:(BOOL)expanded { +- (void)infoSectionUpdates:(void (^)(void))updates { [self.tableView update:updates]; - self.infoExpanded = expanded; } #pragma mark - MWMLocationObserver @@ -799,5 +804,3 @@ using namespace std; } @end - -NS_ASSUME_NONNULL_END diff --git a/iphone/Maps/Bookmarks/Categories/BMCView/BMCViewController.swift b/iphone/Maps/Bookmarks/Categories/BMCView/BMCViewController.swift index fc2241460a..e86c5bbdbc 100644 --- a/iphone/Maps/Bookmarks/Categories/BMCView/BMCViewController.swift +++ b/iphone/Maps/Bookmarks/Categories/BMCView/BMCViewController.swift @@ -375,11 +375,11 @@ extension BMCViewController: CategorySettingsViewControllerDelegate { } extension BMCViewController: BookmarksVCDelegate { - func bookmarksVCdidUpdateCategory(_ viewController: BookmarksVC!) { + func bookmarksVCdidUpdateCategory(_ viewController: BookmarksVC) { // for now we did necessary interface update in -viewWillAppear } - func bookmarksVCdidDeleteCategory(_ viewController: BookmarksVC!) { + func bookmarksVCdidDeleteCategory(_ viewController: BookmarksVC) { guard let parentVC = parent else { return } navigationController?.popToViewController(parentVC, animated: true) } diff --git a/iphone/Maps/Bookmarks/InfoSection.h b/iphone/Maps/Bookmarks/InfoSection.h index b659c1aead..3e0b02a33e 100644 --- a/iphone/Maps/Bookmarks/InfoSection.h +++ b/iphone/Maps/Bookmarks/InfoSection.h @@ -2,9 +2,9 @@ NS_ASSUME_NONNULL_BEGIN -@protocol InfoSectionObserver +@protocol InfoSectionDelegate -- (void)infoSectionUpdates:(void (^_Nullable)(void))updates expanded:(BOOL)expanded; +- (void)infoSectionUpdates:(void (^)(void))updates; @end @@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN - (instancetype)initWithCategoryId:(MWMMarkGroupID)categoryId expanded:(BOOL)expanded - observer:(id)observer; + observer:(id)observer; @end diff --git a/iphone/Maps/Bookmarks/InfoSection.mm b/iphone/Maps/Bookmarks/InfoSection.mm index 1ccf11ea1f..756fb0ce7b 100644 --- a/iphone/Maps/Bookmarks/InfoSection.mm +++ b/iphone/Maps/Bookmarks/InfoSection.mm @@ -1,25 +1,26 @@ #import "InfoSection.h" -#include "Framework.h" #import "MWMCategoryInfoCell.h" #import "SwiftBridge.h" +#include "Framework.h" + @interface InfoSection () { - kml::MarkGroupId m_categoryId; + kml::MarkGroupId _categoryId; } @property(nonatomic) BOOL infoExpanded; -@property(weak, nonatomic) id observer; - +@property(weak, nonatomic) id observer; +@property(strong, nonatomic) MWMCategoryInfoCell *infoCell; @end @implementation InfoSection - (instancetype)initWithCategoryId:(MWMMarkGroupID)categoryId expanded:(BOOL)expanded - observer:(id)observer { + observer:(id)observer { self = [super init]; if (self) { - m_categoryId = static_cast(categoryId); + _categoryId = categoryId; _infoExpanded = expanded; _observer = observer; } @@ -39,18 +40,20 @@ } - (UITableViewCell *)tableView:(UITableView *)tableView cellForRow:(NSInteger)row { + if (self.infoCell != nil) + return self.infoCell; + UITableViewCell *cell = [tableView dequeueReusableCellWithCellClass:MWMCategoryInfoCell.class]; CHECK(cell, ("Invalid category info cell.")); - auto &f = GetFramework(); - auto &bm = f.GetBookmarkManager(); - bool const categoryExists = bm.HasBmCategory(m_categoryId); + auto &bm = GetFramework().GetBookmarkManager(); + bool const categoryExists = bm.HasBmCategory(_categoryId); CHECK(categoryExists, ("Nonexistent category")); - auto infoCell = (MWMCategoryInfoCell *)cell; - auto const &categoryData = bm.GetCategoryData(m_categoryId); - [infoCell updateWithCategoryData:categoryData delegate:self]; - infoCell.expanded = _infoExpanded; + self.infoCell = (MWMCategoryInfoCell *)cell; + auto const &categoryData = bm.GetCategoryData(_categoryId); + [self.infoCell updateWithCategoryData:categoryData delegate:self]; + self.infoCell.expanded = self.infoExpanded; return cell; } @@ -62,14 +65,13 @@ - (void)deleteRow:(NSInteger)row { } -#pragma mark - InfoSectionObserver +#pragma mark - InfoSectionDelegate - (void)categoryInfoCellDidPressMore:(MWMCategoryInfoCell *)cell { _infoExpanded = YES; [self.observer infoSectionUpdates:^{ cell.expanded = YES; - } - expanded:_infoExpanded]; + }]; } @end diff --git a/iphone/Maps/Bookmarks/TracksSection.mm b/iphone/Maps/Bookmarks/TracksSection.mm index 5b6f9e651f..1128f43ff7 100644 --- a/iphone/Maps/Bookmarks/TracksSection.mm +++ b/iphone/Maps/Bookmarks/TracksSection.mm @@ -1,18 +1,17 @@ #import "TracksSection.h" #import "CircleView.h" -#include "Framework.h" -NS_ASSUME_NONNULL_BEGIN +#include "Framework.h" namespace { CGFloat const kPinDiameter = 22.0f; } // namespace -@interface TracksSection () { - NSString *m_title; - NSMutableArray *m_trackIds; - BOOL m_isEditable; -} +@interface TracksSection () + +@property(copy, nonatomic, nullable) NSString *sectionTitle; +@property(strong, nonatomic) NSMutableArray *trackIds; +@property(nonatomic) BOOL isEditable; @end @@ -23,27 +22,27 @@ CGFloat const kPinDiameter = 22.0f; isEditable:(BOOL)isEditable { self = [super init]; if (self) { - m_title = title; - m_trackIds = trackIds.mutableCopy; - m_isEditable = isEditable; + _sectionTitle = [title copy]; + _trackIds = [trackIds mutableCopy]; + _isEditable = isEditable; } return self; } -- (kml::TrackId)getTrackIdForRow:(NSInteger)row { - return static_cast(m_trackIds[row].unsignedLongLongValue); +- (kml::TrackId)trackIdForRow:(NSInteger)row { + return static_cast(self.trackIds[row].unsignedLongLongValue); } - (NSInteger)numberOfRows { - return [m_trackIds count]; + return [self.trackIds count]; } - (nullable NSString *)title { - return m_title; + return self.sectionTitle; } - (BOOL)canEdit { - return m_isEditable; + return self.isEditable; } - (UITableViewCell *)tableView:(UITableView *)tableView cellForRow:(NSInteger)row { @@ -54,7 +53,7 @@ CGFloat const kPinDiameter = 22.0f; auto const &bm = GetFramework().GetBookmarkManager(); - auto const trackId = [self getTrackIdForRow:row]; + auto const trackId = [self trackIdForRow:row]; Track const *track = bm.GetTrack(trackId); cell.textLabel.text = @(track->GetName().c_str()); string dist; @@ -72,18 +71,16 @@ CGFloat const kPinDiameter = 22.0f; } - (BOOL)didSelectRow:(NSInteger)row { - auto const trackId = [self getTrackIdForRow:row]; + auto const trackId = [self trackIdForRow:row]; GetFramework().ShowTrack(trackId); return YES; } - (void)deleteRow:(NSInteger)row { - auto const trackId = [self getTrackIdForRow:row]; + auto const trackId = [self trackIdForRow:row]; auto &bm = GetFramework().GetBookmarkManager(); bm.GetEditSession().DeleteTrack(trackId); - [m_trackIds removeObjectAtIndex:row]; + [self.trackIds removeObjectAtIndex:row]; } @end - -NS_ASSUME_NONNULL_END diff --git a/iphone/Maps/Classes/CircleView.mm b/iphone/Maps/Classes/CircleView.mm index 25dd451c53..ca9d1af37f 100644 --- a/iphone/Maps/Classes/CircleView.mm +++ b/iphone/Maps/Classes/CircleView.mm @@ -2,8 +2,6 @@ #import "CircleView.h" #import -NS_ASSUME_NONNULL_BEGIN - @interface CircleView() @property(nonatomic) UIColor *circleColor; @@ -78,5 +76,3 @@ NS_ASSUME_NONNULL_BEGIN } @end - -NS_ASSUME_NONNULL_END diff --git a/iphone/Maps/Core/Bookmarks/MWMBookmarksManager.mm b/iphone/Maps/Core/Bookmarks/MWMBookmarksManager.mm index 48f1d1c170..32089dda75 100644 --- a/iphone/Maps/Core/Bookmarks/MWMBookmarksManager.mm +++ b/iphone/Maps/Core/Bookmarks/MWMBookmarksManager.mm @@ -412,7 +412,7 @@ NSString * const CloudErrorToString(Cloud::SynchronizationResult result) NSMutableArray *collection = [[NSMutableArray alloc] initWithCapacity:bookmarkIds.size()]; for (auto bookmarkId : bookmarkIds) [collection addObject:@(bookmarkId)]; - return collection.copy; + return [collection copy]; } - (void)deleteBookmark:(MWMMarkID)bookmarkId @@ -431,7 +431,7 @@ NSString * const CloudErrorToString(Cloud::SynchronizationResult result) NSMutableArray *collection = [[NSMutableArray alloc] initWithCapacity:trackIds.size()]; for (auto trackId : trackIds) [collection addObject:@(trackId)]; - return collection.copy; + return [collection copy]; } #pragma mark - Category sharing diff --git a/kml/types.hpp b/kml/types.hpp index f55ea64eb2..e358950569 100644 --- a/kml/types.hpp +++ b/kml/types.hpp @@ -102,7 +102,7 @@ enum class BookmarkIcon : uint16_t Count }; -inline std::string DebugPrint(BookmarkIcon icon) +inline std::string ToString(BookmarkIcon icon) { switch (icon) { @@ -362,4 +362,9 @@ struct FileData // Tracks collection. std::vector m_tracksData; }; + +inline std::string DebugPrint(BookmarkIcon icon) +{ + return ToString(icon); +} } // namespace kml