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

[ios] Fixed bookmark list descriptions (#5300)

Browse source 
* [ios] Show the list description in BookmarksListInfoView
Fixes #4799

Signed-off-by: André <135858315+andre1110@users.noreply.github.com>

* [cleanup] Spelling fix

Signed-off-by: André <135858315+andre1110@users.noreply.github.com>

* Apply suggestions from code review

Signed-off-by: André <135858315+andre1110@users.noreply.github.com>

* Added CSS for plain text descriptions

Signed-off-by: André <135858315+andre1110@users.noreply.github.com>

---------

Signed-off-by: André <135858315+andre1110@users.noreply.github.com>
This commit is contained in:
André 2023-06-15 03:38:58 +07:00 • committed by GitHub
parent 67aa775abb
commit 90c39c07ce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 74 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarkGroup.h
View file

@ -28,6 +28,7 @@ NS_SWIFT_NAME(BookmarkGroup)
@property(nonatomic, readonly, getter=isVisible) BOOL visible;
@property(nonatomic, readonly, getter=isEmpty) BOOL empty;
@property(nonatomic, readonly) BOOL hasDescription;
@property(nonatomic, readonly) BOOL isHtmlDescription;
@property(nonatomic, readonly) MWMBookmarkGroupAccessStatus accessStatus;
@property(nonatomic, readonly) NSArray<MWMBookmark *> *bookmarks;
@property(nonatomic, readonly) NSArray<MWMTrack *> *tracks;

4
iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarkGroup.m
View file

@ -84,4 +84,8 @@
return [self.manager getCategoryGroupType:self.categoryId];
}
- (BOOL)isHtmlDescription {
return [self.manager isHtmlDescription:self.categoryId];
}
@end

1
iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.h
View file

@ -47,6 +47,7 @@ NS_SWIFT_NAME(BookmarksManager)
- (MWMBookmarkGroupType)getCategoryGroupType:(MWMMarkGroupID)groupId;
- (nullable NSURL *)getCategoryImageUrl:(MWMMarkGroupID)groupId;
- (BOOL)hasExtraInfo:(MWMMarkGroupID)groupId;
- (BOOL)isHtmlDescription:(MWMMarkGroupID)groupId;
- (MWMMarkGroupID)createCategoryWithName:(NSString *)name;
- (void)setCategory:(MWMMarkGroupID)groupId name:(NSString *)name;

5
iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm
View file

