Add settings for bolder content font

hartlco · Feb 16, 2020 · 089cad1 · 089cad1
1 parent 6d562d7
commit 089cad1
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 3 deletions.
diff --git a/Icro/View/Settings/SettingsContentView.swift b/Icro/View/Settings/SettingsContentView.swift
@@ -22,6 +22,7 @@ struct SettingsContentView: View {
     var body: some View {
         NavigationView {
             Form {
+                AppearanceSection(store: store)
                 WordpressSection(store: store)
                 MicropubSection(store: store, settingsNavigator: settingsNavigator)
                 AccountSection(settingsNavigator: settingsNavigator)
@@ -150,6 +151,20 @@ struct AccountSection: View {
     }
 }
 
+struct AppearanceSection: View {
+    @ObservedObject var store: SettingsViewModel
+
+    var body: some View {
+        return Section(header: Text("Appearance")
+            .font(.headline)
+            .fontWeight(.bold)) {
+                Toggle(isOn: $store.useMediumContentFont) {
+                    Text("Use bolder content font")
+                }
+        }
+    }
+}
+
 struct TipJarSection: View {
     @ObservedObject var tipJarViewModel = TipJarViewModel()
 

diff --git a/Icro/ViewModel/SettingsViewModel.swift b/Icro/ViewModel/SettingsViewModel.swift
@@ -35,6 +35,7 @@ final class SettingsViewModel: ObservableObject {
         self.notificationCenter = notificationCenter
         self.indieAuthMeURLString = userSettings.indieAuthMeURLString
         self.canSendMail = canSendMail
+        self.useMediumContentFont = userSettings.useMediumContentFont
 
         if isWordpressBlog {
             isMicropubBlog = false
@@ -115,6 +116,14 @@ final class SettingsViewModel: ObservableObject {
     let wordpressSubTitle = NSLocalizedString("SETTINGSVIEWCONTROLLER_BLOGINFO_TEXT", comment: "")
     let wordpressSwitchTitle = NSLocalizedString("SETTINGSVIEWCONTROLLER_BLOGSETUPSWITCH_TEXT", comment: "")
 
+    // MARK: - Appearance
+
+    var useMediumContentFont: Bool {
+        didSet {
+            updateSetup()
+        }
+    }
+
     private func updateSetup() {
         objectWillChange.send()
 
@@ -141,5 +150,6 @@ final class SettingsViewModel: ObservableObject {
         }
 
         userSettings.indieAuthMeURLString = indieAuthMeURLString
+        userSettings.useMediumContentFont = useMediumContentFont
     }
 }
diff --git a/IcroKit/Helper/Font.swift b/IcroKit/Helper/Font.swift
@@ -3,6 +3,8 @@
 //  Copyright © 2018 Martin Hartl. All rights reserved.
 //
 
+import Settings
+
 #if os(iOS)
 import UIKit
 public typealias XFont = UIFont
@@ -11,16 +13,22 @@ public typealias XFont = NSFont
 #endif
 
 public struct Font {
+    private let userSettings: UserSettings
+
+    public init(userSettings: UserSettings = .shared) {
+        self.userSettings = userSettings
+    }
+
     #if os(iOS)
     let bodySize: CGFloat = 17
     #elseif os(OSX)
     let bodySize: CGFloat = 13
     #endif
 
-    public init() { }
-
     public var body: XFont {
-        let font = XFont.systemFont(ofSize: bodySize, weight: .medium)
+        let useMedium = userSettings.useMediumContentFont
+        let font = XFont.systemFont(ofSize: bodySize,
+                                    weight: useMedium ? .medium : .regular)
         let fontMetrics = UIFontMetrics(forTextStyle: .body)
         return fontMetrics.scaledFont(for: font)
     }

diff --git a/Settings/Sources/Settings/Settings.swift b/Settings/Sources/Settings/Settings.swift
@@ -233,6 +233,18 @@ public final class UserSettings {
         }
     }
 
+    // MARK: - Appearance
+
+    public var useMediumContentFont: Bool {
+        set {
+            userDefaults.set(newValue, forKey: #function)
+        }
+        get {
+            guard let data = userDefaults.value(forKey: #function) as? Bool else { return true }
+            return data
+        }
+    }
+
     public func logout() {
         token = ""
         username = ""