Sidebar: Add activity indicator when user subscriptions are loading

Dimillian · May 15, 2021 · b3a78ec · b3a78ec
1 parent 8b5019d
commit b3a78ec
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/Packages/Backend/Sources/Backend/User/CurrentUserStore.swift b/Packages/Backend/Sources/Backend/User/CurrentUserStore.swift
@@ -20,12 +20,19 @@ public class CurrentUserStore: ObservableObject, PersistentDataStore {
  }
  }
 
+ @Published public private(set) var isRefreshingSubscriptions = false
+
  @Published public private(set) var overview: [GenericListingContent]?
  @Published public private(set) var savedPosts: [SubredditPost]?
  @Published public private(set) var submittedPosts: [SubredditPost]?
 
  private var subscriptionFetched = false
- private var fetchingSubscriptions: [Subreddit] = []
+ private var fetchingSubscriptions: [Subreddit] = [] {
+ didSet {
+ isRefreshingSubscriptions = !fetchingSubscriptions.isEmpty
+ }
+ }
+
  private var disposables: [AnyCancellable?] = []
  private var authStateCancellable: AnyCancellable?
  private var afterOverview: String?

diff --git a/RedditOs/Features/Sidebar/SidebarView.swift b/RedditOs/Features/Sidebar/SidebarView.swift
@@ -83,7 +83,7 @@ struct SidebarView: View {
  .animation(.easeInOut)
 
  if let subs = currentUser.subscriptions, currentUser.user != nil {
- Section(header: Text("Subscriptions")) {
+ Section(header: subscriptionsHeader) {
  ForEach(subs) { reddit in
  HStack {
  SidebarSubredditRow(name: reddit.displayName,
@@ -119,6 +119,18 @@ struct SidebarView: View {
  }
  }
 
+ private var subscriptionsHeader: some View {
+ HStack(spacing: 8) {
+ Text("Subscriptions")
+ if currentUser.isRefreshingSubscriptions {
+ ProgressView()
+ .progressViewStyle(CircularProgressViewStyle())
+ .frame(width: 15, height: 15)
+ .scaleEffect(0.5)
+ }
+ }
+ }
+
  private var subredditsHeader: some View {
  HStack(spacing: 8) {
  Text("Favorites")