writefreely/swiftui-multiplatform
2
0
Fork 0
mirror of https://github.com/writeas/writefreely-swiftui-multiplatform.git synced 2024-11-15 01:11:02 +00:00
Code Issues Releases Wiki Activity

Fix iOS 16+ navigation

Browse Source
This commit is contained in:
Angelo Stavrow 2024-09-01 16:00:33 -04:00
parent 8a35fe37f7
commit f758b55fea
No known key found for this signature in database
GPG Key ID: 1A49C7064E060EEE
1 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
Shared/Navigation/WFNavigation.swift
View File

@ -45,25 +45,39 @@ struct WFNavigation<CollectionList, PostList, PostDetail>: View
} }
#else #else
if #available(iOS 16, *) { if #available(iOS 16, *) {
/// Consider converting this into a NavigationStack instead, and using `$model.selectedCollection` to set
/// the detail view that should be shown. Try moving navigation state out of **WriteFreelyModel** and into
/// **WFNavigation** instead, so that it eventually encapsulates _all_ things related to app navigation.
// NavigationSplitView {
// collectionList
// } detail: {
// postList
// }
NavigationStack { NavigationStack {
List(collections, id: \.self, selection: $model.navState.selectedPost) { collection in if model.account.isLoggedIn {
NavigationLink("\(collection.title)", destination: PostListView(selectedCollection: model.navState.selectedCollection, showAllPosts: model.navState.showAllPosts)) List(selection: $model.navState.selectedCollection) {
NavigationLink(
"All Posts",
destination: PostListView(selectedCollection: nil, showAllPosts: true)
)
NavigationLink(
model.account.server == "https://write.as" ? "Anonymous" : "Drafts",
destination: PostListView(selectedCollection: nil, showAllPosts: false)
)
Section("Your Blogs") {
ForEach(collections, id: \.self) { collection in
NavigationLink(
"\(collection.title)",
destination: PostListView(
selectedCollection: model.navState.selectedCollection,
showAllPosts: model.navState.showAllPosts
)
)
}
}
}
.navigationTitle("\(URL(string: model.account.server)?.host ?? "WriteFreely")")
} else {
List {
NavigationLink(
"Drafts",
destination: PostListView(selectedCollection: nil, showAllPosts: false)
)
}
.navigationTitle("WriteFreely")
} }
// List(fetchRequest.wrappedValue, id: \.self, selection: $model.navState.selectedPost) { post in
// NavigationLink(
// "\(post.title.isEmpty ? "UNTITLED" : post.title)",
// destination: PostEditorView(post: post)
// )
// }
} }
} else { } else {
NavigationView { NavigationView {