ios: changes to media views

Author: morajabi

apple/InlineIOS/Features/Media/DocumentView.swift

@@ -9,10 +9,11 @@ import UIKit
 class DocumentView: UIView {
   // MARK: - Properties
 
-  let fullMessage: FullMessage?
-  let outgoing: Bool
+  private var fullMessage: FullMessage?
+  private var outgoing: Bool
   private var isBeingRemoved = false
 
+
   enum DocumentState: Equatable {
     case locallyAvailable
     case needsDownload
@@ -147,7 +148,23 @@ class DocumentView: UIView {
 
   // MARK: - Setup & helpers
 
+  override var intrinsicContentSize: CGSize {
+    let targetSize = CGSize(
+      width: UIView.layoutFittingCompressedSize.width,
+      height: UIView.layoutFittingCompressedSize.height
+    )
+    let stackSize = horizantalStackView.systemLayoutSizeFitting(
+      targetSize,
+      withHorizontalFittingPriority: .fittingSizeLevel,
+      verticalFittingPriority: .fittingSizeLevel
+    )
+    return CGSize(width: ceil(stackSize.width + 4), height: ceil(stackSize.height + 2))
+  }
+
   func setupViews() {
+    setContentHuggingPriority(.required, for: .horizontal)
+    setContentCompressionResistancePriority(.required, for: .horizontal)
+
     addSubview(horizantalStackView)
     horizantalStackView.addArrangedSubview(fileIconButton)
     fileIconButton.addSubview(iconView)
@@ -256,6 +273,8 @@ class DocumentView: UIView {
     progressLayer.path = UIBezierPath().cgPath
   }
 
+  private var fileSizeMinWidthConstraint: NSLayoutConstraint?
+
   func setupContent() {
     // Colors
     fileNameLabel.textColor = textColor
@@ -268,9 +287,42 @@ class DocumentView: UIView {
 
     // Set fixed width for fileSizeLabel to prevent layout shifts
     let maxSizeTextWidth = fileSizeLabel.intrinsicContentSize.width * 1.5
-    fileSizeLabel.widthAnchor.constraint(greaterThanOrEqualToConstant: maxSizeTextWidth).isActive = true
+    if let fileSizeMinWidthConstraint {
+      fileSizeMinWidthConstraint.constant = maxSizeTextWidth
+    } else {
+      let constraint = fileSizeLabel.widthAnchor.constraint(greaterThanOrEqualToConstant: maxSizeTextWidth)
+      constraint.isActive = true
+      fileSizeMinWidthConstraint = constraint
+    }
 
     updateFileIcon()
+    invalidateIntrinsicContentSize()
+  }
+
+  func update(with fullMessage: FullMessage, outgoing: Bool) {
+    self.fullMessage = fullMessage
+    self.outgoing = outgoing
+    isBeingRemoved = false
+    progressSubscription?.cancel()
+    progressSubscription = nil
+
+    setupContent()
+
+    if let document {
+      documentState = determineDocumentState(document)
+    } else {
+      documentState = .needsDownload
+    }
+
+    if fullMessage.message.status == .sending,
+       fullMessage.message.documentId != nil,
+       let document
+    {
+      documentState = .uploading(bytesSent: 0, totalBytes: Int64(document.size ?? 0))
+    }
+
+    updateUIForDocumentState()
+    invalidateIntrinsicContentSize()
   }
 
   @objc func fileIconButtonTapped() {
@@ -491,6 +543,7 @@ class DocumentView: UIView {
 
     updateFileIcon()
     updateProgressLayerColor()
+    invalidateIntrinsicContentSize()
   }
 
   private func updateProgressLayerColor() {

apple/InlineIOS/Features/Media/ImageViewerController.swift

@@ -676,7 +676,7 @@ final class ImageViewerController: UIViewController {
 
   @objc func image(_ image: UIImage, didFinishSavingWithError error: Error?, contextInfo: UnsafeRawPointer) {
     if let error = error {
-      print("Error saving image: \(error.localizedDescription)")
+      Log.shared.error("Failed to save image", error: error)
 
       let alert = UIAlertController(
         title: "Save Error",

apple/InlineIOS/Features/Media/NewVideoView.swift

@@ -17,6 +17,7 @@ final class NewVideoView: UIView {
   private var isDownloading = false
   private var isPresentingViewer = false
   private var pendingViewerURL: URL?
+  private var downloadProgress: Double = 0
 
   private var hasText: Bool {
     fullMessage.message.text?.isEmpty == false
@@ -67,6 +68,24 @@ final class NewVideoView: UIView {
     return view
   }()
 
+  private let downloadProgressView: CircularProgressHostingView = {
+    let view = CircularProgressHostingView()
+    view.translatesAutoresizingMaskIntoConstraints = false
+    view.isHidden = true
+    return view
+  }()
+
+  private let cancelDownloadButton: UIButton = {
+    let config = UIImage.SymbolConfiguration(pointSize: 14, weight: .bold)
+    let button = UIButton(type: .system)
+    button.translatesAutoresizingMaskIntoConstraints = false
+    button.setImage(UIImage(systemName: "xmark", withConfiguration: config), for: .normal)
+    button.tintColor = .white
+    button.isHidden = true
+    button.accessibilityLabel = "Cancel download"
+    return button
+  }()
+
   private let durationBadge: PillLabel = {
     let label = PillLabel()
     label.font = .systemFont(ofSize: 10, weight: .semibold)
@@ -198,6 +217,8 @@ final class NewVideoView: UIView {
     addSubview(overlayBackground)
     overlayBackground.addSubview(overlayIconView)
     overlayBackground.addSubview(overlaySpinner)
+    overlayBackground.addSubview(downloadProgressView)
+    overlayBackground.addSubview(cancelDownloadButton)
     addSubview(durationBadge)
 
     NSLayoutConstraint.activate([
@@ -212,6 +233,14 @@ final class NewVideoView: UIView {
       overlaySpinner.centerXAnchor.constraint(equalTo: overlayBackground.centerXAnchor),
       overlaySpinner.centerYAnchor.constraint(equalTo: overlayBackground.centerYAnchor),
 
+      downloadProgressView.topAnchor.constraint(equalTo: overlayBackground.topAnchor, constant: 3),
+      downloadProgressView.leadingAnchor.constraint(equalTo: overlayBackground.leadingAnchor, constant: 3),
+      downloadProgressView.trailingAnchor.constraint(equalTo: overlayBackground.trailingAnchor, constant: -3),
+      downloadProgressView.bottomAnchor.constraint(equalTo: overlayBackground.bottomAnchor, constant: -3),
+
+      cancelDownloadButton.centerXAnchor.constraint(equalTo: overlayBackground.centerXAnchor),
+      cancelDownloadButton.centerYAnchor.constraint(equalTo: overlayBackground.centerYAnchor),
+
       durationBadge.leadingAnchor.constraint(equalTo: leadingAnchor, constant: 8),
       durationBadge.topAnchor.constraint(equalTo: topAnchor, constant: 6),
     ])
@@ -229,7 +258,9 @@ final class NewVideoView: UIView {
 
   private func setupGestures() {
     let tapGesture = UITapGestureRecognizer(target: self, action: #selector(handleTap))
+    tapGesture.delegate = self
     addGestureRecognizer(tapGesture)
+    cancelDownloadButton.addTarget(self, action: #selector(handleCancelDownload), for: .touchUpInside)
   }
 
   private func setupMask() {
@@ -282,6 +313,12 @@ final class NewVideoView: UIView {
       return
     }
 
+    progressCancellable?.cancel()
+    progressCancellable = nil
+    isDownloading = false
+    downloadProgress = 0
+    downloadProgressView.setProgress(0)
+
     setupVideoConstraints()
     updateImage()
     updateDurationLabel()
@@ -303,12 +340,25 @@ final class NewVideoView: UIView {
       .map { FileDownloader.shared.isVideoDownloadActive(videoId: $0.id) } ?? false
     let downloading = !isVideoDownloaded && (isDownloading || globalDownloadActive)
 
-    if isUploading || downloading {
+    if isUploading {
       overlayIconView.isHidden = true
       overlaySpinner.startAnimating()
+      downloadProgressView.isHidden = true
+      cancelDownloadButton.isHidden = true
+    } else if downloading {
+      overlaySpinner.stopAnimating()
+      overlayIconView.isHidden = true
+      downloadProgressView.isHidden = false
+      cancelDownloadButton.isHidden = false
+      downloadProgressView.setProgress(downloadProgress)
+      if let videoId = fullMessage.videoInfo?.id {
+        bindProgressIfNeeded(videoId: videoId)
+      }
     } else {
       overlaySpinner.stopAnimating()
       overlayIconView.isHidden = false
+      downloadProgressView.isHidden = true
+      cancelDownloadButton.isHidden = true
       overlayIconView.image = UIImage(
         systemName: isVideoDownloaded ? "play.fill" : "arrow.down",
         withConfiguration: UIImage.SymbolConfiguration(pointSize: 22, weight: .semibold)
@@ -388,11 +438,14 @@ final class NewVideoView: UIView {
     }
 
     isDownloading = true
+    downloadProgress = 0
+    downloadProgressView.setProgress(0)
     updateOverlay()
     FileDownloader.shared.downloadVideo(video: videoInfo, for: fullMessage.message) { [weak self] _ in
       DispatchQueue.main.async { [weak self] in
         guard let self else { return }
         self.isDownloading = false
+        self.downloadProgress = 0
         self.updateOverlay()
       }
     }
@@ -411,18 +464,36 @@ final class NewVideoView: UIView {
         if let local = self.videoLocalUrl(), FileManager.default.fileExists(atPath: local.path) {
           self.progressCancellable = nil
           self.isDownloading = false
+          self.downloadProgress = 0
           self.updateOverlay()
           return
         }
 
+        if progress.error == nil, !progress.isComplete {
+          self.downloadProgress = progress.progress
+          self.downloadProgressView.setProgress(progress.progress)
+        }
+
         if progress.error != nil || progress.isComplete {
           self.progressCancellable = nil
           self.isDownloading = false
+          self.downloadProgress = 0
           self.updateOverlay()
         }
       }
   }
 
+  @objc private func handleCancelDownload() {
+    guard let videoId = fullMessage.videoInfo?.id else { return }
+    FileDownloader.shared.cancelVideoDownload(videoId: videoId)
+    progressCancellable?.cancel()
+    progressCancellable = nil
+    isDownloading = false
+    downloadProgress = 0
+    downloadProgressView.setProgress(0)
+    updateOverlay()
+  }
+
   private func videoLocalUrl() -> URL? {
     if let localPath = fullMessage.videoInfo?.video.localPath {
       return FileCache.getUrl(for: .videos, localPath: localPath)
@@ -456,3 +527,12 @@ final class NewVideoView: UIView {
     }
   }
 }
+
+extension NewVideoView: UIGestureRecognizerDelegate {
+  func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldReceive touch: UITouch) -> Bool {
+    if let touchedView = touch.view, touchedView.isDescendant(of: cancelDownloadButton) {
+      return false
+    }
+    return true
+  }
+}

apple/InlineIOS/Features/Media/PhotoView.swift

@@ -150,6 +150,24 @@ final class PhotoView: UIView, QLPreviewControllerDataSource, QLPreviewControlle
     }
   }
 
+  func update(with fullMessage: FullMessage) {
+    let previousFileId = self.fullMessage.file?.id
+    let previousLocalPath = self.fullMessage.file?.localPath
+    self.fullMessage = fullMessage
+
+    if previousFileId == fullMessage.file?.id,
+       previousLocalPath == fullMessage.file?.localPath
+    {
+      return
+    }
+
+    NSLayoutConstraint.deactivate(imageConstraints)
+    imageConstraints.removeAll()
+    imageView.removeFromSuperview()
+    setupImage()
+    setNeedsLayout()
+  }
+
   private func triggerMessageReload() {
     Task { @MainActor in
       await MessagesPublisher.shared

apple/InlineIOS/Features/Reactions/MessageReactionView.swift

@@ -60,6 +60,7 @@ class MessageReactionView: UIView, UIContextMenuInteractionDelegate, UIGestureRe
   private lazy var emojiLabel: UILabel = {
     let label = UILabel()
     label.font = UIFont.systemFont(ofSize: Constants.emojiSize, weight: .medium)
+    label.translatesAutoresizingMaskIntoConstraints = false
     configureEmojiLabel(label)
     return label
   }()
@@ -123,10 +124,6 @@ class MessageReactionView: UIView, UIContextMenuInteractionDelegate, UIGestureRe
   private func setupView() {
     configureContainerAppearance()
 
-    // Center the emoji and count labels
-    stackView.distribution = .equalSpacing
-    stackView.alignment = .center
-
     // Add subviews
     addSubview(containerView)
     containerView.addSubview(stackView)

apple/InlineIOS/Localizable.xcstrings

@@ -755,7 +755,7 @@
     "No files found in this chat." : {
 
     },
-    "No photos found in this chat." : {
+    "No media found in this chat." : {
 
     },
     "No Spaces Yet" : {

apple/InlineIOS/UI/CircularProgressHostingView.swift

@@ -0,0 +1,43 @@
+import SwiftUI
+import UIKit
+
+final class CircularProgressHostingView: UIView {
+  private let hostingController = UIHostingController(rootView: CircularProgressRing(progress: 0))
+
+  override init(frame: CGRect) {
+    super.init(frame: frame)
+
+    hostingController.view.translatesAutoresizingMaskIntoConstraints = false
+    hostingController.view.backgroundColor = .clear
+    hostingController.view.isUserInteractionEnabled = false
+
+    addSubview(hostingController.view)
+    NSLayoutConstraint.activate([
+      hostingController.view.topAnchor.constraint(equalTo: topAnchor),
+      hostingController.view.leadingAnchor.constraint(equalTo: leadingAnchor),
+      hostingController.view.trailingAnchor.constraint(equalTo: trailingAnchor),
+      hostingController.view.bottomAnchor.constraint(equalTo: bottomAnchor),
+    ])
+  }
+
+  @available(*, unavailable)
+  required init?(coder: NSCoder) {
+    fatalError("init(coder:) has not been implemented")
+  }
+
+  func setProgress(_ progress: Double) {
+    let clamped = min(max(progress, 0), 1)
+    hostingController.rootView = CircularProgressRing(progress: clamped)
+  }
+}
+
+private struct CircularProgressRing: View {
+  let progress: Double
+
+  var body: some View {
+    ProgressView(value: progress)
+      .progressViewStyle(.circular)
+      .tint(Color.white)
+      .frame(maxWidth: .infinity, maxHeight: .infinity)
+  }
+}