Commit `77df444b20`

77df444b20bc0e380a17abffc9f5688452c7c721

parent: fa8188260f

Unsigned

cmc <hello@cleberg.net> · 2026-03-19 22:05 UTC

fix README height update and settings save alerts

Layout: unified · split

Hutch.xcodeproj/project.pbxproj +4 −4

	@@ -359,7 +359,7 @@
359	ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;	359	ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
360	ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;	360	ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
361	CODE_SIGN_STYLE = Automatic;	361	CODE_SIGN_STYLE = Automatic;
362	CURRENT_PROJECT_VERSION = 5;	362	CURRENT_PROJECT_VERSION = 6;
363	DEVELOPMENT_TEAM = ZCNAX3VL9D;	363	DEVELOPMENT_TEAM = ZCNAX3VL9D;
364	ENABLE_PREVIEWS = YES;	364	ENABLE_PREVIEWS = YES;
365	GENERATE_INFOPLIST_FILE = YES;	365	GENERATE_INFOPLIST_FILE = YES;
	@@ -376,7 +376,7 @@
376	"$(inherited)",	376	"$(inherited)",
377	"@executable_path/Frameworks",	377	"@executable_path/Frameworks",
378	);	378	);
379	MARKETING_VERSION = 2.0;	379	MARKETING_VERSION = 2.1;
380	PRODUCT_BUNDLE_IDENTIFIER = net.cleberg.Hutch;	380	PRODUCT_BUNDLE_IDENTIFIER = net.cleberg.Hutch;
381	PRODUCT_NAME = "$(TARGET_NAME)";	381	PRODUCT_NAME = "$(TARGET_NAME)";
382	STRING_CATALOG_GENERATE_SYMBOLS = YES;	382	STRING_CATALOG_GENERATE_SYMBOLS = YES;
	@@ -395,7 +395,7 @@
395	ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;	395	ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
396	ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;	396	ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
397	CODE_SIGN_STYLE = Automatic;	397	CODE_SIGN_STYLE = Automatic;
398	CURRENT_PROJECT_VERSION = 5;	398	CURRENT_PROJECT_VERSION = 6;
399	DEVELOPMENT_TEAM = ZCNAX3VL9D;	399	DEVELOPMENT_TEAM = ZCNAX3VL9D;
400	ENABLE_PREVIEWS = YES;	400	ENABLE_PREVIEWS = YES;
401	GENERATE_INFOPLIST_FILE = YES;	401	GENERATE_INFOPLIST_FILE = YES;
	@@ -412,7 +412,7 @@
412	"$(inherited)",	412	"$(inherited)",
413	"@executable_path/Frameworks",	413	"@executable_path/Frameworks",
414	);	414	);
415	MARKETING_VERSION = 2.0;	415	MARKETING_VERSION = 2.1;
416	PRODUCT_BUNDLE_IDENTIFIER = net.cleberg.Hutch;	416	PRODUCT_BUNDLE_IDENTIFIER = net.cleberg.Hutch;
417	PRODUCT_NAME = "$(TARGET_NAME)";	417	PRODUCT_NAME = "$(TARGET_NAME)";
418	STRING_CATALOG_GENERATE_SYMBOLS = YES;	418	STRING_CATALOG_GENERATE_SYMBOLS = YES;

Hutch/Views/Repositories/HgRepositorySettingsView.swift +29 −2

     @State private var viewModel: HgRepositorySettingsViewModel?
     @State private var showDeleteConfirmation = false
     @State private var pendingACLDeletion: HgACLEntry?
+    @State private var saveResultAlert: SaveResultAlert?
     var body: some View {
         NavigationStack {
                 Text("\(entry.entity.canonicalName) will lose \(entry.mode) access to this repository.")
             }
         }
