jellyfin/Swiftfin
1
0
Fork 0
mirror of https://github.com/jellyfin/Swiftfin.git synced 2024-12-02 11:06:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

todo work and update to minimum of iOS 15

Browse Source
This commit is contained in:
Ethan Pippin 2021-09-21 11:06:09 -06:00
parent eac2181171
commit f639bee126
4 changed files with 21 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
JellyfinPlayer.xcodeproj/project.pbxproj
View File

@ -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",

20
JellyfinPlayer.xcworkspace/xcshareddata/swiftpm/Package.resolved
View File

@ -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"
}
}
]

12
Shared/Objects/VideoPlayerJumpLength.swift
View File

@ -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)!

16
Shared/Views/SearchBarView.swift
View File

@ -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 = ""