Compare commits
No commits in common. "d7953470e30c3c7114a7be235e62f6a0979ae804" and "f2e08e96f3347c53528f316e7ebb451b7e109ebe" have entirely different histories.
d7953470e3
...
f2e08e96f3
|
@ -94,9 +94,7 @@ class BookmarksTableViewController: EnhancedTableViewController {
|
|||
self.statuses.append(contentsOf: newStatuses.map { ($0.id, .unknown) })
|
||||
|
||||
DispatchQueue.main.async {
|
||||
UIView.performWithoutAnimation {
|
||||
self.tableView.insertRows(at: newIndexPaths, with: .automatic)
|
||||
}
|
||||
self.tableView.insertRows(at: newIndexPaths, with: .automatic)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -52,7 +52,7 @@ class GalleryViewController: UIPageViewController, UIPageViewControllerDataSourc
|
|||
switch $0.kind {
|
||||
case .image:
|
||||
return AttachmentViewController(attachment: $0)
|
||||
case .video, .audio:
|
||||
case .video:
|
||||
let vc = AVPlayerViewController()
|
||||
vc.player = AVPlayer(url: $0.url)
|
||||
return vc
|
||||
|
|
|
@ -37,6 +37,8 @@ class LargeImageViewController: UIViewController, UIScrollViewDelegate {
|
|||
@IBOutlet weak var bottomControlsView: UIView!
|
||||
@IBOutlet weak var descriptionLabel: UILabel!
|
||||
|
||||
var initializedTopControlsConstrains = false
|
||||
|
||||
var image: UIImage?
|
||||
var gifData: Data?
|
||||
var imageDescription: String?
|
||||
|
@ -118,13 +120,16 @@ class LargeImageViewController: UIViewController, UIScrollViewDelegate {
|
|||
|
||||
centerImage()
|
||||
|
||||
if view.safeAreaInsets.top == 44 {
|
||||
// running on iPhone X style notched device
|
||||
let notchWidth: CGFloat = 209
|
||||
let earWidth = (view.bounds.width - notchWidth) / 2
|
||||
let offset = (earWidth - shareButton.bounds.width) / 2
|
||||
shareButtonLeadingConstraint.constant = offset
|
||||
closeButtonTrailingConstraint.constant = offset
|
||||
if !initializedTopControlsConstrains {
|
||||
initializedTopControlsConstrains = true
|
||||
if view.safeAreaInsets.top == 44 {
|
||||
// running on iPhone X style notched device
|
||||
let notchWidth: CGFloat = 209
|
||||
let earWidth = (view.bounds.width - notchWidth) / 2
|
||||
let offset = (earWidth - shareButton.bounds.width) / 2
|
||||
shareButtonLeadingConstraint.constant = offset
|
||||
closeButtonTrailingConstraint.constant = offset
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -143,9 +143,7 @@ class NotificationsTableViewController: EnhancedTableViewController {
|
|||
self.older = pagination?.older
|
||||
|
||||
DispatchQueue.main.async {
|
||||
UIView.performWithoutAnimation {
|
||||
self.tableView.insertRows(at: newIndexPaths, with: .automatic)
|
||||
}
|
||||
self.tableView.insertRows(at: newIndexPaths, with: .automatic)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -226,9 +224,7 @@ class NotificationsTableViewController: EnhancedTableViewController {
|
|||
let newIndexPaths = (0..<groups.count).map {
|
||||
IndexPath(row: $0, section: 0)
|
||||
}
|
||||
UIView.performWithoutAnimation {
|
||||
self.tableView.insertRows(at: newIndexPaths, with: .automatic)
|
||||
}
|
||||
self.tableView.insertRows(at: newIndexPaths, with: .automatic)
|
||||
|
||||
self.refreshControl?.endRefreshing()
|
||||
|
||||
|
|
|
@ -106,9 +106,7 @@ class TimelineTableViewController: EnhancedTableViewController {
|
|||
let newIndexPaths = newRows.map { IndexPath(row: $0, section: self.timelineSegments.count - 1) }
|
||||
self.timelineSegments[self.timelineSegments.count - 1].append(contentsOf: newStatuses.map { ($0.id, .unknown) })
|
||||
DispatchQueue.main.async {
|
||||
UIView.performWithoutAnimation {
|
||||
self.tableView.insertRows(at: newIndexPaths, with: .none)
|
||||
}
|
||||
self.tableView.insertRows(at: newIndexPaths, with: .none)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -144,9 +142,7 @@ class TimelineTableViewController: EnhancedTableViewController {
|
|||
let newIndexPaths = (0..<newStatuses.count).map {
|
||||
IndexPath(row: $0, section: 0)
|
||||
}
|
||||
UIView.performWithoutAnimation {
|
||||
self.tableView.insertRows(at: newIndexPaths, with: .automatic)
|
||||
}
|
||||
self.tableView.insertRows(at: newIndexPaths, with: .automatic)
|
||||
|
||||
self.refreshControl?.endRefreshing()
|
||||
|
||||
|
|
|
@ -19,7 +19,7 @@ class AttachmentView: UIImageView, GIFAnimatable {
|
|||
|
||||
weak var delegate: AttachmentViewDelegate?
|
||||
|
||||
var playImageView: UIImageView?
|
||||
var playImageView: UIImageView!
|
||||
|
||||
var attachment: Attachment!
|
||||
var index: Int!
|
||||
|
@ -54,21 +54,25 @@ class AttachmentView: UIImageView, GIFAnimatable {
|
|||
isUserInteractionEnabled = true
|
||||
addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(imagePressed)))
|
||||
|
||||
playImageView = UIImageView(image: UIImage(systemName: "play.circle.fill"))
|
||||
playImageView.translatesAutoresizingMaskIntoConstraints = false
|
||||
addSubview(playImageView)
|
||||
NSLayoutConstraint.activate([
|
||||
playImageView.widthAnchor.constraint(equalToConstant: 50),
|
||||
playImageView.heightAnchor.constraint(equalToConstant: 50),
|
||||
playImageView.centerXAnchor.constraint(equalTo: centerXAnchor),
|
||||
playImageView.centerYAnchor.constraint(equalTo: centerYAnchor)
|
||||
])
|
||||
}
|
||||
|
||||
func loadAttachment() {
|
||||
guard AttachmentsContainerView.supportedAttachmentTypes.contains(attachment.kind) else {
|
||||
preconditionFailure("invalid attachment type")
|
||||
}
|
||||
switch attachment.kind {
|
||||
case .image:
|
||||
loadImage()
|
||||
case .video:
|
||||
loadVideo()
|
||||
case .audio:
|
||||
loadAudio()
|
||||
default:
|
||||
preconditionFailure("invalid attachment type")
|
||||
fatalError()
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -85,6 +89,8 @@ class AttachmentView: UIImageView, GIFAnimatable {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
playImageView.isHidden = true
|
||||
}
|
||||
|
||||
func loadVideo() {
|
||||
|
@ -100,36 +106,7 @@ class AttachmentView: UIImageView, GIFAnimatable {
|
|||
}
|
||||
}
|
||||
|
||||
let playImageView = UIImageView(image: UIImage(systemName: "play.circle.fill"))
|
||||
playImageView.translatesAutoresizingMaskIntoConstraints = false
|
||||
addSubview(playImageView)
|
||||
NSLayoutConstraint.activate([
|
||||
playImageView.widthAnchor.constraint(equalToConstant: 50),
|
||||
playImageView.heightAnchor.constraint(equalToConstant: 50),
|
||||
playImageView.centerXAnchor.constraint(equalTo: centerXAnchor),
|
||||
playImageView.centerYAnchor.constraint(equalTo: centerYAnchor),
|
||||
])
|
||||
}
|
||||
|
||||
func loadAudio() {
|
||||
let label = UILabel()
|
||||
label.text = "Audio Only"
|
||||
let playImageView = UIImageView(image: UIImage(systemName: "play.circle.fill"))
|
||||
let stack = UIStackView(arrangedSubviews: [
|
||||
label,
|
||||
playImageView
|
||||
])
|
||||
stack.translatesAutoresizingMaskIntoConstraints = false
|
||||
stack.axis = .vertical
|
||||
stack.spacing = 8
|
||||
stack.alignment = .center
|
||||
addSubview(stack)
|
||||
NSLayoutConstraint.activate([
|
||||
stack.centerXAnchor.constraint(equalTo: centerXAnchor),
|
||||
stack.centerYAnchor.constraint(equalTo: centerYAnchor),
|
||||
playImageView.widthAnchor.constraint(equalToConstant: 50),
|
||||
playImageView.heightAnchor.constraint(equalToConstant: 50),
|
||||
])
|
||||
playImageView.isHidden = false
|
||||
}
|
||||
|
||||
override func display(_ layer: CALayer) {
|
||||
|
|
|
@ -11,8 +11,6 @@ import Pachyderm
|
|||
|
||||
class AttachmentsContainerView: UIView {
|
||||
|
||||
static let supportedAttachmentTypes = [Attachment.Kind.image, .video, .audio]
|
||||
|
||||
weak var delegate: AttachmentViewDelegate?
|
||||
|
||||
var statusID: String!
|
||||
|
@ -49,7 +47,7 @@ class AttachmentsContainerView: UIView {
|
|||
|
||||
func updateUI(status: Status) {
|
||||
self.statusID = status.id
|
||||
attachments = status.attachments.filter { AttachmentsContainerView.supportedAttachmentTypes.contains($0.kind) }
|
||||
attachments = status.attachments.filter { $0.kind == .image || $0.kind == .video }
|
||||
|
||||
attachmentViews.allObjects.forEach { $0.removeFromSuperview() }
|
||||
attachmentViews.removeAllObjects()
|
||||
|
|
Loading…
Reference in New Issue