diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2023-03-31 18:21:43 +0200 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2023-03-31 18:21:43 +0200 |
| commit | 3efcaabe2007e267c54964b96f7a9e02ce21d503 (patch) | |
| tree | d6a9069febc66495f7d4dc0144e7ad2c4021c4b5 | |
| parent | 17d029677eb1710a0262143d5ad7ff8a4cd8dd18 (diff) | |
| parent | 8ad574c210155d4cda7e2fa20f366d8996f45072 (diff) | |
| download | mullvadvpn-3efcaabe2007e267c54964b96f7a9e02ce21d503.tar.xz mullvadvpn-3efcaabe2007e267c54964b96f7a9e02ce21d503.zip | |
Merge branch 'head-indent-changelog-ios-73'
| -rw-r--r-- | ios/MullvadVPN/Classes/ChangeLog.swift | 4 | ||||
| -rw-r--r-- | ios/MullvadVPN/View controllers/ChangeLog/ChangeLogContentView.swift | 12 |
2 files changed, 11 insertions, 5 deletions
diff --git a/ios/MullvadVPN/Classes/ChangeLog.swift b/ios/MullvadVPN/Classes/ChangeLog.swift index 418bf277a8..a9bbc5c894 100644 --- a/ios/MullvadVPN/Classes/ChangeLog.swift +++ b/ios/MullvadVPN/Classes/ChangeLog.swift @@ -44,9 +44,7 @@ enum ChangeLog { .compactMap { line in let trimmedString = line.trimmingCharacters(in: .whitespaces) - guard !trimmedString.isEmpty else { return nil } - - return "• \(trimmedString)" + return trimmedString.isEmpty ? nil : trimmedString } .joined(separator: "\n") } diff --git a/ios/MullvadVPN/View controllers/ChangeLog/ChangeLogContentView.swift b/ios/MullvadVPN/View controllers/ChangeLog/ChangeLogContentView.swift index edfe3413d4..fd751dd182 100644 --- a/ios/MullvadVPN/View controllers/ChangeLog/ChangeLogContentView.swift +++ b/ios/MullvadVPN/View controllers/ChangeLog/ChangeLogContentView.swift @@ -93,15 +93,23 @@ final class ChangeLogContentView: UIView { } func setChangeLogText(_ string: String) { + let bullet = "• " + let font = UIFont.systemFont(ofSize: 18) + + let bulletList = string.split(whereSeparator: { $0.isNewline }) + .map { "\(bullet)\($0)" } + .joined(separator: "\n") + let paragraphStyle = NSMutableParagraphStyle() paragraphStyle.lineHeightMultiple = 1.5 paragraphStyle.lineBreakMode = .byWordWrapping + paragraphStyle.headIndent = bullet.size(withAttributes: [.font: font]).width textView.attributedText = NSAttributedString( - string: string, + string: bulletList, attributes: [ .paragraphStyle: paragraphStyle, - .font: UIFont.systemFont(ofSize: 18), + .font: font, .foregroundColor: UIColor.white, ] ) |