[ios] Fixed bookmark list descriptions #5300

Merged

andre1110 merged 4 commits from fix-4799 into master

2023-06-14 20:38:59 +00:00

andre1110 commented

2023-06-09 21:02:39 +00:00

(Migrated from github.com)

Fixes #4799

biodranik (Migrated from github.com) reviewed 2023-06-09 21:17:51 +00:00

biodranik (Migrated from github.com) left a comment

Thanks! Can you please record a video of how it looks and works now for text and HTML?

biodranik (Migrated from github.com) reviewed 2023-06-13 17:35:09 +00:00

iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm

biodranik (Migrated from github.com) commented

2023-06-13 17:30:16 +00:00

    auto const description = GetPreferredBookmarkStr(self.bm.GetCategoryData(groupId).m_description);

```suggestion auto const description = GetPreferredBookmarkStr(self.bm.GetCategoryData(groupId).m_description); ```

iphone/Maps/Bookmarks/BookmarksList/BookmarksListInfoViewController.swift

biodranik (Migrated from github.com) commented

2023-06-13 17:31:08 +00:00

What if a non-html description is big enough? Will it expand in the disabled state?

biodranik (Migrated from github.com) commented

2023-06-13 17:32:59 +00:00

      let description = info.isHtmlDescription
          ? BookmarksListInfoViewController.getPlainText(info.description)
          : info.description
      descriptionButton.setTitle(description for: .normal)

There is no need to uppercase it.

```suggestion let description = info.isHtmlDescription ? BookmarksListInfoViewController.getPlainText(info.description) : info.description descriptionButton.setTitle(description for: .normal) ``` There is no need to uppercase it.

andre1110 (Migrated from github.com) reviewed 2023-06-13 18:35:22 +00:00

iphone/Maps/Bookmarks/BookmarksList/BookmarksListInfoViewController.swift

andre1110 (Migrated from github.com) commented

2023-06-13 18:35:21 +00:00

It won't. I think that we should distinguish 2 use cases here:

A user specified an html string - in this case we should certainly allow to open a new WebView to display rich formatting, pictures, etc.
A user set a plain string, which I assume to be really short in majority of cases. Thus, it'd be excessive to open a WebView for this

As an option for plain strings, we can 1) enable the button only if the string size will be more than it's possible to fit the string using NSString.size(withAttributes:), or
2) shrink the label with adjustsFontSizeToFitWidth, or
3) use ExpandableLabel only for plain strings

It won't. I think that we should distinguish 2 use cases here: 1. A user specified an html string - in this case we should certainly allow to open a new WebView to display rich formatting, pictures, etc. 2. A user set a plain string, which I assume to be really short in majority of cases. Thus, it'd be excessive to open a WebView for this As an option for plain strings, we can 1) enable the button only if the string size will be more than it's possible to fit the string using [NSString.size(withAttributes:)](https://developer.apple.com/documentation/foundation/nsstring/1531844-size), or 2) shrink the label with [adjustsFontSizeToFitWidth](https://developer.apple.com/documentation/uikit/uilabel/1620546-adjustsfontsizetofitwidth), or 3) use ExpandableLabel only for plain strings <img width="292" alt="image" src="https://github.com/organicmaps/organicmaps/assets/135858315/ec6d3385-bed5-4294-a9a6-39b77130ec61">

andre1110 (Migrated from github.com) reviewed 2023-06-13 20:04:24 +00:00

iphone/Maps/Bookmarks/BookmarksList/BookmarksListInfoViewController.swift

andre1110 (Migrated from github.com) commented

2023-06-13 20:04:23 +00:00

@biodranik I reconsidered :) Now I show WKWebView for both cases

https://github.com/organicmaps/organicmaps/assets/135858315/b65a82bb-275d-489e-8f07-f5355bf14441

@biodranik I reconsidered :) Now I show WKWebView for both cases https://github.com/organicmaps/organicmaps/assets/135858315/b65a82bb-275d-489e-8f07-f5355bf14441