Skip to content

Commit ff7e7c3

Browse files
committed
Re-enable launch-to-last-draft policy
1 parent 3c1e04e commit ff7e7c3

File tree

3 files changed

+26
-12
lines changed

3 files changed

+26
-12
lines changed

Shared/Navigation/ContentView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ struct ContentView: View {
4949
}
5050
}
5151
#else
52-
PostListView(selectedCollection: nil, showAllPosts: false)
52+
PostListView(selectedCollection: model.selectedCollection, showAllPosts: model.showAllPosts)
5353
#endif
5454

5555
Text("Select a post, or create a new local draft.")

Shared/PostList/PostListView.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,10 @@ struct PostListView: View {
125125
.overlay(Divider(), alignment: .top)
126126
}
127127
.ignoresSafeArea()
128+
.onAppear {
129+
model.selectedCollection = selectedCollection
130+
model.showAllPosts = showAllPosts
131+
}
128132
#else
129133
PostListFilteredView(
130134
collection: selectedCollection,

Shared/WriteFreely_MultiPlatformApp.swift

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,19 @@ struct WriteFreely_MultiPlatformApp: App {
3434
WindowGroup {
3535
ContentView()
3636
.onAppear(perform: {
37-
// if model.editor.showAllPostsFlag {
38-
// DispatchQueue.main.async {
39-
// self.model.selectedCollection = nil
40-
// self.model.showAllPosts = true
41-
// }
42-
// } else {
43-
// DispatchQueue.main.async {
44-
// self.model.selectedCollection = model.editor.fetchSelectedCollectionFromAppStorage()
45-
// self.model.showAllPosts = false
46-
// }
47-
// }
37+
if model.editor.showAllPostsFlag {
38+
DispatchQueue.main.async {
39+
self.model.selectedCollection = nil
40+
self.model.showAllPosts = true
41+
showLastDraftOrCreateNewLocalPost()
42+
}
43+
} else {
44+
DispatchQueue.main.async {
45+
self.model.selectedCollection = model.editor.fetchSelectedCollectionFromAppStorage()
46+
self.model.showAllPosts = false
47+
showLastDraftOrCreateNewLocalPost()
48+
}
49+
}
4850
// DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
4951
// if model.editor.lastDraftURL != nil {
5052
// self.model.selectedPost = model.editor.fetchLastDraftFromAppStorage()
@@ -128,6 +130,14 @@ struct WriteFreely_MultiPlatformApp: App {
128130
#endif
129131
}
130132

133+
private func showLastDraftOrCreateNewLocalPost() {
134+
if model.editor.lastDraftURL != nil {
135+
self.model.selectedPost = model.editor.fetchLastDraftFromAppStorage()
136+
} else {
137+
createNewLocalPost()
138+
}
139+
}
140+
131141
private func createNewLocalPost() {
132142
withAnimation {
133143
// Un-set the currently selected post

0 commit comments

Comments
 (0)