-
Notifications
You must be signed in to change notification settings - Fork 1.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Reader: Add a way to view posts that are restricted #23853
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,130 @@ | ||
import UIKit | ||
import SafariServices | ||
|
||
// […] | ||
final class ReaderReadMoreView: UIView, UIAdaptivePresentationControllerDelegate, UIPopoverPresentationControllerDelegate { | ||
private let textView = UITextView.makeLabel() | ||
private let infoIconView = UIImageView(image: UIImage(systemName: "info.circle")) | ||
private var postURL: URL? | ||
|
||
init(post: ReaderPost) { | ||
super.init(frame: .zero) | ||
|
||
let gradientMaskView = GradientAlphaMaskView() | ||
addSubview(gradientMaskView) | ||
gradientMaskView.pinEdges() | ||
|
||
let visualEffectView = UIVisualEffectView(effect: UIBlurEffect(style: .prominent)) | ||
visualEffectView.layer.cornerRadius = 8 | ||
visualEffectView.layer.masksToBounds = true | ||
|
||
addSubview(visualEffectView) | ||
visualEffectView.pinEdges(insets: UIEdgeInsets(top: 80, left: 0, bottom: 16, right: 0)) | ||
|
||
textView.adjustsFontForContentSizeCategory = true | ||
|
||
let string = NSMutableAttributedString(string: Strings.viewForMore, attributes: [ | ||
.font: UIFont.preferredFont(forTextStyle: .body), | ||
.foregroundColor: UIColor.label | ||
]) | ||
let range = string.mutableString.range(of: "%@") | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I guess we'd just have to hope the Probably not for this PR, but it should not be too difficult to find out the difference between the String format and the formatted string, and compute the argument values positions in the final String.
|
||
if range.location != NSNotFound { | ||
let replacement = NSMutableString(string: post.blogNameForDisplay() ?? Strings.blog) | ||
string.replaceCharacters(in: range, with: String(replacement)) | ||
if let postURL = post.permaLink.flatMap(URL.init) { | ||
string.addAttribute(.link, value: postURL, range: NSRange(location: range.location, length: replacement.length)) | ||
self.postURL = postURL | ||
} | ||
} | ||
|
||
textView.attributedText = string | ||
|
||
infoIconView.tintColor = .secondaryLabel | ||
infoIconView.isUserInteractionEnabled = true | ||
NSLayoutConstraint.activate([ | ||
infoIconView.widthAnchor.constraint(equalToConstant: 20), | ||
infoIconView.heightAnchor.constraint(equalToConstant: 20) | ||
]) | ||
infoIconView.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(showInfoTapped))) | ||
|
||
let stackView = UIStackView(alignment: .center, spacing: 16, [textView, infoIconView]) | ||
|
||
visualEffectView.contentView.addSubview(stackView) | ||
stackView.pinEdges(insets: UIEdgeInsets(.all, 16)) | ||
|
||
visualEffectView.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(viewMoreTapped))) | ||
} | ||
|
||
required init?(coder: NSCoder) { | ||
fatalError("init(coder:) has not been implemented") | ||
} | ||
|
||
@objc private func viewMoreTapped() { | ||
guard let postURL else { | ||
return | ||
} | ||
let safariVC = SFSafariViewController(url: postURL) | ||
UIViewController.topViewController?.present(safariVC, animated: true) | ||
} | ||
|
||
@objc private func showInfoTapped() { | ||
let popoverVC = UIViewController() | ||
|
||
let detailsLabel = UILabel() | ||
detailsLabel.font = .preferredFont(forTextStyle: .footnote) | ||
detailsLabel.textColor = .secondaryLabel | ||
detailsLabel.text = Strings.details | ||
detailsLabel.numberOfLines = 0 | ||
let preferredWidth: CGFloat = 320 | ||
detailsLabel.widthAnchor.constraint(lessThanOrEqualToConstant: preferredWidth).isActive = true | ||
|
||
popoverVC.view.backgroundColor = .systemBackground | ||
popoverVC.view.addSubview(detailsLabel) | ||
detailsLabel.pinEdges(insets: UIEdgeInsets(.all, 16)) | ||
popoverVC.preferredContentSize = popoverVC.view.systemLayoutSizeFitting(CGSize(width: preferredWidth, height: 1200)) | ||
|
||
popoverVC.modalPresentationStyle = .popover | ||
popoverVC.popoverPresentationController?.delegate = self | ||
popoverVC.popoverPresentationController?.sourceView = infoIconView | ||
UIViewController.topViewController?.present(popoverVC, animated: true) | ||
} | ||
|
||
// MARK: UIAdaptivePresentationControllerDelegate | ||
|
||
func adaptivePresentationStyle(for controller: UIPresentationController) -> UIModalPresentationStyle { | ||
.none // Force popover on iPhone | ||
} | ||
} | ||
|
||
private final class GradientAlphaMaskView: UIView { | ||
private let gradientLayer = CAGradientLayer() | ||
|
||
override init(frame: CGRect) { | ||
super.init(frame: frame) | ||
|
||
gradientLayer.frame = bounds | ||
gradientLayer.colors = [UIColor.white.withAlphaComponent(0.33).cgColor, UIColor.white.cgColor] | ||
gradientLayer.locations = [0.0, 1.0] | ||
|
||
gradientLayer.startPoint = CGPoint(x: 0.5, y: 0.0) | ||
gradientLayer.endPoint = CGPoint(x: 0.5, y: 0.5) | ||
|
||
self.layer.addSublayer(gradientLayer) | ||
} | ||
|
||
required init?(coder: NSCoder) { | ||
fatalError("init(coder:) has not been implemented") | ||
} | ||
|
||
override func layoutSubviews() { | ||
super.layoutSubviews() | ||
|
||
gradientLayer.frame = bounds | ||
} | ||
} | ||
|
||
private enum Strings { | ||
static let viewForMore = NSLocalizedString("reader.postDetails.viewMoreOn", value: "Visit %@ for the full post", comment: "Reader post details view") | ||
static let blog = NSLocalizedString("reader.postDetails.blog", value: "blog", comment: "Reader post details view placeholder when blog name not avail") | ||
static let details = NSLocalizedString("reader.postDetails.viewModeDescription", value: "The owner of this site only allows us to show a brief summary of their content. To view the full post, you'll have to visit their site.", comment: "Reader post details view") | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There gotta be a better way to test, but I couldn't find one. I think it'll do for now.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hey, @nbradbury, would you mind checking how the scenario from the PR is detected in Android?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
On Android, when the post is tapped in the list view we show the excerpt in the detail view, with a link at the bottom to visit the site for the full post.