@ -287,6 +287,11 @@ static BookmarkManager::SortingType convertSortingTypeToCore(MWMBookmarksSorting
return !data.m_description.empty() || !data.m_annotation.empty();
}
- (BOOL)isHtmlDescription:(MWMMarkGroupID)groupId {
auto const description = GetPreferredBookmarkStr(self.bm.GetCategoryData(groupId).m_description);
return strings::IsHTML(description);
}
- (MWMMarkGroupID)createCategoryWithName:(NSString *)name
{
auto groupId = self.bm.CreateBookmarkCategory(name.UTF8String);

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

@ -4,7 +4,7 @@ protocol BookmarksListInfoViewControllerDelegate: AnyObject {
}
final class BookmarksListInfoViewController: UIViewController {
var info: IBookmakrsListInfoViewModel? {
var info: IBookmarksListInfoViewModel? {
didSet {
guard isViewLoaded, let info = info else { return }
updateInfo(info)
@ -26,17 +26,23 @@ final class BookmarksListInfoViewController: UIViewController {
override func viewDidLoad() {
super.viewDidLoad()
descriptionButton.setTitle(L("placepage_place_description").uppercased(), for: .normal)
separatorsConstraints.forEach { $0.constant = 1 / UIScreen.main.scale }
descriptionButton.titleLabel?.numberOfLines = 2
guard let info = info else { return }
updateInfo(info)
}
private func updateInfo(_ info: IBookmakrsListInfoViewModel) {
private func updateInfo(_ info: IBookmarksListInfoViewModel) {
titleLabel.text = info.title
descriptionButton.isHidden = !info.hasDescription
if info.hasDescription {
let description = info.isHtmlDescription
? BookmarksListInfoViewController.getPlainText(info.description)
: info.description
descriptionButton.setTitle(description, for: .normal)
}
titleImageView.isHidden = true
if let imageUrl = info.imageUrl {
titleImageView.wi_setImage(with: imageUrl, transitionDuration: 0) { [weak self] (image, error) in
@ -46,4 +52,9 @@ final class BookmarksListInfoViewController: UIViewController {
}
}
}
private static func getPlainText(_ htmlText: String) -> String? {
let formattedText = NSAttributedString.string(withHtml: htmlText, defaultAttributes: [:])
return formattedText?.string
}
}

2
iphone/Maps/Bookmarks/BookmarksList/BookmarksListInfoViewController.xib
View file

@ -60,7 +60,7 @@
<constraint firstAttribute="bottom" secondItem="TFR-Qj-pUF" secondAttribute="bottom" id="j5w-Th-flQ"/>
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="leading" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cxc-pt-qei">
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="leading" contentVerticalAlignment="center" buttonType="system" lineBreakMode="tailTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cxc-pt-qei">
<rect key="frame" x="0.0" y="48" width="343" height="40"/>
<constraints>
<constraint firstAttribute="height" constant="40" id="g6j-hs-K1V"/>

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

@ -53,7 +53,7 @@ protocol IBookmarksListMenuItem {
protocol IBookmarksListView: AnyObject {
func setTitle(_ title: String)
func setInfo(_ info: IBookmakrsListInfoViewModel)
func setInfo(_ info: IBookmarksListInfoViewModel)
func setSections(_ sections: [IBookmarksListSectionViewModel])
func setMoreItemTitle(_ itemTitle: String)
func showMenu(_ items: [IBookmarksListMenuItem])
@ -125,8 +125,10 @@ protocol IBookmarksListRouter {
func editTrack(trackId: MWMTrackID, completion: @escaping (Bool) -> Void)
}
protocol IBookmakrsListInfoViewModel {
protocol IBookmarksListInfoViewModel {
var title: String { get }
var description: String { get }
var hasDescription: Bool { get }
var isHtmlDescription: Bool { get }
var imageUrl: URL? { get }
}

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

@ -181,8 +181,9 @@ extension BookmarksListPresenter: IBookmarksListPresenter {
view.enableEditing(true)
let info = BookmarksListInfo(title: bookmarkGroup.title,
author: bookmarkGroup.author,
description: bookmarkGroup.detailedAnnotation,
hasDescription: bookmarkGroup.hasDescription,
isHtmlDescription: bookmarkGroup.isHtmlDescription,
imageUrl: bookmarkGroup.imageUrl,
hasLogo: false)
view.setInfo(info)
@ -333,8 +334,9 @@ extension BookmarksListPresenter: IBookmarksListPresenter {
extension BookmarksListPresenter: CategorySettingsViewControllerDelegate {
func categorySettingsController(_ viewController: CategorySettingsViewController, didEndEditing categoryId: MWMMarkGroupID) {
let info = BookmarksListInfo(title: bookmarkGroup.title,
author: bookmarkGroup.author,
description: bookmarkGroup.detailedAnnotation,
hasDescription: bookmarkGroup.hasDescription,
isHtmlDescription: bookmarkGroup.isHtmlDescription,
imageUrl: bookmarkGroup.imageUrl,
hasLogo: false)
view.setInfo(info)
@ -495,17 +497,19 @@ fileprivate struct BookmarksListMenuItem: IBookmarksListMenuItem {
}
}
fileprivate struct BookmarksListInfo: IBookmakrsListInfoViewModel {
fileprivate struct BookmarksListInfo: IBookmarksListInfoViewModel {
let title: String
let author: String
let description: String
let hasDescription: Bool
let isHtmlDescription: Bool
let imageUrl: URL?
let hasLogo: Bool
init(title: String, author: String, hasDescription:Bool, imageUrl: URL? = nil, hasLogo: Bool = false) {
init(title: String, description: String, hasDescription: Bool, isHtmlDescription: Bool, imageUrl: URL? = nil, hasLogo: Bool = false) {
self.title = title
self.author = author
self.description = description
self.hasDescription = hasDescription
self.isHtmlDescription = isHtmlDescription
self.imageUrl = imageUrl
self.hasLogo = hasLogo
}

34
iphone/Maps/Bookmarks/BookmarksList/BookmarksListRouter.swift
View file

@ -20,8 +20,38 @@ extension BookmarksListRouter: IBookmarksListRouter {
}
func showDescription(_ bookmarkGroup: BookmarkGroup) {
// let descriptionViewController = GuideDescriptionViewController(category: bookmarkGroup)
// mapViewController.navigationController?.pushViewController(descriptionViewController, animated: true)
let description = prepareHtmlDescription(bookmarkGroup)
let descriptionViewController = WebViewController(html: description, baseUrl: nil, title: bookmarkGroup.title)!
descriptionViewController.openInSafari = true
mapViewController.navigationController?.pushViewController(descriptionViewController, animated: true)
}
func prepareHtmlDescription(_ bookmarkGroup: BookmarkGroup) -> String {
var description = bookmarkGroup.detailedAnnotation
if bookmarkGroup.isHtmlDescription {
if !description.contains("<body>") {
description = "<body>" + description
}
} else {
description = description.replacingOccurrences(of: "\n", with: "<br>")
let header = """
<head>
<style>
body {
line-height: 1.4;
margin-right: 16px;
margin-left: 16px;
}
</style>
</head>
<body>
"""
description = header + description
}
if !description.contains("</body>") {
description += "</body>"
}
return description
}
func showSubgroup(_ subgroupId: MWMMarkGroupID) {

2
iphone/Maps/Bookmarks/BookmarksList/BookmarksListViewController.swift
View file

@ -188,7 +188,7 @@ extension BookmarksListViewController: IBookmarksListView {
self.title = title
}
func setInfo(_ info: IBookmakrsListInfoViewModel) {
func setInfo(_ info: IBookmarksListInfoViewModel) {
infoViewController.info = info
updateInfoSize()
}