Merge pull request #288 from Planetable/update-media-view

Update media view framework, using minor version dependency.
Planetable · Oct 30, 2023 · db35e38 · db35e38
2 parents 9f44965 + e4faeef
commit db35e38
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/Planet.xcodeproj/project.pbxproj b/Planet.xcodeproj/project.pbxproj
@@ -2370,8 +2370,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/airwolfspace/mediaview";
 			requirement = {
-				branch = main;
-				kind = branch;
+				kind = upToNextMinorVersion;
+				minimumVersion = 1.0.0;
 			};
 		};
 		6A2A4D2A2A86422700F4491A /* XCRemoteSwiftPackageReference "WrappingHStack" */ = {

diff --git a/Planet.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Planet.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -59,8 +59,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/airwolfspace/mediaview",
       "state" : {
-        "branch" : "main",
-        "revision" : "b1442b2371bd7c141f86b1331c83358bf1885806"
+        "revision" : "c64f8e9056203cdde5493ed469b350e14217b053",
+        "version" : "1.0.0"
       }
     },
     {

diff --git a/PlanetLite/AppContentItemView.swift b/PlanetLite/AppContentItemView.swift
@@ -88,9 +88,19 @@ struct AppContentItemView: View {
 
     private func processAttachments(_ urls: [URL]) {
         if article.hasVideo {
-            ASMediaManager.shared.activateVideoView(withVideos: urls, title: article.title, andID: article.id)
+            DispatchQueue.global(qos: .userInitiated).async {
+                if let videoThumbnail = self.article.getVideoThumbnail(), !CGSizeEqualToSize(.zero, videoThumbnail.size) {
+                    DispatchQueue.main.async {
+                        ASMediaManager.shared.activateVideoView(withVideos: urls, title: self.article.title, id: self.article.id, defaultSize: videoThumbnail.size)
+                    }
+                } else {
+                    DispatchQueue.main.async {
+                        ASMediaManager.shared.activateVideoView(withVideos: urls, title: self.article.title, id: self.article.id)
+                    }
+                }
+            }
         } else {
-            ASMediaManager.shared.activatePhotoView(withPhotos: urls, title: article.title, andID: article.id)
+            ASMediaManager.shared.activatePhotoView(withPhotos: urls, title: article.title, id: article.id)
         }
     }