Skip to content

Rework add/remove lists view: present create-list locally and move create button into list #2393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Dimillian merged 1 commit into from
Dec 26, 2025
Merged

Rework add/remove lists view: present create-list locally and move create button into list #2393

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions Packages/Lists/Sources/Lists/AddAccounts/ListAddAccountView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ public struct ListAddAccountView: View {
@Environment(MastodonClient.self) private var client
@Environment(Theme.self) private var theme
@Environment(CurrentAccount.self) private var currentAccount
@Environment(RouterPath.self) private var routerPath
@State private var viewModel: ListAddAccountViewModel
@State private var isPresentingCreateList = false

public init(account: Account) {
_viewModel = .init(initialValue: .init(account: account))
Expand All @@ -20,6 +20,15 @@ public struct ListAddAccountView: View {
public var body: some View {
NavigationStack {
List {
Section {
Button {
isPresentingCreateList = true
} label: {
Label("account.list.create", systemImage: "plus")
}
}
.listRowBackground(theme.primaryBackgroundColor)

ForEach(currentAccount.sortedLists) { list in
HStack {
Toggle(
Expand Down Expand Up @@ -49,20 +58,16 @@ public struct ListAddAccountView: View {
.navigationTitle("lists.add-remove-\(viewModel.account.safeDisplayName)")
.navigationBarTitleDisplayMode(.inline)
.toolbar {
ToolbarItem(placement: .navigationBarLeading) {
Button {
routerPath.presentedSheet = .listCreate
} label: {
Label("account.list.create", systemImage: "plus")
}
}
ToolbarItem(placement: .navigationBarTrailing) {
Button("action.done") {
dismiss()
}
}
}
}
.sheet(isPresented: $isPresentingCreateList) {
ListCreateView()
}
.task {
viewModel.client = client
await viewModel.fetchInfo()
Expand Down
Loading