Merge remote-tracking branch 'origin/main' into main

This commit is contained in:
Aiden Vigue 2021-06-05 22:57:36 -07:00
commit a7147e7e7c
4 changed files with 15 additions and 29 deletions

View File

@ -273,13 +273,13 @@ struct SeasonItemView: View {
.shadow(radius: 5)
.frame(width: 150, height: 90)
.cornerRadius(10)
.overlay(RoundedRectangle(cornerRadius: 10, style: .circular)
.fill(Color(red: 172 / 255, green: 92 / 255, blue: 195 / 255)
.opacity(0.4))
.frame(width: CGFloat((episode.Progress / Double(episode.RuntimeTicks)) *
150),
height: 90)
.padding(0), alignment: .bottomLeading)
.overlay(
Rectangle()
.fill(Color(red: 172/255, green: 92/255, blue: 195/255))
.mask(CustomShape(radius: 10))
.frame(width: CGFloat((episode.Progress / Double(episode.RuntimeTicks)) * 150), height: 7)
.padding(0), alignment: .bottomLeading
)
VStack(alignment: .leading) {
HStack {
Text("S\(String(episode.ParentIndexNumber ?? 0)):E\(String(episode.IndexNumber ?? 0))").font(.subheadline)
@ -407,13 +407,13 @@ struct SeasonItemView: View {
.shadow(radius: 5)
.frame(width: 150, height: 90)
.cornerRadius(10)
.overlay(RoundedRectangle(cornerRadius: 10, style: .circular)
.fill(Color(red: 172 / 255, green: 92 / 255, blue: 195 / 255)
.opacity(0.4))
.frame(width: CGFloat((episode.Progress / Double(episode.RuntimeTicks)) *
150),
height: 90)
.padding(0), alignment: .bottomLeading)
.overlay(
Rectangle()
.fill(Color(red: 172/255, green: 92/255, blue: 195/255))
.mask(CustomShape(radius: 10))
.frame(width: CGFloat((episode.Progress / Double(episode.RuntimeTicks)) * 150), height: 7)
.padding(0), alignment: .bottomLeading
)
VStack(alignment: .leading) {
HStack {
Text("S\(String(episode.ParentIndexNumber ?? 0)):E\(String(episode.IndexNumber ?? 0))").font(.subheadline)

View File

@ -1,4 +1,4 @@
<h1 align="center">Jellyfin Native for iOS</h1>
<h1 align="center">SwiftFin client for iOS</h1>
<h3 align="center">Part of the <a href="https://jellyfin.org">Jellyfin Project</a></h3>
---

View File

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict/>
</plist>

View File

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="1" systemVersion="11A491" minimumToolsVersion="Automatic" sourceLanguage="Swift" usedWithCloudKit="false" userDefinedModelVersionIdentifier="">
<entity name="Item" representedClassName="Item" syncable="YES" codeGenerationType="class">
<attribute name="timestamp" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
</entity>
<elements>
<element name="Item" positionX="-63" positionY="-18" width="128" height="44"/>
</elements>
</model>