Tusker.xcodeproj/project.pbxproj

@@ -234,8 +234,6 @@
 		D6C7D27D22B6EBF800071952 /* AttachmentsContainerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6C7D27C22B6EBF800071952 /* AttachmentsContainerView.swift */; };
 		D6C94D872139E62700CB5196 /* LargeImageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6C94D862139E62700CB5196 /* LargeImageViewController.swift */; };
 		D6C94D892139E6EC00CB5196 /* AttachmentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6C94D882139E6EC00CB5196 /* AttachmentView.swift */; };
-		D6CA6A92249FAD8900AD45C1 /* AudioSessionHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6CA6A91249FAD8900AD45C1 /* AudioSessionHelper.swift */; };
-		D6CA6A94249FADE700AD45C1 /* GalleryPlayerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6CA6A93249FADE700AD45C1 /* GalleryPlayerViewController.swift */; };
 		D6D4DDD0212518A000E1C4BB /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6D4DDCF212518A000E1C4BB /* AppDelegate.swift */; };
 		D6D4DDD7212518A200E1C4BB /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D6D4DDD6212518A200E1C4BB /* Assets.xcassets */; };
 		D6D4DDDA212518A200E1C4BB /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D6D4DDD8212518A200E1C4BB /* LaunchScreen.storyboard */; };
@@ -538,8 +536,6 @@
 		D6C7D27C22B6EBF800071952 /* AttachmentsContainerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AttachmentsContainerView.swift; sourceTree = "<group>"; };
 		D6C94D862139E62700CB5196 /* LargeImageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LargeImageViewController.swift; sourceTree = "<group>"; };
 		D6C94D882139E6EC00CB5196 /* AttachmentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AttachmentView.swift; sourceTree = "<group>"; };
-		D6CA6A91249FAD8900AD45C1 /* AudioSessionHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AudioSessionHelper.swift; sourceTree = "<group>"; };
-		D6CA6A93249FADE700AD45C1 /* GalleryPlayerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GalleryPlayerViewController.swift; sourceTree = "<group>"; };
 		D6D4DDCC212518A000E1C4BB /* Tusker.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Tusker.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		D6D4DDCF212518A000E1C4BB /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		D6D4DDD6212518A200E1C4BB /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -622,7 +618,6 @@
 				04D14BAE22B34A2800642648 /* GalleryViewController.swift */,
 				D647D92724257BEB0005044F /* AttachmentPreviewViewController.swift */,
 				D6531DEF246B867E000F9538 /* GifvAttachmentViewController.swift */,
-				D6CA6A93249FADE700AD45C1 /* GalleryPlayerViewController.swift */,
 			);
 			path = "Attachment Gallery";
 			sourceTree = "<group>";
@@ -1294,7 +1289,6 @@
 				D6DFC69F242C4CCC00ACC392 /* WeakArray.swift */,
 				D64D8CA82463B494006B0BAA /* CachedDictionary.swift */,
 				D60E2F2B24423EAD005F8713 /* LazilyDecoding.swift */,
-				D6CA6A91249FAD8900AD45C1 /* AudioSessionHelper.swift */,
 				D6F1F84E2193B9BE00F5FE67 /* Caching */,
 				D6757A7A2157E00100721E32 /* XCallbackURL */,
 				D62D241E217AA46B005076CC /* Shortcuts */,
@@ -1731,13 +1725,11 @@
 				D60E2F2E244248BF005F8713 /* MastodonCachePersistentStore.swift in Sources */,
 				D620483623D38075008A63EF /* ContentTextView.swift in Sources */,
 				D6F2E965249E8BFD005846BB /* CrashReporterViewController.swift in Sources */,
