Improve style cache behavior - addStyleNamed() should never use the cached default style

Author: calimarkus

JDStatusBarNotification/Private/StyleCache.swift

@@ -10,38 +10,45 @@ import Foundation
 import UIKit
 
 class StyleCache: NSObject {
-  var defaultStyle: StatusBarNotificationStyle = StatusBarNotificationStyle()
-  var userStyles: [String: StatusBarNotificationStyle] = [:]
+  private var defaultStyle: StatusBarNotificationStyle = StatusBarNotificationStyle()
+  private var userStyles: [String: StatusBarNotificationStyle] = [:]
 
+  //  default to cached (potentially modified) default style
   func style(forName styleName: String?) -> StatusBarNotificationStyle {
     if let styleName, let style = userStyles[styleName] {
       return style
     }
     return defaultStyle
   }
 
+  //  default to cached (potentially modified) default style
   func style(forIncludedStyle includedStyle: IncludedStatusBarNotificationStyle) -> StatusBarNotificationStyle {
+    if includedStyle == .defaultStyle {
+      return defaultStyle
+    }
     return buildStyleForIncludedStyle(includedStyle)
   }
 
   func updateDefaultStyle(_ styleBuilder: NotificationPresenter.PrepareStyleClosure) {
     defaultStyle = styleBuilder(defaultStyle)
   }
 
+  // never base this on the (potentially modified) default style
   func addStyleNamed(_ styleName: String,
                      basedOnStyle includedStyle: IncludedStatusBarNotificationStyle,
                      prepare styleBuilder: NotificationPresenter.PrepareStyleClosure) -> String
   {
-    userStyles[styleName] = styleBuilder(style(forIncludedStyle: includedStyle))
+    userStyles[styleName] = styleBuilder(buildStyleForIncludedStyle(includedStyle))
     return styleName
   }
 
   // MARK: - Included Styles
 
+  // Always creates a new Style instance
   private func buildStyleForIncludedStyle(_ includedStyle: IncludedStatusBarNotificationStyle) -> StatusBarNotificationStyle {
       switch includedStyle {
       case .defaultStyle:
-          return defaultStyle
+          return StatusBarNotificationStyle()
 
       case .light:
           let style = StatusBarNotificationStyle()

JDStatusBarNotification/Public/NotificationPresenter.swift

@@ -217,7 +217,7 @@ public class NotificationPresenter: NSObject, NotificationWindowDelegate {
     styleCache.updateDefaultStyle(prepare)
   }
 
-  /// Adds a new named style - based on an included style, if given.
+  /// Adds a new named style - based on an included style, if given.(otherwise based on the default style)
   /// This can later be used by referencing it using the `styleName`.
   ///
   /// The added style can be used in future presentations by utilizing the same `styleName` in e.g. ``present(_:subtitle:styleName:duration:completion:)``.