From f639bee126060b011904097426573fb8ba624567 Mon Sep 17 00:00:00 2001
From: Ethan Pippin <ethanpippin2343@gmail.com>
Date: Tue, 21 Sep 2021 11:06:09 -0600
Subject: [PATCH] todo work and update to minimum of iOS 15

---
 JellyfinPlayer.xcodeproj/project.pbxproj      |  4 ++--
 .../xcshareddata/swiftpm/Package.resolved     | 20 +++++++++----------
 Shared/Objects/VideoPlayerJumpLength.swift    | 12 +++++------
 Shared/Views/SearchBarView.swift              | 16 ++++-----------
 4 files changed, 21 insertions(+), 31 deletions(-)

diff --git a/JellyfinPlayer.xcodeproj/project.pbxproj b/JellyfinPlayer.xcodeproj/project.pbxproj
index 64d95b43..a38039f0 100644
--- a/JellyfinPlayer.xcodeproj/project.pbxproj
+++ b/JellyfinPlayer.xcodeproj/project.pbxproj
@@ -1929,7 +1929,7 @@
 				EXCLUDED_ARCHS = "";
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = JellyfinPlayer/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1966,7 +1966,7 @@
 				EXCLUDED_ARCHS = "";
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = JellyfinPlayer/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
diff --git a/JellyfinPlayer.xcworkspace/xcshareddata/swiftpm/Package.resolved b/JellyfinPlayer.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 462ac202..2f82a2bf 100644
--- a/JellyfinPlayer.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/JellyfinPlayer.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -15,8 +15,8 @@
         "repositoryURL": "https://github.com/Flight-School/AnyCodable",
         "state": {
           "branch": null,
-          "revision": "69261f239f0fffaf51495dadc4f8483fbfe97025",
-          "version": "0.6.1"
+          "revision": "b1a7a8a6186f2fcb28f7bda67cfc545de48b3c80",
+          "version": "0.6.2"
         }
       },
       {
@@ -24,8 +24,8 @@
         "repositoryURL": "https://github.com/pointfreeco/combine-schedulers",
         "state": {
           "branch": null,
-          "revision": "6dcc7c034d28fe7ac652453faeae07656f723909",
-          "version": "0.5.1"
+          "revision": "6bde3b0063ba8e7537b43744948535ca7e9e0dad",
+          "version": "0.5.2"
         }
       },
       {
@@ -78,8 +78,8 @@
         "repositoryURL": "https://github.com/kean/Nuke.git",
         "state": {
           "branch": null,
-          "revision": "3bd3a1765bdf62d561d4c2e10e1c4fc7a010f44e",
-          "version": "10.3.2"
+          "revision": "0db18dd34998cca18e9a28bcee136f84518007a0",
+          "version": "10.4.1"
         }
       },
       {
@@ -105,8 +105,8 @@
         "repositoryURL": "https://github.com/sushichop/Puppy",
         "state": {
           "branch": null,
-          "revision": "d670c669ce2a6ab554a903b815f461d6efc565e4",
-          "version": "0.3.0"
+          "revision": "95ce04b0e778b8d7c351876bc98bbf68328dfc9b",
+          "version": "0.3.1"
         }
       },
       {
@@ -150,8 +150,8 @@
         "repositoryURL": "https://github.com/pointfreeco/xctest-dynamic-overlay",
         "state": {
           "branch": null,
-          "revision": "b9eeb1a7ea3fd6fea54ce57dee2f5794b667c8df",
-          "version": "0.2.0"
+          "revision": "50a70a9d3583fe228ce672e8923010c8df2deddd",
+          "version": "0.2.1"
         }
       }
     ]
diff --git a/Shared/Objects/VideoPlayerJumpLength.swift b/Shared/Objects/VideoPlayerJumpLength.swift
index e3a0b282..6a2a38b4 100644
--- a/Shared/Objects/VideoPlayerJumpLength.swift
+++ b/Shared/Objects/VideoPlayerJumpLength.swift
@@ -14,9 +14,7 @@ enum VideoPlayerJumpLength: Int32, CaseIterable, Defaults.Serializable {
     case thirty = 30
     case fifteen = 15
     case ten = 10
-
-    // TODO - Uncomment once iOS 15 released
-//    case five = 5
+    case five = 5
 
     var label: String {
         return "\(self.rawValue) seconds"
@@ -33,8 +31,8 @@ enum VideoPlayerJumpLength: Int32, CaseIterable, Defaults.Serializable {
             systemName = "goforward.15"
         case .ten:
             systemName = "goforward.10"
-//        case .five:
-//            systemName = "goforward.5"
+        case .five:
+            systemName = "goforward.5"
         }
 
         return UIImage(systemName: systemName, withConfiguration: config)!
@@ -51,8 +49,8 @@ enum VideoPlayerJumpLength: Int32, CaseIterable, Defaults.Serializable {
             systemName = "gobackward.15"
         case .ten:
             systemName = "gobackward.10"
-//        case .five:
-//            systemName = "gobackward.5"
+        case .five:
+            systemName = "gobackward.5"
         }
 
         return UIImage(systemName: systemName, withConfiguration: config)!
diff --git a/Shared/Views/SearchBarView.swift b/Shared/Views/SearchBarView.swift
index 4e565210..ac4b8f32 100644
--- a/Shared/Views/SearchBarView.swift
+++ b/Shared/Views/SearchBarView.swift
@@ -16,21 +16,13 @@ struct SearchBar: View {
 
     var body: some View {
         HStack(spacing: 8) {
-            // TODO: Clean up the statement as previously done
-            //       in commit 93a25eb9c43eddd03e09df87722c086fb6cb6da4
-            //       after Swift 5.5 is released.
+            TextField(NSLocalizedString("Search...", comment: ""), text: $text)
+                .padding(8)
+                .padding(.horizontal, 16)
             #if os(iOS)
-            TextField(NSLocalizedString("Search...", comment: ""), text: $text)
-                .padding(8)
-                .padding(.horizontal, 16)
                 .background(Color(.systemGray6))
-                .cornerRadius(8)
-            #else
-            TextField(NSLocalizedString("Search...", comment: ""), text: $text)
-                .padding(8)
-                .padding(.horizontal, 16)
-                .cornerRadius(8)
             #endif
+                .cornerRadius(8)
             if !text.isEmpty {
                 Button(action: {
                     self.text = ""