Merge pull request #2178 from rizwankce/swiftui-color-palette

SwiftUI Appearance Settings

Multiplatform/Shared/MainApp.swift

@@ -146,7 +146,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")
@@ -193,3 +195,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)
+		}
+	}
+}

Multiplatform/Shared/Sidebar/SidebarToolbar.swift

@@ -10,6 +10,7 @@ import SwiftUI
 
 struct SidebarToolbar: View {
 
+	@EnvironmentObject private var appSettings: AppDefaults
 	@State private var showSettings: Bool = false
 	@State private var showAddSheet: Bool = false
 
@@ -57,7 +58,7 @@ struct SidebarToolbar: View {
 		}
 		.background(VisualEffectBlur(blurStyle: .systemChromeMaterial).edgesIgnoringSafeArea(.bottom))
 		.sheet(isPresented: $showSettings, onDismiss: { showSettings = false }) {
-			SettingsView()
+			SettingsView().modifier(PreferredColorSchemeModifier(preferredColorScheme: appSettings.userInterfaceColorPalette))
 		}
 	
     }

Multiplatform/iOS/AppDelegate.swift

@@ -103,6 +103,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
 		UNUserNotificationCenter.current().delegate = self
 		userNotificationManager = UserNotificationManager()
 
+		NotificationCenter.default.addObserver(self, selector: #selector(userDefaultsDidChange), name: UserDefaults.didChangeNotification, object: nil)
+
+
 //		extensionContainersFile = ExtensionContainersFile()
 //		extensionFeedAddRequestFile = ExtensionFeedAddRequestFile()
 		
@@ -388,3 +391,29 @@ private extension AppDelegate {
 	}
 	
 }
+
+private extension AppDelegate {
+	@objc func userDefaultsDidChange() {
+		updateUserInterfaceStyle()
+	}
+
+	var window: UIWindow? {
+		guard let scene = UIApplication.shared.connectedScenes.first,
+			  let windowSceneDelegate = scene.delegate as? UIWindowSceneDelegate,
+			  let window = windowSceneDelegate.window else {
+			return nil
+		}
+		return window
+	}
+
+	func updateUserInterfaceStyle() {
+//		switch AppDefaults.shared.userInterfaceColorPalette {
+//		case .automatic:
+//			window?.overrideUserInterfaceStyle = .unspecified
+//		case .light:
+//			window?.overrideUserInterfaceStyle = .light
+//		case .dark:
+//			window?.overrideUserInterfaceStyle = .dark
+//		}
+	}
+}

Multiplatform/iOS/Settings/SettingsView.swift

