Fix sidebar in latest tvOS release. Stop doing an overlay, instead pu…

…sh content to the side. No more hacky focus tricks. Unfortunately I don't quite know how to get the content to stay its same width and be pushed over, so it resizes. And since it's resizing a lot of content on animation, it's a bit slow to compute. But at least it's workable now.
Jman012 · Oct 8, 2024 · bf3f95c · bf3f95c
1 parent 16c0a9c
commit bf3f95c
Show file tree

Hide file tree

Showing 5 changed files with 93 additions and 79 deletions.
diff --git a/FloatplaneAPIClient/Package.swift b/FloatplaneAPIClient/Package.swift
@@ -17,8 +17,8 @@ let package = Package(
     ],
     dependencies: [
         // Dependencies declare other packages that this package depends on.
-        .package(url: "https://github.com/Flight-School/AnyCodable", .upToNextMajor(from: "0.6.1")),
-        .package(url: "https://github.com/vapor/vapor", from: "4.0.0")
+        .package(url: "https://github.com/Flight-School/AnyCodable", .upToNextMajor(from: "0.6.7")),
+        .package(url: "https://github.com/vapor/vapor", from: "4.106.0")
     ],
     targets: [
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.

diff --git a/Wasserflug-tvOS.xcodeproj/project.pbxproj b/Wasserflug-tvOS.xcodeproj/project.pbxproj
@@ -88,6 +88,7 @@
 		E7A469B32A9BCF51003A156A /* FPChatManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = E7A469B22A9BCF51003A156A /* FPChatManager.swift */; };
 		E7A469B52A9BCF59003A156A /* FPChatClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = E7A469B42A9BCF59003A156A /* FPChatClient.swift */; };
 		E7BD7E7528E6682900E1BBE9 /* DeliveryHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = E7BD7E7428E6682900E1BBE9 /* DeliveryHelper.swift */; };
+		E7E713332CB4EB19003B8A0F /* MultipartKit in Frameworks */ = {isa = PBXBuildFile; productRef = E7E713322CB4EB19003B8A0F /* MultipartKit */; };
 		E7F2F23D2A113F0000602991 /* OnCustomAppear.swift in Sources */ = {isa = PBXBuildFile; fileRef = E7F2F23C2A113F0000602991 /* OnCustomAppear.swift */; };
 /* End PBXBuildFile section */
 
@@ -201,6 +202,7 @@
 			files = (
 				E75337BC27CB07900010E3D2 /* FloatplaneAPIClient in Frameworks */,
 				E7304FBB2A86FE730008DE93 /* FloatplaneAPIAsync in Frameworks */,
+				E7E713332CB4EB19003B8A0F /* MultipartKit in Frameworks */,
 				E7304FAE2A86F9B60008DE93 /* SocketIO in Frameworks */,
 				E74C98A62A080B9E00FDDB9C /* DebouncedOnChange in Frameworks */,
 				E76D685C2A927EE4009A2374 /* BigNumber in Frameworks */,
@@ -461,6 +463,7 @@
 				E7304FAD2A86F9B60008DE93 /* SocketIO */,
 				E7304FBA2A86FE730008DE93 /* FloatplaneAPIAsync */,
 				E76D685B2A927EE4009A2374 /* BigNumber */,
+				E7E713322CB4EB19003B8A0F /* MultipartKit */,
 			);
 			productName = "Wasserflug-tvOS";
 			productReference = E753373927CAFAFE0010E3D2 /* Wasserflug.app */;
@@ -539,6 +542,7 @@
 				E74C98A42A080B9E00FDDB9C /* XCRemoteSwiftPackageReference "DebouncedOnChange" */,
 				E7304FAC2A86F9B60008DE93 /* XCRemoteSwiftPackageReference "socket" */,
 				E76D685A2A927EE4009A2374 /* XCRemoteSwiftPackageReference "Swift-BigInt" */,
+				E7E713312CB4EB19003B8A0F /* XCRemoteSwiftPackageReference "multipart-kit" */,
 			);
 			productRefGroup = E753373A27CAFAFE0010E3D2 /* Products */;
 			projectDirPath = "";
@@ -1034,7 +1038,7 @@
 			repositoryURL = "https://github.com/vapor/vapor";
 			requirement = {
 				kind = exactVersion;
-				version = 4.65.2;
+				version = 4.106.0;
 			};
 		};
 		E76D685A2A927EE4009A2374 /* XCRemoteSwiftPackageReference "Swift-BigInt" */ = {
@@ -1045,6 +1049,14 @@
 				minimumVersion = 2.2.1;
 			};
 		};
