فهرست منبع

set static height

nayooti 5 سال پیش
والد
کامیت
a0ed8fa471

+ 2 - 9
deltachat-ios/MessageKit/Layout/MediaMessageSizeCalculator.swift

@@ -31,8 +31,6 @@ open class MediaMessageSizeCalculator: MessageSizeCalculator {
         return UIScreen.main.bounds.size.height * 0.7
     }
 
-    private let defaultHeight: CGFloat = 250
-
     open override func messageContainerSize(for message: MessageType) -> CGSize {
         let maxWidth = messageContainerMaxWidth(for: message)
         let sizeForMediaItem = { (maxWidth: CGFloat, item: MediaItem) -> CGSize in
@@ -55,13 +53,8 @@ open class MediaMessageSizeCalculator: MessageSizeCalculator {
         switch message.kind {
         case .photo(let item):
             return sizeForMediaItem(maxWidth, item)
-        case .video(let item):
-            if item.image == nil {
-                // no cached thumbnail -> is generated asynchronously
-                return CGSize(width: maxWidth, height: defaultHeight)
-            } else {
-                return sizeForMediaItem(maxWidth, item)
-            }
+        case .video:
+            return CGSize(width: maxWidth, height: maxWidth)
         default:
             fatalError("messageContainerSize received unhandled MessageDataType: \(message.kind)")
         }

+ 1 - 6
deltachat-ios/MessageKit/Views/Cells/MediaMessageCell.swift

@@ -37,13 +37,10 @@ open class MediaMessageCell: MessageContentCell {
     open var imageView: UIImageView = {
         let imageView = UIImageView()
         imageView.contentMode = .scaleAspectFill
+        imageView.clipsToBounds = true
         return imageView
     }()
 
-    private lazy var imageViewHeightConstraint: NSLayoutConstraint = {
-        return imageView.heightAnchor.constraint(equalToConstant: 350)
-    }()
-
     // MARK: - Methods
 
     /// Responsible for setting up the constraints of the cell's subviews.
@@ -74,12 +71,10 @@ open class MediaMessageCell: MessageContentCell {
 
         switch message.kind {
         case .photo(let mediaItem):
-            imageViewHeightConstraint.isActive = false
             imageView.image = mediaItem.image ?? mediaItem.placeholderImage
             playButtonView.isHidden = true
         case .video(let mediaItem):
             if let url = mediaItem.url {
-                imageViewHeightConstraint.isActive = true
                 if let image = mediaItem.image {
                     imageView.image = image
                 } else {