Mastodon
/
mastodon-app-ufficiale-iphone-ios
mirror of https://github.com/mastodon/mastodon-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

IOS-132: Server picker VQA improvements (#994)

This commit is contained in:
Marcus Kida 2023-03-28 11:13:13 +02:00 committed by GitHub
parent 245543ea60
commit b7508f8fb6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Mastodon/Scene/Onboarding/PickServer/CollectionViewCell/PickServerCategoryCollectionViewCell.swift
View File

@ -62,7 +62,7 @@ class PickServerCategoryCollectionViewCell: UICollectionViewCell {
layer.borderColor = UIColor.black.cgColor layer.borderColor = UIColor.black.cgColor
layer.borderWidth = 1.0 layer.borderWidth = 1.0
applyCornerRadius(radius: 15) applyCornerRadius(radius: 18)
contentView.addSubview(container) contentView.addSubview(container)
contentView.addSubview(menuButton) contentView.addSubview(menuButton)

14
Mastodon/Scene/Onboarding/PickServer/MastodonPickServerViewController.swift
View File

@ -142,6 +142,13 @@ extension MastodonPickServerViewController {
} }
.store(in: &disposeBag) .store(in: &disposeBag)
viewModel.scrollToTop
.receive(on: DispatchQueue.main)
.sink { [weak self] _ in
self?.tableView.scroll(to: .top, animated: false)
}
.store(in: &disposeBag)
authenticationViewModel authenticationViewModel
.authenticated .authenticated
.asyncMap { domain, user -> Result<Bool, Error> in .asyncMap { domain, user -> Result<Bool, Error> in
@ -371,6 +378,13 @@ extension MastodonPickServerViewController: UITableViewDelegate {
guard case let .server(server, _) = item else { return } guard case let .server(server, _) = item else { return }
tableView.selectRow(at: indexPath, animated: false, scrollPosition: .none) tableView.selectRow(at: indexPath, animated: false, scrollPosition: .none)
viewModel.selectedServer.send(server) viewModel.selectedServer.send(server)
// Briefly highlight selected cell
guard let cell = tableView.cellForRow(at: indexPath) else { return }
cell.backgroundColor = Asset.Colors.selectionHighlight.color
UIView.animate(withDuration: 0.3, animations: {
cell.backgroundColor = .none
})
} }
func tableView(_ tableView: UITableView, didDeselectRowAt indexPath: IndexPath) { func tableView(_ tableView: UITableView, didDeselectRowAt indexPath: IndexPath) {

4
Mastodon/Scene/Onboarding/PickServer/MastodonPickServerViewModel.swift
View File

@ -47,6 +47,7 @@ class MastodonPickServerViewModel: NSObject {
let unindexedServers = CurrentValueSubject<[Mastodon.Entity.Server]?, Never>([]) // set nil when loading let unindexedServers = CurrentValueSubject<[Mastodon.Entity.Server]?, Never>([]) // set nil when loading
let viewWillAppear = PassthroughSubject<Void, Never>() let viewWillAppear = PassthroughSubject<Void, Never>()
let viewDidAppear = CurrentValueSubject<Void, Never>(Void()) let viewDidAppear = CurrentValueSubject<Void, Never>(Void())
let scrollToTop = PassthroughSubject<Void, Never>()
@Published var additionalTableViewInsets: UIEdgeInsets = .zero @Published var additionalTableViewInsets: UIEdgeInsets = .zero
// output // output
@ -125,7 +126,7 @@ extension MastodonPickServerViewModel {
(selectedLanguage, manualApprovalRequired) (selectedLanguage, manualApprovalRequired)
} }
) )
.map { indexedServers, selectCategoryItem, searchText, filters -> [Mastodon.Entity.Server] in .map { [weak self] indexedServers, selectCategoryItem, searchText, filters -> [Mastodon.Entity.Server] in
var indexedServers = indexedServers var indexedServers = indexedServers
var _indexedServers: [Mastodon.Entity.Server] = [] var _indexedServers: [Mastodon.Entity.Server] = []
@ -151,6 +152,7 @@ extension MastodonPickServerViewModel {
case .language(_), .signupSpeed(_): case .language(_), .signupSpeed(_):
return MastodonPickServerViewModel.filterServers(servers: indexedServers, language: filters.selectedLanguage, manualApprovalRequired: filters.manualApprovalRequired, category: nil, searchText: searchText) return MastodonPickServerViewModel.filterServers(servers: indexedServers, language: filters.selectedLanguage, manualApprovalRequired: filters.manualApprovalRequired, category: nil, searchText: searchText)
case .category(let category): case .category(let category):
self?.scrollToTop.send()
return MastodonPickServerViewModel.filterServers(servers: indexedServers, language: filters.selectedLanguage, manualApprovalRequired: filters.manualApprovalRequired, category: category.category.rawValue, searchText: searchText) return MastodonPickServerViewModel.filterServers(servers: indexedServers, language: filters.selectedLanguage, manualApprovalRequired: filters.manualApprovalRequired, category: category.category.rawValue, searchText: searchText)
} }
} }

1
Mastodon/Scene/Onboarding/PickServer/View/OnboardingNextView.swift
View File

@ -28,6 +28,7 @@ final class OnboardingNextView: UIView {
button.layer.cornerRadius = 14 button.layer.cornerRadius = 14
button.backgroundColor = Asset.Colors.Brand.blurple.color button.backgroundColor = Asset.Colors.Brand.blurple.color
button.setTitle(L10n.Common.Controls.Actions.next, for: .normal) button.setTitle(L10n.Common.Controls.Actions.next, for: .normal)
button.titleLabel?.font = UIFontMetrics(forTextStyle: .body).scaledFont(for: .systemFont(ofSize: 16, weight: .bold))
return button return button
}() }()

2
Mastodon/Scene/Onboarding/PickServer/View/PickServerServerSectionTableHeaderView.swift
View File

@ -18,7 +18,7 @@ protocol PickServerServerSectionTableHeaderViewDelegate: AnyObject {
final class PickServerServerSectionTableHeaderView: UIView { final class PickServerServerSectionTableHeaderView: UIView {
static let collectionViewHeight: CGFloat = 30 static let collectionViewHeight: CGFloat = 36
static let spacing: CGFloat = 16 static let spacing: CGFloat = 16
static let height: CGFloat = collectionViewHeight + spacing static let height: CGFloat = collectionViewHeight + spacing