Add default dark styles for Views

Sources/TokamakCore/Modifiers/FlexFrameLayout.swift

@@ -21,6 +21,16 @@ public struct _FlexFrameLayout: ViewModifier {
   public let maxHeight: CGFloat?
   public let alignment: Alignment
 
+  // These are special cases in SwiftUI, where the child
+  // will request the entire width/height of the parent.
+  public var fillWidth: Bool {
+    minWidth == 0 && maxWidth == .infinity
+  }
+
+  public var fillHeight: Bool {
+    minHeight == 0 && maxHeight == .infinity
+  }
+
   init(
     minWidth: CGFloat? = nil,
     idealWidth: CGFloat? = nil,

Sources/TokamakCore/Modifiers/ModifiedContent.swift

@@ -14,17 +14,23 @@
 
 /// A value with a modifier applied to it.
 public struct ModifiedContent<Content, Modifier> {
+  @Environment(\.self) public var environment
   public typealias Body = Never
-  public let content: Content
-  public let modifier: Modifier
+  public private(set) var content: Content
+  public private(set) var modifier: Modifier
 
-  @inlinable
   public init(content: Content, modifier: Modifier) {
     self.content = content
     self.modifier = modifier
   }
 }
 
+extension ModifiedContent: EnvironmentReader where Modifier: EnvironmentReader {
+  mutating func setContent(from values: EnvironmentValues) {
+    modifier.setContent(from: values)
+  }
+}
+
 extension ModifiedContent: View, ParentView where Content: View, Modifier: ViewModifier {
   public var body: Body {
     neverBody("ModifiedContent<View, ViewModifier>")

Sources/TokamakCore/Modifiers/StyleModifiers.swift

@@ -15,7 +15,10 @@
 //  Created by Carson Katri on 6/29/20.
 //
 
-public struct _BackgroundModifier<Background>: ViewModifier where Background: View {
+public struct _BackgroundModifier<Background>: ViewModifier, EnvironmentReader
+  where Background: View
+{
+  public var environment: EnvironmentValues!
   public var background: Background
   public var alignment: Alignment
 
@@ -27,9 +30,20 @@ public struct _BackgroundModifier<Background>: ViewModifier where Background: Vi
   public func body(content: Content) -> some View {
     content
   }
+
+  mutating func setContent(from values: EnvironmentValues) {
+    environment = values
+  }
 }
 
-extension _BackgroundModifier: Equatable where Background: Equatable {}
+extension _BackgroundModifier: Equatable where Background: Equatable {
+  public static func == (
+    lhs: _BackgroundModifier<Background>,
+    rhs: _BackgroundModifier<Background>
+  ) -> Bool {
+    lhs.background == rhs.background
+  }
+}
 
 extension View {
   public func background<Background>(
@@ -40,7 +54,10 @@ extension View {
   }
 }
 
-public struct _OverlayModifier<Overlay>: ViewModifier where Overlay: View {
+public struct _OverlayModifier<Overlay>: ViewModifier, EnvironmentReader
+  where Overlay: View
+{
+  public var environment: EnvironmentValues!
   public var overlay: Overlay
   public var alignment: Alignment
 
@@ -55,9 +72,17 @@ public struct _OverlayModifier<Overlay>: ViewModifier where Overlay: View {
       overlay
     }
   }
+
+  mutating func setContent(from values: EnvironmentValues) {
+    environment = values
+  }
 }
 
-extension _OverlayModifier: Equatable where Overlay: Equatable {}
+extension _OverlayModifier: Equatable where Overlay: Equatable {
+  public static func == (lhs: _OverlayModifier<Overlay>, rhs: _OverlayModifier<Overlay>) -> Bool {
+    lhs.overlay == rhs.overlay
+  }
+}
 
 extension View {
   public func overlay<Overlay>(_ overlay: Overlay, alignment: Alignment = .center) -> some View

Sources/TokamakCore/Shapes/ModifiedShapes.swift

@@ -16,6 +16,7 @@
 //
 
 public struct _StrokedShape<S>: Shape where S: Shape {
+  @Environment(\.self) public var environment
   public var shape: S
   public var style: StrokeStyle
 

Sources/TokamakCore/Shapes/Shape.swift

@@ -47,6 +47,7 @@ public struct FillStyle: Equatable, ShapeStyle {
 }
 
 public struct _ShapeView<Content, Style>: View where Content: Shape, Style: ShapeStyle {
+  @Environment(\.self) public var environment
   @Environment(\.foregroundColor) public var foregroundColor
   public var shape: Content
   public var style: Style

Sources/TokamakCore/Styles/NavigationLinkStyle.swift

@@ -0,0 +1,74 @@
+// Copyright 2020 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.
+//
+//  Created by Carson Katri on 8/2/20.
+//
+
+public struct _NavigationLinkStyleConfiguration: View {
+  public let body: AnyView
+  public let isSelected: Bool
+}
+
+public protocol _NavigationLinkStyle {
+  associatedtype Body: View
+  typealias Configuration = _NavigationLinkStyleConfiguration
+  func makeBody(configuration: Configuration) -> Self.Body
+}
+
+public struct _DefaultNavigationLinkStyle: _NavigationLinkStyle {
+  public func makeBody(configuration: Configuration) -> some View {
+    configuration.foregroundColor(.accentColor)
+  }
+}
+
+public struct _AnyNavigationLinkStyle: _NavigationLinkStyle {
+  public typealias Body = AnyView
+
+  private let bodyClosure: (_NavigationLinkStyleConfiguration) -> AnyView
+  public let type: Any.Type
+
+  public init<S: _NavigationLinkStyle>(_ style: S) {
+    type = S.self
+    bodyClosure = { configuration in
+      AnyView(style.makeBody(configuration: configuration))
+    }
+  }
+
+  public func makeBody(configuration: Configuration) -> AnyView {
+    bodyClosure(configuration)
+  }
+}
+
+public enum _NavigationLinkStyleKey: EnvironmentKey {
+  public static var defaultValue: _AnyNavigationLinkStyle {
+    _AnyNavigationLinkStyle(_DefaultNavigationLinkStyle())
+  }
+}
+
+extension EnvironmentValues {
+  var _navigationLinkStyle: _AnyNavigationLinkStyle {
+    get {
+      self[_NavigationLinkStyleKey.self]
+    }
+    set {
+      self[_NavigationLinkStyleKey.self] = newValue
+    }
+  }
+}
+
+extension View {
+  public func _navigationLinkStyle<S: _NavigationLinkStyle>(_ style: S) -> some View {
+    environment(\._navigationLinkStyle, _AnyNavigationLinkStyle(style))
+  }
+}

Sources/TokamakCore/Tokens/Color.swift

@@ -16,20 +16,38 @@
 //
 
 public struct Color: Hashable, Equatable {
-  // FIXME: This is not injected.
-  @Environment(\.accentColor) static var envAccentColor
+  public static func == (lhs: Self, rhs: Self) -> Bool {
+    var lightEnv = EnvironmentValues()
+    lightEnv.colorScheme = .light
+    var darkEnv = EnvironmentValues()
+    darkEnv.colorScheme = .dark
+    return lhs._evaluate(lightEnv) == rhs._evaluate(lightEnv) &&
+      lhs._evaluate(darkEnv) == rhs._evaluate(darkEnv)
+  }
+
+  public func hash(into hasher: inout Hasher) {
+    hasher.combine(evaluator(EnvironmentValues()))
+  }
 
   public enum RGBColorSpace {
     case sRGB
     case sRGBLinear
     case displayP3
   }
 
-  public let red: Double
-  public let green: Double
-  public let blue: Double
-  public let opacity: Double
-  public let space: RGBColorSpace
+  public struct _RGBA: Hashable, Equatable {
+    public let red: Double
+    public let green: Double
+    public let blue: Double
+    public let opacity: Double
+    public let space: RGBColorSpace
+  }
+
+  let evaluator: (EnvironmentValues) -> _RGBA
+
+  private init(_ evaluator: @escaping (EnvironmentValues) -> _RGBA) {
+    self.evaluator = evaluator
+  }
 
   public init(
     _ colorSpace: RGBColorSpace = .sRGB,
@@ -38,34 +56,35 @@ public struct Color: Hashable, Equatable {
     blue: Double,
     opacity: Double = 1
   ) {
-    self.red = red
-    self.green = green
-    self.blue = blue
-    self.opacity = opacity
-    space = colorSpace
+    self.init { _ in
+      _RGBA(red: red, green: green, blue: blue, opacity: opacity, space: colorSpace)
+    }
   }
 
   public init(_ colorSpace: RGBColorSpace = .sRGB, white: Double, opacity: Double = 1) {
-    red = white
-    green = white
-    blue = white
-    self.opacity = opacity
-    space = colorSpace
+    self.init(colorSpace, red: white, green: white, blue: white, opacity: opacity)
   }
 
   // Source for the formula:
   // https://en.wikipedia.org/wiki/HSL_and_HSV#HSL_to_RGB_alternative
   public init(hue: Double, saturation: Double, brightness: Double, opacity: Double = 1) {
     let a = saturation * min(brightness / 2, 1 - (brightness / 2))
-    let f: (Int) -> Double = { n in
+    let f = { (n: Int) -> Double in
       let k = Double((n + Int(hue * 12)) % 12)
       return brightness - (a * max(-1, min(k - 3, 9 - k, 1)))
     }
-    red = f(0)
-    green = f(8)
-    blue = f(4)
-    self.opacity = opacity
-    space = .sRGB
+    self.init(.sRGB, red: f(0), green: f(8), blue: f(4), opacity: opacity)
+  }
+
+  /// Create a `Color` dependent on the current `ColorScheme`.
+  public static func _withScheme(_ evaluator: @escaping (ColorScheme) -> Self) -> Self {
+    .init {
+      evaluator($0.colorScheme)._evaluate($0)
+    }
+  }
+
+  public func _evaluate(_ environment: EnvironmentValues) -> _RGBA {
+    evaluator(environment)
   }
 }
 
@@ -81,9 +100,19 @@ extension Color {
   public static let yellow: Self = .init(red: 1.00, green: 0.84, blue: 0.04)
   public static let pink: Self = .init(red: 1.00, green: 0.22, blue: 0.37)
   public static let purple: Self = .init(red: 0.75, green: 0.36, blue: 0.95)
-  // FIXME: Switch to use colorScheme
-  public static let primary: Self = .black
+  public static let primary: Self = .init {
+    switch $0.colorScheme {
+    case .light:
+      return .init(red: 0, green: 0, blue: 0, opacity: 1, space: .sRGB)
+    case .dark:
+      return .init(red: 1, green: 1, blue: 1, opacity: 1, space: .sRGB)
+    }
+  }
+
   public static let secondary: Self = .gray
+  public static let accentColor: Self = .init {
+    ($0.accentColor ?? Self.blue)._evaluate($0)
+  }
 
   public init(_ color: UIColor) {
     self = color.color
@@ -93,11 +122,13 @@ extension Color {
 extension Color: ExpressibleByIntegerLiteral {
   /// Allows initializing value of `Color` type from hex values
   public init(integerLiteral bitMask: UInt32) {
-    red = Double((bitMask & 0xFF0000) >> 16) / 255
-    green = Double((bitMask & 0x00FF00) >> 8) / 255
-    blue = Double(bitMask & 0x0000FF) / 255
-    opacity = 1
-    space = .sRGB
+    self.init(
+      .sRGB,
+      red: Double((bitMask & 0xFF0000) >> 16) / 255,
+      green: Double((bitMask & 0x00FF00) >> 8) / 255,
+      blue: Double(bitMask & 0x0000FF) / 255,
+      opacity: 1
+    )
   }
 }
 
@@ -114,11 +145,13 @@ extension Color {
     else {
       return nil
     }
-    self.red = Double(red) / 255
-    self.green = Double(green) / 255
-    self.blue = Double(blue) / 255
-    opacity = 1
-    space = .sRGB
+    self.init(
+      .sRGB,
+      red: Double(red) / 255,
+      green: Double(green) / 255,
+      blue: Double(blue) / 255,
+      opacity: 1
+    )
   }
 }
 
@@ -150,12 +183,6 @@ extension View {
   }
 }
 
-extension Color {
-  public static var accentColor: Self {
-    envAccentColor ?? .blue
-  }
-}
-
 struct ForegroundColorKey: EnvironmentKey {
   static let defaultValue: Color? = nil
 }