Mastodon/mastodon-app-ufficiale-iphone-ios
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: the data source update queue , change activityIndicatorView color

Browse Source
This commit is contained in:
sunxiaojian 2021-04-23 19:15:52 +08:00
parent 61a26fbe66
commit d6d91180cb
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Mastodon/Scene/Search/SearchViewModel.swift
View File

@ -162,7 +162,6 @@ final class SearchViewModel: NSObject {
.store(in: &disposeBag) .store(in: &disposeBag)
requestRecommendAccountsV2() requestRecommendAccountsV2()
.receive(on: DispatchQueue.main)
.sink { [weak self] _ in .sink { [weak self] _ in
guard let self = self else { return } guard let self = self else { return }
if !self.recommendAccounts.isEmpty { if !self.recommendAccounts.isEmpty {
@ -176,7 +175,6 @@ final class SearchViewModel: NSObject {
.sink { [weak self] _ in .sink { [weak self] _ in
guard let self = self else { return } guard let self = self else { return }
self.requestRecommendAccounts() self.requestRecommendAccounts()
.receive(on: DispatchQueue.main)
.sink { [weak self] _ in .sink { [weak self] _ in
guard let self = self else { return } guard let self = self else { return }
if !self.recommendAccounts.isEmpty { if !self.recommendAccounts.isEmpty {
@ -295,12 +293,14 @@ final class SearchViewModel: NSObject {
} }
func applyDataSource() { func applyDataSource() {
guard let dataSource = accountDiffableDataSource else { return } DispatchQueue.main.async {
guard let dataSource = self.accountDiffableDataSource else { return }
var snapshot = NSDiffableDataSourceSnapshot<RecommendAccountSection, NSManagedObjectID>() var snapshot = NSDiffableDataSourceSnapshot<RecommendAccountSection, NSManagedObjectID>()
snapshot.appendSections([.main]) snapshot.appendSections([.main])
snapshot.appendItems(recommendAccounts, toSection: .main) snapshot.appendItems(self.recommendAccounts, toSection: .main)
dataSource.apply(snapshot, animatingDifferences: false, completion: nil) dataSource.apply(snapshot, animatingDifferences: false, completion: nil)
} }
}
func receiveAccounts(ids: [String]) { func receiveAccounts(ids: [String]) {
guard let activeMastodonAuthenticationBox = context.authenticationService.activeMastodonAuthenticationBox.value else { guard let activeMastodonAuthenticationBox = context.authenticationService.activeMastodonAuthenticationBox.value else {

1
Mastodon/Scene/SuggestionAccount/TableViewCell/SuggestionAccountTableViewCell.swift
View File

@ -62,7 +62,6 @@ final class SuggestionAccountTableViewCell: UITableViewCell {
let activityIndicatorView: UIActivityIndicatorView = { let activityIndicatorView: UIActivityIndicatorView = {
let activityIndicatorView = UIActivityIndicatorView(style: .medium) let activityIndicatorView = UIActivityIndicatorView(style: .medium)
activityIndicatorView.color = .white
activityIndicatorView.hidesWhenStopped = true activityIndicatorView.hidesWhenStopped = true
return activityIndicatorView return activityIndicatorView
}() }()