Merge pull request #7 from angristan/account-navbar-title-emoji

AccountDetailView: support display name with emoji in navbar title
This commit is contained in:
Thomas Ricouard 2022-12-30 22:51:23 +01:00 committed by GitHub
commit 193469fbc0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions

View file

@ -92,7 +92,14 @@ public struct AccountDetailView: View {
}
}
.edgesIgnoringSafeArea(.top)
.navigationTitle(Text(scrollOffset < -200 ? viewModel.title : ""))
.navigationBarTitleDisplayMode(.inline)
.toolbar {
ToolbarItem(placement: .principal) {
if scrollOffset < -200 {
currentAccount.account?.displayNameWithEmojis
}
}
}
}
@ViewBuilder

View file

@ -46,7 +46,6 @@ class AccountDetailViewModel: ObservableObject, StatusesFetcher {
}
@Published var statusesState: StatusesState = .loading
@Published var title: String = ""
@Published var relationship: Relationshionship?
@Published var favourites: [Status] = []
private var favouritesNextPage: LinkHandler?
@ -89,7 +88,6 @@ class AccountDetailViewModel: ObservableObject, StatusesFetcher {
self.featuredTags = try await featuredTags
self.featuredTags.sort { $0.statusesCountInt > $1.statusesCountInt }
self.fields = loadedAccount.fields
self.title = loadedAccount.displayName
if isCurrentUser {
self.followedTags = try await followedTags
} else {