Save and restore sidebar width (initial value: 220)

livid · livid · commit bbd7bfe78702 · 2025-01-27T23:21:56.000-08:00
diff --git a/Planet/Views/Sidebar/PlanetSidebarView.swift b/Planet/Views/Sidebar/PlanetSidebarView.swift
@@ -161,7 +161,7 @@ struct PlanetSidebarView: View {
         .sheet(isPresented: $planetStore.isCreatingPlanet) {
             CreatePlanetView()
         }
-        .frame(minWidth: 220)
+        .frame(minWidth: 220, idealWidth: UserDefaults.standard.double(forKey: "sidebarWidth") > 0 ? UserDefaults.standard.double(forKey: "sidebarWidth") : 220) // See https://github.com/Planetable/Planet/issues/393
         .toolbar {
             Button(action: toggleSidebar) {
                 Image(systemName: "sidebar.left")
@@ -219,6 +219,10 @@ struct PlanetSidebarView: View {
                 await planetStore.aggregate()
             }
         }
+        .onWidthChange { newWidth in
+            @AppStorage("sidebarWidth") var sidebarWidth = 220.0
+            sidebarWidth = newWidth
+        }
     }
 
     private func toggleSidebar() {
diff --git a/Planet/versioning.xcconfig b/Planet/versioning.xcconfig
@@ -1 +1 @@
-CURRENT_PROJECT_VERSION = 2324
+CURRENT_PROJECT_VERSION = 2325

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ struct PlanetSidebarView: View {`
`161`	`161`	`.sheet(isPresented: $planetStore.isCreatingPlanet) {`
`162`	`162`	`CreatePlanetView()`
`163`	`163`	`}`
`164`		`- .frame(minWidth: 220)`
	`164`	`+ .frame(minWidth: 220, idealWidth: UserDefaults.standard.double(forKey: "sidebarWidth") > 0 ? UserDefaults.standard.double(forKey: "sidebarWidth") : 220) // See https://github.com/Planetable/Planet/issues/393`
`165`	`165`	`.toolbar {`
`166`	`166`	`Button(action: toggleSidebar) {`
`167`	`167`	`Image(systemName: "sidebar.left")`
`@@ -219,6 +219,10 @@ struct PlanetSidebarView: View {`
`219`	`219`	`await planetStore.aggregate()`
`220`	`220`	`}`
`221`	`221`	`}`
	`222`	`+ .onWidthChange { newWidth in`
	`223`	`+ @AppStorage("sidebarWidth") var sidebarWidth = 220.0`
	`224`	`+ sidebarWidth = newWidth`
	`225`	`+ }`
`222`	`226`	`}`
`223`	`227`
`224`	`228`	`private func toggleSidebar() {`