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

fix: expand/collapse animation. 

fix: use instance's uri as domain
This commit is contained in:
jk234ert 2021-02-25 20:39:56 +08:00
parent 1024f37d5f
commit ea24ea6514
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -220,6 +220,15 @@ extension PickServerCell {
let expandButtonTopConstraintInExpand = expandButton.topAnchor.constraint(equalTo: expandBox.bottomAnchor, constant: 8).priority(.required) let expandButtonTopConstraintInExpand = expandButton.topAnchor.constraint(equalTo: expandBox.bottomAnchor, constant: 8).priority(.required)
expandConstraints.append(expandButtonTopConstraintInExpand) expandConstraints.append(expandButtonTopConstraintInExpand)
// domainLabel.setContentHuggingPriority(.required - 1, for: .vertical)
// domainLabel.setContentCompressionResistancePriority(.required - 1, for: .vertical)
// descriptionLabel.setContentHuggingPriority(.required - 2, for: .vertical)
// descriptionLabel.setContentCompressionResistancePriority(.required - 2, for: .vertical)
domainLabel.setContentHuggingPriority(.required, for: .vertical)
domainLabel.setContentCompressionResistancePriority(.required, for: .vertical)
descriptionLabel.setContentHuggingPriority(.defaultHigh, for: .vertical)
descriptionLabel.setContentCompressionResistancePriority(.defaultHigh, for: .vertical)
NSLayoutConstraint.activate([ NSLayoutConstraint.activate([
// Set background view // Set background view
bgView.leadingAnchor.constraint(equalTo: contentView.readableContentGuide.leadingAnchor), bgView.leadingAnchor.constraint(equalTo: contentView.readableContentGuide.leadingAnchor),

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

@ -39,7 +39,7 @@ extension Mastodon.Entity {
} }
public init(instance: Instance) { public init(instance: Instance) {
self.domain = instance.title self.domain = instance.uri
self.version = instance.version ?? "" self.version = instance.version ?? ""
self.description = instance.shortDescription ?? instance.description self.description = instance.shortDescription ?? instance.description
self.language = instance.languages?.first ?? "" self.language = instance.languages?.first ?? ""