@@ -155,12 +155,12 @@ struct SettingsView: View {
 	var appearance: some View {
 		Section(header: Text("Appearance"), content: {
 			NavigationLink(
-				destination: EmptyView(),
+				destination: ColorPaletteContainerView().environmentObject(settings),
 				label: {
 					HStack {
-						Text("Color Pallete")
+						Text("Color Palette")
 						Spacer()
-						Text("Automatic")
+						Text(settings.userInterfaceColorPalette.description)
 							.foregroundColor(.secondary)
 					}
 				})

Multiplatform/iOS/Settings/Submenus/ColorPaletteContainerView.swift

@@ -0,0 +1,60 @@
+//
+//  ColorPaletteContainerView.swift
+//  Multiplatform iOS
+//
+//  Created by Rizwan on 02/07/20.
+//  Copyright © 2020 Ranchero Software. All rights reserved.
+//
+
+import SwiftUI
+
+struct ColorPaletteContainerView: View {
+	private let colorPalettes = UserInterfaceColorPalette.allCases
+	@EnvironmentObject private var appSettings: AppDefaults
+	@Environment(\.presentationMode) var presentationMode
+
+	var body: some View {
+		List {
+			ForEach.init(0 ..< colorPalettes.count) { index in
+				Button(action: {
+					onTapColorPalette(at:index)
+				}) {
+					ColorPaletteView(colorPalette: colorPalettes[index])
+				}
+			}
+		}
+		.listStyle(InsetGroupedListStyle())
+		.navigationBarTitle("Color Palette", displayMode: .inline)
+    }
+
+	func onTapColorPalette(at index: Int) {
+		if let colorPalette = UserInterfaceColorPalette(rawValue: index) {
+			appSettings.userInterfaceColorPalette = colorPalette
+		}
+		self.presentationMode.wrappedValue.dismiss()
+	}
+}
+
+struct ColorPaletteView: View {
+	var colorPalette: UserInterfaceColorPalette
+	@EnvironmentObject private var appSettings: AppDefaults
+
+	var body: some View {
+		HStack {
+			Text(colorPalette.description).foregroundColor(.primary)
+			Spacer()
+			if colorPalette == appSettings.userInterfaceColorPalette {
+				Image(systemName: "checkmark")
+					.foregroundColor(.blue)
+			}
+		}
+	}
+}
+
+struct ColorPaletteContainerView_Previews: PreviewProvider {
+    static var previews: some View {
+		NavigationView {
+			ColorPaletteContainerView()
+		}
+    }
+}

NetNewsWire.xcodeproj/project.pbxproj

@@ -627,6 +627,8 @@
 		6581C73D20CED60100F4AD34 /* SafariExtensionViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6581C73B20CED60100F4AD34 /* SafariExtensionViewController.xib */; };
 		6581C74020CED60100F4AD34 /* netnewswire-subscribe-to-feed.js in Resources */ = {isa = PBXBuildFile; fileRef = 6581C73F20CED60100F4AD34 /* netnewswire-subscribe-to-feed.js */; };
 		6581C74220CED60100F4AD34 /* ToolbarItemIcon.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 6581C74120CED60100F4AD34 /* ToolbarItemIcon.pdf */; };
+		65CBAD3624AE02D50006DD91 /* TimelineLayoutView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 17B223DB24AC24D2001E4592 /* TimelineLayoutView.swift */; };
+		65CBAD5A24AE03C20006DD91 /* ColorPaletteContainerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65CBAD5924AE03C20006DD91 /* ColorPaletteContainerView.swift */; };
 		65ED3FB7235DEF6C0081F399 /* ArticleArray.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84F204DF1FAACBB30076E152 /* ArticleArray.swift */; };
 		65ED3FB8235DEF6C0081F399 /* CrashReporter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848B937121C8C5540038DC0D /* CrashReporter.swift */; };
 		65ED3FB9235DEF6C0081F399 /* IconView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 847CD6C9232F4CBF00FAC46D /* IconView.swift */; };
@@ -1994,6 +1996,7 @@
 		6581C73F20CED60100F4AD34 /* netnewswire-subscribe-to-feed.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = "netnewswire-subscribe-to-feed.js"; sourceTree = "<group>"; };
 		6581C74120CED60100F4AD34 /* ToolbarItemIcon.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = ToolbarItemIcon.pdf; sourceTree = "<group>"; };
 		6581C74320CED60100F4AD34 /* Subscribe_to_Feed.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Subscribe_to_Feed.entitlements; sourceTree = "<group>"; };
+		65CBAD5924AE03C20006DD91 /* ColorPaletteContainerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ColorPaletteContainerView.swift; sourceTree = "<group>"; };
 		65ED4083235DEF6C0081F399 /* NetNewsWire.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = NetNewsWire.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		65ED409D235DEF770081F399 /* Subscribe to Feed.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = "Subscribe to Feed.appex"; sourceTree = BUILT_PRODUCTS_DIR; };
 		65ED409F235DEFF00081F399 /* container-migration.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "container-migration.plist"; sourceTree = "<group>"; };
@@ -2398,6 +2401,7 @@
 			isa = PBXGroup;
 			children = (
 				17B223DB24AC24D2001E4592 /* TimelineLayoutView.swift */,
+				65CBAD5924AE03C20006DD91 /* ColorPaletteContainerView.swift */,
 			);
 			path = Submenus;
 			sourceTree = "<group>";
@@ -4794,6 +4798,7 @@
 				51E498F524A8085D00B667CB /* TodayFeedDelegate.swift in Sources */,
 				172952B024AA287100D65E66 /* CompactSidebarContainerView.swift in Sources */,
 				172199F124AB716900A31D04 /* SidebarToolbar.swift in Sources */,
+				65CBAD5A24AE03C20006DD91 /* ColorPaletteContainerView.swift in Sources */,
 				51E4990B24A808C500B667CB /* ImageDownloader.swift in Sources */,
 				51E498F424A8085D00B667CB /* SmartFeedDelegate.swift in Sources */,
 				514E6BFF24AD255D00AC6F6E /* PreviewArticles.swift in Sources */,