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

Merge pull request #32 from tootsuite/fix/30 

fix: #30
This commit is contained in:
BradGao 2021-03-01 18:02:54 +08:00 committed by GitHub
parent 0e96a2f1d0 cff6a1d9ef
commit 5e3939853d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -103,7 +103,9 @@ extension MastodonPickServerViewController {
.sink { _ in .sink { _ in
} receiveValue: { [weak self] servers in } receiveValue: { [weak self] servers in
self?.tableView.beginUpdates()
self?.tableView.reloadSections(IndexSet(integer: 3), with: .automatic) self?.tableView.reloadSections(IndexSet(integer: 3), with: .automatic)
self?.tableView.endUpdates()
if let selectedServer = self?.viewModel.selectedServer.value, servers.contains(selectedServer) { if let selectedServer = self?.viewModel.selectedServer.value, servers.contains(selectedServer) {
// Previously selected server is still in the list, do nothing // Previously selected server is still in the list, do nothing
} else { } else {
@ -291,8 +293,7 @@ extension MastodonPickServerViewController: UITableViewDelegate {
// Same reason as above // Same reason as above
return 10 return 10
case .serverList: case .serverList:
// Header with 1 height as the separator return 0
return 1
} }
} }

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

@ -80,8 +80,6 @@ class MastodonPickServerViewModel: NSObject {
weak var tableView: UITableView? weak var tableView: UITableView?
// private var expandServerDomainSet = Set<String>()
var mastodonPinBasedAuthenticationViewController: UIViewController? var mastodonPinBasedAuthenticationViewController: UIViewController?
init(context: AppContext, mode: PickServerMode) { init(context: AppContext, mode: PickServerMode) {

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

@ -231,7 +231,7 @@ extension PickServerCell {
// Set bottom separator // Set bottom separator
seperator.leadingAnchor.constraint(equalTo: containerView.leadingAnchor), seperator.leadingAnchor.constraint(equalTo: containerView.leadingAnchor),
containerView.trailingAnchor.constraint(equalTo: seperator.trailingAnchor), containerView.trailingAnchor.constraint(equalTo: seperator.trailingAnchor),
containerView.bottomAnchor.constraint(equalTo: seperator.bottomAnchor), containerView.topAnchor.constraint(equalTo: seperator.topAnchor),
seperator.heightAnchor.constraint(equalToConstant: 1).priority(.defaultHigh), seperator.heightAnchor.constraint(equalToConstant: 1).priority(.defaultHigh),
domainLabel.topAnchor.constraint(equalTo: containerView.layoutMarginsGuide.topAnchor), domainLabel.topAnchor.constraint(equalTo: containerView.layoutMarginsGuide.topAnchor),

2
MastodonSDK/Sources/MastodonSDK/Entity/Mastodon+Entity+Instance.swift
View File

@ -47,7 +47,7 @@ extension Mastodon.Entity {
case approvalRequired = "approval_required" case approvalRequired = "approval_required"
case invitesEnabled = "invites_enabled" case invitesEnabled = "invites_enabled"
case urls case urls
case statistics case statistics = "stats"
case thumbnail case thumbnail
case contactAccount = "contact_account" case contactAccount = "contact_account"