From ffb5ad0d5f2b8f68bd8a06ad2b215e3667c8bbf2 Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Fri, 20 Jan 2023 20:04:25 +0800 Subject: [PATCH] Cut down on loading refreshes --- .../OmnivoreKit/Sources/App/Views/Home/HomeFeedViewIOS.swift | 4 ++-- .../Sources/App/Views/Home/HomeFeedViewModel.swift | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewIOS.swift b/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewIOS.swift index 457a07037..6c58731dd 100644 --- a/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewIOS.swift +++ b/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewIOS.swift @@ -146,7 +146,7 @@ import Views } } .onReceive(NotificationCenter.default.publisher(for: UIApplication.willEnterForegroundNotification)) { _ in - loadItems(isRefresh: true) + loadItems(isRefresh: false) } .onReceive(NotificationCenter.default.publisher(for: Notification.Name("PushJSONArticle"))) { notification in guard let jsonArticle = notification.userInfo?["article"] as? JSONArticle else { return } @@ -191,7 +191,7 @@ import Views } .task { if viewModel.items.isEmpty { - loadItems(isRefresh: true) + loadItems(isRefresh: false) } } } diff --git a/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewModel.swift b/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewModel.swift index 8bed5d183..8c99130f9 100644 --- a/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewModel.swift +++ b/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewModel.swift @@ -191,6 +191,7 @@ import Views group.addTask { await self.loadCurrentViewer(dataService: dataService) } group.addTask { await self.loadLabels(dataService: dataService) } group.addTask { await self.syncItems(dataService: dataService) } + group.addTask { await self.updateFetchController(dataService: dataService) } await group.waitForAll() } @@ -199,9 +200,6 @@ import Views await loadSearchQuery(dataService: dataService, isRefresh: isRefresh) } else { updateFetchController(dataService: dataService) - Task.detached(priority: .background) { - await self.loadSearchQuery(dataService: dataService, isRefresh: isRefresh) - } } isLoading = false