-				D6CA6A94249FADE700AD45C1 /* GalleryPlayerViewController.swift in Sources */,
 				D6A3BC802321B7E600FD64D5 /* FollowNotificationGroupTableViewCell.swift in Sources */,
 				D627944D23A9A03D00D38C68 /* ListTimelineViewController.swift in Sources */,
 				D6945C3823AC739F005C403C /* InstanceTimelineViewController.swift in Sources */,
 				D60309B52419D4F100A465FF /* ComposeAttachmentsViewController.swift in Sources */,
 				D62D2422217AA7E1005076CC /* UserActivityManager.swift in Sources */,
-				D6CA6A92249FAD8900AD45C1 /* AudioSessionHelper.swift in Sources */,
 				D60D2B8223844C71001B87A3 /* BaseStatusTableViewCell.swift in Sources */,
 				D60E2F272442372B005F8713 /* StatusMO.swift in Sources */,
 				D60E2F2C24423EAD005F8713 /* LazilyDecoding.swift in Sources */,

Tusker/AppDelegate.swift

@@ -8,6 +8,7 @@
 
 import UIKit
 import CrashReporter
+import MessageUI
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {
@@ -19,14 +20,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         #if !DEBUG
         setupCrashReporter()
         #endif
-        
         AppShortcutItem.createItems(for: application)
-        
-        DispatchQueue.global(qos: .userInitiated).async {
-            AudioSessionHelper.disable()
-            AudioSessionHelper.setDefault()
-        }
-
         return true
     }
     

Tusker/AudioSessionHelper.swift

@@ -1,28 +0,0 @@
-//
-//  AudioSessionHelper.swift
-//  Tusker
-//
-//  Created by Shadowfacts on 6/21/20.
-//  Copyright © 2020 Shadowfacts. All rights reserved.
-//
-
-import Foundation
-import AVFoundation
-
-struct AudioSessionHelper {
-    static func enable() {
-        try? AVAudioSession.sharedInstance().setActive(true, options: [])
-    }
-    
-    static func disable() {
-        try? AVAudioSession.sharedInstance().setActive(false, options: .notifyOthersOnDeactivation)
-    }
-
-    static func setDefault() {
-        try? AVAudioSession.sharedInstance().setCategory(.playback, options: .mixWithOthers)
-    }
-    
-    static func setVideoPlayback() {
-        try? AVAudioSession.sharedInstance().setCategory(.playback, options: [])
-    }
-}

Tusker/Screens/Attachment Gallery/GalleryPlayerViewController.swift

@@ -1,36 +0,0 @@
-//
-//  GalleryPlayerViewController.swift
-//  Tusker
-//
-//  Created by Shadowfacts on 6/21/20.
-//  Copyright © 2020 Shadowfacts. All rights reserved.
-//
-
-import UIKit
-import AVKit
-
-class GalleryPlayerViewController: AVPlayerViewController {
-
-    override func viewDidAppear(_ animated: Bool) {
-        super.viewDidAppear(animated)
-        
-        // starting while audio is already playing from another app often takes nearly a second,
-        // so do it on a background thread as to not block the UI
-        DispatchQueue.global(qos: .userInitiated).async {
-            AudioSessionHelper.enable()
-            AudioSessionHelper.setVideoPlayback()
-        }
-    }
-
-    override func viewWillDisappear(_ animated: Bool) {
-        super.viewWillDisappear(animated)
-        
-        // starting often takes around half a second,
-        // so do it on a background thread as to not block the UI
-        DispatchQueue.global(qos: .userInitiated).async {
-            AudioSessionHelper.setDefault()
-            AudioSessionHelper.disable()
-        }
-    }
-
-}

Tusker/Screens/Attachment Gallery/GalleryViewController.swift

@@ -72,7 +72,7 @@ class GalleryViewController: UIPageViewController, UIPageViewControllerDataSourc
                 vc.shrinkGestureEnabled = false
                 return vc
             case .video, .audio:
-                let vc = GalleryPlayerViewController()
+                let vc = AVPlayerViewController()
                 vc.player = AVPlayer(url: attachment.url)
                 return vc
             case .gifv:

Tusker/Views/Attachments/GifvAttachmentView.swift

@@ -30,7 +30,6 @@ class GifvAttachmentView: UIView {
         
         playerLayer.player = player
         playerLayer.videoGravity = gravity
-        player.isMuted = true
         player.play()
         
         NotificationCenter.default.addObserver(self, selector: #selector(restartItem), name: .AVPlayerItemDidPlayToEndTime, object: item)

Tusker/Views/Status/ConversationMainStatusTableViewCell.xib

@@ -94,10 +94,10 @@
                             <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                         </textView>
                         <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="IF9-9U-Gk0" customClass="AttachmentsContainerView" customModule="Tusker" customModuleProvider="target">
-                            <rect key="frame" x="0.0" y="184" width="343" height="193"/>
+                            <rect key="frame" x="0.0" y="184" width="343" height="0.0"/>
                             <color key="backgroundColor" systemColor="secondarySystemBackgroundColor" red="0.94901960780000005" green="0.94901960780000005" blue="0.96862745100000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <constraints>
-                                <constraint firstAttribute="width" secondItem="IF9-9U-Gk0" secondAttribute="height" multiplier="16:9" id="5oh-eK-J5d"/>
+                                <constraint firstAttribute="height" priority="999" constant="200" id="UMv-Bk-ZyY"/>
                             </constraints>
                         </view>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ejU-sO-Og5">

Tusker/Views/Status/TimelineStatusTableViewCell.xib

@@ -112,13 +112,6 @@
                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                             <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                                         </textView>
-                                        <view hidden="YES" contentMode="scaleToFill" verticalCompressionResistancePriority="1" translatesAutoresizingMaskIntoConstraints="NO" id="nbq-yr-2mA" customClass="AttachmentsContainerView" customModule="Tusker" customModuleProvider="target">
-                                            <rect key="frame" x="0.0" y="171.5" width="277" height="156"/>
-                                            <color key="backgroundColor" systemColor="secondarySystemBackgroundColor" red="0.94901960780000005" green="0.94901960780000005" blue="0.96862745100000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                            <constraints>
-                                                <constraint firstAttribute="width" secondItem="nbq-yr-2mA" secondAttribute="height" multiplier="16:9" id="Rvt-zs-fkd"/>
-                                            </constraints>
-                                        </view>
                                         <stackView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" distribution="equalSpacing" alignment="bottom" translatesAutoresizingMaskIntoConstraints="NO" id="Zlb-yt-NTw">
                                             <rect key="frame" x="0.0" y="173.5" width="277" height="22"/>
                                             <subviews>
@@ -194,8 +187,16 @@
                                 <constraint firstItem="QMP-j2-HLn" firstAttribute="leading" secondItem="ve3-Y1-NQH" secondAttribute="leading" id="zeW-tQ-uJl"/>
                             </constraints>
                         </view>
+                        <view hidden="YES" contentMode="scaleToFill" verticalCompressionResistancePriority="1" translatesAutoresizingMaskIntoConstraints="NO" id="nbq-yr-2mA" customClass="AttachmentsContainerView" customModule="Tusker" customModuleProvider="target">
+                            <rect key="frame" x="0.0" y="224" width="343" height="0.0"/>
+                            <color key="backgroundColor" systemColor="secondarySystemBackgroundColor" red="0.94901960780000005" green="0.94901960780000005" blue="0.96862745100000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <constraints>
+                                <constraint firstAttribute="height" priority="999" constant="200" id="J42-49-2MU"/>
+                            </constraints>
+                        </view>
                     </subviews>
                     <constraints>
+                        <constraint firstItem="nbq-yr-2mA" firstAttribute="width" secondItem="yNh-ac-v6c" secondAttribute="width" id="JCZ-x5-Xa2"/>
                         <constraint firstItem="ve3-Y1-NQH" firstAttribute="width" secondItem="yNh-ac-v6c" secondAttribute="width" id="xN6-cs-Tnn"/>
                     </constraints>
                 </stackView>