chore: use Binding.isNotNil everywhere

Author: pixelspark

Sushitrain/BrowserListView.swift

@@ -361,30 +361,30 @@ private struct ItemSelectSwipeView<Content: View>: View {
 
 	var body: some View {
 		if self.file.isSelectionToggleAvailable {
-			self.content.alert(
-				isPresented: Binding(get: { errorMessage != nil }, set: { s in errorMessage = s ? errorMessage : nil })
-			) {
-				Alert(
-					title: Text("Could not change synchronization setting"), message: Text(errorMessage ?? ""),
-					dismissButton: .default(Text("OK")))
-			}.swipeActions(allowsFullSwipe: false) {
-				if file.isExplicitlySelected() || file.isSelected() {
-					// Unselect button
-					Button {
-						Task { self.errorMessage = await self.file.setSelectedFromToggle(s: false) }
-					} label: {
-						Label("Do not synchronize with this device", systemImage: "pin.slash")
-					}.tint(.red)
+			self.content
+				.alert(isPresented: Binding.isNotNil($errorMessage)) {
+					Alert(
+						title: Text("Could not change synchronization setting"), message: Text(errorMessage ?? ""),
+						dismissButton: .default(Text("OK")))
 				}
-				else {
-					// Select button
-					Button {
-						Task { self.errorMessage = await self.file.setSelectedFromToggle(s: true) }
-					} label: {
-						Label("Synchronize with this device", systemImage: "pin")
+				.swipeActions(allowsFullSwipe: false) {
+					if file.isExplicitlySelected() || file.isSelected() {
+						// Unselect button
+						Button {
+							Task { self.errorMessage = await self.file.setSelectedFromToggle(s: false) }
+						} label: {
+							Label("Do not synchronize with this device", systemImage: "pin.slash")
+						}.tint(.red)
+					}
+					else {
+						// Select button
+						Button {
+							Task { self.errorMessage = await self.file.setSelectedFromToggle(s: true) }
+						} label: {
+							Label("Synchronize with this device", systemImage: "pin")
+						}
 					}
 				}
-			}
 		}
 		else {
 			self.content

Sushitrain/BrowserTableView.swift

@@ -188,13 +188,9 @@ struct BrowserTableView: View {
 			},
 			primaryAction: self.doubleClick
 		)
-		.navigationDestination(
-			isPresented: Binding(
-				get: { self.openedEntry != nil },
-				set: { self.openedEntry = $0 ? self.openedEntry : nil }),
-			destination: {
-				self.nextView()
-			})
+		.navigationDestination(isPresented: Binding.isNotNil($openedEntry)) {
+			self.nextView()
+		}
 	}
 
 	@ViewBuilder private func nextView() -> some View {

Sushitrain/BrowserView.swift

@@ -248,15 +248,7 @@ struct BrowserView: View {
 					return true
 				})
 		#endif
-		.alert(
-			isPresented: Binding(
-				get: { return self.error != nil },
-				set: { nv in
-					if !nv {
-						self.error = nil
-					}
-				})
-		) {
+		.alert(isPresented: Binding.isNotNil($error)) {
 			Alert(
 				title: Text("An error occurred"),
 				message: self.error == nil ? nil : Text(self.error!.localizedDescription),

Sushitrain/ContentView.swift

@@ -42,14 +42,12 @@ private struct ContentView: View {
 	@Environment(AppState.self) private var appState
 	@Environment(\.scenePhase) var scenePhase
 	@Environment(\.horizontalSizeClass) private var horizontalSizeClass
+	
 	@State private var showCustomConfigWarning = false
 	@State var route: Route? = .start
 	@State private var columnVisibility = NavigationSplitViewVisibility.doubleColumn
-
-	#if os(iOS)
-		@State private var showSearchSheet = false
-		@State private var searchSheetSearchTerm: String = ""
-	#endif
+	@State private var showSearchSheet = false
+	@State private var searchSheetSearchTerm: String = ""
 
 	@ViewBuilder private func foldersTab() -> some View {
 		NavigationStack {
@@ -268,7 +266,9 @@ private struct ContentView: View {
 				initialSearchText: self.searchSheetSearchTerm
 			)
 			.navigationTitle("Search")
-			.navigationBarTitleDisplayMode(.inline)
+			#if os(iOS)
+				.navigationBarTitleDisplayMode(.inline)
+			#endif
 			.toolbar {
 				SheetButton(role: .done) {
 					showSearchSheet = false

Sushitrain/DecrypterView.swift

@@ -110,10 +110,7 @@ import SwiftUI
 					}.frame(minWidth: 400, maxWidth: .infinity, maxHeight: .infinity)
 				}
 				.frame(maxWidth: .infinity, maxHeight: .infinity)
-				.fileImporter(
-					isPresented: Binding(get: { self.showPickerFor != nil }, set: { _ in return }),
-					allowedContentTypes: [.directory]
-				) { (result) in
+				.fileImporter(isPresented: Binding.isNotNil($showPickerFor), allowedContentTypes: [.directory]) { (result) in
 					switch (result, showPickerFor) {
 					case (.success(let url), .source):
 						self.sourceURL = url

Sushitrain/DeviceView.swift

@@ -27,13 +27,11 @@ private struct DeviceAddressesView: View {
 			.onDisappear {
 				self.write()
 			}
-			.alert(
-				isPresented: Binding(get: { self.error != nil }, set: { show in self.error = show ? self.error : nil }),
-				content: {
-					Alert(
-						title: Text("Could not change addresses"), message: Text(self.error ?? ""),
-						dismissButton: .default(Text("OK")))
-				})
+			.alert(isPresented: Binding.isNotNil($error)) {
+				Alert(
+					title: Text("Could not change addresses"), message: Text(self.error ?? ""),
+					dismissButton: .default(Text("OK")))
+			}
 	}
 
 	private func update() async {

Sushitrain/DevicesView.swift

@@ -613,11 +613,7 @@ struct LatencyView: View {
 			.task {
 				await self.update()
 			}
-			.navigationDestination(
-				isPresented: Binding(
-					get: { self.openedDevice != nil },
-					set: { self.openedDevice = $0 ? self.openedDevice : nil })
-			) {
+			.navigationDestination(isPresented: Binding.isNotNil($openedDevice)) {
 				self.nextView()
 			}
 			.toolbar {

Sushitrain/ExtraFilesView.swift

@@ -134,7 +134,9 @@ struct ExtraFilesView: View {
 						}
 					}
 				})
-		}.quickLookPreview(self.$localItemURL).alert(isPresented: Binding.constant(errorMessage != nil)) {
+		}
+		.quickLookPreview(self.$localItemURL)
+		.alert(isPresented: Binding.isNotNil($errorMessage)) {
 			Alert(
 				title: Text("An error occurred"), message: Text(errorMessage ?? ""),
 				dismissButton: .default(Text("OK")) { errorMessage = nil })

Sushitrain/FolderView.swift

@@ -86,10 +86,7 @@ struct ShareFolderWithDeviceDetailsView: View {
 				}
 			}
 		}
-		.alert(
-			isPresented: Binding(
-				get: { self.error != nil }, set: { nv in self.error = nv ? self.error : nil })
-		) {
+		.alert(isPresented: Binding.isNotNil($error)) {
 			Alert(title: Text("Could not set encryption key"), message: Text(self.error!))
 		}
 	}
@@ -439,12 +436,9 @@ private struct ExternalFolderSectionView: View {
 					}
 				}
 			)
-			.alert(
-				isPresented: .constant(self.errorText != nil),
-				content: {
-					Alert(title: Text("Could not relink folder"), message: Text(errorText ?? ""), dismissButton: .default(Text("OK")))
-				}
-			)
+			.alert(isPresented: Binding.isNotNil($errorText)) {
+				Alert(title: Text("Could not relink folder"), message: Text(errorText ?? ""), dismissButton: .default(Text("OK")))
+			}
 		} footer: {
 			if isAccessible {
 				Text("This folder is not in the default location, and may belong to another app.")
@@ -549,12 +543,9 @@ struct ExternalFolderInaccessibleView: View {
 					}
 				}
 			)
-			.alert(
-				isPresented: .constant(self.errorText != nil),
-				content: {
-					Alert(title: Text("Could not relink folder"), message: Text(errorText ?? ""), dismissButton: .default(Text("OK")))
-				}
-			)
+			.alert(isPresented: Binding.isNotNil($errorText)) {
+				Alert(title: Text("Could not relink folder"), message: Text(errorText ?? ""), dismissButton: .default(Text("OK")))
+			}
 		}
 	}
 
@@ -587,13 +578,11 @@ struct ExternalFolderInaccessibleView: View {
 
 struct FolderView: View {
 	private enum ConfirmableAction {
-		case none
 		case unlinkFolder
 		case removeFolder
 
 		var message: String {
 			switch self {
-			case .none: return ""
 			case .removeFolder:
 				return String(
 					localized:
@@ -609,7 +598,6 @@ struct FolderView: View {
 
 		var buttonTitle: String {
 			switch self {
-			case .none: return ""
 			case .removeFolder: return String(localized: "Remove the folder and all files")
 			case .unlinkFolder: return String(localized: "Unlink the folder")
 			}
@@ -621,7 +609,7 @@ struct FolderView: View {
 	@Environment(\.dismiss) private var dismiss
 	@State private var isWorking = false
 	@State private var showAlert: ShowAlert? = nil
-	@State private var showConfirmable: ConfirmableAction = .none
+	@State private var showConfirmable: ConfirmableAction? = nil
 	@State private var advancedExpanded = false
 	@State private var possiblePeers: [SushitrainPeer] = []
 	@State private var unsupportedDataProtection = false
@@ -758,14 +746,11 @@ struct FolderView: View {
 			#endif
 		}
 		.confirmationDialog(
-			showConfirmable.message,
-			isPresented: Binding(
-				get: { self.showConfirmable != .none },
-				set: { self.showConfirmable = $0 ? self.showConfirmable : .none }
-			),
-			titleVisibility: .visible
+			showConfirmable?.message ?? "", isPresented: Binding.isNotNil($showConfirmable), titleVisibility: .visible
 		) {
-			Button(showConfirmable.buttonTitle, role: .destructive, action: self.confirmedAction)
+			if let sc = showConfirmable {
+				Button(sc.buttonTitle, role: .destructive, action: self.confirmedAction)
+			}
 		}
 	}
 
@@ -1296,7 +1281,7 @@ private struct FolderGenerateThumbnailsView: View {
 			}
 		}
 		.padding(30)
-		.alert(isPresented: Binding.constant(error != nil)) {
+		.alert(isPresented: Binding.isNotNil($error)) {
 			Alert(
 				title: Text("An error occurred"), message: Text(error!),
 				dismissButton: .default(Text("OK")) {

Sushitrain/IgnoresView.swift

@@ -120,7 +120,7 @@ struct IgnoresView: View {
 		.onDisappear {
 			self.write()
 		}
-		.alert(isPresented: Binding.constant(error != nil)) {
+		.alert(isPresented: Binding.isNotNil($error)) {
 			Alert(
 				title: Text("Error loading ignore settings"),
 				message: error != nil ? Text(error!.localizedDescription) : nil,