clean

Session.xcodeproj/project.pbxproj

@@ -154,6 +154,7 @@
 		7BA6890D27325CCC00EFC32F /* SessionCallManager+CXCallController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BA6890C27325CCC00EFC32F /* SessionCallManager+CXCallController.swift */; };
 		7BA6890F27325CE300EFC32F /* SessionCallManager+CXProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BA6890E27325CE300EFC32F /* SessionCallManager+CXProvider.swift */; };
 		7BAADFCC27B0EF23007BCF92 /* CallVideoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BAADFCB27B0EF23007BCF92 /* CallVideoView.swift */; };
+		7BAADFCE27B215FE007BCF92 /* UIView+Draggable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BAADFCD27B215FE007BCF92 /* UIView+Draggable.swift */; };
 		7BAF54CE27ACCEEC003D12F8 /* Storage+RecentSearchResults.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BAF54CB27ACCEEC003D12F8 /* Storage+RecentSearchResults.swift */; };
 		7BAF54CF27ACCEEC003D12F8 /* GlobalSearchViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BAF54CC27ACCEEC003D12F8 /* GlobalSearchViewController.swift */; };
 		7BAF54D027ACCEEC003D12F8 /* EmptySearchResultCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BAF54CD27ACCEEC003D12F8 /* EmptySearchResultCell.swift */; };
@@ -1163,6 +1164,7 @@
 		7BA6890C27325CCC00EFC32F /* SessionCallManager+CXCallController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SessionCallManager+CXCallController.swift"; sourceTree = "<group>"; };
 		7BA6890E27325CE300EFC32F /* SessionCallManager+CXProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SessionCallManager+CXProvider.swift"; sourceTree = "<group>"; };
 		7BAADFCB27B0EF23007BCF92 /* CallVideoView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CallVideoView.swift; sourceTree = "<group>"; };
+		7BAADFCD27B215FE007BCF92 /* UIView+Draggable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+Draggable.swift"; sourceTree = "<group>"; };
 		7BAF54CB27ACCEEC003D12F8 /* Storage+RecentSearchResults.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Storage+RecentSearchResults.swift"; sourceTree = "<group>"; };
 		7BAF54CC27ACCEEC003D12F8 /* GlobalSearchViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GlobalSearchViewController.swift; sourceTree = "<group>"; };
 		7BAF54CD27ACCEEC003D12F8 /* EmptySearchResultCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EmptySearchResultCell.swift; sourceTree = "<group>"; };
@@ -2101,6 +2103,7 @@
 				B83F2B87240CB75A000A54AB /* UIImage+Scaling.swift */,
 				C31A6C59247F214E001123EF /* UIView+Glow.swift */,
 				C3548F0724456AB6009433A8 /* UIView+Wrapping.swift */,
+				7BAADFCD27B215FE007BCF92 /* UIView+Draggable.swift */,
 				7BFD1A892745C4F000FB91B9 /* Permissions.swift */,
 			);
 			path = Utilities;
@@ -5055,6 +5058,7 @@
 				7B1581E827210ECC00848B49 /* RenderView.swift in Sources */,
 				7BC707F227290ACB002817AD /* SessionCallManager.swift in Sources */,
 				3441FD9F21A3604F00BB9542 /* BackupRestoreViewController.swift in Sources */,
+				7BAADFCE27B215FE007BCF92 /* UIView+Draggable.swift in Sources */,
 				45C0DC1B1E68FE9000E04C47 /* UIApplication+OWS.swift in Sources */,
 				4539B5861F79348F007141FF /* PushRegistrationManager.swift in Sources */,
 				B8041A9525C8FA1D003C2166 /* MediaLoaderView.swift in Sources */,

Session/Calls/CallVC.swift

