zelo72
/
mastodon-ios
mirror of https://github.com/mastodon/mastodon-ios
2
2
Fork 1
Code Issues 19 Releases Wiki Activity

Fix profile-button (IOS-192)

This commit is contained in:
Nathan Mattes 2024-01-12 10:47:17 +01:00
parent 2c653320fb
commit 127c3167b8
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Mastodon/Scene/Root/MainTab/MainTabBarController.swift
View File

@ -91,6 +91,8 @@ class MainTabBarController: UITabBarController {
viewControllers = [homeTimelineViewController, searchViewController, composeViewController, notificationViewController, meProfileViewController].map { AdaptiveStatusBarStyleNavigationController(rootViewController: $0) }
tabBar.addInteraction(largeContentViewerInteraction)
layoutAvatarButton()
}
required init?(coder: NSCoder) { fatalError("init(coder:) has not been implemented") }
@ -171,8 +173,6 @@ extension MainTabBarController {
}
.store(in: &disposeBag)
layoutAvatarButton()
$avatarURL
.receive(on: DispatchQueue.main)
.sink { [weak self] avatarURL in
@ -188,21 +188,24 @@ extension MainTabBarController {
NotificationCenter.default.publisher(for: .userFetched)
.receive(on: DispatchQueue.main)
.sink { [weak self] _ in
guard let self else { return }
if let account = self.authContext?.mastodonAuthenticationBox.authentication.account() {
self.avatarURL = account.avatarImageURL()
// a11y
let _profileTabItem = self.tabBar.items?.first { item in item.tag == Tab.me.tag }
guard let profileTabItem = _profileTabItem else { return }
profileTabItem.accessibilityHint = L10n.Scene.AccountList.tabBarHint(account.displayNameWithFallback)
self.context.authenticationService.updateActiveUserAccountPublisher
.sink { [weak self] in
self?.updateUserAccount()
}
.store(in: &self.disposeBag)
}
guard let self,
let authContext = self.authContext,
let account = authContext.mastodonAuthenticationBox.authentication.account() else { return }
self.avatarURL = account.avatarImageURL()
// a11y
let _profileTabItem = self.tabBar.items?.first { item in item.tag == Tab.me.tag }
guard let profileTabItem = _profileTabItem else { return }
profileTabItem.accessibilityHint = L10n.Scene.AccountList.tabBarHint(account.displayNameWithFallback)
self.context.authenticationService.updateActiveUserAccountPublisher
.sink { [weak self] in
self?.updateUserAccount()
}
.store(in: &self.disposeBag)
self.meProfileViewController.viewModel = ProfileViewModel(context: self.context, authContext: authContext, account: account, relationship: nil, me: account)
}
.store(in: &disposeBag)
@ -315,8 +318,7 @@ extension MainTabBarController {
private func layoutAvatarButton() {
guard avatarButton.superview == nil else { return }
let _profileTabItem = self.tabBar.items?.first { item in item.tag == Tab.me.tag }
guard let profileTabItem = _profileTabItem else { return }
guard let profileTabItem = meProfileViewController.tabBarItem else { return }
guard let view = profileTabItem.value(forKey: "view") as? UIView else {
return
}