Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2025-08-05 02:04:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Unwatched videos in subscriptions

Browse Source
This commit is contained in:
Arkadiusz Fal
2022-12-13 00:39:50 +01:00
parent 02b30394ed
commit 8c1d900a63
8 changed files with 154 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Shared/Navigation/AccountsView.swift
View File

@@ -12,7 +12,7 @@ struct AccountsView: View {
list
}
.frame(minWidth: 500, maxWidth: 800, minHeight: 350, maxHeight: 700)
.frame(minWidth: 500, maxWidth: 800, minHeight: 700, maxHeight: 1200)
#else
NavigationView {

21
Shared/Navigation/AppTabNavigation.swift
View File

@@ -5,6 +5,7 @@ struct AppTabNavigation: View {
@ObservedObject private var accounts = AccountsModel.shared
@ObservedObject private var navigation = NavigationModel.shared
private var player = PlayerModel.shared
@ObservedObject private var feed = FeedModel.shared
@ObservedObject private var subscriptions = SubscribedChannelsModel.shared
@Default(.showHome) private var showHome
@@ -47,7 +48,12 @@ struct AppTabNavigation: View {
}
.overlay(ControlsBar(fullScreen: .constant(false)), alignment: .bottom)
}
.onAppear {
feed.calculateUnwatchedFeed()
}
.onChange(of: accounts.current) { _ in
feed.calculateUnwatchedFeed()
}
.id(accounts.current?.id ?? "")
.overlay(playlistView)
.overlay(channelView)
@@ -87,6 +93,19 @@ struct AppTabNavigation: View {
.accessibility(label: Text("Subscriptions"))
}
.tag(TabSelection.subscriptions)
.backport
.badge(subscriptionsBadge)
}
var subscriptionsBadge: Text? {
guard let account = accounts.current,
let unwatched = feed.unwatched[account],
unwatched > 0
else {
return nil
}
return Text("\(String(unwatched))")
}
private var subscriptionsVisible: Bool {

20
Shared/Navigation/Sidebar.swift
View File

@@ -4,6 +4,7 @@ import SwiftUI
struct Sidebar: View {
@ObservedObject private var accounts = AccountsModel.shared
@ObservedObject private var navigation = NavigationModel.shared
@ObservedObject private var feed = FeedModel.shared
@Default(.showHome) private var showHome
@Default(.visibleSections) private var visibleSections
@@ -36,6 +37,12 @@ struct Sidebar: View {
}
.listStyle(.sidebar)
}
.onAppear {
feed.calculateUnwatchedFeed()
}
.onChange(of: accounts.current) { _ in
feed.calculateUnwatchedFeed()
}
.navigationTitle("Yattee")
#if os(iOS)
.navigationBarTitleDisplayMode(.inline)
@@ -70,6 +77,8 @@ struct Sidebar: View {
Label("Subscriptions", systemImage: "star.circle")
.accessibility(label: Text("Subscriptions"))
}
.backport
.badge(subscriptionsBadge)
.id("subscriptions")
}
@@ -99,6 +108,17 @@ struct Sidebar: View {
}
}
private var subscriptionsBadge: Text? {
guard let account = accounts.current,
let unwatched = feed.unwatched[account],
unwatched > 0
else {
return nil
}
return Text("\(String(unwatched))")
}
private func scrollScrollViewToItem(scrollView: ScrollViewProxy, for selection: TabSelection) {
if case .recentlyOpened = selection {
scrollView.scrollTo("recentlyOpened")