From adc32d5ae1dfaf670291299eca18a78903500550 Mon Sep 17 00:00:00 2001 From: Arkadiusz Fal Date: Fri, 16 Dec 2022 23:13:16 +0100 Subject: [PATCH] Add playing indicator --- Shared/Videos/VideoBanner.swift | 18 +++++++---- Shared/Videos/VideoCell.swift | 19 +++++++---- Shared/Views/PlayingIndicatorView.swift | 43 +++++++++++++++++++++++++ Yattee.xcodeproj/project.pbxproj | 8 +++++ 4 files changed, 75 insertions(+), 13 deletions(-) create mode 100644 Shared/Views/PlayingIndicatorView.swift diff --git a/Shared/Videos/VideoBanner.swift b/Shared/Videos/VideoBanner.swift index 28654657..4841b8ff 100644 --- a/Shared/Videos/VideoBanner.swift +++ b/Shared/Videos/VideoBanner.swift @@ -250,12 +250,18 @@ struct VideoBanner: View { } @ViewBuilder private var timeView: some View { - if let timeLabel { - Text(timeLabel) - .font(.caption2.weight(.semibold).monospacedDigit()) - .allowsTightening(true) - .padding(2) - .modifier(ControlBackgroundModifier()) + VStack(alignment: .trailing, spacing: 2) { + PlayingIndicatorView(video: video, height: 10) + .frame(width: 12, alignment: .trailing) + .padding(.trailing, 3) + + if let timeLabel { + Text(timeLabel) + .font(.caption2.weight(.semibold).monospacedDigit()) + .allowsTightening(true) + .padding(2) + .modifier(ControlBackgroundModifier()) + } } } diff --git a/Shared/Videos/VideoCell.swift b/Shared/Videos/VideoCell.swift index 03f9c746..8e051e98 100644 --- a/Shared/Videos/VideoCell.swift +++ b/Shared/Videos/VideoCell.swift @@ -418,14 +418,19 @@ struct VideoCell: View { Spacer() - HStack { - Spacer() + VStack(alignment: .trailing, spacing: 4) { + PlayingIndicatorView(video: video, height: 20) + .frame(width: 15, alignment: .trailing) + .padding(.trailing, 3) + HStack { + Spacer() - if timeOnThumbnail, - !video.live, - let time - { - DetailBadge(text: time, style: .prominent) + if timeOnThumbnail, + !video.live, + let time + { + DetailBadge(text: time, style: .prominent) + } } } #if os(tvOS) diff --git a/Shared/Views/PlayingIndicatorView.swift b/Shared/Views/PlayingIndicatorView.swift new file mode 100644 index 00000000..b4f947be --- /dev/null +++ b/Shared/Views/PlayingIndicatorView.swift @@ -0,0 +1,43 @@ +import SwiftUI + +struct PlayingIndicatorView: View { + var video: Video? + var height = 65.0 + + @State private var drawingHeight = true + + @ObservedObject private var player = PlayerModel.shared + + var body: some View { + HStack(spacing: 2) { + bar(low: 0.4) + .animation(animation.speed(1.5), value: drawingHeight) + bar(low: 0.3) + .animation(animation.speed(1.2), value: drawingHeight) + bar(low: 0.5) + .animation(animation.speed(1.0), value: drawingHeight) + } + .opacity(player.currentVideo == video && player.isPlaying ? 1 : 0) + .onAppear { + drawingHeight.toggle() + } + } + + func bar(low: Double = 0.0, high: Double = 1.0) -> some View { + RoundedRectangle(cornerRadius: 3) + .foregroundColor(.white) + .frame(height: (drawingHeight ? high : low) * height) + .frame(height: height, alignment: .bottom) + .shadow(radius: 3) + } + + var animation: Animation { + .easeIn(duration: 0.5).repeatForever() + } +} + +struct PlayingIndicatorView_Previews: PreviewProvider { + static var previews: some View { + PlayingIndicatorView(video: .fixture) + } +} diff --git a/Yattee.xcodeproj/project.pbxproj b/Yattee.xcodeproj/project.pbxproj index c1f6b4db..470181f7 100644 --- a/Yattee.xcodeproj/project.pbxproj +++ b/Yattee.xcodeproj/project.pbxproj @@ -191,6 +191,9 @@ 371AC0AC294D1A490085989E /* CachedAsyncImage in Frameworks */ = {isa = PBXBuildFile; productRef = 371AC0AB294D1A490085989E /* CachedAsyncImage */; }; 371AC0B2294D1C230085989E /* CachedAsyncImage in Frameworks */ = {isa = PBXBuildFile; productRef = 371AC0B1294D1C230085989E /* CachedAsyncImage */; }; 371AC0B4294D1C290085989E /* CachedAsyncImage in Frameworks */ = {isa = PBXBuildFile; productRef = 371AC0B3294D1C290085989E /* CachedAsyncImage */; }; + 371AC0B6294D1D6E0085989E /* PlayingIndicatorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 371AC0B5294D1D6E0085989E /* PlayingIndicatorView.swift */; }; + 371AC0B7294D1D6E0085989E /* PlayingIndicatorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 371AC0B5294D1D6E0085989E /* PlayingIndicatorView.swift */; }; + 371AC0B8294D1D6E0085989E /* PlayingIndicatorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 371AC0B5294D1D6E0085989E /* PlayingIndicatorView.swift */; }; 371B7E5C27596B8400D21217 /* Comment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 371B7E5B27596B8400D21217 /* Comment.swift */; }; 371B7E5D27596B8400D21217 /* Comment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 371B7E5B27596B8400D21217 /* Comment.swift */; }; 371B7E5E27596B8400D21217 /* Comment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 371B7E5B27596B8400D21217 /* Comment.swift */; }; @@ -1162,6 +1165,7 @@ 3717407C2949D40800FDDBC7 /* ChannelLinkView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChannelLinkView.swift; sourceTree = ""; }; 37192D5628B179D60012EEDD /* ChaptersView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChaptersView.swift; sourceTree = ""; }; 371AC09E294D13AA0085989E /* UnwatchedFeedCountModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnwatchedFeedCountModel.swift; sourceTree = ""; }; + 371AC0B5294D1D6E0085989E /* PlayingIndicatorView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayingIndicatorView.swift; sourceTree = ""; }; 371B7E5B27596B8400D21217 /* Comment.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Comment.swift; sourceTree = ""; }; 371B7E602759706A00D21217 /* CommentsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommentsView.swift; sourceTree = ""; }; 371B7E652759786B00D21217 /* Comment+Fixtures.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Comment+Fixtures.swift"; sourceTree = ""; }; @@ -1846,6 +1850,7 @@ 37FEF11227EFD8580033912F /* PlaceholderCell.swift */, 3710A55429488C7D006F8025 /* PlaceholderListItem.swift */, 3769C02D2779F18600DDB3EA /* PlaceholderProgressView.swift */, + 371AC0B5294D1D6E0085989E /* PlayingIndicatorView.swift */, 37AAF27D26737323007FC770 /* PopularView.swift */, 3786D05D294C737300D23E82 /* RequestErrorButton.swift */, 371CC76F29468BDC00979C1A /* SettingsButtons.swift */, @@ -3247,6 +3252,7 @@ 37F4AD1B28612B23004D0F66 /* OpeningStream.swift in Sources */, 373CFAEB26975CBF003CB2C6 /* PlaylistFormView.swift in Sources */, 372915E62687E3B900F5A35B /* Defaults.swift in Sources */, + 371AC0B6294D1D6E0085989E /* PlayingIndicatorView.swift in Sources */, 37E084AC2753D95F00039B7D /* AccountsNavigationLink.swift in Sources */, 378E9C38294552A700B2D696 /* ThumbnailView.swift in Sources */, 37732FF42703D32400F04329 /* Sidebar.swift in Sources */, @@ -3346,6 +3352,7 @@ 371AC0A0294D13AA0085989E /* UnwatchedFeedCountModel.swift in Sources */, 37192D5828B179D60012EEDD /* ChaptersView.swift in Sources */, 3784CDE327772EE40055BBF2 /* Watch.swift in Sources */, + 371AC0B7294D1D6E0085989E /* PlayingIndicatorView.swift in Sources */, 37E80F3D287B107F00561799 /* VideoDetailsOverlay.swift in Sources */, 37DD9DBB2785D60300539416 /* FramePreferenceKey.swift in Sources */, 375DFB5926F9DA010013F468 /* InstancesModel.swift in Sources */, @@ -3786,6 +3793,7 @@ 379775952689365600DD52A8 /* Array+Next.swift in Sources */, 3752069F285E910600CA655F /* ChapterView.swift in Sources */, 37F4AD1D28612B23004D0F66 /* OpeningStream.swift in Sources */, + 371AC0B8294D1D6E0085989E /* PlayingIndicatorView.swift in Sources */, 37270F1E28E06E3E00856150 /* String+Localizable.swift in Sources */, 3705B180267B4DFB00704544 /* TrendingCountry.swift in Sources */, 375B8AB528B580D300397B31 /* KeychainModel.swift in Sources */,