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 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:
CMK 2022-06-05 16:51:24 +08:00
parent 1f13012812 ed2e1bb462
commit 0ffb3e75f9
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Mastodon/Scene/Profile/Header/View/ProfileHeaderView+Configuration.swift
View File

@ -33,7 +33,7 @@ extension ProfileHeaderView {
.assign(to: \.name, on: viewModel) .assign(to: \.name, on: viewModel)
.store(in: &disposeBag) .store(in: &disposeBag)
// username // username
viewModel.username = user.username viewModel.acct = user.acctWithDomain
// bio // bio
user.publisher(for: \.note) user.publisher(for: \.note)
.assign(to: \.note, on: viewModel) .assign(to: \.note, on: viewModel)

6
Mastodon/Scene/Profile/Header/View/ProfileHeaderView+ViewModel.swift
View File

@ -33,7 +33,7 @@ extension ProfileHeaderView {
@Published var name: String? @Published var name: String?
@Published var nameEditing: String? @Published var nameEditing: String?
@Published var username: String? @Published var acct: String?
@Published var note: String? @Published var note: String?
@Published var noteEditing: String? @Published var noteEditing: String?
@ -133,8 +133,8 @@ extension ProfileHeaderView.ViewModel {
} }
.store(in: &disposeBag) .store(in: &disposeBag)
// username // username
$username $acct
.map { username in username.flatMap { "@" + $0 } ?? " " } .map { acct in acct.flatMap { "@" + $0 } ?? " " }
.assign(to: \.text, on: view.usernameLabel) .assign(to: \.text, on: view.usernameLabel)
.store(in: &disposeBag) .store(in: &disposeBag)
// bio // bio

4
Mastodon/Scene/Share/View/Content/PollOptionView+Configuration.swift
View File

@ -101,7 +101,9 @@ extension PollOptionView {
.receive(on: DispatchQueue.main) .receive(on: DispatchQueue.main)
.sink { [weak self] theme in .sink { [weak self] theme in
guard let self = self else { return } 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) .store(in: &disposeBag)
} }