@@ -25,7 +25,7 @@ final class CallVC : UIViewController, VideoPreviewDelegate {
         result.isHidden = !call.isVideoEnabled
         result.set(.width, to: 80)
         result.set(.height, to: 173)
-        result.addGestureRecognizer(UIPanGestureRecognizer(target: self, action: #selector(handlePanGesture)))
+        result.makeViewDraggable()
         return result
     }()
     
@@ -470,38 +470,6 @@ final class CallVC : UIViewController, VideoPreviewDelegate {
         }
     }
     
-    // MARK: Pan gesture handling
-    @objc private func handlePanGesture(gesture: UIPanGestureRecognizer) {
-        let location = gesture.location(in: self.view)
-        if let draggedView = gesture.view {
-            draggedView.center = location
-            if gesture.state == .ended {
-                let sideMargin = 40 + Values.verySmallSpacing
-                if draggedView.frame.midX >= self.view.layer.frame.width / 2 {
-                    UIView.animate(withDuration: 0.5, delay: 0, usingSpringWithDamping: 1, initialSpringVelocity: 1, options: .curveEaseIn, animations: {
-                        draggedView.center.x = self.view.layer.frame.width - sideMargin
-                    }, completion: nil)
-                }else{
-                    UIView.animate(withDuration: 0.5, delay: 0, usingSpringWithDamping: 1, initialSpringVelocity: 1, options: .curveEaseIn, animations: {
-                        draggedView.center.x = sideMargin
-                    }, completion: nil)
-                }
-                let topMargin = UIApplication.shared.keyWindow!.safeAreaInsets.top + Values.veryLargeSpacing
-                if draggedView.frame.minY <= topMargin {
-                    UIView.animate(withDuration: 0.5, delay: 0, usingSpringWithDamping: 1, initialSpringVelocity: 1, options: .curveEaseIn, animations: {
-                        draggedView.center.y = topMargin + draggedView.frame.size.height / 2
-                    }, completion: nil)
-                }
-                let bottomMargin = UIApplication.shared.keyWindow!.safeAreaInsets.bottom
-                if draggedView.frame.maxY >= self.view.layer.frame.height {
-                    UIView.animate(withDuration: 0.5, delay: 0, usingSpringWithDamping: 1, initialSpringVelocity: 1, options: .curveEaseIn, animations: {
-                        draggedView.center.y = self.view.layer.frame.height - draggedView.frame.size.height / 2 - bottomMargin
-                    }, completion: nil)
-                }
-            }
-        }
-    }
-    
     @objc private func handleRemoteVieioViewTapped(gesture: UITapGestureRecognizer) {
         let isHidden = callInfoLabel.alpha < 0.5
         UIView.animate(withDuration: 0.5) {

Session/Calls/Views & Modals/MiniCallView.swift

@@ -6,6 +6,7 @@ final class MiniCallView: UIView {
     
     private lazy var remoteVideoView: RemoteVideoView = {
         let result = RemoteVideoView()
+        result.alpha = 0
         result.videoContentMode = .scaleAspectFit
         result.backgroundColor = .black
         return result
@@ -17,7 +18,7 @@ final class MiniCallView: UIView {
     init(from callVC: CallVC) {
         self.callVC = callVC
         super.init(frame: CGRect.zero)
-        self.backgroundColor = .black
+        self.backgroundColor = UIColor.init(white: 0, alpha: 0.8)
         setUpViewHierarchy()
         setUpGestureRecognizers()
         MiniCallView.current = self
@@ -32,8 +33,9 @@ final class MiniCallView: UIView {
     }
     
     private func setUpViewHierarchy() {
-        self.set(.width, to: 160)
+        self.set(.width, to: 100)
-        self.set(.height, to: 160)
+        self.set(.height, to: 100)
+        self.layer.cornerRadius = 10
         self.layer.masksToBounds = true
         // Background
         let background = getBackgroudView()
@@ -57,11 +59,6 @@ final class MiniCallView: UIView {
         imageView.set(.width, to: 64)
         imageView.set(.height, to: 64)
         imageView.center(in: background)
-        let blurView = UIView()
-        blurView.alpha = 0.5
-        blurView.backgroundColor = .black
-        background.addSubview(blurView)
-        blurView.autoPinEdgesToSuperviewEdges()
         return background
     }
     
@@ -69,8 +66,7 @@ final class MiniCallView: UIView {
         let tapGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(handleTap))
         tapGestureRecognizer.numberOfTapsRequired = 1
         addGestureRecognizer(tapGestureRecognizer)
-        let panGestureRecognizer = UIPanGestureRecognizer(target: self, action: #selector(handlePan))
+        makeViewDraggable()
-        addGestureRecognizer(panGestureRecognizer)
     }
     
     // MARK: Interaction
@@ -80,42 +76,11 @@ final class MiniCallView: UIView {
         presentingVC.present(callVC, animated: true, completion: nil)
     }
     
-    @objc private func handlePan(_ gesture: UIPanGestureRecognizer) {
-        let location = gesture.location(in: self.superview!)
-        if let draggedView = gesture.view {
-            draggedView.center = location
-            if gesture.state == .ended {
-                let sideMargin = 40 + Values.verySmallSpacing
-                if draggedView.frame.midX >= self.superview!.layer.frame.width / 2 {
-                    UIView.animate(withDuration: 0.5, delay: 0, usingSpringWithDamping: 1, initialSpringVelocity: 1, options: .curveEaseIn, animations: {
-                        draggedView.center.x = self.superview!.layer.frame.width - sideMargin
-                    }, completion: nil)
-                }else{
-                    UIView.animate(withDuration: 0.5, delay: 0, usingSpringWithDamping: 1, initialSpringVelocity: 1, options: .curveEaseIn, animations: {
-                        draggedView.center.x = sideMargin
-                    }, completion: nil)
-                }
-                let topMargin = UIApplication.shared.keyWindow!.safeAreaInsets.top + Values.veryLargeSpacing
-                if draggedView.frame.minY <= topMargin {
-                    UIView.animate(withDuration: 0.5, delay: 0, usingSpringWithDamping: 1, initialSpringVelocity: 1, options: .curveEaseIn, animations: {
-                        draggedView.center.y = topMargin + draggedView.frame.size.height / 2
-                    }, completion: nil)
-                }
-                let bottomMargin = UIApplication.shared.keyWindow!.safeAreaInsets.bottom
-                if draggedView.frame.maxY >= self.superview!.layer.frame.height {
-                    UIView.animate(withDuration: 0.5, delay: 0, usingSpringWithDamping: 1, initialSpringVelocity: 1, options: .curveEaseIn, animations: {
-                        draggedView.center.y = self.layer.frame.height - draggedView.frame.size.height / 2 - bottomMargin
-                    }, completion: nil)
-                }
-            }
-        }
-    }
-    
     public func show() {
         self.alpha = 0.0
         let window = CurrentAppContext().mainWindow!
         window.addSubview(self)
-        self.autoPinEdge(toSuperviewEdge: .right, withInset: Values.smallSpacing)
+        self.autoPinEdge(toSuperviewEdge: .right)
         let topMargin = UIApplication.shared.keyWindow!.safeAreaInsets.top + Values.veryLargeSpacing
         self.autoPinEdge(toSuperviewEdge: .top, withInset: topMargin)
         UIView.animate(withDuration: 0.5, delay: 0, options: [], animations: {

Session/Utilities/UIView+Draggable.swift

@@ -0,0 +1,41 @@
+// Copyright © 2022 Rangeproof Pty Ltd. All rights reserved.
+
+extension UIView {
+    
+    func makeViewDraggable() {
+        let panGestureRecognizer = UIPanGestureRecognizer(target: self, action: #selector(handlePan))
+        addGestureRecognizer(panGestureRecognizer)
+    }
+    
+    @objc private func handlePan(_ gesture: UIPanGestureRecognizer) {
+        let location = gesture.location(in: self.superview!)
+        if let draggedView = gesture.view {
+            draggedView.center = location
+            if gesture.state == .ended {
+                let sideMargin = 40 + Values.verySmallSpacing
+                if draggedView.frame.midX >= self.superview!.layer.frame.width / 2 {
+                    UIView.animate(withDuration: 0.5, delay: 0, usingSpringWithDamping: 1, initialSpringVelocity: 1, options: .curveEaseIn, animations: {
+                        draggedView.center.x = self.superview!.layer.frame.width - sideMargin
+                    }, completion: nil)
+                }else{
+                    UIView.animate(withDuration: 0.5, delay: 0, usingSpringWithDamping: 1, initialSpringVelocity: 1, options: .curveEaseIn, animations: {
+                        draggedView.center.x = sideMargin
+                    }, completion: nil)
+                }
+                let topMargin = UIApplication.shared.keyWindow!.safeAreaInsets.top + Values.veryLargeSpacing
+                if draggedView.frame.minY <= topMargin {
+                    UIView.animate(withDuration: 0.5, delay: 0, usingSpringWithDamping: 1, initialSpringVelocity: 1, options: .curveEaseIn, animations: {
+                        draggedView.center.y = topMargin + draggedView.frame.size.height / 2
+                    }, completion: nil)
+                }
+                let bottomMargin = UIApplication.shared.keyWindow!.safeAreaInsets.bottom
+                if draggedView.frame.maxY >= self.superview!.layer.frame.height {
+                    UIView.animate(withDuration: 0.5, delay: 0, usingSpringWithDamping: 1, initialSpringVelocity: 1, options: .curveEaseIn, animations: {
+                        draggedView.center.y = self.layer.frame.height - draggedView.frame.size.height / 2 - bottomMargin
+                    }, completion: nil)
+                }
+            }
+        }
+    }
+    
+}