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

Enable account switcher on macOS

Browse source
This commit is contained in:
Thomas Ricouard 2023-01-16 21:27:54 +01:00
parent 9dc7fa00f9
commit 451cc7a4ac
2 changed files with 24 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
IceCubesApp/App/SideBarView.swift
View file

@ -16,15 +16,15 @@ struct SideBarView<Content: View>: View {
var body: some View { var body: some View {
HStack(spacing: 0) { HStack(spacing: 0) {
VStack(alignment: .center) { VStack(alignment: .center) {
if let account = currentAccount.account {
Button { Button {
selectedTab = .profile selectedTab = .profile
} label: { } label: {
AvatarView(url: account.avatar, size: .status) AppAccountsSelectorView(routeurPath: RouterPath(),
accountCreationEnabled: false,
avatarSize: .status)
} }
.frame(width: 70, height: 50) .frame(width: 70, height: 60)
.background(selectedTab == .profile ? theme.secondaryBackgroundColor : .clear) .background(selectedTab == .profile ? theme.secondaryBackgroundColor : .clear)
}
ForEach(tabs) { tab in ForEach(tabs) { tab in
Button { Button {
if tab == selectedTab { if tab == selectedTab {

11
Packages/AppAccount/Sources/AppAccount/AppAccountsSelectorView.swift
View file

@ -22,11 +22,20 @@ public struct AppAccountsSelectorView: View {
} }
public var body: some View { public var body: some View {
Group {
if ProcessInfo.processInfo.isiOSAppOnMac {
labelView
.contextMenu {
menuView
}
} else {
Menu { Menu {
menuView menuView
} label: { } label: {
labelView labelView
} }
}
}
.onAppear { .onAppear {
refreshAccounts() refreshAccounts()
} }
@ -82,10 +91,12 @@ public struct AppAccountsSelectorView: View {
let viewModel: AppAccountViewModel = .init(appAccount: account) let viewModel: AppAccountViewModel = .init(appAccount: account)
Task { Task {
await viewModel.fetchAccount() await viewModel.fetchAccount()
if !accountsViewModel.contains(where: { $0.acct == viewModel.acct }) {
accountsViewModel.append(viewModel) accountsViewModel.append(viewModel)
} }
} }
} }
} }
}
} }