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

[ios] implement recovery for the recently deleted bookmarks

Browse source 
Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>
This commit is contained in:
Kiryl Kaveryn 2024-05-23 19:53:42 +04:00
parent 6a8b8e3f05
commit efb4889006
12 changed files with 90 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
iphone/Maps/Bookmarks/BookmarksList/BookmarksListInteractor.swift
View file

@ -121,14 +121,24 @@ extension BookmarksListInteractor: IBookmarksListInteractor {
return BookmarksListSortingType(bookmarksManager.lastSortingType(markGroupId))
}
func deleteBookmark(_ bookmarkId: MWMMarkID) {
func deleteBookmark(_ bookmarkId: MWMMarkID, completion: (Bookmark) -> Void) {
completion(bookmarksManager.bookmark(withId: bookmarkId))
bookmarksManager.deleteBookmark(bookmarkId)
}
func deleteTrack(_ trackId: MWMTrackID) {
func deleteTrack(_ trackId: MWMTrackID, completion: (Track) -> Void) {
completion(bookmarksManager.track(withId: trackId))
bookmarksManager.deleteTrack(trackId)
}
func recoverBookmark(_ bookmarkId: MWMMarkID) {
bookmarksManager.recoverBookmark(bookmarkId)
}
func recoverTrack(_ trackId: MWMTrackID) {
bookmarksManager.recoverTrack(trackId)
}
func moveBookmark(_ bookmarkId: MWMMarkID, toGroupId groupId: MWMMarkGroupID) {
bookmarksManager.moveBookmark(bookmarkId, toGroupId: groupId)
}
@ -183,4 +193,9 @@ extension BookmarksListInteractor: BookmarksObserver {
func onBookmarksCategoryDeleted(_ groupId: MWMMarkGroupID) {
reloadCategory()
}
func onBookmarksCategoryUpdated(_ groupId: MWMMarkGroupID) {
guard groupId == markGroupId else { return }
reloadCategory()
}
}

6
iphone/Maps/Bookmarks/BookmarksList/BookmarksListInterfaces.swift
View file

@ -110,8 +110,10 @@ protocol IBookmarksListInteractor {
completion: @escaping ([BookmarksSection]) -> Void)
func resetSort()
func lastSortingType() -> BookmarksListSortingType?
func deleteBookmark(_ bookmarkId: MWMMarkID)
func deleteTrack(_ trackId: MWMTrackID)
func deleteBookmark(_ bookmarkId: MWMMarkID, completion: (Bookmark) -> Void)
func deleteTrack(_ trackId: MWMTrackID, completion: (Track) -> Void)
func recoverBookmark(_ bookmarkId: MWMMarkID)
func recoverTrack(_ trackId: MWMTrackID)
func moveBookmark(_ bookmarkId: MWMMarkID, toGroupId: MWMMarkGroupID)
func moveTrack(_ trackId: MWMTrackID, toGroupId: MWMMarkGroupID)
func updateBookmark(_ bookmarkId: MWMMarkID, setGroupId groupId: MWMMarkGroupID, title: String, color: BookmarkColor, description: String)

18
iphone/Maps/Bookmarks/BookmarksList/BookmarksListPresenter.swift
View file

@ -273,11 +273,25 @@ extension BookmarksListPresenter: IBookmarksListPresenter {
switch section {
case let bookmarksSection as IBookmarksSectionViewModel:
guard let bookmark = bookmarksSection.bookmarks[index] as? BookmarkViewModel else { fatalError() }
interactor.deleteBookmark(bookmark.bookmarkId)
interactor.deleteBookmark(bookmark.bookmarkId) { bookmark in
// TODO: localize texts
Toast.undoToast(deletedObject: bookmark.bookmarkName,
undoAction: { [weak self, interactor] in
interactor.recoverBookmark(bookmark.bookmarkId)
self?.reload()
}).show()
}
reload()
case let tracksSection as ITracksSectionViewModel:
guard let track = tracksSection.tracks[index] as? TrackViewModel else { fatalError() }
interactor.deleteTrack(track.trackId)
interactor.deleteTrack(track.trackId) { track in
// TODO: localize texts
Toast.undoToast(deletedObject: track.trackName,
undoAction: { [weak self, interactor] in
interactor.recoverTrack(track.trackId)
self?.reload()
}).show()
}
reload()
default:
fatalError("Cannot delete item: unsupported section type: \(section.self)")

4
iphone/Maps/Bookmarks/Categories/BMCView/BMCViewController.swift
View file

@ -185,6 +185,10 @@ extension BMCViewController: BMCView {
}
}
}
func isVisible() -> Bool {
isViewLoaded && view.window != nil
}
}
extension BMCViewController: UITableViewDataSource {

5
iphone/Maps/Bookmarks/Categories/BMCViewModel/BMCDefaultViewModel.swift
View file

@ -3,6 +3,7 @@ protocol BMCView: AnyObject {
func delete(at indexPaths: [IndexPath])
func insert(at indexPaths: [IndexPath])
func conversionFinished(success: Bool)
func isVisible() -> Bool
}
final class BMCDefaultViewModel: NSObject {
@ -169,10 +170,12 @@ extension BMCDefaultViewModel: BookmarksObserver {
}
func onBookmarksCategoryDeleted(_ groupId: MWMMarkGroupID) {
guard let view, view.isVisible() else { return }
reloadData()
}
func onBookmarkDeleted(_: MWMMarkID) {
func onBookmarksCategoryUpdated(_ groupId: MWMMarkGroupID) {
guard let view, view.isVisible() else { return }
reloadData()
}
}

4
iphone/Maps/UI/EditBookmark/EditBookmarkViewController.swift
View file

@ -235,6 +235,10 @@ extension EditBookmarkViewController: MWMNoteCellDelegate {
extension EditBookmarkViewController: MWMButtonCellDelegate {
func cellDidPressButton(_ cell: UITableViewCell) {
BookmarksManager.shared().deleteBookmark(bookmarkId)
Toast.undoToast(deletedObject: bookmarkTitle ?? L("bookmark"),
undoAction: { [bookmarkId] in
BookmarksManager.shared().recoverBookmark(bookmarkId)
}).show()
if let placePageData = placePageData {
FrameworkHelper.updateAfterDeleteBookmark()
placePageData.updateBookmarkStatus()

7
iphone/Maps/UI/EditBookmark/EditTrackViewController.swift
View file

@ -186,7 +186,12 @@ extension EditTrackViewController: BookmarkTitleCellDelegate {
extension EditTrackViewController: MWMButtonCellDelegate {
func cellDidPressButton(_ cell: UITableViewCell) {
bookmarksManager.deleteTrack(trackId)
BookmarksManager.shared().deleteTrack(trackId)
Toast.undoToast(withText: trackTitle ?? L("track_title"),
undoAction: { [trackId] in
BookmarksManager.shared().recoverTrack(trackId)
}).show()
// TODO: When the PlacePage screen will be implemented it should be reloaded here (see EditBookmarkViewController).
goBack()
}
}

7
iphone/Maps/UI/PlacePage/Components/ActionBarViewController.swift
View file

@ -64,6 +64,13 @@ class ActionBarViewController: UIViewController {
configureButtons()
}
func setBookmarkSelected(_ isSelected: Bool) {
guard let bookmarkButton = stackView.arrangedSubviews.first(where: { ($0 as? ActionBarButton)?.type == .bookmark }) as? ActionBarButton else {
return
}
bookmarkButton.setBookmarkSelected(isSelected)
}
override func viewDidLoad() {
super.viewDidLoad()

2
iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.h
View file

@ -47,6 +47,8 @@ NS_SWIFT_NAME(ActionBarButton)
isSelected:(BOOL)isSelected
isEnabled:(BOOL)isEnabled;
- (void)setBookmarkSelected:(BOOL)isSelected;
@end
NS_ASSUME_NONNULL_END

7
iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.m
View file

@ -155,8 +155,6 @@ NSString *titleForButton(MWMActionBarButtonType type, BOOL isSelected) {
}
- (IBAction)tap {
if (self.type == MWMActionBarButtonTypeBookmark)
[self setBookmarkSelected:!self.button.isSelected];
if (self.type == MWMActionBarButtonTypeRouteTo)
[self disableRouteToButtonHighlight];
@ -164,7 +162,10 @@ NSString *titleForButton(MWMActionBarButtonType type, BOOL isSelected) {
}
- (void)setBookmarkSelected:(BOOL)isSelected {
if (isSelected)
if (self.type != MWMActionBarButtonTypeBookmark)
return;
if (!self.button.isSelected && isSelected)
[self.button.imageView startAnimating];
self.button.selected = isSelected;

2
iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageCommonLayout.swift
View file

@ -187,6 +187,7 @@ extension PlacePageCommonLayout {
bookmarkViewController.bookmarkData = bookmarkData
isBookmark = true
}
actionBarViewController.setBookmarkSelected(isBookmark)
if let title = placePageData.previewData.title, let headerViewController = headerViewControllers.compactMap({ $0 as? PlacePageHeaderViewController }).first {
let secondaryTitle = placePageData.previewData.secondaryTitle
headerViewController.setTitle(title, secondaryTitle: secondaryTitle)
@ -195,6 +196,7 @@ extension PlacePageCommonLayout {
self.presenter?.layoutIfNeeded()
UIView.animate(withDuration: kDefaultAnimationDuration) { [unowned self] in
self.bookmarkViewController.view.isHidden = !isBookmark
self.actionBar?.placePageData = self.placePageData
self.presenter?.layoutIfNeeded()
}
}

23
iphone/Maps/UI/PlacePage/PlacePageManager/MWMPlacePageManager.mm
View file

@ -187,11 +187,28 @@ using namespace storage;
- (void)removeBookmark:(PlacePageData *)data
{
auto &f = GetFramework();
f.GetBookmarkManager().GetEditSession().DeleteBookmark(data.bookmarkData.bookmarkId);
PlacePageBookmarkData * bookmarkData = data.bookmarkData;
NSString * bookmarkTitle = data.previewData.title;
[MWMBookmarksManager.sharedManager deleteBookmark:bookmarkData.bookmarkId];
[[MWMToast undoToastWithDeletedObject:bookmarkTitle undoAction:^{
[MWMBookmarksManager.sharedManager recoverBookmark:bookmarkData.bookmarkId];
// Skip updating PP if it's closed.
if (![self isPPShown])
return;
auto & f = GetFramework();
auto & info = f.GetCurrentPlacePageInfo();
auto buildInfo = info.GetBuildInfo();
buildInfo.m_match = place_page::BuildInfo::Match::Everything;
buildInfo.m_userMarkId = bookmarkData.bookmarkId;
f.UpdatePlacePageInfoForCurrentSelection(buildInfo);
[data updateBookmarkStatus];
}] show];
[MWMFrameworkHelper updateAfterDeleteBookmark];
[data updateBookmarkStatus];
}