Tusker.xcodeproj/project.pbxproj

@@ -121,7 +121,6 @@
 		D6531DF0246B867E000F9538 /* GifvAttachmentViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6531DEF246B867E000F9538 /* GifvAttachmentViewController.swift */; };
 		D6538945214D6D7500E3CEFC /* TableViewSwipeActionProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6538944214D6D7500E3CEFC /* TableViewSwipeActionProvider.swift */; };
 		D653F411267D1E32004E32B1 /* DiffableTimelineLikeTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D653F410267D1E32004E32B1 /* DiffableTimelineLikeTableViewController.swift */; };
-		D6552367289870790048A653 /* ScreenCorners in Frameworks */ = {isa = PBXBuildFile; productRef = D6552366289870790048A653 /* ScreenCorners */; };
 		D65C6BF525478A9C00A6E89C /* BackgroundableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D65C6BF425478A9C00A6E89C /* BackgroundableViewController.swift */; };
 		D65F613423AEAB6600F3CFD3 /* OnboardingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D65F613323AEAB6600F3CFD3 /* OnboardingTests.swift */; };
 		D6620ACE2511A0ED00312CA0 /* StatusStateResolver.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6620ACD2511A0ED00312CA0 /* StatusStateResolver.swift */; };
@@ -669,7 +668,6 @@
 				D674A50927F9128D00BA03AC /* Pachyderm in Frameworks */,
 				D69CCBBF249E6EFD000AF167 /* CrashReporter in Frameworks */,
 				D60CFFDB24A290BA00D00083 /* SwiftSoup in Frameworks */,
-				D6552367289870790048A653 /* ScreenCorners in Frameworks */,
 				D6676CA527A8D0020052936B /* WebURLFoundationExtras in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1508,7 +1506,6 @@
 				D60CFFDA24A290BA00D00083 /* SwiftSoup */,
 				D6676CA427A8D0020052936B /* WebURLFoundationExtras */,
 				D674A50827F9128D00BA03AC /* Pachyderm */,
-				D6552366289870790048A653 /* ScreenCorners */,
 			);
 			productName = Tusker;
 			productReference = D6D4DDCC212518A000E1C4BB /* Tusker.app */;
@@ -1617,7 +1614,6 @@
 				D69CCBBD249E6EFD000AF167 /* XCRemoteSwiftPackageReference "plcrashreporter" */,
 				D60CFFD924A290BA00D00083 /* XCRemoteSwiftPackageReference "SwiftSoup" */,
 				D6676CA127A8D0020052936B /* XCRemoteSwiftPackageReference "swift-url" */,
-				D6552365289870790048A653 /* XCRemoteSwiftPackageReference "ScreenCorners" */,
 			);
 			productRefGroup = D6D4DDCD212518A000E1C4BB /* Products */;
 			projectDirPath = "";
@@ -2447,14 +2443,6 @@
 				minimumVersion = 2.3.2;
 			};
 		};
-		D6552365289870790048A653 /* XCRemoteSwiftPackageReference "ScreenCorners" */ = {
-			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/kylebshr/ScreenCorners";
-			requirement = {
-				kind = upToNextMinorVersion;
-				minimumVersion = 1.0.1;
-			};
-		};
 		D6676CA127A8D0020052936B /* XCRemoteSwiftPackageReference "swift-url" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/karwa/swift-url";
@@ -2479,11 +2467,6 @@
 			package = D60CFFD924A290BA00D00083 /* XCRemoteSwiftPackageReference "SwiftSoup" */;
 			productName = SwiftSoup;
 		};
-		D6552366289870790048A653 /* ScreenCorners */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = D6552365289870790048A653 /* XCRemoteSwiftPackageReference "ScreenCorners" */;
-			productName = ScreenCorners;
-		};
 		D6676CA427A8D0020052936B /* WebURLFoundationExtras */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = D6676CA127A8D0020052936B /* XCRemoteSwiftPackageReference "swift-url" */;

Tusker/Screens/Large Image/LargeImageViewController.swift