+		E7E713312CB4EB19003B8A0F /* XCRemoteSwiftPackageReference "multipart-kit" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/vapor/multipart-kit";
+			requirement = {
+				kind = upToNextMajorVersion;
+				minimumVersion = 4.7.0;
+			};
+		};
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
@@ -1076,6 +1088,11 @@
 			package = E76D685A2A927EE4009A2374 /* XCRemoteSwiftPackageReference "Swift-BigInt" */;
 			productName = BigNumber;
 		};
+		E7E713322CB4EB19003B8A0F /* MultipartKit */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = E7E713312CB4EB19003B8A0F /* XCRemoteSwiftPackageReference "multipart-kit" */;
+			productName = MultipartKit;
+		};
 /* End XCSwiftPackageProductDependency section */
 
 /* Begin XCVersionGroup section */

diff --git a/Wasserflug-tvOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Wasserflug-tvOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -6,35 +6,35 @@
         "repositoryURL": "https://github.com/Flight-School/AnyCodable",
         "state": {
           "branch": null,
-          "revision": "b1a7a8a6186f2fcb28f7bda67cfc545de48b3c80",
-          "version": "0.6.2"
+          "revision": "862808b2070cd908cb04f9aafe7de83d35f81b05",
+          "version": "0.6.7"
         }
       },
       {
         "package": "async-http-client",
         "repositoryURL": "https://github.com/swift-server/async-http-client.git",
         "state": {
           "branch": null,
-          "revision": "fc510a39cff61b849bf5cdff17eb2bd6d0777b49",
-          "version": "1.11.5"
+          "revision": "64abc77edf1ef81e69bd90a2ac386de615c8e8ea",
+          "version": "1.23.0"
         }
       },
       {
         "package": "async-kit",
         "repositoryURL": "https://github.com/vapor/async-kit.git",
         "state": {
           "branch": null,
-          "revision": "e2f741640364c1d271405da637029ea6a33f754e",
-          "version": "1.11.1"
+          "revision": "eab9edff78e8ace20bd7cb6e792ab46d54f59ab9",
+          "version": "1.18.0"
         }
       },
       {
         "package": "console-kit",
         "repositoryURL": "https://github.com/vapor/console-kit.git",
         "state": {
           "branch": null,
-          "revision": "75ea3b627d88221440b878e5dfccc73fd06842ed",
-          "version": "4.2.7"
+          "revision": "78c0dd739df8cb9ee14a8bbbf770facc4fc3402a",
+          "version": "4.15.0"
         }
       },
       {
@@ -51,17 +51,17 @@
         "repositoryURL": "https://github.com/vapor/multipart-kit.git",
         "state": {
           "branch": null,
-          "revision": "2dd9368a3c9580792b77c7ef364f3735909d9996",
-          "version": "4.5.1"
+          "revision": "a31236f24bfd2ea2f520a74575881f6731d7ae68",
+          "version": "4.7.0"
         }
       },
       {
         "package": "routing-kit",
         "repositoryURL": "https://github.com/vapor/routing-kit.git",
         "state": {
           "branch": null,
-          "revision": "ffac7b3a127ce1e85fb232f1a6271164628809ad",
-          "version": "4.6.0"
+          "revision": "8c9a227476555c55837e569be71944e02a056b72",
+          "version": "4.9.1"
         }
       },
       {
@@ -96,26 +96,26 @@
         "repositoryURL": "https://github.com/apple/swift-atomics.git",
         "state": {
           "branch": null,
-          "revision": "919eb1d83e02121cdb434c7bfc1f0c66ef17febe",
-          "version": "1.0.2"
+          "revision": "cd142fd2f64be2100422d658e7411e39489da985",
+          "version": "1.2.0"
         }
       },
       {
-        "package": "swift-backtrace",
-        "repositoryURL": "https://github.com/swift-server/swift-backtrace.git",
+        "package": "BigNumber",
+        "repositoryURL": "https://github.com/mkrd/Swift-BigInt.git",
         "state": {
           "branch": null,
-          "revision": "d3e04a9d4b3833363fb6192065b763310b156d54",
-          "version": "1.3.1"
+          "revision": "f98947c391b84f7557fb13fa40f3d3bcbc0d9ff0",
+          "version": "2.2.1"
         }
       },
       {
-        "package": "BigNumber",
-        "repositoryURL": "https://github.com/mkrd/Swift-BigInt.git",
+        "package": "swift-collections",
+        "repositoryURL": "https://github.com/apple/swift-collections.git",
         "state": {
           "branch": null,
-          "revision": "f98947c391b84f7557fb13fa40f3d3bcbc0d9ff0",
-          "version": "2.2.1"
+          "revision": "671108c96644956dddcd89dd59c203dcdb36cec7",
+          "version": "1.1.4"
         }
       },
       {
@@ -127,67 +127,76 @@
           "version": "2.0.4"
         }
       },
