Gardening (#89)

Author: davdroman

Examples/Demo/Demo/PageView.swift

@@ -13,7 +13,7 @@ struct PageView<Content: View, Link: View, Destination: View>: View {
 	var body: some View {
 		ZStack {
 			Rectangle()
-				.do {
+				.modifier {
 					if #available(iOS 16, tvOS 16, *) {
 						$0.fill(color.gradient)
 					} else {
@@ -111,9 +111,17 @@ extension PageView where Link == EmptyView, Destination == EmptyView {
 }
 
 extension View {
-	func `do`<ModifiedView: View>(
-		@ViewBuilder modifierClosure: (Self) -> ModifiedView
-	) -> some View {
-		modifierClosure(self)
+	/// Modify a view with a `ViewBuilder` closure.
+	///
+	/// This represents a streamlining of the
+	/// [`modifier`](https://developer.apple.com/documentation/swiftui/view/modifier(_:)) +
+	/// [`ViewModifier`](https://developer.apple.com/documentation/swiftui/viewmodifier) pattern.
+	///
+	/// - Note: Useful only when you don't need to reuse the closure.
+	/// If you do, turn the closure into a proper modifier.
+	public func modifier<ModifiedContent: View>(
+		@ViewBuilder _ modifier: (Self) -> ModifiedContent
+	) -> ModifiedContent {
+		modifier(self)
 	}
 }

Examples/Demo/Demo/Pages.swift

@@ -13,7 +13,7 @@ struct PageOne: View {
 		} destination: {
 			PageTwo()
 		}
-		.do {
+		.modifier {
 			if #available(iOS 16, tvOS 16, *) {
 				$0.navigationDestination(for: Int.self) { number in
 					switch number {
@@ -130,9 +130,9 @@ struct PageLink: View {
 				.fill(Color.blue.opacity(0.8))
 			#endif
 			Text(title)
-			#if !os(tvOS)
+				#if !os(tvOS)
 				.foregroundColor(.white)
-			#endif
+				#endif
 				.font(.system(size: 18, weight: .medium, design: .rounded))
 		}
 		.frame(maxHeight: 50)
@@ -162,14 +162,14 @@ struct Code<Content: StringProtocol>: View {
 			.font(.system(size: 14, design: .monospaced))
 			.background(shape.stroke(Color(white: 0.1).opacity(0.35), lineWidth: 1))
 			.background(Color(white: 0.94).opacity(0.6).clipShape(shape))
-		#if !os(tvOS)
-			.do {
+			#if !os(tvOS)
+			.modifier {
 				if #available(iOS 15, *) {
 					$0.textSelection(.enabled)
 				} else {
 					$0
 				}
 			}
-		#endif
+			#endif
 	}
 }

Sources/NavigationTransitions/NavigationTransition+SwiftUI.swift

@@ -2,7 +2,6 @@ import SwiftUI
 @_implementationOnly @_spi(Advanced) import SwiftUIIntrospect
 
 extension View {
-	@ViewBuilder
 	public func navigationTransition(
 		_ transition: AnyNavigationTransition,
 		interactivity: AnyNavigationTransition.Interactivity = .default