+        .alert(item: $saveResultAlert) { alert in
+            Alert(
+                title: Text(alert.title),
+                message: Text(alert.message),
+                dismissButton: .default(Text("OK"))
+            )
+        }
     }
     @ViewBuilder
             }
             Button {
-                Task { await viewModel.saveInfo() }
+                Task {
+                    let didSave = await viewModel.saveInfo()
+                    saveResultAlert = SaveResultAlert(
+                        title: didSave ? "Settings Updated" : "Couldn't Update Settings",
+                        message: didSave ? "Repository settings were saved." : (viewModel.error ?? "Please try again.")
+                    )
+                }
             } label: {
                 if viewModel.isSavingInfo {
                     ProgressView()
             Toggle("Hide this repository from public listings", isOn: Bindable(viewModel).editedNonPublishing)
             Button {
-                Task { await viewModel.saveInfo() }
+                Task {
+                    let didSave = await viewModel.saveInfo()
+                    saveResultAlert = SaveResultAlert(
+                        title: didSave ? "Settings Updated" : "Couldn't Update Settings",
+                        message: didSave ? "Repository settings were saved." : (viewModel.error ?? "Please try again.")
+                    )
+                }
             } label: {
                 if viewModel.isSavingInfo {
                     ProgressView()
             .disabled(viewModel.isDeleting)
         }
     }
+    private struct SaveResultAlert: Identifiable {
+        let title: String
+        let message: String
+        var id: String { "\(title)-\(message)" }
+    }
 }

Hutch/Views/Repositories/HgRepositorySettingsViewModel.swift +3 −1

         }
     }
-    func saveInfo() async {
+    func saveInfo() async -> Bool {
         isSavingInfo = true
         defer { isSavingInfo = false }
         error = nil
                 variables: ["id": repositoryId, "input": input],
                 responseType: HgUpdateRepositoryResponse.self
             )
+            return true
         } catch {
             self.error = error.userFacingMessage
+            return false
         }
     }

Hutch/Views/Repositories/ReadmeView.swift +5 −1

         if let cachedHeight = HTMLWebViewCoordinator.heightCache.object(forKey: wrapped as NSString)?.doubleValue {
             let height = CGFloat(cachedHeight)
             if abs(dynamicHeight - height) > 0.5 {
-                dynamicHeight = height
+                DispatchQueue.main.async {
+                    if abs(self.dynamicHeight - height) > 0.5 {
+                        self.dynamicHeight = height
+                    }
+                }
             }
         }

Hutch/Views/Repositories/RepositorySettingsView.swift +22 −1

     @State private var viewModel: RepositorySettingsViewModel?
     @State private var showDeleteConfirmation = false
     @State private var pendingACLDeletion: ACLEntry?
+    @State private var saveResultAlert: SaveResultAlert?
     var body: some View {
         NavigationStack {
                 Text("\(entry.entity.canonicalName) will lose \(entry.mode) access to this repository.")
             }
         }
+        .alert(item: $saveResultAlert) { alert in
+            Alert(
+                title: Text(alert.title),
+                message: Text(alert.message),
+                dismissButton: .default(Text("OK"))
+            )
+        }
     }
     // MARK: - Info Section
             }
             Button {
-                Task { await viewModel.saveInfo() }
+                Task {
+                    let didSave = await viewModel.saveInfo()
+                    saveResultAlert = SaveResultAlert(
+                        title: didSave ? "Settings Updated" : "Couldn't Update Settings",
+                        message: didSave ? "Repository settings were saved." : (viewModel.error ?? "Please try again.")
+                    )
+                }
             } label: {
                 if viewModel.isSavingInfo {
                     ProgressView()
             .disabled(viewModel.isDeleting)
         }
     }
+    private struct SaveResultAlert: Identifiable {
+        let title: String
+        let message: String
+        var id: String { "\(title)-\(message)" }
+    }
 }

Hutch/Views/Repositories/RepositorySettingsViewModel.swift +3 −1

     }
     """
-    func saveInfo() async {
+    func saveInfo() async -> Bool {
         isSavingInfo = true
         defer { isSavingInfo = false }
         error = nil
                 variables: ["id": repositoryId, "input": input],
                 responseType: UpdateRepoInfoResponse.self
             )
+            return true
         } catch {
             self.error = error.userFacingMessage
+            return false
         }
     }

Commit 77df444b20

Commit `77df444b20`