From 1980e8a10effef04460af384e88543bd10597dd6 Mon Sep 17 00:00:00 2001 From: Arkadiusz Fal Date: Tue, 25 Jul 2023 13:20:20 +0200 Subject: [PATCH] Minor image fixes --- Shared/Channels/ChannelAvatarView.swift | 13 +++++++++++-- Shared/Player/Video Details/VideoDetails.swift | 2 +- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Shared/Channels/ChannelAvatarView.swift b/Shared/Channels/ChannelAvatarView.swift index 54462007..723954e8 100644 --- a/Shared/Channels/ChannelAvatarView.swift +++ b/Shared/Channels/ChannelAvatarView.swift @@ -10,6 +10,7 @@ struct ChannelAvatarView: View { @ObservedObject private var subscribedChannels = SubscribedChannelsModel.shared @State private var url: URL? + @State private var loaded = false var body: some View { ZStack(alignment: .bottomTrailing) { @@ -19,13 +20,20 @@ struct ChannelAvatarView: View { ThumbnailView(url: url) } else { ZStack { - Color("PlaceholderColor") + if loaded { + Image(systemName: "person.circle") + .imageScale(.large) + .foregroundColor(.accentColor) + } else { + Color("PlaceholderColor") + } if let video, video.isLocal { Image(systemName: video.localStreamImageSystemName) .foregroundColor(.accentColor) .font(.system(size: 20)) .contentShape(Rectangle()) + .imageScale(.small) } } .onAppear(perform: updateURL) @@ -47,10 +55,10 @@ struct ChannelAvatarView: View { #endif .clipShape(Circle()) .foregroundColor(.secondary) + .imageScale(.small) } } } - .imageScale(.small) } func updateURL() { @@ -60,6 +68,7 @@ struct ChannelAvatarView: View { self.url = url } } + self.loaded = true } } } diff --git a/Shared/Player/Video Details/VideoDetails.swift b/Shared/Player/Video Details/VideoDetails.swift index 3f185c18..b5c5bb35 100644 --- a/Shared/Player/Video Details/VideoDetails.swift +++ b/Shared/Player/Video Details/VideoDetails.swift @@ -41,7 +41,7 @@ struct VideoDetails: View { ) } else { Circle() - .foregroundColor(Color(white: 0.6).opacity(0.5)) + .foregroundColor(Color("PlaceholderColor")) } } .frame(width: 40, height: 40)