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

[ios] refactor bookmarks types

Browse source 
Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>
This commit is contained in:
Kiryl Kaveryn 2024-03-02 13:59:45 +04:00 • committed by Alexander Borsuk
parent 3a93b39b6e
commit 20005c12f6
2 changed files with 14 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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 }

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

@ -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
}
}