Skip to content

Commit b76f9eb

Browse files
committed
Apply the post language to the AltViewController
1 parent 1ff8453 commit b76f9eb

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

Mastodon/Scene/MediaPreview/AltViewController.swift

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,23 @@ class AltViewController: UIViewController {
2020

2121
textView.textContainer.maximumNumberOfLines = 0
2222
textView.textContainer.lineBreakMode = .byWordWrapping
23-
textView.font = .preferredFont(forTextStyle: .callout)
2423
textView.isScrollEnabled = true
2524
textView.backgroundColor = .clear
2625
textView.isOpaque = false
2726
textView.isEditable = false
28-
textView.tintColor = .white
2927
textView.textContainerInset = UIEdgeInsets(top: 12, left: 8, bottom: 8, right: 8)
3028
textView.contentInsetAdjustmentBehavior = .always
3129
textView.verticalScrollIndicatorInsets.bottom = 4
3230

3331
return textView
3432
}()
3533

36-
init(alt: String, sourceView: UIView?) {
37-
textView.text = alt
34+
init(alt: String, language: String?, sourceView: UIView?) {
35+
textView.attributedText = NSAttributedString(string: alt, attributes: [
36+
.languageIdentifier: "",
37+
.foregroundColor: UIColor.white,
38+
.font: UIFont.preferredFont(forTextStyle: .callout),
39+
])
3840
super.init(nibName: nil, bundle: nil)
3941
self.modalPresentationStyle = .popover
4042
self.popoverPresentationController?.delegate = self

Mastodon/Scene/MediaPreview/MediaPreviewViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ extension MediaPreviewViewController {
186186
@objc private func altButtonPressed(_ sender: UIButton) {
187187
guard let alt = viewModel.altText else { return }
188188

189-
present(AltViewController(alt: alt, sourceView: sender), animated: true)
189+
present(AltViewController(alt: alt, language: viewModel.language, sourceView: sender), animated: true)
190190
}
191191
}
192192

Mastodon/Scene/MediaPreview/MediaPreviewViewModel.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ final class MediaPreviewViewModel: NSObject {
2828
@Published var currentPage: Int
2929
@Published var showingChrome = true
3030
@Published var altText: String?
31+
@Published var language: String?
3132

3233
// output
3334
let viewControllers: [MediaPreviewPage]
@@ -47,6 +48,7 @@ final class MediaPreviewViewModel: NSObject {
4748
switch item {
4849
case .attachment(let previewContext):
4950
getAltText = { previewContext.attachments[$0].altDescription }
51+
self.language = previewContext.language
5052

5153
currentPage = previewContext.initialIndex
5254
for (i, attachment) in previewContext.attachments.enumerated() {

0 commit comments

Comments
 (0)