diff options
Diffstat (limited to 'Jel')
| -rw-r--r-- | Jel/Extensions/BaseItemDtoExtensions.swift (renamed from Jel/Extensions/JellyfinKitExtensions.swift) | 8 | ||||
| -rw-r--r-- | Jel/Views/Item/ItemMediaView.swift | 2 | ||||
| -rw-r--r-- | Jel/Views/Item/Series/ItemSeriesEpisodeIconView.swift | 24 | ||||
| -rw-r--r-- | Jel/Views/Item/Types/ItemPersonView.swift | 2 | ||||
| -rw-r--r-- | Jel/Views/Item/Types/ItemSeasonView.swift | 2 |
5 files changed, 23 insertions, 15 deletions
diff --git a/Jel/Extensions/JellyfinKitExtensions.swift b/Jel/Extensions/BaseItemDtoExtensions.swift index 197731c..27771bb 100644 --- a/Jel/Extensions/JellyfinKitExtensions.swift +++ b/Jel/Extensions/BaseItemDtoExtensions.swift @@ -26,3 +26,11 @@ extension BaseItemDto { return nil } } + +extension BaseItemDto { + var overviewNL: String? { + get { + self.overview?.replacingOccurrences(of: "<br>", with: "\n") + } + } +} diff --git a/Jel/Views/Item/ItemMediaView.swift b/Jel/Views/Item/ItemMediaView.swift index efcfb55..515cf47 100644 --- a/Jel/Views/Item/ItemMediaView.swift +++ b/Jel/Views/Item/ItemMediaView.swift @@ -19,7 +19,7 @@ struct ItemMediaView: View { .font(.headline) .frame(maxWidth: .infinity, alignment: .leading) - ExpandableText((item.overview ?? "").replacingOccurrences(of: "<br>", with: "")) + ExpandableText((item.overviewNL ?? "").replacingOccurrences(of: "<br>", with: "")) .lineLimit(8) } } diff --git a/Jel/Views/Item/Series/ItemSeriesEpisodeIconView.swift b/Jel/Views/Item/Series/ItemSeriesEpisodeIconView.swift index 9217bea..c198e66 100644 --- a/Jel/Views/Item/Series/ItemSeriesEpisodeIconView.swift +++ b/Jel/Views/Item/Series/ItemSeriesEpisodeIconView.swift @@ -14,30 +14,30 @@ struct ItemSeriesEpisodeIconView: View { @EnvironmentObject var size: ScreenSize - var iconWidthMultiplier: CGFloat = 0.35 + var iconWidthMultiplier: CGFloat = 0.5 var body: some View { VStack(alignment: .leading) { - HStack(alignment: .top) { - ItemIconView(item: item, width: (size.size.width * iconWidthMultiplier), height: (size.size.width * iconWidthMultiplier) / 1.7) + HStack { + ItemIconView(item: item, + width: (size.size.width * iconWidthMultiplier), + height: (size.size.width * iconWidthMultiplier) / 1.7, + contentMode: .fill) VStack(alignment: .leading) { Text("Episode \(item.indexNumber ?? 0)") - .foregroundStyle(Color.secondary) - .font(.caption) - Text(item.name ?? "---") - .bold() - .lineLimit(nil) - - Text(item.overview ?? "") - .foregroundStyle(Color.secondary) + .foregroundStyle(.secondary) .font(.callout) - Spacer() + Text(item.name ?? "---") + .bold() } .frame(height: (size.size.width * iconWidthMultiplier) / 1.7) } + ExpandableText((item.overviewNL ?? "").replacingOccurrences(of: "<br>", with: "\n")) + .foregroundColor(.secondary) } + .padding(.vertical) } } diff --git a/Jel/Views/Item/Types/ItemPersonView.swift b/Jel/Views/Item/Types/ItemPersonView.swift index 9aad716..15a300c 100644 --- a/Jel/Views/Item/Types/ItemPersonView.swift +++ b/Jel/Views/Item/Types/ItemPersonView.swift @@ -44,7 +44,7 @@ struct ItemPersonView: View { .font(.title) .padding([.horizontal, .top]) - if let overview = item.overview { + if let overview = item.overviewNL { ExpandableText(overview) .lineLimit(8) .padding([.horizontal, .bottom]) diff --git a/Jel/Views/Item/Types/ItemSeasonView.swift b/Jel/Views/Item/Types/ItemSeasonView.swift index f73c9a5..7eae8bb 100644 --- a/Jel/Views/Item/Types/ItemSeasonView.swift +++ b/Jel/Views/Item/Types/ItemSeasonView.swift @@ -13,7 +13,7 @@ struct ItemSeasonView: View { var body: some View { VStack { - if item.overview != nil { + if item.overviewNL != nil { ItemMediaView(item: item) .padding([.horizontal, .bottom]) } |