From 3b6fefd09288426f2e956c4022aae08f86cefd7e Mon Sep 17 00:00:00 2001 From: Aiden Vigue Date: Fri, 4 Jun 2021 13:05:40 -0400 Subject: [PATCH] progress view on seasonitemview --- JellyfinPlayer/SeasonItemView.swift | 28 +++++++++---------- .../.xccurrentversion | 5 ---- .../jellyfin_tvos.xcdatamodel/contents | 9 ------ 3 files changed, 14 insertions(+), 28 deletions(-) delete mode 100644 jellyfin-tvos/jellyfin_tvos.xcdatamodeld/.xccurrentversion delete mode 100644 jellyfin-tvos/jellyfin_tvos.xcdatamodeld/jellyfin_tvos.xcdatamodel/contents diff --git a/JellyfinPlayer/SeasonItemView.swift b/JellyfinPlayer/SeasonItemView.swift index 0931a379..9261cff9 100644 --- a/JellyfinPlayer/SeasonItemView.swift +++ b/JellyfinPlayer/SeasonItemView.swift @@ -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) diff --git a/jellyfin-tvos/jellyfin_tvos.xcdatamodeld/.xccurrentversion b/jellyfin-tvos/jellyfin_tvos.xcdatamodeld/.xccurrentversion deleted file mode 100644 index 0c67376e..00000000 --- a/jellyfin-tvos/jellyfin_tvos.xcdatamodeld/.xccurrentversion +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/jellyfin-tvos/jellyfin_tvos.xcdatamodeld/jellyfin_tvos.xcdatamodel/contents b/jellyfin-tvos/jellyfin_tvos.xcdatamodeld/jellyfin_tvos.xcdatamodel/contents deleted file mode 100644 index 9ed2921a..00000000 --- a/jellyfin-tvos/jellyfin_tvos.xcdatamodeld/jellyfin_tvos.xcdatamodel/contents +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file