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

[iOS] Fixed crash when open AllPass Subscription from richmedia

Browse source 
https://jira.mail.ru/browse/MAPSME-14934
This commit is contained in:
Alexander Boriskov 2020-09-29 16:32:48 +03:00 • committed by mpimenov
parent 67ada9dc58
commit e85a03407c
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
iphone/Maps/UI/Subscription/AllPass/AllPassSubscriptionViewController.swift
View file

@ -67,13 +67,22 @@ class AllPassSubscriptionViewController: UIViewController {
startAnimating()
let fontSize: CGFloat = UIScreen.main.bounds.width > 320 ? 17.0 : 14.0
let fontColor = UIColor.whitePrimaryText()
let fontFamily = UIFont.systemFont(ofSize: fontSize).familyName
let css = "<style type=\"text/css\">b{font-weight: 900;}body{font-weight: 300; font-size: \(fontSize); font-family: '-apple-system','\(fontFamily)';}</style>"
zip(descriptionSubtitles, ["all_pass_subscription_message_subtitle",
"all_pass_subscription_message_subtitle_3",
"all_pass_subscription_message_subtitle_2",
"all_pass_subscription_message_subtitle_4"]).forEach { title, loc in
title.attributedText = NSAttributedString.string(withHtml: css + L(loc), defaultAttributes: [:])
DispatchQueue.global().async {
let titles = ["all_pass_subscription_message_subtitle",
"all_pass_subscription_message_subtitle_3",
"all_pass_subscription_message_subtitle_2",
"all_pass_subscription_message_subtitle_4"].map { (key) -> NSAttributedString? in
NSAttributedString.string(withHtml: css + L(key), defaultAttributes: [.foregroundColor: fontColor])
}
DispatchQueue.main.async {
zip(self.descriptionSubtitles, titles).forEach { title, str in
title.attributedText = str
}
}
}
preferredContentSize = CGSize(width: 414, height: contentView.frame.height)