@@ -140,12 +140,9 @@ class LargeImageViewController: UIViewController, UIScrollViewDelegate, LargeIma
         let notchedDeviceTopInsets: [CGFloat] = [
             44, // iPhone X, Xs, Xs Max, 11 Pro, 11 Pro Max
             48, // iPhone XR, 11
-            47, // iPhone 12, 12 Pro, 12 Pro Max, 13, 13 Pro, 13 Pro Max, 14, 14 Plus
+            47, // iPhone 12, 12 Pro, 12 Pro Max, 13, 13 Pro, 13 Pro Max
             50, // iPhone 12 mini, 13 mini
         ]
-        let pillDeviceTopInsets: [CGFloat] = [
-            59, // iPhone 14 Pro, 14 Pro Max
-        ]
         if notchedDeviceTopInsets.contains(view.safeAreaInsets.top) {
             // the notch width is not the same for the iPhones 13,
             // but what we actually want is the same offset from the edges
@@ -155,11 +152,6 @@ class LargeImageViewController: UIViewController, UIScrollViewDelegate, LargeIma
             let offset = (earWidth - shareButton.bounds.width) / 2
             shareButtonLeadingConstraint.constant = offset
             closeButtonTrailingConstraint.constant = offset
-        } else if pillDeviceTopInsets.contains(view.safeAreaInsets.top) {
-            shareButtonLeadingConstraint.constant = 24
-            shareButtonTopConstraint.constant = 24
-            closeButtonTrailingConstraint.constant = 24
-            closeButtonTopConstraint.constant = 24
         }
     }
     

Tusker/Screens/Large Image/LargeImageViewController.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21225" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17132" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21207"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17105"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -108,7 +108,7 @@
         </view>
     </objects>
     <resources>
-        <image name="square.and.arrow.up" catalog="system" width="32" height="32"/>
+        <image name="square.and.arrow.up" catalog="system" width="115" height="128"/>
-        <image name="xmark" catalog="system" width="32" height="32"/>
+        <image name="xmark" catalog="system" width="128" height="113"/>
     </resources>
 </document>

Tusker/Screens/Main/AccountSwitchingContainerViewController.swift

@@ -7,7 +7,6 @@
 //
 
 import UIKit
-import ScreenCorners
 
 class AccountSwitchingContainerViewController: UIViewController {
 
@@ -50,30 +49,14 @@ class AccountSwitchingContainerViewController: UIViewController {
             } else {
                 let sign: CGFloat = direction == .downwards ? -1 : 1
                 let newInitialOffset = sign * view.bounds.height
-                let scale: CGFloat = 0.75
                 
-                newRoot.view.transform = CGAffineTransform(translationX: 0, y: newInitialOffset).scaledBy(x: 0.9, y: 0.9)
+                newRoot.view.transform = CGAffineTransform(translationX: 0, y: newInitialOffset)
-                newRoot.view.layer.masksToBounds = true
-                newRoot.view.layer.cornerCurve = .continuous
-                newRoot.view.layer.cornerRadius = view.window?.screen.displayCornerRadius ?? 0
                 
-                oldRoot.view.layer.masksToBounds = true
+                UIView.animate(withDuration: 0.3, delay: 0, options: .curveEaseInOut) {
-                oldRoot.view.layer.cornerCurve = .continuous
-                oldRoot.view.layer.cornerRadius = view.window?.screen.displayCornerRadius ?? 0
-
-                // only one edge is affected in each direction, i have no idea why
-                if direction == .upwards {
-                    oldRoot.additionalSafeAreaInsets.bottom = view.safeAreaInsets.bottom
-                } else {
-                    oldRoot.additionalSafeAreaInsets.top = view.safeAreaInsets.top
-                }
-                
-                UIView.animate(withDuration: 0.4, delay: 0, options: .curveEaseInOut) {
-                    oldRoot.view.transform = CGAffineTransform(translationX: 0, y: -newInitialOffset).scaledBy(x: scale, y: scale)
                     newRoot.view.transform = .identity
+                    oldRoot.view.transform = CGAffineTransform(translationX: 0, y: -newInitialOffset)
                 } completion: { (_) in
                     oldRoot.removeViewAndController()
-                    newRoot.view.layer.masksToBounds = false
                 }
             }
         }