From d4014825249f95b9e1850cea1cea7ffffb32f801 Mon Sep 17 00:00:00 2001 From: Kiryl Kaveryn Date: Mon, 11 Mar 2024 13:43:54 +0400 Subject: [PATCH] [ios] implement 'userCategoriesCount' Signed-off-by: Kiryl Kaveryn --- iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.h | 1 + iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm | 4 ++++ .../Bookmarks/BookmarksList/BookmarksListInteractor.swift | 2 +- .../Category settings/CategorySettingsViewController.swift | 2 +- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.h b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.h index 1bf3728a18..b57358a9ff 100644 --- a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.h +++ b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.h @@ -92,6 +92,7 @@ NS_SWIFT_NAME(BookmarksManager) - (BOOL)areNotificationsEnabled; - (NSArray *)sortedUserCategories; +- (size_t)userCategoriesCount; - (MWMBookmarkGroup *)categoryWithId:(MWMMarkGroupID)groupId; - (MWMBookmarkGroup *)categoryForBookmarkId:(MWMMarkID)bookmarkId; - (MWMBookmarkGroup *)categoryForTrackId:(MWMTrackID)trackId; diff --git a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm index 293e8731a2..348113f337 100644 --- a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm +++ b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm @@ -641,6 +641,10 @@ static BookmarkManager::SortingType convertSortingTypeToCore(MWMBookmarksSorting return [[MWMBookmarkGroup alloc] initWithCategoryId:groupId bookmarksManager:self]; } +- (size_t)userCategoriesCount { + return self.bm.GetBmGroupsCount(); +} + - (void)updateBookmark:(MWMMarkID)bookmarkId setGroupId:(MWMMarkGroupID)groupId title:(NSString *)title diff --git a/iphone/Maps/Bookmarks/BookmarksList/BookmarksListInteractor.swift b/iphone/Maps/Bookmarks/BookmarksList/BookmarksListInteractor.swift index 3e0272db68..89417f159d 100644 --- a/iphone/Maps/Bookmarks/BookmarksList/BookmarksListInteractor.swift +++ b/iphone/Maps/Bookmarks/BookmarksList/BookmarksListInteractor.swift @@ -163,7 +163,7 @@ extension BookmarksListInteractor: IBookmarksListInteractor { } func canDeleteGroup() -> Bool { - bookmarksManager.sortedUserCategories().count > 1 + bookmarksManager.userCategoriesCount() > 1 } func exportFile(_ completion: @escaping (URL?, ExportFileStatus) -> Void) { diff --git a/iphone/Maps/Bookmarks/Categories/Category settings/CategorySettingsViewController.swift b/iphone/Maps/Bookmarks/Categories/Category settings/CategorySettingsViewController.swift index 55ba9358f2..7114c156b8 100644 --- a/iphone/Maps/Bookmarks/Categories/Category settings/CategorySettingsViewController.swift +++ b/iphone/Maps/Bookmarks/Categories/Category settings/CategorySettingsViewController.swift @@ -87,7 +87,7 @@ final class CategorySettingsViewController: MWMTableViewController { let cell = tableView.dequeueReusableCell(cell: MWMButtonCell.self, indexPath: indexPath) cell.configure(with: self, title: L("delete_list"), - enabled: BookmarksManager.shared().sortedUserCategories().count > 1) + enabled: BookmarksManager.shared().userCategoriesCount() > 1) return cell default: fatalError()