mirrors/IceCubesApp
1
0
Fork 0
mirror of https://github.com/Dimillian/IceCubesApp.git synced 2024-11-26 18:21:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Packages/Account/Sources/Account/AccountDetailView.swift
View file

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

2
Packages/Account/Sources/Account/AccountDetailViewModel.swift
View file

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