Merge branch 'pr/7' into swiftui

# Conflicts:
#	Multiplatform/Shared/Sidebar/SidebarToolbar.swift
This commit is contained in:
Stuart Breckenridge
2020-07-03 23:47:21 +08:00
13 changed files with 278 additions and 95 deletions

View File

@@ -150,7 +150,9 @@ struct MainApp: App {
SceneNavigationView()
.environmentObject(sceneModel)
.environmentObject(defaults)
}.commands {
.modifier(PreferredColorSchemeModifier(preferredColorScheme: defaults.userInterfaceColorPalette))
}
.commands {
CommandGroup(after: .newItem, addition: {
Button("New Feed", action: {})
.keyboardShortcut("N")
@@ -197,3 +199,20 @@ struct MainApp: App {
#endif
}
}
struct PreferredColorSchemeModifier: ViewModifier {
var preferredColorScheme: UserInterfaceColorPalette
@ViewBuilder
func body(content: Content) -> some View {
switch preferredColorScheme {
case .automatic:
content
case .dark:
content.preferredColorScheme(.dark)
case .light:
content.preferredColorScheme(.light)
}
}
}