Fix dark mode (#53)

* Fix dark mode * Update * Remove
EmergeTools · Sep 28, 2023 · d19f8cd · d19f8cd
1 parent 8a1e2ae
commit d19f8cd
Showing 1 changed file with 5 additions and 21 deletions.
diff --git a/DemoApp/DemoApp/TestViews/PreviewVariants.swift b/DemoApp/DemoApp/TestViews/PreviewVariants.swift
@@ -31,8 +31,7 @@ struct PreviewVariants: View {
           .filter { !$0.isEmpty }
           .joined(separator: ", ")
 
-        view.value
-          .modifier(modifier.value)
+        AnyView(modifier.value(view.value))
           .previewDisplayName(displayName)
           .previewLayout(layout)
       }
@@ -44,24 +43,9 @@ struct PreviewVariants: View {
   private let views: [PreviewView]
 }
 
-struct AnyViewModifier: ViewModifier {
-  func body(content: Content) -> some View {
-    modifier(content)
-  }
-
-  init(modifier: @escaping (Content) -> any View) {
-    self.modifier = {
-      AnyView(modifier($0))
-    }
-  }
-
-  let modifier: (Content) -> AnyView
-
-}
-
 struct NamedViewModifier {
   var name: String
-  var value: AnyViewModifier
+  var value: (any View) -> any View
 }
 
 extension NamedViewModifier: Identifiable {
@@ -70,15 +54,15 @@ extension NamedViewModifier: Identifiable {
 
 extension NamedViewModifier {
   static var unmodified: NamedViewModifier {
-    .init(name: "", value: .init { $0 })
+    .init(name: "", value: { $0 })
   }
 
   static var darkMode: NamedViewModifier {
-    .init(name: "Dark mode", value: .init { $0.environment(\.colorScheme, .dark) })
+    .init(name: "Dark mode", value: { $0.preferredColorScheme(.dark).environment(\.colorScheme, .dark)})
   }
 
   static var xxlTextSize: NamedViewModifier {
-    .init(name: "XXL Text Size", value: .init { $0.dynamicTypeSize(.xxxLarge) })
+    .init(name: "XXL Text Size", value: { $0.dynamicTypeSize(.xxxLarge) })
   }
 }