zelo72
/
mastodon-ios
mirror of https://github.com/mastodon/mastodon-ios
2
2
Fork 1
Code Issues 19 Releases Wiki Activity

chore: fix conflicts

This commit is contained in:
jk234ert 2021-02-25 16:52:41 +08:00
parent ec96690ac9
commit b67cb61fd8
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Mastodon/Scene/PickServer/PickServerViewController.swift
View File

@ -120,7 +120,7 @@ extension PickServerViewController {
.receive(on: DispatchQueue.main) .receive(on: DispatchQueue.main)
.sink { [weak self] error in .sink { [weak self] error in
guard let self = self else { return } guard let self = self else { return }
let alertController = UIAlertController(error, preferredStyle: .alert) let alertController = UIAlertController(for: error, title: "Error", preferredStyle: .alert)
let okAction = UIAlertAction(title: L10n.Common.Controls.Actions.ok, style: .default, handler: nil) let okAction = UIAlertAction(title: L10n.Common.Controls.Actions.ok, style: .default, handler: nil)
alertController.addAction(okAction) alertController.addAction(okAction)
self.coordinator.present( self.coordinator.present(
@ -385,7 +385,8 @@ extension PickServerViewController: PickServerCellDelegate {
} }
tableView.performBatchUpdates(updates) { _ in tableView.performBatchUpdates(updates) { _ in
if let modeChangeIndex = self.viewModel.searchedServers.value.firstIndex(where: { $0 == server }) { // Scroll to fully show the expanded cell, do not scroll when collapse
if newMode == .expand, let modeChangeIndex = self.viewModel.searchedServers.value.firstIndex(where: { $0 == server }), self.tableView.indexPathsForVisibleRows?.last?.row == modeChangeIndex {
self.tableView.scrollToRow(at: IndexPath(row: modeChangeIndex, section: 3), at: .bottom, animated: true) self.tableView.scrollToRow(at: IndexPath(row: modeChangeIndex, section: 3), at: .bottom, animated: true)
} }
} }

2
Mastodon/Scene/PickServer/TableViewCell/PickServerCell.swift
View File

@ -243,7 +243,7 @@ extension PickServerCell {
checkbox.centerYAnchor.constraint(equalTo: domainLabel.centerYAnchor), checkbox.centerYAnchor.constraint(equalTo: domainLabel.centerYAnchor),
descriptionLabel.leadingAnchor.constraint(equalTo: bgView.leadingAnchor, constant: 16), descriptionLabel.leadingAnchor.constraint(equalTo: bgView.leadingAnchor, constant: 16),
descriptionLabel.topAnchor.constraint(equalTo: domainLabel.firstBaselineAnchor, constant: 8), descriptionLabel.topAnchor.constraint(equalTo: domainLabel.firstBaselineAnchor, constant: 8).priority(.defaultHigh),
bgView.trailingAnchor.constraint(equalTo: descriptionLabel.trailingAnchor, constant: 16), bgView.trailingAnchor.constraint(equalTo: descriptionLabel.trailingAnchor, constant: 16),
// Set expandBox constraints // Set expandBox constraints