mirror of
https://github.com/yattee/yattee.git
synced 2025-10-12 18:38:16 +00:00
Save last used account instead of having to set default
This commit is contained in:
@@ -4,24 +4,29 @@ import SwiftUI
|
||||
struct AccountsMenuView: View {
|
||||
@EnvironmentObject<AccountsModel> private var model
|
||||
|
||||
@Default(.accounts) private var accounts
|
||||
@Default(.instances) private var instances
|
||||
|
||||
var body: some View {
|
||||
Menu {
|
||||
ForEach(model.all, id: \.id) { account in
|
||||
ForEach(allAccounts, id: \.id) { account in
|
||||
Button(accountButtonTitle(account: account)) {
|
||||
model.setAccount(account)
|
||||
model.setCurrent(account)
|
||||
}
|
||||
}
|
||||
} label: {
|
||||
Label(model.account?.name ?? "Select Account", systemImage: "person.crop.circle")
|
||||
Label(model.current?.name ?? "Select Account", systemImage: "person.crop.circle")
|
||||
.labelStyle(.titleAndIcon)
|
||||
}
|
||||
.disabled(instances.isEmpty)
|
||||
.transaction { t in t.animation = .none }
|
||||
}
|
||||
|
||||
func accountButtonTitle(account: Instance.Account) -> String {
|
||||
private var allAccounts: [Instance.Account] {
|
||||
accounts + instances.map(\.anonymousAccount)
|
||||
}
|
||||
|
||||
private func accountButtonTitle(account: Instance.Account) -> String {
|
||||
instances.count > 1 ? "\(account.description) — \(account.instance.description)" : account.description
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user