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

[iOS] resize images in html description of object to fit PP width

Browse source 
https://jira.mail.ru/browse/MAPSME-13740
This commit is contained in:
Aleksey Belousov 2020-06-08 14:54:53 +03:00 • committed by Vladimir Byko-Ianko
parent ed2ee93182
commit 72eae517c4
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
iphone/Maps/Categories/NSAttributedString+HTML.swift
View file

@ -13,11 +13,14 @@ extension NSAttributedString {
}
extension NSMutableAttributedString {
@objc convenience init?(htmlString: String, baseFont: UIFont, paragraphStyle: NSParagraphStyle?) {
@objc convenience init?(htmlString: String, baseFont: UIFont, paragraphStyle: NSParagraphStyle?, estimatedWidth: CGFloat = 0) {
self.init(htmlString: htmlString, baseFont: baseFont)
if let paragraphStyle = paragraphStyle {
addAttribute(.paragraphStyle, value: paragraphStyle, range: NSMakeRange(0, length))
}
guard estimatedWidth > 0 else { return }
enumerateAttachments(estimatedWidth: estimatedWidth)
}
@objc convenience init?(htmlString: String, baseFont: UIFont) {

14
iphone/Maps/UI/PlacePage/Components/PlacePageBookmarkViewController.swift
View file

@ -29,12 +29,20 @@ class PlacePageBookmarkViewController: UIViewController {
updateViews()
}
override func viewDidLayoutSubviews() {
super.viewDidLayoutSubviews()
guard let bookmarkData = bookmarkData,
bookmarkData.isHtmlDescription,
expandableLabel.width > 0,
let description = bookmarkData.bookmarkDescription else { return }
setHtmlDescription(description, maxWidth: expandableLabel.width)
}
func updateViews() {
guard let bookmarkData = bookmarkData else { return }
editButton.isEnabled = bookmarkData.isEditable
if let description = bookmarkData.bookmarkDescription {
if bookmarkData.isHtmlDescription {
setHtmlDescription(description)
topConstraint.constant = 16
} else {
expandableLabel.text = description
@ -45,7 +53,7 @@ class PlacePageBookmarkViewController: UIViewController {
}
}
private func setHtmlDescription(_ htmlDescription: String) {
private func setHtmlDescription(_ htmlDescription: String, maxWidth: CGFloat) {
DispatchQueue.global().async {
let font = UIFont.regular14()
let color = UIColor.blackPrimaryText()
@ -53,7 +61,7 @@ class PlacePageBookmarkViewController: UIViewController {
paragraphStyle.lineSpacing = 4
let attributedString: NSAttributedString
if let str = NSMutableAttributedString(htmlString: htmlDescription, baseFont: font, paragraphStyle: paragraphStyle) {
if let str = NSMutableAttributedString(htmlString: htmlDescription, baseFont: font, paragraphStyle: paragraphStyle, estimatedWidth: maxWidth) {
str.addAttribute(NSAttributedString.Key.foregroundColor,
value: color,
range: NSRange(location: 0, length: str.length))