Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CATTY-665 Stuttering while scrolling Catrobat Community #1791

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

CATTY-665 Stuttering while scrolling Catrobat Community #1791

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 22 additions & 4 deletions src/Catty/ViewController/Download/ChartProjects/ChartProjectStoreDataSource.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ class ChartProjectStoreDataSource: NSObject, UITableViewDataSource, UITableViewD
}
}

var cellPrototype = [StoreProject]()

var projectOffset: Int {
switch projectType {
case .mostDownloaded:
Expand Down Expand Up @@ -94,6 +96,9 @@ class ChartProjectStoreDataSource: NSObject, UITableViewDataSource, UITableViewD
fileprivate init(with downloader: StoreProjectDownloaderProtocol) {
self.downloader = downloader
self.projectType = .mostDownloaded
for _ in 1 ... NetworkDefines.chartProjectsBatchSize {
cellPrototype.append(StoreProject(id: ""))
}
}

static func dataSource(with downloader: StoreProjectDownloaderProtocol = StoreProjectDownloader()) -> ChartProjectStoreDataSource {
Expand All @@ -105,23 +110,35 @@ class ChartProjectStoreDataSource: NSObject, UITableViewDataSource, UITableViewD
func fetchItems(type: ProjectType, completion: @escaping (StoreProjectDownloaderError?) -> Void) {

projectType = type
scrollView.setContentOffset(scrollViewOffset, animated: false)

if self.projectOffset == projects.count || projects.isEmpty {
switch self.projectType {
case .mostDownloaded:
self.mostDownloadedProjects.append(contentsOf: cellPrototype)
self.mostDownloadedOffset += NetworkDefines.chartProjectsBatchSize
case .mostViewed:
self.mostViewedProjects.append(contentsOf: cellPrototype)
self.mostViewedOffset += NetworkDefines.chartProjectsBatchSize
case .mostRecent:
self.mostRecentProjects.append(contentsOf: cellPrototype)
self.mostRecentOffset += NetworkDefines.chartProjectsBatchSize

}

self.downloader.fetchProjects(for: type, offset: self.projectOffset) {items, error in

guard let collection = items, error == nil else { completion(error); return }

switch self.projectType {
case .mostDownloaded:
self.mostDownloadedProjects.removeSubrange(self.mostDownloadedOffset - NetworkDefines.chartProjectsBatchSize ... self.mostDownloadedOffset - 1)
self.mostDownloadedProjects.append(contentsOf: collection)
self.mostDownloadedOffset += NetworkDefines.chartProjectsBatchSize
case .mostViewed:
self.mostViewedProjects.removeSubrange(self.mostViewedOffset - NetworkDefines.chartProjectsBatchSize ... self.mostViewedOffset - 1)
self.mostViewedProjects.append(contentsOf: collection)
self.mostViewedOffset += NetworkDefines.chartProjectsBatchSize
case .mostRecent:
self.mostRecentProjects.removeSubrange(self.mostRecentOffset - NetworkDefines.chartProjectsBatchSize ... self.mostRecentOffset - 1)
self.mostRecentProjects.append(contentsOf: collection)
self.mostRecentOffset += NetworkDefines.chartProjectsBatchSize
}
completion(nil)

Expand Down Expand Up @@ -215,6 +232,7 @@ class ChartProjectStoreDataSource: NSObject, UITableViewDataSource, UITableViewD

self.fetchItems(type: self.projectType) { error in
self.delegate?.hideLoadingIndicator(true)
self.delegate?.scrollViewHandler()
self.isReloadingData = false
if error != nil {
self.delegate?.errorAlertHandler(error: error!)
Expand Down