Deprecate frame(maxSize:) on views

AparokshaUI · Apr 21, 2024 · 7ff5661 · 7ff5661
1 parent b7aabb0
commit 7ff5661
Show file tree

Hide file tree

Showing 15 changed files with 18 additions and 68 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,4 +10,5 @@ DerivedData/
 /Package.resolved
 .Ulysses-Group.plist
 /.docc-build
-/io.github.AparokshaUI.Generation.json
+/io.github.AparokshaUI.Generation.json
+/.vscode
diff --git a/.vscode/launch.json b/.vscode/launch.json
diff --git a/Sources/Adwaita/View/Modifiers/Clamp+.swift b/Sources/Adwaita/View/Modifiers/Clamp+.swift
@@ -27,6 +27,7 @@ extension View {
  /// Set the view's maximum width.
  /// - Parameter maxSize: The maximum width.
  /// - Returns: A view.
+ @available(*, deprecated, message: "Use frame(maxWidth:) on views instead")
  public func frame(maxSize: Int? = nil) -> Clamp {
  frame(maxWidth: maxSize)
  }

diff --git a/Tests/AlertDialogDemo.swift b/Tests/AlertDialogDemo.swift
@@ -20,7 +20,7 @@ struct AlertDialogDemo: View {
  dialog = true
  }
  .style("pill")
- .frame(maxSize: 100)
+ .frame(maxWidth: 100)
  .padding()
  }
  .alertDialog(visible: $dialog, heading: "Alert Dialog", body: "This is an alert dialog")

diff --git a/Tests/CarouselDemo.swift b/Tests/CarouselDemo.swift
@@ -36,7 +36,7 @@ struct CarouselDemo: View {
  .onClick { print(element.id) }
  .padding(20)
  .frame(minWidth: 300, minHeight: 200)
- .frame(maxSize: 500)
+ .frame(maxWidth: 500)
  }
  .longSwipes()
  }

diff --git a/Tests/DialogDemo.swift b/Tests/DialogDemo.swift
@@ -22,7 +22,7 @@ struct DialogDemo: View {
  dialog = true
  }
  .style("pill")
- .frame(maxSize: 100)
+ .frame(maxWidth: 100)
  .padding()
  }
  .dialog(visible: $dialog, title: "Counter", width: width, height: height) {

diff --git a/Tests/DiceDemo.swift b/Tests/DiceDemo.swift
@@ -28,7 +28,7 @@ struct DiceDemo: View {
  }
  .style("pill")
  .style("suggested-action")
- .frame(maxSize: 100)
+ .frame(maxWidth: 100)
  }
  .valign(.center)
  .padding()

diff --git a/Tests/FormDemo.swift b/Tests/FormDemo.swift
@@ -19,7 +19,7 @@ struct FormDemo: View {
  app.showWindow("form-demo")
  }
  .style("suggested-action")
- .frame(maxSize: 100)
+ .frame(maxWidth: 100)
  }
  }
 
@@ -62,7 +62,7 @@ struct FormDemo: View {
  })
  }
  .padding()
- .frame(maxSize: 400)
+ .frame(maxWidth: 400)
  }
  .topToolbar {
  HeaderBar.empty()

diff --git a/Tests/NavigationViewDemo.swift b/Tests/NavigationViewDemo.swift
@@ -19,7 +19,7 @@ struct NavigationViewDemo: View {
  app.showWindow("navigation")
  }
  .style("suggested-action")
- .frame(maxSize: 100)
+ .frame(maxWidth: 100)
  .padding()
  }
  }

diff --git a/Tests/PopoverDemo.swift b/Tests/PopoverDemo.swift
@@ -19,7 +19,7 @@ struct PopoverDemo: View {
  visible = true
  }
  .style("suggested-action")
- .frame(maxSize: 100)
+ .frame(maxWidth: 100)
  .popover(visible: $visible) {
  CounterDemo()
  }

diff --git a/Tests/ToastDemo.swift b/Tests/ToastDemo.swift
@@ -19,7 +19,7 @@ struct ToastDemo: View {
  toast.signal()
  }
  .style("suggested-action")
- .frame(maxSize: 100)
+ .frame(maxWidth: 100)
  }
  }
 

diff --git a/Tests/ToolbarDemo.swift b/Tests/ToolbarDemo.swift
@@ -19,7 +19,7 @@ struct ToolbarDemo: View {
  app.showWindow("toolbar-demo")
  }
  .style("suggested-action")
- .frame(maxSize: 100)
+ .frame(maxWidth: 100)
  }
  }
 
@@ -34,7 +34,7 @@ struct ToolbarDemo: View {
  visible.toggle()
  }
  .style("suggested-action")
- .frame(maxSize: 100)
+ .frame(maxWidth: 100)
  .padding(15)
  }
  .valign(.center)

diff --git a/Tests/TransitionDemo.swift b/Tests/TransitionDemo.swift
@@ -27,14 +27,14 @@ struct TransitionDemo: View {
  }
  .modifyContent(Text.self) { $0.style("title-2").padding() }
  .style("card")
- .frame(maxSize: 200)
+ .frame(maxWidth: 200)
  .padding()
  Button("Toggle View") {
  firstView.toggle()
  }
  .style("pill")
  .padding()
- .frame(maxSize: 100)
+ .frame(maxWidth: 100)
  }
 
 }

diff --git a/Tests/ViewSwitcherDemo.swift b/Tests/ViewSwitcherDemo.swift
@@ -19,7 +19,7 @@ struct ViewSwitcherDemo: View {
  app.showWindow("switcher-demo")
  }
  .style("suggested-action")
- .frame(maxSize: 100)
+ .frame(maxWidth: 100)
  }
  }
 

diff --git a/Tests/WindowsDemo.swift b/Tests/WindowsDemo.swift
@@ -29,7 +29,7 @@ struct WindowsDemo: View {
  .style("linked")
  .padding()
  }
- .frame(maxSize: 100)
+ .frame(maxWidth: 100)
  }
 
  struct WindowContent: View {