nayooti 5 роки тому
батько
коміт
d8c9f14bd5

+ 6 - 3
deltachat-ios/Controller/ContactDetailViewController.swift

@@ -330,7 +330,10 @@ class ContactDetailViewController: UITableViewController {
     }
 
     private func showGallery() {
-        presentPreview(for: DC_MSG_IMAGE, messageType2: DC_MSG_GIF, messageType3: DC_MSG_VIDEO)
+        guard let chatId = viewModel.chatId else { return }
+        let messageIds = viewModel.context.getChatMedia(chatId: chatId, messageType: DC_MSG_IMAGE, messageType2: DC_MSG_GIF, messageType3: DC_MSG_VIDEO)
+        let galleryController = GalleryViewController(mediaMessageIds: messageIds)
+            navigationController?.pushViewController(galleryController, animated: true)
     }
 
     private func presentPreview(for messageType: Int32, messageType2: Int32, messageType3: Int32) {
@@ -348,8 +351,8 @@ class ContactDetailViewController: UITableViewController {
                 mediaUrls.insert(url, at: 0)
             }
         }
-        let galleryController = GalleryViewController(mediaMessageIds: messageIds)
-        navigationController?.pushViewController(galleryController, animated: true)
+        let previewController = PreviewController(currentIndex: 0, urls: mediaUrls)
+        navigationController?.pushViewController(previewController, animated: true)
     }
 
     private func deleteChat() {

+ 0 - 1
deltachat-ios/Controller/GalleryViewController.swift

@@ -124,7 +124,6 @@ extension GalleryViewController: UICollectionViewDataSource, UICollectionViewDel
         }
         let msg = DcMsg(id: mediaMessageIds[indexPath.row])
         mediaCell.update(msg: msg)
-        // cell update
         return mediaCell
     }
 

+ 3 - 2
deltachat-ios/View/GallerySectionHeader.swift

@@ -27,7 +27,7 @@ class GalleryGridSectionHeader: UICollectionReusableView {
     var text: String? {
         set {
             label.text = newValue?.uppercased()
-            verticalAlignLabel(ratio: 0.75)
+            yAlignLabel(ratio: 0.75)
         }
         get {
             return label.text
@@ -53,7 +53,8 @@ class GalleryGridSectionHeader: UICollectionReusableView {
         label.trailingAnchor.constraint(equalTo: trailingAnchor, constant: -leadingMargin).isActive = true
     }
 
-    private func verticalAlignLabel(ratio: CGFloat) {
+    /// Can be used to offset the label from center (if there is enough space) - ration == 0.5 will Ycenter the label - ratio >= 0.5 will move the label down.
+    private func yAlignLabel(ratio: CGFloat) {
         safe_assert(ratio <= 1)
         let labelHeight = label.intrinsicContentSize.height
         let verticalMarginTotal = frame.height - labelHeight