Merge branch 'release-1.4.3' into feature-purple-tint
# Conflicts: # AppShared/Info.plist # Mastodon.xcodeproj/project.pbxproj # Mastodon.xcodeproj/xcuserdata/mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist # Mastodon/Info.plist # MastodonIntent/Info.plist # MastodonTests/Info.plist # MastodonUITests/Info.plist # NotificationService/Info.plist # ShareActionExtension/Info.plist
This commit is contained in:
commit
0ffb3e75f9
|
@ -33,7 +33,7 @@ extension ProfileHeaderView {
|
|||
.assign(to: \.name, on: viewModel)
|
||||
.store(in: &disposeBag)
|
||||
// username
|
||||
viewModel.username = user.username
|
||||
viewModel.acct = user.acctWithDomain
|
||||
// bio
|
||||
user.publisher(for: \.note)
|
||||
.assign(to: \.note, on: viewModel)
|
||||
|
|
|
@ -33,7 +33,7 @@ extension ProfileHeaderView {
|
|||
@Published var name: String?
|
||||
@Published var nameEditing: String?
|
||||
|
||||
@Published var username: String?
|
||||
@Published var acct: String?
|
||||
|
||||
@Published var note: String?
|
||||
@Published var noteEditing: String?
|
||||
|
@ -133,8 +133,8 @@ extension ProfileHeaderView.ViewModel {
|
|||
}
|
||||
.store(in: &disposeBag)
|
||||
// username
|
||||
$username
|
||||
.map { username in username.flatMap { "@" + $0 } ?? " " }
|
||||
$acct
|
||||
.map { acct in acct.flatMap { "@" + $0 } ?? " " }
|
||||
.assign(to: \.text, on: view.usernameLabel)
|
||||
.store(in: &disposeBag)
|
||||
// bio
|
||||
|
|
|
@ -101,7 +101,9 @@ extension PollOptionView {
|
|||
.receive(on: DispatchQueue.main)
|
||||
.sink { [weak self] theme in
|
||||
guard let self = self else { return }
|
||||
self.checkmarkBackgroundView.backgroundColor = theme.tertiarySystemBackgroundColor
|
||||
self.checkmarkBackgroundView.backgroundColor = UIColor(dynamicProvider: { trailtCollection in
|
||||
return trailtCollection.userInterfaceStyle == .light ? .white : theme.tableViewCellSelectionBackgroundColor
|
||||
})
|
||||
}
|
||||
.store(in: &disposeBag)
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue