FreshRSS
/
NetNewsWire
mirror of https://github.com/Ranchero-Software/NetNewsWire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Animate sidebar item changes

This commit is contained in:
Maurice Parker 2020-07-23 11:53:59 -05:00
parent b3ca806d0b
commit 36aba33c3d
2 changed files with 60 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
Multiplatform/Shared/Sidebar/SidebarModel.swift
View File

@ -19,8 +19,9 @@ protocol SidebarModelDelegate: class {
class SidebarModel: ObservableObject, UndoableCommandRunner {
weak var delegate: SidebarModelDelegate?
var sidebarItemsPublisher: AnyPublisher<[SidebarItem], Never>?
@Published var sidebarItems = [SidebarItem]()
@Published var selectedFeedIdentifiers = Set<FeedIdentifier>()
@Published var selectedFeedIdentifier: FeedIdentifier? = .none
@Published var selectedFeeds = [Feed]()
@ -39,13 +40,13 @@ class SidebarModel: ObservableObject, UndoableCommandRunner {
// MARK: API
func goToNextUnread() {
guard let startFeed = selectedFeeds.first ?? sidebarItems.first?.children.first?.feed else { return }
if !goToNextUnread(startingAt: startFeed) {
if let firstFeed = sidebarItems.first?.children.first?.feed {
goToNextUnread(startingAt: firstFeed)
}
}
// guard let startFeed = selectedFeeds.first ?? sidebarItems.first?.children.first?.feed else { return }
//
// if !goToNextUnread(startingAt: startFeed) {
// if let firstFeed = sidebarItems.first?.children.first?.feed {
// goToNextUnread(startingAt: firstFeed)
// }
// }
}
}
@ -179,13 +180,14 @@ private extension SidebarModel {
let kickStarter = Notification(name: Notification.Name(rawValue: "Kick Starter"))
sidebarRebuildPublishers
sidebarItemsPublisher = sidebarRebuildPublishers
.prepend(kickStarter)
.debounce(for: .milliseconds(500), scheduler: RunLoop.main)
.combineLatest($isReadFiltered, $selectedFeeds)
.sink { [weak self] _, readFilter, selectedFeeds in
.compactMap { [weak self] _, readFilter, selectedFeeds in
self?.rebuildSidebarItems(isReadFiltered: readFilter, selectedFeeds: selectedFeeds)
}.store(in: &cancellables)
}
.eraseToAnyPublisher()
}
// MARK: Sidebar Building
@ -198,9 +200,9 @@ private extension SidebarModel {
return feeds.sorted(by: { $0.nameForDisplay.localizedStandardCompare($1.nameForDisplay) == .orderedAscending })
}
func rebuildSidebarItems(isReadFiltered: Bool, selectedFeeds: [Feed]) {
guard let delegate = delegate else { return }
func rebuildSidebarItems(isReadFiltered: Bool, selectedFeeds: [Feed]) -> [SidebarItem] {
var items = [SidebarItem]()
guard let delegate = delegate else { return items }
var smartFeedControllerItem = SidebarItem(SmartFeedsController.shared)
for feed in SmartFeedsController.shared.smartFeeds {
@ -238,7 +240,7 @@ private extension SidebarModel {
items.append(accountItem)
}
sidebarItems = items
return items
}
// MARK:
@ -252,38 +254,38 @@ private extension SidebarModel {
}
}
@discardableResult
func goToNextUnread(startingAt: Feed) -> Bool {
var foundStartFeed = false
var nextSidebarItem: SidebarItem? = nil
for section in sidebarItems {
if nextSidebarItem == nil {
section.visit { sidebarItem in
if !foundStartFeed && sidebarItem.feed?.feedID == startingAt.feedID {
foundStartFeed = true
return false
}
if foundStartFeed && sidebarItem.unreadCount > 0 {
nextSidebarItem = sidebarItem
return true
}
return false
}
}
}
if let nextFeedID = nextSidebarItem?.feed?.feedID {
select(nextFeedID)
return true
}
return false
}
func select(_ feedID: FeedIdentifier) {
selectedFeedIdentifiers = Set([feedID])
selectedFeedIdentifier = feedID
}
// @discardableResult
// func goToNextUnread(startingAt: Feed) -> Bool {
//
// var foundStartFeed = false
// var nextSidebarItem: SidebarItem? = nil
// for section in sidebarItems {
// if nextSidebarItem == nil {
// section.visit { sidebarItem in
// if !foundStartFeed && sidebarItem.feed?.feedID == startingAt.feedID {
// foundStartFeed = true
// return false
// }
// if foundStartFeed && sidebarItem.unreadCount > 0 {
// nextSidebarItem = sidebarItem
// return true
// }
// return false
// }
// }
// }
//
// if let nextFeedID = nextSidebarItem?.feed?.feedID {
// select(nextFeedID)
// return true
// }
//
// return false
// }
//
// func select(_ feedID: FeedIdentifier) {
// selectedFeedIdentifiers = Set([feedID])
// selectedFeedIdentifier = feedID
// }
}

12
Multiplatform/Shared/Sidebar/SidebarView.swift
View File

@ -18,6 +18,8 @@ struct SidebarView: View {
@EnvironmentObject private var refreshProgress: RefreshProgressModel
@EnvironmentObject private var sceneModel: SceneModel
@EnvironmentObject private var sidebarModel: SidebarModel
@State var sidebarItems = [SidebarItem]()
private let threshold: CGFloat = 80
@State private var previousScrollOffset: CGFloat = 0
@ -64,6 +66,9 @@ struct SidebarView: View {
.onAppear {
sidebarModel.undoManager = undoManager
}
.onReceive(sidebarModel.sidebarItemsPublisher!) { newItems in
sidebarItems = newItems
}
#else
ZStack(alignment: .top) {
List {
@ -81,6 +86,11 @@ struct SidebarView: View {
.onAppear {
sidebarModel.undoManager = undoManager
}
.onReceive(sidebarModel.sidebarItemsPublisher!) { newItems in
withAnimation {
sidebarItems = newItems
}
}
#endif
// .onAppear {
@ -148,7 +158,7 @@ struct SidebarView: View {
}
var rows: some View {
ForEach(sidebarModel.sidebarItems) { sidebarItem in
ForEach(sidebarItems) { sidebarItem in
if let containerID = sidebarItem.containerID {
DisclosureGroup(isExpanded: $expandedContainers[containerID]) {
ForEach(sidebarItem.children) { sidebarItem in