Use CGFloat, CGPoint, CGRect from Foundation (#411)

Resolves #404. This also allows us to write more tests that are source-compatible with SwiftUI. * Use `CGFloat`, `CGPoint`, `CGRect` from Foundation * Fix GTK build * Fix macOS build
TokamakUI · Jun 19, 2021 · ae219e9 · ae219e9
1 parent ac69bbc
commit ae219e9
Show file tree

Hide file tree

Showing 44 changed files with 174 additions and 126 deletions.
diff --git a/Sources/TokamakCore/Modifiers/Effects/ClipEffect.swift b/Sources/TokamakCore/Modifiers/Effects/ClipEffect.swift
@@ -1,4 +1,4 @@
-// Copyright 2020 Tokamak contributors
+// Copyright 2020-2021 Tokamak contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
 //  Created by Carson Katri on 06/29/2020.
 //
 
+import Foundation
+
 public struct _ClipEffect<ClipShape>: ViewModifier where ClipShape: Shape {
   public var shape: ClipShape
   public var style: FillStyle

diff --git a/Sources/TokamakCore/Modifiers/Effects/GeometryEffect.swift b/Sources/TokamakCore/Modifiers/Effects/GeometryEffect.swift
@@ -1,4 +1,4 @@
-// Copyright 2020 Tokamak contributors
+// Copyright 2020-2021 Tokamak contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
 //  Created by Carson Katri on 7/3/20.
 //
 
+import Foundation
+
 // FIXME: Make `Animatable`
 public protocol GeometryEffect: ViewModifier {
   func effectValue(size: CGSize) -> ProjectionTransform

diff --git a/Sources/TokamakCore/Modifiers/Effects/RotationEffect.swift b/Sources/TokamakCore/Modifiers/Effects/RotationEffect.swift
@@ -1,4 +1,4 @@
-// Copyright 2020 Tokamak contributors
+// Copyright 2020-2021 Tokamak contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
 //  Created by Carson Katri on 7/3/20.
 //
 
+import Foundation
+
 public struct _RotationEffect: GeometryEffect {
   public var angle: Angle
   public var anchor: UnitPoint
@@ -25,7 +27,7 @@ public struct _RotationEffect: GeometryEffect {
   }
 
   public func effectValue(size: CGSize) -> ProjectionTransform {
-    .init(CGAffineTransform.identity.rotated(by: angle.radians))
+    .init(CGAffineTransform.identity.rotated(by: CGFloat(angle.radians)))
   }
 
   public func body(content: Content) -> some View {

diff --git a/Sources/TokamakCore/Modifiers/FlexFrameLayout.swift b/Sources/TokamakCore/Modifiers/FlexFrameLayout.swift
@@ -1,4 +1,4 @@
-// Copyright 2020 Tokamak contributors
+// Copyright 2020-2021 Tokamak contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import Foundation
+
 public struct _FlexFrameLayout: ViewModifier {
   public let minWidth: CGFloat?
   public let idealWidth: CGFloat?

diff --git a/Sources/TokamakCore/Modifiers/FrameLayout.swift b/Sources/TokamakCore/Modifiers/FrameLayout.swift
@@ -1,4 +1,4 @@
-// Copyright 2020 Tokamak contributors
+// Copyright 2020-2021 Tokamak contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import Foundation
+
 public struct _FrameLayout: ViewModifier {
   public let width: CGFloat?
   public let height: CGFloat?

diff --git a/Sources/TokamakCore/Modifiers/PaddingLayout.swift b/Sources/TokamakCore/Modifiers/PaddingLayout.swift
@@ -1,4 +1,4 @@
-// Copyright 2020 Tokamak contributors
+// Copyright 2020-2021 Tokamak contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import Foundation
+
 public struct _PaddingLayout: ViewModifier {
   public var edges: Edge.Set
   public var insets: EdgeInsets?

diff --git a/Sources/TokamakCore/Modifiers/ShadowLayout.swift b/Sources/TokamakCore/Modifiers/ShadowLayout.swift
@@ -1,3 +1,19 @@
+// Copyright 2021 Tokamak contributors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import Foundation
+
 public struct _ShadowLayout: ViewModifier, EnvironmentReader {
   public var color: Color
   public var radius: CGFloat

diff --git a/Sources/TokamakCore/Modifiers/StyleModifiers.swift b/Sources/TokamakCore/Modifiers/StyleModifiers.swift
@@ -1,4 +1,4 @@
-// Copyright 2020 Tokamak contributors
+// Copyright 2020-2021 Tokamak contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
 //  Created by Carson Katri on 6/29/20.
 //
 
+import Foundation
+
 public struct _BackgroundModifier<Background>: ViewModifier, EnvironmentReader
   where Background: View
 {

diff --git a/Sources/TokamakCore/PreviewProvider.swift b/Sources/TokamakCore/PreviewProvider.swift
@@ -1,4 +1,4 @@
-// Copyright 2020 Tokamak contributors
+// Copyright 2020-2021 Tokamak contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import Foundation
+
 /// This protocol has no functionality currently, and is only provided for compatibility purposes.
 public protocol PreviewProvider {
   associatedtype Previews: View

diff --git a/Sources/TokamakCore/Shapes/Ellipse.swift b/Sources/TokamakCore/Shapes/Ellipse.swift
@@ -1,4 +1,4 @@
-// Copyright 2020 Tokamak contributors
+// Copyright 2020-2021 Tokamak contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
 //  Created by Carson Katri on 6/29/20.
 //
 
+import Foundation
+
 public struct Ellipse: Shape {
   public func path(in rect: CGRect) -> Path {
     .init(storage: .ellipse(rect), sizing: .flexible)

diff --git a/Sources/TokamakCore/Shapes/FixedRoundedRect.swift b/Sources/TokamakCore/Shapes/FixedRoundedRect.swift
@@ -1,4 +1,4 @@
-// Copyright 2020 Tokamak contributors
+// Copyright 2020-2021 Tokamak contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
 //  Created by Carson Katri on 7/22/20.
 //
 
+import Foundation
+
 public struct FixedRoundedRect: Equatable {
   public let rect: CGRect
   public let cornerSize: CGSize?

diff --git a/Sources/TokamakCore/Shapes/ModifiedShapes.swift b/Sources/TokamakCore/Shapes/ModifiedShapes.swift
@@ -1,4 +1,4 @@
-// Copyright 2020 Tokamak contributors
+// Copyright 2020-2021 Tokamak contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
 //  Created by Carson Katri on 06/28/2020.
 //
 
+import Foundation
+
 public struct _StrokedShape<S>: Shape where S: Shape {
   @Environment(\.self) public var environment
   public var shape: S
@@ -106,7 +108,7 @@ public struct RotatedShape<Content>: Shape where Content: Shape {
   public func path(in rect: CGRect) -> Path {
     shape
       .path(in: rect)
-      .applying(.init(rotationAngle: angle.radians))
+      .applying(.init(rotationAngle: CGFloat(angle.radians)))
   }
 }
 

diff --git a/Sources/TokamakCore/Shapes/Path.swift b/Sources/TokamakCore/Shapes/Path.swift
@@ -1,4 +1,4 @@
-// Copyright 2020 Tokamak contributors
+// Copyright 2020-2021 Tokamak contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,13 +15,7 @@
 //  Created by Carson Katri on 06/28/2020.
 //
 
-#if canImport(Darwin)
-import Darwin
-#elseif canImport(Glibc)
-import Glibc
-#elseif os(WASI)
-import WASILibc
-#endif
+import Foundation
 
 /// The outline of a 2D shape.
 public struct Path: Equatable, LosslessStringConvertible {
@@ -610,6 +604,7 @@ private func getArc(
           clockwise: clockwise
         )
     } else {
+      let angle = CGFloat(angle)
       let endPoint = CGPoint(
         x: (radius * cos(angle)) + center.x,
         y: (radius * sin(angle)) + center.y

diff --git a/Sources/TokamakCore/Shapes/Rectangle.swift b/Sources/TokamakCore/Shapes/Rectangle.swift
@@ -1,4 +1,4 @@
-// Copyright 2018-2020 Tokamak contributors
+// Copyright 2018-2021 Tokamak contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import Foundation
+
 public struct Rectangle: Shape {
   public func path(in rect: CGRect) -> Path {
     .init(storage: .rect(rect), sizing: .flexible)

diff --git a/Sources/TokamakCore/Shapes/Shape.swift b/Sources/TokamakCore/Shapes/Shape.swift
@@ -1,4 +1,4 @@
-// Copyright 2020 Tokamak contributors
+// Copyright 2020-2021 Tokamak contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
 //  Created by Carson Katri on 06/28/2020.
 //
 
+import Foundation
+
 public protocol Shape: View {
   func path(in rect: CGRect) -> Path
 }

diff --git a/Sources/TokamakCore/Shapes/ShapeModifiers.swift b/Sources/TokamakCore/Shapes/ShapeModifiers.swift
@@ -1,4 +1,4 @@
-// Copyright 2020 Tokamak contributors
+// Copyright 2020-2021 Tokamak contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
 //  Created by Carson Katri on 6/29/20.
 //
 
+import Foundation
+
 public extension InsettableShape {
   func strokeBorder<S>(
     _ content: S,

diff --git a/Sources/TokamakCore/Shapes/StrokeStyle.swift b/Sources/TokamakCore/Shapes/StrokeStyle.swift
@@ -1,4 +1,4 @@
-// Copyright 2020 Tokamak contributors
+// Copyright 2020-2021 Tokamak contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
 //  Created by Carson Katri on 7/22/20.
 //
 
+import Foundation
+
 public struct StrokeStyle: Equatable {
   public var lineWidth: CGFloat
   public var lineCap: CGLineCap

diff --git a/Sources/TokamakCore/Shapes/TrimmedPath.swift b/Sources/TokamakCore/Shapes/TrimmedPath.swift
@@ -1,4 +1,4 @@
-// Copyright 2020 Tokamak contributors
+// Copyright 2020-2021 Tokamak contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
 //  Created by Carson Katri on 7/22/20.
 //
 
+import Foundation
+
 public struct TrimmedPath: Equatable {
   public let path: Path
   public let from: CGFloat