Merge branch 'pr/7' into swiftui

# Conflicts: # Multiplatform/Shared/Sidebar/SidebarToolbar.swift
2025-08-12 06:26:36 +00:00 · 2020-07-03 23:47:21 +08:00
parent d8914510f7 01a26a23a3
commit 75166b404e
13 changed files with 278 additions and 95 deletions
--- a/Multiplatform/Shared/AppDefaults.swift
+++ b/Multiplatform/Shared/AppDefaults.swift
@@ -26,13 +26,6 @@ enum UserInterfaceColorPalette: Int, CustomStringConvertible, CaseIterable {
 	}
 }

-enum FontSize: Int {
-	case small = 0
-	case medium = 1
-	case large = 2
-	case veryLarge = 3
-}
-
 final class AppDefaults: ObservableObject {
 	
 	#if os(macOS)
@@ -62,26 +55,21 @@ final class AppDefaults: ObservableObject {
 		static let addWebFeedAccountID = "addWebFeedAccountID"
 		static let addWebFeedFolderName = "addWebFeedFolderName"
 		static let addFolderAccountID = "addFolderAccountID"
-		static let timelineSortDirection = "timelineSortDirection"
-		
-		// iOS Defaults
+				
 		static let userInterfaceColorPalette = "userInterfaceColorPalette"
+		static let timelineSortDirection = "timelineSortDirection"
 		static let timelineGroupByFeed = "timelineGroupByFeed"
-		static let refreshClearsReadArticles = "refreshClearsReadArticles" 
-		static let timelineNumberOfLines = "timelineNumberOfLines" 
-		static let timelineIconSize = "timelineIconSize"
-		static let articleFullscreenAvailable = "articleFullscreenAvailable" 
+		static let timelineIconDimensions = "timelineIconDimensions"
+		static let timelineNumberOfLines = "timelineNumberOfLines"
+
+		// iOS Defaults
+		static let refreshClearsReadArticles = "refreshClearsReadArticles"
+		static let articleFullscreenAvailable = "articleFullscreenAvailable"
 		static let articleFullscreenEnabled = "articleFullscreenEnabled" 
 		static let confirmMarkAllAsRead = "confirmMarkAllAsRead" 
 		
 		// macOS Defaults
-		static let windowState = "windowState"
-		static let sidebarFontSize = "sidebarFontSize"
-		static let timelineFontSize = "timelineFontSize"
-		static let detailFontSize = "detailFontSize"
 		static let openInBrowserInBackground = "openInBrowserInBackground"
-		static let importOPMLAccountID = "importOPMLAccountID"
-		static let exportOPMLAccountID = "exportOPMLAccountID"
 		static let defaultBrowserID = "defaultBrowserID"
 		static let checkForUpdatesAutomatically = "checkForUpdatesAutomatically"
 		static let downloadTestBuilds = "downloadTestBuild"
@@ -99,9 +87,6 @@ final class AppDefaults: ObservableObject {
 		
 	}
 	
-	private static let smallestFontSizeRawValue = FontSize.small.rawValue
-	private static let largestFontSizeRawValue = FontSize.veryLarge.rawValue
-	
 	// MARK:  Development Builds
 	let isDeveloperBuild: Bool = {
 		if let dev = Bundle.main.object(forInfoDictionaryKey: "DeveloperEntitlements") as? String, dev == "-dev" {
@@ -193,7 +178,7 @@ final class AppDefaults: ObservableObject {
 		}
 	}
 	
-	@AppStorage(wrappedValue: 40.0, Key.timelineIconSize, store: store) var timelineIconSize: Double {
+	@AppStorage(wrappedValue: 40.0, Key.timelineIconDimensions, store: store) var timelineIconDimensions: Double {
 		didSet {
 			objectWillChange.send()
 		}
@@ -220,64 +205,12 @@ final class AppDefaults: ObservableObject {
 	}
 	
 	// MARK: Window State
-	var windowState: [AnyHashable : Any]? {
-		get {
-			return AppDefaults.store.object(forKey: Key.windowState) as? [AnyHashable : Any]
-		}
-		set {
-			UserDefaults.standard.set(newValue, forKey: Key.windowState)
-			objectWillChange.send()
-		}
-	}
-	
 	@AppStorage(wrappedValue: false, Key.openInBrowserInBackground, store: store) var openInBrowserInBackground: Bool {
 		didSet {
 			objectWillChange.send()
 		}
 	}
 	
-	var sidebarFontSize: FontSize {
-		get {
-			return fontSize(for: Key.sidebarFontSize)
-		}
-		set {
-			AppDefaults.store.set(newValue.rawValue, forKey: Key.sidebarFontSize)
-			objectWillChange.send()
-		}
-	}
-	
-	var timelineFontSize: FontSize {
-		get {
-			return fontSize(for: Key.timelineFontSize)
-		}
-		set {
-			AppDefaults.store.set(newValue.rawValue, forKey: Key.timelineFontSize)
-			objectWillChange.send()
-		}
-	}
-	
-	var detailFontSize: FontSize {
-		get {
-			return fontSize(for: Key.detailFontSize)
-		}
-		set {
-			AppDefaults.store.set(newValue.rawValue, forKey: Key.detailFontSize)
-			objectWillChange.send()
-		}
-	}
-	
-	@AppStorage(Key.importOPMLAccountID, store: store) var importOPMLAccountID: String? {
-		didSet {
-			objectWillChange.send()
-		}
-	}
-	
-	@AppStorage(Key.exportOPMLAccountID, store: store) var exportOPMLAccountID: String? {
-		didSet {
-			objectWillChange.send()
-		}
-	}
-	
 	@AppStorage(Key.defaultBrowserID, store: store) var defaultBrowserID: String? {
 		didSet {
 			objectWillChange.send()
@@ -333,6 +266,21 @@ final class AppDefaults: ObservableObject {
 			objectWillChange.send()
 		}
 	}
+
+	static func registerDefaults() {
+		let defaults: [String : Any] = [Key.userInterfaceColorPalette: UserInterfaceColorPalette.automatic.rawValue,
+										Key.timelineGroupByFeed: false,
+										Key.refreshClearsReadArticles: false,
+										Key.timelineNumberOfLines: 2,
+										Key.timelineIconDimensions: 40,
+										Key.timelineSortDirection: ComparisonResult.orderedDescending.rawValue,
+										Key.articleFullscreenAvailable: false,
+										Key.articleFullscreenEnabled: false,
+										Key.confirmMarkAllAsRead: true,
+										"NSScrollViewShouldScrollUnderTitlebar": false,
+										Key.refreshInterval: RefreshInterval.everyHour.rawValue]
+		AppDefaults.store.register(defaults: defaults)
+	}
 	
 }

@@ -346,8 +294,4 @@ extension AppDefaults {
 		return true
 	}
 	
-	func fontSize(for key: String) -> FontSize {
-		// Punted till after 1.0.
-		return .medium
-	}
 }
--- a/Multiplatform/Shared/MainApp.swift
+++ b/Multiplatform/Shared/MainApp.swift
@@ -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)
+		}
+	}
+}
--- a/Multiplatform/Shared/Sidebar/SidebarToolbar.swift
+++ b/Multiplatform/Shared/Sidebar/SidebarToolbar.swift
@@ -9,6 +9,7 @@
 import SwiftUI

 struct SidebarToolbar: View {
+<<<<<<< HEAD
    
 	enum ToolbarSheets {
 		case none, web, twitter, reddit, folder, settings
@@ -21,6 +22,12 @@ struct SidebarToolbar: View {
 		}
 	}
 	@State private var showActionSheet: Bool = false
+=======
+
+	@EnvironmentObject private var appSettings: AppDefaults
+	@State private var showSettings: Bool = false
+	@State private var showAddSheet: Bool = false
+>>>>>>> pr/7

 	var addActionSheetButtons = [
 		Button(action: {}, label: { Text("Add Feed") })
@@ -66,6 +73,7 @@ struct SidebarToolbar: View {
 			.padding(.top, 4)
 		}
 		.background(VisualEffectBlur(blurStyle: .systemChromeMaterial).edgesIgnoringSafeArea(.bottom))
+<<<<<<< HEAD
 		.sheet(isPresented: $showSheet, onDismiss: { sheetToShow = .none }) {
 			switch sheetToShow {
 			case .web:
@@ -73,6 +81,10 @@ struct SidebarToolbar: View {
 			default:
 				EmptyView()
 			}
+=======
+		.sheet(isPresented: $showSettings, onDismiss: { showSettings = false }) {
+			SettingsView().modifier(PreferredColorSchemeModifier(preferredColorScheme: appSettings.userInterfaceColorPalette))
+>>>>>>> pr/7
 		}
 	
    }
--- a/Multiplatform/Shared/Timeline/TimelineItemView.swift
+++ b/Multiplatform/Shared/Timeline/TimelineItemView.swift
@@ -21,7 +21,7 @@ struct TimelineItemView: View {
 				TimelineItemStatusView(status: timelineItem.status)
 				if let image = articleIconImageLoader.image {
 					IconImageView(iconImage: image)
-						.frame(width: CGFloat(defaults.timelineIconSize), height: CGFloat(defaults.timelineIconSize), alignment: /*@START_MENU_TOKEN@*/.center/*@END_MENU_TOKEN@*/)
+						.frame(width: CGFloat(defaults.timelineIconDimensions), height: CGFloat(defaults.timelineIconDimensions), alignment: /*@START_MENU_TOKEN@*/.center/*@END_MENU_TOKEN@*/)
 				}
 				VStack {
 					Text(verbatim: timelineItem.article.title ?? "N/A")