+      {
+        "package": "swift-http-types",
+        "repositoryURL": "https://github.com/apple/swift-http-types",
+        "state": {
+          "branch": null,
+          "revision": "ae67c8178eb46944fd85e4dc6dd970e1f3ed6ccd",
+          "version": "1.3.0"
+        }
+      },
       {
         "package": "swift-log",
         "repositoryURL": "https://github.com/apple/swift-log.git",
         "state": {
           "branch": null,
-          "revision": "5d66f7ba25daf4f94100e7022febf3c75e37a6c7",
-          "version": "1.4.2"
+          "revision": "9cb486020ebf03bfa5b5df985387a14a98744537",
+          "version": "1.6.1"
         }
       },
       {
         "package": "swift-metrics",
         "repositoryURL": "https://github.com/apple/swift-metrics.git",
         "state": {
           "branch": null,
-          "revision": "3edd2f57afc4e68e23c3e4956bc8b65ca6b5b2ff",
-          "version": "2.2.0"
+          "revision": "e0165b53d49b413dd987526b641e05e246782685",
+          "version": "2.5.0"
         }
       },
       {
         "package": "swift-nio",
         "repositoryURL": "https://github.com/apple/swift-nio.git",
         "state": {
           "branch": null,
-          "revision": "154f1d32366449dcccf6375a173adf4ed2a74429",
-          "version": "2.38.0"
+          "revision": "665206000b8307cab5ac51203d29b0f232d7e31b",
+          "version": "2.74.0"
         }
       },
       {
         "package": "swift-nio-extras",
         "repositoryURL": "https://github.com/apple/swift-nio-extras.git",
         "state": {
           "branch": null,
-          "revision": "f73ca5ee9c6806800243f1ac415fcf82de9a4c91",
-          "version": "1.10.2"
+          "revision": "d1ead62745cc3269e482f1c51f27608057174379",
+          "version": "1.24.0"
         }
       },
       {
         "package": "swift-nio-http2",
         "repositoryURL": "https://github.com/apple/swift-nio-http2.git",
         "state": {
           "branch": null,
-          "revision": "f9ab1c94c80d568efd762d2a638f25162691d766",
-          "version": "1.22.1"
+          "revision": "b5f7062b60e4add1e8c343ba4eb8da2e324b3a94",
+          "version": "1.34.0"
         }
       },
       {
         "package": "swift-nio-ssl",
         "repositoryURL": "https://github.com/apple/swift-nio-ssl.git",
         "state": {
           "branch": null,
-          "revision": "52a486ff6de9bc3e26bf634c5413c41c5fa89ca5",
-          "version": "2.17.2"
+          "revision": "7b84abbdcef69cc3be6573ac12440220789dcd69",
+          "version": "2.27.2"
         }
       },
       {
         "package": "swift-nio-transport-services",
         "repositoryURL": "https://github.com/apple/swift-nio-transport-services.git",
         "state": {
           "branch": null,
-          "revision": "8ab824b140d0ebcd87e9149266ddc353e3705a3e",
-          "version": "1.11.4"
+          "revision": "dbace16f126fdcd80d58dc54526c561ca17327d7",
+          "version": "1.22.0"
         }
       },
       {
@@ -199,22 +208,31 @@
           "version": "1.0.2"
         }
       },
+      {
+        "package": "swift-system",
+        "repositoryURL": "https://github.com/apple/swift-system.git",
+        "state": {
+          "branch": null,
+          "revision": "d2ba781702a1d8285419c15ee62fd734a9437ff5",
+          "version": "1.3.2"
+        }
+      },
       {
         "package": "vapor",
         "repositoryURL": "https://github.com/vapor/vapor",
         "state": {
           "branch": null,
-          "revision": "dda0de537e7906414dccd551e77095be1e34e3da",
-          "version": "4.65.2"
+          "revision": "1466c50e4ad39072143e2fcdf13b4ba11be375a0",
+          "version": "4.106.0"
         }
       },
       {
         "package": "websocket-kit",
         "repositoryURL": "https://github.com/vapor/websocket-kit.git",
         "state": {
           "branch": null,
-          "revision": "ff8fbce837ef01a93d49c6fb49a72be0f150dac7",
-          "version": "2.3.0"
+          "revision": "4232d34efa49f633ba61afde365d3896fc7f8740",
+          "version": "2.15.0"
         }
       }
     ]

diff --git a/Wasserflug-tvOS/Utilities/InnerShadow.swift b/Wasserflug-tvOS/Utilities/InnerShadow.swift
@@ -12,7 +12,7 @@ private struct InnerShadow: ViewModifier {
 	var edges: Edge.Set
 
 	private var colors: [Color] {
-		[color.opacity(0.75), color.opacity(0.0), .clear]
+		[color.opacity(0.25), color.opacity(0.0)]
 	}
 
 	func body(content: Content) -> some View {