From 20005c12f6855cab46484510ec811a6fc687152c Mon Sep 17 00:00:00 2001
From: Kiryl Kaveryn <kirylkaveryn@gmail.com>
Date: Sat, 2 Mar 2024 13:59:45 +0400
Subject: [PATCH] [ios] refactor bookmarks types

Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>
---
 .../BookmarksListInterfaces.swift             | 15 ++++----------
 .../BookmarksListPresenter.swift              | 20 +++++++++----------
 2 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/iphone/Maps/Bookmarks/BookmarksList/BookmarksListInterfaces.swift b/iphone/Maps/Bookmarks/BookmarksList/BookmarksListInterfaces.swift
index 981ff17b89..6422119815 100644
--- a/iphone/Maps/Bookmarks/BookmarksList/BookmarksListInterfaces.swift
+++ b/iphone/Maps/Bookmarks/BookmarksList/BookmarksListInterfaces.swift
@@ -14,11 +14,11 @@ protocol IBookmarksListSectionViewModel {
 }
 
 protocol IBookmarksSectionViewModel: IBookmarksListSectionViewModel {
-  var bookmarks: [IBookmarkViewModel] { get }
+  var bookmarks: [IBookmarksListItemViewModel] { get }
 }
 
 protocol ITracksSectionViewModel: IBookmarksListSectionViewModel {
-  var tracks: [ITrackViewModel] { get }
+  var tracks: [IBookmarksListItemViewModel] { get }
 }
 
 protocol ISubgroupsSectionViewModel: IBookmarksListSectionViewModel {
@@ -26,15 +26,8 @@ protocol ISubgroupsSectionViewModel: IBookmarksListSectionViewModel {
   var type: BookmarkGroupType { get }
 }
 
-protocol IBookmarkViewModel {
-  var bookmarkName: String { get }
-  var subtitle: String { get }
-  var image: UIImage { get }
-  var colorDidTapAction: (() -> Void)? { get }
-}
-
-protocol ITrackViewModel {
-  var trackName: String { get }
+protocol IBookmarksListItemViewModel {
+  var name: String { get }
   var subtitle: String { get }
   var image: UIImage { get }
   var colorDidTapAction: (() -> Void)? { get }
diff --git a/iphone/Maps/Bookmarks/BookmarksList/BookmarksListPresenter.swift b/iphone/Maps/Bookmarks/BookmarksList/BookmarksListPresenter.swift
index 1e0f9d2383..ab92e085b7 100644
--- a/iphone/Maps/Bookmarks/BookmarksList/BookmarksListPresenter.swift
+++ b/iphone/Maps/Bookmarks/BookmarksList/BookmarksListPresenter.swift
@@ -419,9 +419,9 @@ extension ISubgroupsSectionViewModel {
   var canEdit: Bool { false }
 }
 
-fileprivate struct BookmarkViewModel: IBookmarkViewModel {
+fileprivate struct BookmarkViewModel: IBookmarksListItemViewModel {
   let bookmarkId: MWMMarkID
-  let bookmarkName: String
+  let name: String
   let subtitle: String
   var image: UIImage {
     bookmarkColor.image(bookmarkIconName)
@@ -433,7 +433,7 @@ fileprivate struct BookmarkViewModel: IBookmarkViewModel {
 
   init(_ bookmark: Bookmark, formattedDistance: String?, colorDidTap: (() -> Void)?) {
     bookmarkId = bookmark.bookmarkId
-    bookmarkName = bookmark.bookmarkName
+    name = bookmark.bookmarkName
     bookmarkColor = bookmark.bookmarkColor
     bookmarkIconName = bookmark.bookmarkIconName
     subtitle = [formattedDistance, bookmark.bookmarkType].compactMap { $0 }.joined(separator: " • ")
@@ -441,9 +441,9 @@ fileprivate struct BookmarkViewModel: IBookmarkViewModel {
   }
 }
 
-fileprivate struct TrackViewModel: ITrackViewModel {
+fileprivate struct TrackViewModel: IBookmarksListItemViewModel {
   let trackId: MWMTrackID
-  let trackName: String
+  let name: String
   let subtitle: String
   var image: UIImage {
     circleImageForColor(trackColor, frameSize: 22)
@@ -454,7 +454,7 @@ fileprivate struct TrackViewModel: ITrackViewModel {
 
   init(_ track: Track, formattedDistance: String, colorDidTap: (() -> Void)?) {
     trackId = track.trackId
-    trackName = track.trackName
+    name = track.trackName
     subtitle = "\(L("length")) \(formattedDistance)"
     trackColor = track.trackColor
     colorDidTapAction = colorDidTap
@@ -479,18 +479,18 @@ fileprivate struct SubgroupViewModel: ISubgroupViewModel {
 
 fileprivate struct BookmarksSectionViewModel: IBookmarksSectionViewModel {
   let sectionTitle: String
-  let bookmarks: [IBookmarkViewModel]
+  let bookmarks: [IBookmarksListItemViewModel]
 
-  init(title: String, bookmarks: [IBookmarkViewModel]) {
+  init(title: String, bookmarks: [IBookmarksListItemViewModel]) {
     sectionTitle = title
     self.bookmarks = bookmarks
   }
 }
 
 fileprivate struct TracksSectionViewModel: ITracksSectionViewModel {
-  let tracks: [ITrackViewModel]
+  let tracks: [IBookmarksListItemViewModel]
 
-  init(tracks: [ITrackViewModel]) {
+  init(tracks: [IBookmarksListItemViewModel]) {
     self.tracks = tracks
   }
 }