Page MenuHomeMusing Studio
Files F10455909

No OneTemporary
Actions

View Options

diff --git a/Shared/Preferences/PreferencesModel.swift b/Shared/Preferences/PreferencesModel.swift
index 0fde8a6..22d4753 100644
--- a/Shared/Preferences/PreferencesModel.swift
+++ b/Shared/Preferences/PreferencesModel.swift
@@ -1,67 +1,13 @@
import SwiftUI
class PreferencesModel: ObservableObject {
private let defaults = UserDefaults.shared
- /* We're stuck dropping into AppKit/UIKit to set light/dark schemes for now,
- * because setting the .preferredColorScheme modifier on views in SwiftUI is
- * currently unreliable.
- *
- * Feedback submitted to Apple:
- *
- * FB8382883: "On macOS 11β4, preferredColorScheme modifier does not respect .light ColorScheme"
- * FB8383053: "On iOS 14β4/macOS 11β4, it is not possible to unset preferredColorScheme after setting
- * it to either .light or .dark"
- */
-
- #if os(iOS)
- @available(iOSApplicationExtension, unavailable)
- 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
- }
- #endif
-
- @available(iOSApplicationExtension, unavailable)
@Published var selectedColorScheme: ColorScheme?
-
- @available(iOSApplicationExtension, unavailable)
- @Published var appearance: Int = 0 {
- didSet {
- switch appearance {
- case 1:
-// selectedColorScheme = .light
- #if os(macOS)
- NSApp.appearance = NSAppearance(named: .aqua)
- #else
- window?.overrideUserInterfaceStyle = .light
- #endif
- case 2:
-// selectedColorScheme = .dark
- #if os(macOS)
- NSApp.appearance = NSAppearance(named: .darkAqua)
- #else
- window?.overrideUserInterfaceStyle = .dark
- #endif
- default:
-// selectedColorScheme = .none
- #if os(macOS)
- NSApp.appearance = nil
- #else
- window?.overrideUserInterfaceStyle = .unspecified
- #endif
- }
-
- defaults.set(appearance, forKey: WFDefaults.colorSchemeIntegerKey)
- }
- }
+ @Published var appearance: Int = 0
@Published var font: Int = 0 {
didSet {
defaults.set(font, forKey: WFDefaults.defaultFontIntegerKey)
}
}
}
diff --git a/Shared/Preferences/PreferencesView.swift b/Shared/Preferences/PreferencesView.swift
index 1522450..4467da7 100644
--- a/Shared/Preferences/PreferencesView.swift
+++ b/Shared/Preferences/PreferencesView.swift
@@ -1,56 +1,102 @@
import SwiftUI
struct PreferencesView: View {
@ObservedObject var preferences: PreferencesModel
+ /* We're stuck dropping into AppKit/UIKit to set light/dark schemes for now,
+ * because setting the .preferredColorScheme modifier on views in SwiftUI is
+ * currently unreliable.
+ *
+ * Feedback submitted to Apple:
+ *
+ * FB8382883: "On macOS 11β4, preferredColorScheme modifier does not respect .light ColorScheme"
+ * FB8383053: "On iOS 14β4/macOS 11β4, it is not possible to unset preferredColorScheme after setting
+ * it to either .light or .dark"
+ */
+
+ #if os(iOS)
+ 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
+ }
+ #endif
+
var body: some View {
VStack {
VStack {
Text("Choose the preferred appearance for the app.")
.font(.caption)
.foregroundColor(.secondary)
Picker(selection: $preferences.appearance, label: Text("Appearance")) {
Text("System").tag(0)
Text("Light").tag(1)
Text("Dark").tag(2)
}
.pickerStyle(SegmentedPickerStyle())
}
.padding(.bottom)
VStack {
Text("Choose the default font for new posts.")
.font(.caption)
.foregroundColor(.secondary)
Picker(selection: $preferences.font, label: Text("Default Font")) {
Text("Serif").tag(0)
Text("Sans-Serif").tag(1)
Text("Monospace").tag(2)
}
.pickerStyle(SegmentedPickerStyle())
.padding(.bottom)
switch preferences.font {
case 1:
Text("Sample Text")
.frame(width: 240, height: 50, alignment: .center)
.font(.custom("OpenSans-Regular", size: 20))
case 2:
Text("Sample Text")
.frame(width: 240, height: 50, alignment: .center)
.font(.custom("Hack-Regular", size: 20))
default:
Text("Sample Text")
.frame(width: 240, height: 50, alignment: .center)
.font(.custom("Lora", size: 20))
}
}
.padding(.bottom)
}
+ .onChange(of: preferences.appearance) { value in
+ switch value {
+ case 1:
+ #if os(macOS)
+ NSApp.appearance = NSAppearance(named: .aqua)
+ #else
+ window?.overrideUserInterfaceStyle = .light
+ #endif
+ case 2:
+ #if os(macOS)
+ NSApp.appearance = NSAppearance(named: .darkAqua)
+ #else
+ window?.overrideUserInterfaceStyle = .dark
+ #endif
+ default:
+ #if os(macOS)
+ NSApp.appearance = nil
+ #else
+ window?.overrideUserInterfaceStyle = .unspecified
+ #endif
+ }
+
+ UserDefaults.shared.set(value, forKey: WFDefaults.colorSchemeIntegerKey)
+ }
}
}
struct SwiftUIView_Previews: PreviewProvider {
static var previews: some View {
PreferencesView(preferences: PreferencesModel())
}
}

File Metadata

Mime Type
text/x-diff
Expires
Sat, Feb 1, 9:53 AM (1 d, 4 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3144793

Event Timeline

musing studio · developers